teiid SVN: r2485 - in branches/7.1.x/engine/src: test/java/org/teiid/query/optimizer and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-08-23 15:19:45 -0400 (Mon, 23 Aug 2010)
New Revision: 2485
Modified:
branches/7.1.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
branches/7.1.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
branches/7.1.x/engine/src/test/java/org/teiid/query/parser/TestSetQueryParsing.java
Log:
TEIIDDES-567 updates to SQLStringVisitor logic for Teiid Designer.
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2010-08-23 17:53:50 UTC (rev 2484)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2010-08-23 19:19:45 UTC (rev 2485)
@@ -24,11 +24,9 @@
import static org.teiid.language.SQLConstants.Reserved.*;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import org.teiid.core.types.DataTypeManager;
@@ -128,8 +126,9 @@
import org.teiid.translator.SourceSystemFunctions;
/**
- * <p>The SQLStringVisitor will visit a set of language objects and return the
- * corresponding SQL string representation. </p>
+ * <p>
+ * The SQLStringVisitor will visit a set of language objects and return the corresponding SQL string representation.
+ * </p>
*/
public class SQLStringVisitor extends LanguageVisitor {
@@ -138,1099 +137,1010 @@
private static final String BEGIN_HINT = "/*+"; //$NON-NLS-1$
private static final String END_HINT = "*/"; //$NON-NLS-1$
private static final char ID_ESCAPE_CHAR = '\"';
-
- private LinkedList<Object> parts = new LinkedList<Object>();
+ protected StringBuilder parts = new StringBuilder();
+
/**
* Helper to quickly get the parser string for an object using the visitor.
+ *
* @param obj Language object
* @return String SQL String for obj
*/
- public static final String getSQLString(LanguageObject obj) {
- if(obj == null) {
- return UNDEFINED;
+ public static final String getSQLString( LanguageObject obj ) {
+ if (obj == null) {
+ return UNDEFINED;
}
- SQLStringVisitor visitor = new SQLStringVisitor();
+ SQLStringVisitor visitor = new SQLStringVisitor();
obj.acceptVisitor(visitor);
- return visitor.getSQLString();
+ return visitor.getSQLString();
}
/**
* Retrieve completed string from the visitor.
+ *
* @return Complete SQL string for the visited nodes
*/
public String getSQLString() {
- StringBuilder output = new StringBuilder();
- getSQLString(this.parts, output);
- return output.toString();
+ return this.parts.toString();
}
-
- public static void getSQLString(List<Object> parts, StringBuilder output) {
- for (Object object : parts) {
- if (object instanceof List) {
- getSQLString((List<Object>)object, output);
- } else {
- output.append(object);
- }
- }
- }
-
- public List<Object> registerNode(LanguageObject obj) {
+
+ protected void visitNode( LanguageObject obj ) {
if (obj == null) {
- return Arrays.asList((Object)UNDEFINED);
+ append(UNDEFINED);
+ return;
}
- SQLStringVisitor visitor = new SQLStringVisitor();
- obj.acceptVisitor(visitor);
- return visitor.parts;
+ obj.acceptVisitor(this);
}
-
- public void replaceStringParts(Object[] parts) {
- for (int i = 0; i < parts.length; i++) {
- this.parts.add(parts[i]);
- }
+
+ protected void append( Object value ) {
+ this.parts.append(value);
}
+ protected void beginClause( @SuppressWarnings("unused") int level ) {
+ append(SPACE);
+ }
+
// ############ Visitor methods for language objects ####################
- public void visit(BetweenCriteria obj) {
- parts.add(registerNode(obj.getExpression()));
- parts.add(SPACE);
-
+ public void visit( BetweenCriteria obj ) {
+ visitNode(obj.getExpression());
+ append(SPACE);
+
if (obj.isNegated()) {
- parts.add(NOT);
- parts.add(SPACE);
+ append(NOT);
+ append(SPACE);
}
- parts.add(BETWEEN);
- parts.add(SPACE);
- parts.add(registerNode(obj.getLowerExpression()));
+ append(BETWEEN);
+ append(SPACE);
+ visitNode(obj.getLowerExpression());
- parts.add(SPACE);
- parts.add(AND);
- parts.add(SPACE);
- parts.add(registerNode(obj.getUpperExpression()));
+ append(SPACE);
+ append(AND);
+ append(SPACE);
+ visitNode(obj.getUpperExpression());
}
- public void visit(CaseExpression obj) {
- parts.add(CASE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getExpression()) );
- parts.add(SPACE);
+ public void visit( CaseExpression obj ) {
+ append(CASE);
+ append(SPACE);
+ visitNode(obj.getExpression());
+ append(SPACE);
for (int i = 0; i < obj.getWhenCount(); i++) {
- parts.add(WHEN);
- parts.add(SPACE);
- parts.add(registerNode(obj.getWhenExpression(i)) );
- parts.add(SPACE);
- parts.add(THEN);
- parts.add(SPACE);
- parts.add(registerNode(obj.getThenExpression(i)));
- parts.add(SPACE);
+ append(WHEN);
+ append(SPACE);
+ visitNode(obj.getWhenExpression(i));
+ append(SPACE);
+ append(THEN);
+ append(SPACE);
+ visitNode(obj.getThenExpression(i));
+ append(SPACE);
}
if (obj.getElseExpression() != null) {
- parts.add(ELSE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getElseExpression()));
- parts.add(SPACE);
+ append(ELSE);
+ append(SPACE);
+ visitNode(obj.getElseExpression());
+ append(SPACE);
}
- parts.add(END);
+ append(END);
}
- public void visit(CompareCriteria obj) {
+ public void visit( CompareCriteria obj ) {
Expression leftExpression = obj.getLeftExpression();
- Object leftPart = registerNode(leftExpression);
-
- String operator = obj.getOperatorAsString();
-
+ visitNode(leftExpression);
+ append(SPACE);
+ append(obj.getOperatorAsString());
+ append(SPACE);
Expression rightExpression = obj.getRightExpression();
- Object rightPart = registerNode(rightExpression);
-
- replaceStringParts(new Object[] { leftPart, SPACE, operator, SPACE, rightPart });
+ visitNode(rightExpression);
}
- public void visit(CompoundCriteria obj) {
+ public void visit( CompoundCriteria obj ) {
// Get operator string
int operator = obj.getOperator();
String operatorStr = ""; //$NON-NLS-1$
- if(operator == CompoundCriteria.AND) {
+ if (operator == CompoundCriteria.AND) {
operatorStr = AND;
- } else if(operator == CompoundCriteria.OR) {
+ } else if (operator == CompoundCriteria.OR) {
operatorStr = OR;
}
// Get criteria
- List subCriteria = obj.getCriteria();
+ List<Criteria> subCriteria = obj.getCriteria();
// Build parts
- if(subCriteria.size() == 1) {
+ if (subCriteria.size() == 1) {
// Special case - should really never happen, but we are tolerant
- Criteria firstChild = (Criteria) subCriteria.get(0);
- replaceStringParts(new Object[] { registerNode(firstChild) });
+ Criteria firstChild = subCriteria.get(0);
+ visitNode(firstChild);
} else {
- // Magic formula - suppose you have 2 sub criteria, then the string
- // has parts: (|x|)| |AND| |(|y|)
- // Each sub criteria has 3 parts and each connector has 3 parts
- // Number of connectors = number of sub criteria - 1
- // # parts = 3n + 3c ; c=n-1
- // = 3n + 3(n-1)
- // = 6n - 3
- Object[] parts = new Object[(6*subCriteria.size())-3];
-
// Add first criteria
- Iterator iter = subCriteria.iterator();
- Criteria crit = (Criteria) iter.next();
- parts[0] = "("; //$NON-NLS-1$
- parts[1] = registerNode(crit);
- parts[2] = ")"; //$NON-NLS-1$
+ Iterator<Criteria> iter = subCriteria.iterator();
- // Add rest of the criteria
- for(int i=3; iter.hasNext(); i=i+6) {
- // Add connector
- parts[i] = SPACE;
- parts[i+1] = operatorStr;
- parts[i+2] = SPACE;
-
+ while (iter.hasNext()) {
// Add criteria
- crit = (Criteria) iter.next();
- parts[i+3] = "("; //$NON-NLS-1$
- parts[i+4] = registerNode(crit);
- parts[i+5] = ")"; //$NON-NLS-1$
- }
+ Criteria crit = iter.next();
+ append(Tokens.LPAREN);
+ visitNode(crit);
+ append(Tokens.RPAREN);
- replaceStringParts(parts);
+ if (iter.hasNext()) {
+ // Add connector
+ append(SPACE);
+ append(operatorStr);
+ append(SPACE);
+ }
+ }
}
}
- public void visit(Delete obj) {
- //add delete clause
- parts.add(DELETE);
- parts.add(SPACE);
- //add from clause
- parts.add(FROM);
- parts.add(SPACE);
- parts.add(registerNode(obj.getGroup()));
+ public void visit( Delete obj ) {
+ // add delete clause
+ append(DELETE);
+ append(SPACE);
+ // add from clause
+ append(FROM);
+ append(SPACE);
+ visitNode(obj.getGroup());
- //add where clause
- if(obj.getCriteria() != null) {
- parts.add(SPACE);
- parts.add(WHERE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getCriteria()));
- }
+ // add where clause
+ if (obj.getCriteria() != null) {
+ beginClause(0);
+ visitCriteria(WHERE, obj.getCriteria());
+ }
- // Option clause
- if(obj.getOption() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOption()));
- }
+ // Option clause
+ if (obj.getOption() != null) {
+ beginClause(0);
+ visitNode(obj.getOption());
+ }
}
-
- public void visit(DependentSetCriteria obj) {
- parts.add(registerNode(obj.getExpression()));
+ public void visit( DependentSetCriteria obj ) {
+ visitNode(obj.getExpression());
+
// operator and beginning of list
- parts.add(SPACE);
+ append(SPACE);
if (obj.isNegated()) {
- parts.add(NOT);
- parts.add(SPACE);
+ append(NOT);
+ append(SPACE);
}
- parts.add(IN);
- parts.add(" (<dependent values>)"); //$NON-NLS-1$
+ append(IN);
+ append(" (<dependent values>)"); //$NON-NLS-1$
}
- public void visit(From obj) {
- Object[] parts = null;
- List clauses = obj.getClauses();
- if(clauses.size() == 1) {
- replaceStringParts(new Object[] {
- FROM, SPACE,
- registerNode( (FromClause) clauses.get(0) ) });
- } else if(clauses.size() > 1) {
- parts = new Object[2 + clauses.size() + (clauses.size()-1)];
+ public void visit( From obj ) {
+ append(FROM);
+ beginClause(1);
+ registerNodes(obj.getClauses(), 0);
+ }
- // Add first clause
- parts[0] = FROM;
- parts[1] = SPACE;
- Iterator clauseIter = clauses.iterator();
- parts[2] = registerNode((FromClause) clauseIter.next());
-
- // Add rest of the clauses
- for(int i=3; clauseIter.hasNext(); i=i+2) {
- parts[i] = ", "; //$NON-NLS-1$
- parts[i+1] = registerNode((FromClause) clauseIter.next());
- }
-
- replaceStringParts(parts);
- } else {
- // Shouldn't happen, but being tolerant
- replaceStringParts(new Object[] { FROM });
- }
+ public void visit( GroupBy obj ) {
+ append(GROUP);
+ append(SPACE);
+ append(BY);
+ append(SPACE);
+ registerNodes(obj.getSymbols(), 0);
}
- public void visit(GroupBy obj) {
- Object[] parts = null;
- List symbols = obj.getSymbols();
- if(symbols.size() == 1) {
- replaceStringParts(new Object[] {
- GROUP, SPACE, BY, SPACE,
- registerNode( (Expression) symbols.get(0) ) });
- } else if(symbols.size() > 1) {
- parts = new Object[4 + symbols.size() + (symbols.size()-1)];
+ public void visit( Insert obj ) {
+ append(INSERT);
+ append(SPACE);
+ append(INTO);
+ append(SPACE);
+ visitNode(obj.getGroup());
- // Add first clause
- parts[0] = GROUP;
- parts[1] = SPACE;
- parts[2] = BY;
- parts[3] = SPACE;
- Iterator symbolIter = symbols.iterator();
- parts[4] = registerNode((Expression) symbolIter.next());
+ if (!obj.getVariables().isEmpty()) {
+ beginClause(2);
- // Add rest of the clauses
- for(int i=5; symbolIter.hasNext(); i=i+2) {
- parts[i] = ", "; //$NON-NLS-1$
- parts[i+1] = registerNode((Expression) symbolIter.next());
+ // Columns clause
+ List vars = obj.getVariables();
+ if (vars != null) {
+ append("("); //$NON-NLS-1$
+ registerNodes(vars, 0);
+ append(")"); //$NON-NLS-1$
}
-
- replaceStringParts(parts);
- } else {
- // Shouldn't happen, but being tolerant
- replaceStringParts(new Object[] { GROUP, SPACE, BY });
}
- }
-
- public void visit(Insert obj) {
- formatBasicInsert(obj);
-
- if ( obj.getQueryExpression() != null ) {
- parts.add(registerNode(obj.getQueryExpression()));
+ beginClause(1);
+ if (obj.getQueryExpression() != null) {
+ visitNode(obj.getQueryExpression());
} else if (obj.getTupleSource() != null) {
- parts.add(VALUES);
- parts.add(" (...)"); //$NON-NLS-1$
- } else {
- parts.add(VALUES);
- parts.add(" ("); //$NON-NLS-1$
- Iterator valueIter = obj.getValues().iterator();
- while(valueIter.hasNext()) {
- Expression valObj = (Expression) valueIter.next();
- parts.add(registerNode(valObj));
- if(valueIter.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
- }
- }
- parts.add(")"); //$NON-NLS-1$
+ append(VALUES);
+ append(" (...)"); //$NON-NLS-1$
+ } else if (obj.getValues() != null) {
+ append(VALUES);
+ beginClause(2);
+ append("("); //$NON-NLS-1$
+ registerNodes(obj.getValues(), 0);
+ append(")"); //$NON-NLS-1$
}
-
- // Option clause
- if(obj.getOption() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOption()));
- }
+
+ // Option clause
+ if (obj.getOption() != null) {
+ beginClause(1);
+ visitNode(obj.getOption());
+ }
}
- public void visit(Create obj) {
- parts.add(CREATE);
- parts.add(SPACE);
- parts.add(LOCAL);
- parts.add(SPACE);
- parts.add(TEMPORARY);
- parts.add(SPACE);
- parts.add(TABLE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getTable()));
- parts.add(SPACE);
+ public void visit( Create obj ) {
+ append(CREATE);
+ append(SPACE);
+ append(LOCAL);
+ append(SPACE);
+ append(TEMPORARY);
+ append(SPACE);
+ append(TABLE);
+ append(SPACE);
+ visitNode(obj.getTable());
+ append(SPACE);
// Columns clause
List<ElementSymbol> columns = obj.getColumns();
- parts.add("("); //$NON-NLS-1$
+ append("("); //$NON-NLS-1$
Iterator<ElementSymbol> iter = columns.iterator();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
ElementSymbol element = iter.next();
outputShortName(element);
- parts.add(SPACE);
- parts.add(DataTypeManager.getDataTypeName(element.getType()));
- if(iter.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
+ append(SPACE);
+ append(DataTypeManager.getDataTypeName(element.getType()));
+ if (iter.hasNext()) {
+ append(", "); //$NON-NLS-1$
}
}
if (!obj.getPrimaryKey().isEmpty()) {
- parts.add(", "); //$NON-NLS-1$
- parts.add(PRIMARY);
- parts.add(" "); //$NON-NLS-1$
- parts.add(NonReserved.KEY);
- parts.add(Tokens.LPAREN);
- iter = obj.getPrimaryKey().iterator();
- while(iter.hasNext()) {
- outputShortName(iter.next());
- if (iter.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
- }
- }
- parts.add(Tokens.RPAREN);
- }
- parts.add(")"); //$NON-NLS-1$
- }
-
- public void visit(Drop obj) {
- parts.add(DROP);
- parts.add(SPACE);
- parts.add(TABLE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getTable()));
- }
-
- private void formatBasicInsert(Insert obj) {
- parts.add(INSERT);
- parts.add(SPACE);
- parts.add(INTO);
- parts.add(SPACE);
- parts.add(registerNode(obj.getGroup()));
- parts.add(SPACE);
-
- if (!obj.getVariables().isEmpty()) {
-
- // Columns clause
- List vars = obj.getVariables();
- if(vars != null) {
- parts.add("("); //$NON-NLS-1$
- Iterator iter = vars.iterator();
- while(iter.hasNext()) {
- ElementSymbol element = (ElementSymbol) iter.next();
- parts.add(registerNode(element));
- if(iter.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
- }
+ append(", "); //$NON-NLS-1$
+ append(PRIMARY);
+ append(" "); //$NON-NLS-1$
+ append(NonReserved.KEY);
+ append(Tokens.LPAREN);
+ iter = obj.getPrimaryKey().iterator();
+ while (iter.hasNext()) {
+ outputShortName(iter.next());
+ if (iter.hasNext()) {
+ append(", "); //$NON-NLS-1$
}
- parts.add(") "); //$NON-NLS-1$
}
+ append(Tokens.RPAREN);
}
+ append(")"); //$NON-NLS-1$
}
- public void visit(IsNullCriteria obj) {
+ public void visit( Drop obj ) {
+ append(DROP);
+ append(SPACE);
+ append(TABLE);
+ append(SPACE);
+ visitNode(obj.getTable());
+ }
+
+ public void visit( IsNullCriteria obj ) {
Expression expr = obj.getExpression();
- Object exprPart = registerNode(expr);
- parts.add(exprPart);
- parts.add(SPACE);
- parts.add(IS);
- parts.add(SPACE);
+ visitNode(expr);
+ append(SPACE);
+ append(IS);
+ append(SPACE);
if (obj.isNegated()) {
- parts.add(NOT);
- parts.add(SPACE);
+ append(NOT);
+ append(SPACE);
}
- parts.add(NULL);
+ append(NULL);
}
- public void visit(JoinPredicate obj) {
+ public void visit( JoinPredicate obj ) {
addOptionComment(obj);
-
- if(obj.hasHint()) {
- parts.add("(");//$NON-NLS-1$
+
+ if (obj.hasHint()) {
+ append("(");//$NON-NLS-1$
}
// left clause
FromClause leftClause = obj.getLeftClause();
- if(leftClause instanceof JoinPredicate && !((JoinPredicate)leftClause).hasHint()) {
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(leftClause));
- parts.add(")"); //$NON-NLS-1$
- } else {
- parts.add(registerNode(leftClause));
- }
+ if (leftClause instanceof JoinPredicate && !((JoinPredicate)leftClause).hasHint()) {
+ append("("); //$NON-NLS-1$
+ visitNode(leftClause);
+ append(")"); //$NON-NLS-1$
+ } else {
+ visitNode(leftClause);
+ }
// join type
- parts.add(SPACE);
- parts.add(registerNode(obj.getJoinType()));
- parts.add(SPACE);
+ append(SPACE);
+ visitNode(obj.getJoinType());
+ append(SPACE);
// right clause
FromClause rightClause = obj.getRightClause();
- if(rightClause instanceof JoinPredicate && !((JoinPredicate)rightClause).hasHint()) {
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(rightClause));
- parts.add(")"); //$NON-NLS-1$
- } else {
- parts.add(registerNode(rightClause));
- }
+ if (rightClause instanceof JoinPredicate && !((JoinPredicate)rightClause).hasHint()) {
+ append("("); //$NON-NLS-1$
+ visitNode(rightClause);
+ append(")"); //$NON-NLS-1$
+ } else {
+ visitNode(rightClause);
+ }
// join criteria
List joinCriteria = obj.getJoinCriteria();
- if(joinCriteria != null && joinCriteria.size() > 0) {
- parts.add(SPACE);
- parts.add(ON);
- parts.add(SPACE);
- Iterator critIter = joinCriteria.iterator();
- while(critIter.hasNext()) {
- Criteria crit = (Criteria) critIter.next();
- if(crit instanceof PredicateCriteria || crit instanceof AtomicCriteria) {
- parts.add(registerNode(crit));
+ if (joinCriteria != null && joinCriteria.size() > 0) {
+ append(SPACE);
+ append(ON);
+ append(SPACE);
+ Iterator critIter = joinCriteria.iterator();
+ while (critIter.hasNext()) {
+ Criteria crit = (Criteria)critIter.next();
+ if (crit instanceof PredicateCriteria || crit instanceof AtomicCriteria) {
+ visitNode(crit);
} else {
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(crit));
- parts.add(")"); //$NON-NLS-1$
+ append("("); //$NON-NLS-1$
+ visitNode(crit);
+ append(")"); //$NON-NLS-1$
}
- if(critIter.hasNext()) {
- parts.add(SPACE);
- parts.add(AND);
- parts.add(SPACE);
- }
- }
- }
+ if (critIter.hasNext()) {
+ append(SPACE);
+ append(AND);
+ append(SPACE);
+ }
+ }
+ }
- if(obj.hasHint()) {
- parts.add(")"); //$NON-NLS-1$
+ if (obj.hasHint()) {
+ append(")"); //$NON-NLS-1$
}
addFromClasueDepOptions(obj);
}
- private void addFromClasueDepOptions(FromClause obj) {
+ private void addFromClasueDepOptions( FromClause obj ) {
if (obj.isMakeDep()) {
- parts.add(SPACE);
- parts.add(Option.MAKEDEP);
+ append(SPACE);
+ append(Option.MAKEDEP);
}
if (obj.isMakeNotDep()) {
- parts.add(SPACE);
- parts.add(Option.MAKENOTDEP);
+ append(SPACE);
+ append(Option.MAKENOTDEP);
}
}
- private void addOptionComment(FromClause obj) {
- if (obj.isOptional()) {
- parts.add(BEGIN_HINT);
- parts.add(SPACE);
- parts.add(Option.OPTIONAL);
- parts.add(SPACE);
- parts.add(END_HINT);
- parts.add(SPACE);
- }
+ private void addOptionComment( FromClause obj ) {
+ if (obj.isOptional()) {
+ append(BEGIN_HINT);
+ append(SPACE);
+ append(Option.OPTIONAL);
+ append(SPACE);
+ append(END_HINT);
+ append(SPACE);
+ }
}
- public void visit(JoinType obj) {
- Object[] parts = null;
- if(obj.equals(JoinType.JOIN_INNER)) {
- parts = new Object[] { INNER, SPACE, JOIN };
- } else if(obj.equals(JoinType.JOIN_CROSS)) {
- parts = new Object[] { CROSS, SPACE, JOIN };
- } else if(obj.equals(JoinType.JOIN_LEFT_OUTER)) {
- parts = new Object[] { LEFT, SPACE, OUTER, SPACE, JOIN };
- } else if(obj.equals(JoinType.JOIN_RIGHT_OUTER)) {
- parts = new Object[] { RIGHT, SPACE, OUTER, SPACE, JOIN };
- } else if(obj.equals(JoinType.JOIN_FULL_OUTER)) {
- parts = new Object[] { FULL, SPACE, OUTER, SPACE, JOIN };
- } else if(obj.equals(JoinType.JOIN_UNION)) {
- parts = new Object[] { UNION, SPACE, JOIN };
+ public void visit( JoinType obj ) {
+ String[] output = null;
+ if (obj.equals(JoinType.JOIN_INNER)) {
+ output = new String[] {INNER, SPACE, JOIN};
+ } else if (obj.equals(JoinType.JOIN_CROSS)) {
+ output = new String[] {CROSS, SPACE, JOIN};
+ } else if (obj.equals(JoinType.JOIN_LEFT_OUTER)) {
+ output = new String[] {LEFT, SPACE, OUTER, SPACE, JOIN};
+ } else if (obj.equals(JoinType.JOIN_RIGHT_OUTER)) {
+ output = new String[] {RIGHT, SPACE, OUTER, SPACE, JOIN};
+ } else if (obj.equals(JoinType.JOIN_FULL_OUTER)) {
+ output = new String[] {FULL, SPACE, OUTER, SPACE, JOIN};
+ } else if (obj.equals(JoinType.JOIN_UNION)) {
+ output = new String[] {UNION, SPACE, JOIN};
} else if (obj.equals(JoinType.JOIN_SEMI)) {
- parts = new Object[] { "SEMI", SPACE, JOIN }; //$NON-NLS-1$
+ output = new String[] {"SEMI", SPACE, JOIN}; //$NON-NLS-1$
} else if (obj.equals(JoinType.JOIN_ANTI_SEMI)) {
- parts = new Object[] { "ANTI SEMI", SPACE, JOIN }; //$NON-NLS-1$
+ output = new String[] {"ANTI SEMI", SPACE, JOIN}; //$NON-NLS-1$
+ } else {
+ throw new AssertionError();
}
-
- replaceStringParts(parts);
+ for (String part : output) {
+ append(part);
+ }
}
- public void visit(MatchCriteria obj) {
- parts.add(registerNode(obj.getLeftExpression()));
+ public void visit( MatchCriteria obj ) {
+ visitNode(obj.getLeftExpression());
- parts.add(SPACE);
+ append(SPACE);
if (obj.isNegated()) {
- parts.add(NOT);
- parts.add(SPACE);
+ append(NOT);
+ append(SPACE);
}
- parts.add(LIKE);
- parts.add(SPACE);
+ append(LIKE);
+ append(SPACE);
- parts.add(registerNode(obj.getRightExpression()));
+ visitNode(obj.getRightExpression());
- if(obj.getEscapeChar() != MatchCriteria.NULL_ESCAPE_CHAR) {
- parts.add(SPACE);
- parts.add(ESCAPE);
- parts.add(" '"); //$NON-NLS-1$
- parts.add("" + obj.getEscapeChar()); //$NON-NLS-1$
- parts.add("'"); //$NON-NLS-1$
+ if (obj.getEscapeChar() != MatchCriteria.NULL_ESCAPE_CHAR) {
+ append(SPACE);
+ append(ESCAPE);
+ append(" '"); //$NON-NLS-1$
+ append("" + obj.getEscapeChar()); //$NON-NLS-1$
+ append("'"); //$NON-NLS-1$
}
}
- public void visit(NotCriteria obj) {
- parts.add(NOT);
- parts.add(" ("); //$NON-NLS-1$
- parts.add(registerNode(obj.getCriteria()));
- parts.add(")"); //$NON-NLS-1$
+ public void visit( NotCriteria obj ) {
+ append(NOT);
+ append(" ("); //$NON-NLS-1$
+ visitNode(obj.getCriteria());
+ append(")"); //$NON-NLS-1$
}
- public void visit(Option obj) {
- parts.add(OPTION);
+ public void visit( Option obj ) {
+ append(OPTION);
Collection groups = obj.getDependentGroups();
- if(groups != null && groups.size() > 0) {
- parts.add(" "); //$NON-NLS-1$
- parts.add(MAKEDEP);
- parts.add(" "); //$NON-NLS-1$
+ if (groups != null && groups.size() > 0) {
+ append(" "); //$NON-NLS-1$
+ append(MAKEDEP);
+ append(" "); //$NON-NLS-1$
Iterator iter = groups.iterator();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
outputDisplayName((String)iter.next());
-
+
if (iter.hasNext()) {
- parts.add(", ");
+ append(", ");
}
}
}
-
+
groups = obj.getNotDependentGroups();
- if(groups != null && groups.size() > 0) {
- parts.add(" "); //$NON-NLS-1$
- parts.add(MAKENOTDEP);
- parts.add(" "); //$NON-NLS-1$
+ if (groups != null && groups.size() > 0) {
+ append(" "); //$NON-NLS-1$
+ append(MAKENOTDEP);
+ append(" "); //$NON-NLS-1$
Iterator iter = groups.iterator();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
outputDisplayName((String)iter.next());
-
+
if (iter.hasNext()) {
- parts.add(", ");
+ append(", ");
}
}
}
-
+
groups = obj.getNoCacheGroups();
- if(groups != null && groups.size() > 0) {
- parts.add(" "); //$NON-NLS-1$
- parts.add(NOCACHE);
- parts.add(" "); //$NON-NLS-1$
+ if (groups != null && groups.size() > 0) {
+ append(" "); //$NON-NLS-1$
+ append(NOCACHE);
+ append(" "); //$NON-NLS-1$
Iterator iter = groups.iterator();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
outputDisplayName((String)iter.next());
-
+
if (iter.hasNext()) {
- parts.add(", ");
+ append(", ");
}
}
- }else if(obj.isNoCache()){
- parts.add(" "); //$NON-NLS-1$
- parts.add(NOCACHE);
+ } else if (obj.isNoCache()) {
+ append(" "); //$NON-NLS-1$
+ append(NOCACHE);
}
}
- public void visit(OrderBy obj) {
- parts.add(ORDER);
- parts.add(SPACE);
- parts.add(BY);
- parts.add(SPACE);
- for (Iterator<OrderByItem> iterator = obj.getOrderByItems().iterator(); iterator.hasNext();) {
- OrderByItem item = iterator.next();
- parts.add(registerNode(item));
- if (iterator.hasNext()) {
- parts.add( ", " ); //$NON-NLS-1$
- }
- }
+ public void visit( OrderBy obj ) {
+ append(ORDER);
+ append(SPACE);
+ append(BY);
+ append(SPACE);
+ for (Iterator<OrderByItem> iterator = obj.getOrderByItems().iterator(); iterator.hasNext();) {
+ OrderByItem item = iterator.next();
+ visitNode(item);
+ if (iterator.hasNext()) {
+ append(", "); //$NON-NLS-1$
+ }
+ }
}
-
+
@Override
- public void visit(OrderByItem obj) {
- SingleElementSymbol ses = obj.getSymbol();
- if (ses instanceof AliasSymbol) {
- AliasSymbol as = (AliasSymbol)ses;
- outputDisplayName(as.getOutputName());
- } else {
- parts.add(registerNode(ses));
- }
- if(!obj.isAscending()) {
- parts.add(SPACE);
- parts.add(DESC);
+ public void visit( OrderByItem obj ) {
+ SingleElementSymbol ses = obj.getSymbol();
+ if (ses instanceof AliasSymbol) {
+ AliasSymbol as = (AliasSymbol)ses;
+ outputDisplayName(as.getOutputName());
+ } else {
+ visitNode(ses);
+ }
+ if (!obj.isAscending()) {
+ append(SPACE);
+ append(DESC);
} // Don't print default "ASC"
if (obj.getNullOrdering() != null) {
- parts.add(SPACE);
- parts.add(NonReserved.NULLS);
- parts.add(SPACE);
- parts.add(obj.getNullOrdering().name());
+ append(SPACE);
+ append(NonReserved.NULLS);
+ append(SPACE);
+ append(obj.getNullOrdering().name());
}
}
-
- public void visit(DynamicCommand obj) {
- parts.add(EXECUTE);
- parts.add(SPACE);
- parts.add(STRING);
- parts.add(SPACE);
- parts.add(registerNode(obj.getSql()));
- if(obj.isAsClauseSet()){
- parts.add(SPACE);
- parts.add(AS);
- parts.add(SPACE);
+ public void visit( DynamicCommand obj ) {
+ append(EXECUTE);
+ append(SPACE);
+ append(STRING);
+ append(SPACE);
+ visitNode(obj.getSql());
+
+ if (obj.isAsClauseSet()) {
+ beginClause(1);
+ append(AS);
+ append(SPACE);
for (int i = 0; i < obj.getAsColumns().size(); i++) {
ElementSymbol symbol = (ElementSymbol)obj.getAsColumns().get(i);
outputShortName(symbol);
- parts.add(SPACE);
- parts.add(DataTypeManager.getDataTypeName(symbol.getType()));
+ append(SPACE);
+ append(DataTypeManager.getDataTypeName(symbol.getType()));
if (i < obj.getAsColumns().size() - 1) {
- parts.add(", "); //$NON-NLS-1$
+ append(", "); //$NON-NLS-1$
}
}
}
- if(obj.getIntoGroup() != null){
- parts.add(SPACE);
- parts.add(INTO);
- parts.add(SPACE);
- parts.add(registerNode(obj.getIntoGroup()));
+ if (obj.getIntoGroup() != null) {
+ beginClause(1);
+ append(INTO);
+ append(SPACE);
+ visitNode(obj.getIntoGroup());
}
- if(obj.getUsing() != null && !obj.getUsing().isEmpty()) {
- parts.add(SPACE);
- parts.add(USING);
- parts.add(SPACE);
- parts.add(registerNode(obj.getUsing()));
+ if (obj.getUsing() != null && !obj.getUsing().isEmpty()) {
+ beginClause(1);
+ append(USING);
+ append(SPACE);
+ visitNode(obj.getUsing());
}
if (obj.getUpdatingModelCount() > 0) {
- parts.add(SPACE);
- parts.add(UPDATE);
- parts.add(SPACE);
+ beginClause(1);
+ append(UPDATE);
+ append(SPACE);
if (obj.getUpdatingModelCount() > 1) {
- parts.add("*"); //$NON-NLS-1$
+ append("*"); //$NON-NLS-1$
} else {
- parts.add("1"); //$NON-NLS-1$
+ append("1"); //$NON-NLS-1$
}
}
}
- public void visit(SetClauseList obj) {
- for (Iterator<SetClause> iterator = obj.getClauses().iterator(); iterator.hasNext();) {
- SetClause clause = iterator.next();
- parts.add(registerNode(clause));
+ public void visit( SetClauseList obj ) {
+ for (Iterator<SetClause> iterator = obj.getClauses().iterator(); iterator.hasNext();) {
+ SetClause clause = iterator.next();
+ visitNode(clause);
if (iterator.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
+ append(", "); //$NON-NLS-1$
}
- }
+ }
}
-
- public void visit(SetClause obj) {
+
+ public void visit( SetClause obj ) {
ElementSymbol symbol = obj.getSymbol();
outputShortName(symbol);
- parts.add(" = "); //$NON-NLS-1$
- parts.add(registerNode(obj.getValue()));
+ append(" = "); //$NON-NLS-1$
+ visitNode(obj.getValue());
}
- public void visit(Query obj) {
- addCacheHint(obj.getCacheHint());
- parts.add(registerNode(obj.getSelect()));
+ public void visit( Query obj ) {
+ addCacheHint(obj.getCacheHint());
+ visitNode(obj.getSelect());
- if(obj.getInto() != null){
- parts.add(SPACE);
- parts.add(INTO);
- parts.add(SPACE);
- parts.add(registerNode(obj.getInto()));
+ if (obj.getInto() != null) {
+ beginClause(1);
+ visitNode(obj.getInto());
}
- if(obj.getFrom() != null){
- parts.add(SPACE);
- parts.add(registerNode(obj.getFrom()));
+ if (obj.getFrom() != null) {
+ beginClause(1);
+ visitNode(obj.getFrom());
}
// Where clause
- if(obj.getCriteria() != null) {
- parts.add(SPACE);
- parts.add(WHERE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getCriteria()));
+ if (obj.getCriteria() != null) {
+ beginClause(1);
+ visitCriteria(WHERE, obj.getCriteria());
}
- // Group by clause
- if(obj.getGroupBy() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getGroupBy()));
+ // Group by clause
+ if (obj.getGroupBy() != null) {
+ beginClause(1);
+ visitNode(obj.getGroupBy());
}
- // Having clause
- if(obj.getHaving() != null) {
- parts.add(SPACE);
- parts.add(HAVING);
- parts.add(SPACE);
- parts.add(registerNode(obj.getHaving()));
- }
+ // Having clause
+ if (obj.getHaving() != null) {
+ beginClause(1);
+ visitCriteria(HAVING, obj.getHaving());
+ }
- // Order by clause
- if(obj.getOrderBy() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOrderBy()));
- }
-
+ // Order by clause
+ if (obj.getOrderBy() != null) {
+ beginClause(1);
+ visitNode(obj.getOrderBy());
+ }
+
if (obj.getLimit() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getLimit()));
+ beginClause(1);
+ visitNode(obj.getLimit());
}
- // Option clause
- if(obj.getOption() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOption()));
- }
+ // Option clause
+ if (obj.getOption() != null) {
+ beginClause(1);
+ visitNode(obj.getOption());
+ }
}
- public void visit(SearchedCaseExpression obj) {
- parts.add(CASE);
+ protected void visitCriteria( String keyWord,
+ Criteria crit ) {
+ append(keyWord);
+ append(SPACE);
+ visitNode(crit);
+ }
+
+ public void visit( SearchedCaseExpression obj ) {
+ append(CASE);
for (int i = 0; i < obj.getWhenCount(); i++) {
- parts.add(SPACE);
- parts.add(WHEN);
- parts.add(SPACE);
- parts.add(registerNode(obj.getWhenCriteria(i)));
- parts.add(SPACE);
- parts.add(THEN);
- parts.add(SPACE);
- parts.add(registerNode(obj.getThenExpression(i)));
+ append(SPACE);
+ append(WHEN);
+ append(SPACE);
+ visitNode(obj.getWhenCriteria(i));
+ append(SPACE);
+ append(THEN);
+ append(SPACE);
+ visitNode(obj.getThenExpression(i));
}
- parts.add(SPACE);
+ append(SPACE);
if (obj.getElseExpression() != null) {
- parts.add(ELSE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getElseExpression()));
- parts.add(SPACE);
+ append(ELSE);
+ append(SPACE);
+ visitNode(obj.getElseExpression());
+ append(SPACE);
}
- parts.add(END);
+ append(END);
}
- public void visit(Select obj) {
- parts.add(SELECT);
- parts.add(SPACE);
+ public void visit( Select obj ) {
+ append(SELECT);
+ if (obj.isDistinct()) {
+ append(SPACE);
+ append(DISTINCT);
+ }
+ beginClause(2);
- if(obj.isDistinct()) {
- parts.add(DISTINCT);
- parts.add(SPACE);
- }
-
- Iterator iter = obj.getSymbols().iterator();
- while( iter.hasNext() ) {
- SelectSymbol symbol = (SelectSymbol) iter.next();
- parts.add(registerNode(symbol));
- if(iter.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
- }
+ Iterator iter = obj.getSymbols().iterator();
+ while (iter.hasNext()) {
+ SelectSymbol symbol = (SelectSymbol)iter.next();
+ visitNode(symbol);
+ if (iter.hasNext()) {
+ append(", "); //$NON-NLS-1$
+ }
}
}
- public void visit(SetCriteria obj) {
- // variable
- parts.add(registerNode(obj.getExpression()));
+ public void visit( SetCriteria obj ) {
+ // variable
+ visitNode(obj.getExpression());
- // operator and beginning of list
- parts.add(SPACE);
+ // operator and beginning of list
+ append(SPACE);
if (obj.isNegated()) {
- parts.add(NOT);
- parts.add(SPACE);
+ append(NOT);
+ append(SPACE);
}
- parts.add(IN);
- parts.add(" ("); //$NON-NLS-1$
+ append(IN);
+ append(" ("); //$NON-NLS-1$
- // value list
- Collection vals = obj.getValues();
- int size = vals.size();
- if(size == 1) {
- Iterator iter = vals.iterator();
- Expression expr = (Expression) iter.next();
- parts.add( registerNode( expr ) );
- } else if(size > 1) {
- Iterator iter = vals.iterator();
- Expression expr = (Expression) iter.next();
- parts.add( registerNode( expr ) );
- while(iter.hasNext()) {
- expr = (Expression) iter.next();
- parts.add(", "); //$NON-NLS-1$
- parts.add( registerNode( expr ) );
- }
- }
- parts.add(")"); //$NON-NLS-1$
+ // value list
+ Collection vals = obj.getValues();
+ int size = vals.size();
+ if (size == 1) {
+ Iterator iter = vals.iterator();
+ Expression expr = (Expression)iter.next();
+ visitNode(expr);
+ } else if (size > 1) {
+ Iterator iter = vals.iterator();
+ Expression expr = (Expression)iter.next();
+ visitNode(expr);
+ while (iter.hasNext()) {
+ expr = (Expression)iter.next();
+ append(", "); //$NON-NLS-1$
+ visitNode(expr);
+ }
+ }
+ append(")"); //$NON-NLS-1$
}
- public void visit(SetQuery obj) {
- addCacheHint(obj.getCacheHint());
+ public void visit( SetQuery obj ) {
+ addCacheHint(obj.getCacheHint());
QueryCommand query = obj.getLeftQuery();
- if(query instanceof Query) {
- parts.add(registerNode(query));
- } else {
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(query));
- parts.add(")"); //$NON-NLS-1$
- }
+ appendSetQuery(obj, query, false);
- parts.add(SPACE);
- parts.add(obj.getOperation());
- parts.add(SPACE);
+ beginClause(0);
+ append(obj.getOperation());
- if(obj.isAll()) {
- parts.add(ALL);
- parts.add(SPACE);
+ if (obj.isAll()) {
+ append(SPACE);
+ append(ALL);
}
-
+ beginClause(0);
query = obj.getRightQuery();
- if(query instanceof Query) {
- parts.add(registerNode(query));
- } else {
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(query));
- parts.add(")"); //$NON-NLS-1$
+ appendSetQuery(obj, query, true);
+
+ if (obj.getOrderBy() != null) {
+ beginClause(0);
+ visitNode(obj.getOrderBy());
}
- if(obj.getOrderBy() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOrderBy()));
+ if (obj.getLimit() != null) {
+ beginClause(0);
+ visitNode(obj.getLimit());
}
- if(obj.getLimit() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getLimit()));
+ if (obj.getOption() != null) {
+ beginClause(0);
+ visitNode(obj.getOption());
}
+ }
- if(obj.getOption() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOption()));
+ protected void appendSetQuery( SetQuery parent,
+ QueryCommand obj,
+ boolean right ) {
+ if (right && obj instanceof SetQuery
+ && ((parent.isAll() && !((SetQuery)obj).isAll()) || parent.getOperation() != ((SetQuery)obj).getOperation())) {
+ append(Tokens.LPAREN);
+ visitNode(obj);
+ append(Tokens.RPAREN);
+ } else {
+ visitNode(obj);
}
}
- public void visit(StoredProcedure obj) {
- addCacheHint(obj.getCacheHint());
- //exec clause
- parts.add(EXEC);
- parts.add(SPACE);
- parts.add(obj.getProcedureName());
- parts.add("("); //$NON-NLS-1$
- List params = obj.getInputParameters();
- if(params != null) {
+ public void visit( StoredProcedure obj ) {
+ addCacheHint(obj.getCacheHint());
+ // exec clause
+ append(EXEC);
+ append(SPACE);
+ append(obj.getProcedureName());
+ append("("); //$NON-NLS-1$
+ List params = obj.getInputParameters();
+ if (params != null) {
Iterator iter = params.iterator();
- while(iter.hasNext()) {
- SPParameter param = (SPParameter) iter.next();
-
- if (obj.displayNamedParameters()) {
- parts.add(escapeSinglePart(ElementSymbol.getShortName(param.getParameterSymbol().getOutputName())));
- parts.add(" => "); //$NON-NLS-1$
+ while (iter.hasNext()) {
+ SPParameter param = (SPParameter)iter.next();
+
+ if (obj.displayNamedParameters()) {
+ append(escapeSinglePart(ElementSymbol.getShortName(param.getParameterSymbol().getOutputName())));
+ append(" => "); //$NON-NLS-1$
}
-
- if(param.getExpression() == null) {
- if(param.getName() != null) {
- outputDisplayName(obj.getParamFullName(param));
+
+ if (param.getExpression() == null) {
+ if (param.getName() != null) {
+ outputDisplayName(obj.getParamFullName(param));
} else {
- parts.add("?"); //$NON-NLS-1$
+ append("?"); //$NON-NLS-1$
}
} else {
- boolean addParens = !obj.displayNamedParameters() && param.getExpression() instanceof CompareCriteria;
- if (addParens) {
- parts.add(Tokens.LPAREN);
- }
- parts.add(registerNode(param.getExpression()));
+ boolean addParens = !obj.displayNamedParameters() && param.getExpression() instanceof CompareCriteria;
if (addParens) {
- parts.add(Tokens.RPAREN);
- }
+ append(Tokens.LPAREN);
+ }
+ visitNode(param.getExpression());
+ if (addParens) {
+ append(Tokens.RPAREN);
+ }
}
- if(iter.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
+ if (iter.hasNext()) {
+ append(", "); //$NON-NLS-1$
}
}
}
- parts.add(")"); //$NON-NLS-1$
+ append(")"); //$NON-NLS-1$
// Option clause
- if(obj.getOption() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOption()));
- }else{
- parts.add(""); //$NON-NLS-1$
- }
+ if (obj.getOption() != null) {
+ beginClause(1);
+ visitNode(obj.getOption());
+ }
}
- public void addCacheHint(CacheHint obj) {
- if (obj == null) {
- return;
- }
- parts.add(BEGIN_HINT);
- parts.add(SPACE);
- parts.add(CacheHint.CACHE);
+ public void addCacheHint( CacheHint obj ) {
+ if (obj == null) {
+ return;
+ }
+ append(BEGIN_HINT);
+ append(SPACE);
+ append(CacheHint.CACHE);
boolean addParens = false;
if (obj.getPrefersMemory()) {
- parts.add(Tokens.LPAREN);
- addParens = true;
- parts.add(CacheHint.PREF_MEM);
+ append(Tokens.LPAREN);
+ addParens = true;
+ append(CacheHint.PREF_MEM);
}
if (obj.getTtl() != null) {
- if (!addParens) {
- parts.add(Tokens.LPAREN);
- addParens = true;
- } else {
- parts.add(SPACE);
- }
- parts.add(CacheHint.TTL);
- parts.add(obj.getTtl());
+ if (!addParens) {
+ append(Tokens.LPAREN);
+ addParens = true;
+ } else {
+ append(SPACE);
+ }
+ append(CacheHint.TTL);
+ append(obj.getTtl());
}
if (obj.isUpdatable()) {
- if (!addParens) {
- parts.add(Tokens.LPAREN);
- addParens = true;
- } else {
- parts.add(SPACE);
- }
- parts.add(CacheHint.UPDATABLE);
+ if (!addParens) {
+ append(Tokens.LPAREN);
+ addParens = true;
+ } else {
+ append(SPACE);
+ }
+ append(CacheHint.UPDATABLE);
}
if (addParens) {
- parts.add(Tokens.RPAREN);
+ append(Tokens.RPAREN);
}
- parts.add(SPACE);
- parts.add(END_HINT);
- parts.add(SPACE);
- }
+ append(SPACE);
+ append(END_HINT);
+ beginClause(0);
+ }
- public void visit(SubqueryFromClause obj) {
+ public void visit( SubqueryFromClause obj ) {
addOptionComment(obj);
if (obj.isTable()) {
- parts.add(TABLE);
+ append(TABLE);
}
- parts.add("(");//$NON-NLS-1$
- parts.add(registerNode(obj.getCommand()));
- parts.add(")");//$NON-NLS-1$
- parts.add(" AS ");//$NON-NLS-1$
- parts.add(obj.getOutputName());
+ append("(");//$NON-NLS-1$
+ visitNode(obj.getCommand());
+ append(")");//$NON-NLS-1$
+ append(" AS ");//$NON-NLS-1$
+ append(obj.getOutputName());
addFromClasueDepOptions(obj);
}
- public void visit(SubquerySetCriteria obj) {
+ public void visit( SubquerySetCriteria obj ) {
// variable
- parts.add(registerNode(obj.getExpression()));
+ visitNode(obj.getExpression());
// operator and beginning of list
- parts.add(SPACE);
+ append(SPACE);
if (obj.isNegated()) {
- parts.add(NOT);
- parts.add(SPACE);
+ append(NOT);
+ append(SPACE);
}
- parts.add(IN);
- parts.add(" ("); //$NON-NLS-1$
- parts.add(registerNode(obj.getCommand()));
- parts.add(")"); //$NON-NLS-1$
+ append(IN);
+ append(" ("); //$NON-NLS-1$
+ visitNode(obj.getCommand());
+ append(")"); //$NON-NLS-1$
}
-
- public void visit(UnaryFromClause obj) {
+ public void visit( UnaryFromClause obj ) {
addOptionComment(obj);
- parts.add(registerNode(obj.getGroup()));
+ visitNode(obj.getGroup());
addFromClasueDepOptions(obj);
}
- public void visit(Update obj) {
+ public void visit( Update obj ) {
// Update clause
- parts.add(UPDATE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getGroup()));
- parts.add(SPACE);
-
+ append(UPDATE);
+ append(SPACE);
+ visitNode(obj.getGroup());
+ beginClause(1);
// Set clause
- parts.add(SET);
- parts.add(SPACE);
+ append(SET);
+ beginClause(2);
+ visitNode(obj.getChangeList());
- parts.add(registerNode(obj.getChangeList()));
-
- // Where clause
- if(obj.getCriteria() != null) {
- parts.add(SPACE);
- parts.add(WHERE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getCriteria()));
- }
+ // Where clause
+ if (obj.getCriteria() != null) {
+ beginClause(1);
+ visitCriteria(WHERE, obj.getCriteria());
+ }
- // Option clause
- if(obj.getOption() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOption()));
- }
+ // Option clause
+ if (obj.getOption() != null) {
+ beginClause(1);
+ visitNode(obj.getOption());
+ }
}
- public void visit(Into obj) {
- parts.add(registerNode(obj.getGroup()));
+ public void visit( Into obj ) {
+ append(INTO);
+ append(SPACE);
+ visitNode(obj.getGroup());
}
// ############ Visitor methods for symbol objects ####################
- public void visit(AggregateSymbol obj) {
- parts.add(obj.getAggregateFunction().name());
- parts.add("("); //$NON-NLS-1$
+ public void visit( AggregateSymbol obj ) {
+ append(obj.getAggregateFunction().name());
+ append("("); //$NON-NLS-1$
- if(obj.isDistinct()) {
- parts.add(DISTINCT);
- parts.add(" "); //$NON-NLS-1$
- }
+ if (obj.isDistinct()) {
+ append(DISTINCT);
+ append(" "); //$NON-NLS-1$
+ }
- if(obj.getExpression() == null) {
- parts.add(Tokens.ALL_COLS);
- } else {
- parts.add(registerNode(obj.getExpression()));
- }
-
- if (obj.getOrderBy() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOrderBy()));
- }
- parts.add(")"); //$NON-NLS-1$
+ if (obj.getExpression() == null) {
+ append(Tokens.ALL_COLS);
+ } else {
+ visitNode(obj.getExpression());
+ }
+
+ if (obj.getOrderBy() != null) {
+ append(SPACE);
+ visitNode(obj.getOrderBy());
+ }
+ append(")"); //$NON-NLS-1$
}
- public void visit(AliasSymbol obj) {
- parts.add(registerNode(obj.getSymbol()));
- parts.add(SPACE);
- parts.add(AS);
- parts.add(SPACE);
- parts.add(escapeSinglePart(obj.getOutputName()));
+ public void visit( AliasSymbol obj ) {
+ visitNode(obj.getSymbol());
+ append(SPACE);
+ append(AS);
+ append(SPACE);
+ append(escapeSinglePart(obj.getOutputName()));
}
- public void visit(AllInGroupSymbol obj) {
- parts.add(obj.getName());
+ public void visit( AllInGroupSymbol obj ) {
+ append(obj.getName());
}
- public void visit(AllSymbol obj) {
- parts.add(obj.getName());
+ public void visit( AllSymbol obj ) {
+ append(obj.getName());
}
- public void visit(Constant obj) {
+ public void visit( Constant obj ) {
Class<?> type = obj.getType();
- Object[] constantParts = null;
+ String[] constantParts = null;
if (obj.isMultiValued()) {
- constantParts = new Object[] {"?"}; //$NON-NLS-1$
- } else if(obj.isNull()) {
- if(type.equals(DataTypeManager.DefaultDataClasses.BOOLEAN)) {
- constantParts = new Object[] {UNKNOWN};
- } else {
- constantParts = new Object[] {"null"}; //$NON-NLS-1$
- }
- } else {
- if(Number.class.isAssignableFrom(type)) {
- constantParts = new Object[] { obj.getValue().toString() };
- } else if(type.equals(DataTypeManager.DefaultDataClasses.BOOLEAN)) {
- constantParts = new Object[] { obj.getValue().equals(Boolean.TRUE) ? TRUE : FALSE};
- } else if(type.equals(DataTypeManager.DefaultDataClasses.TIMESTAMP)) {
- constantParts = new Object[] { "{ts'", obj.getValue().toString(), "'}" }; //$NON-NLS-1$ //$NON-NLS-2$
- } else if(type.equals(DataTypeManager.DefaultDataClasses.TIME)) {
- constantParts = new Object[] { "{t'", obj.getValue().toString(), "'}" }; //$NON-NLS-1$ //$NON-NLS-2$
- } else if(type.equals(DataTypeManager.DefaultDataClasses.DATE)) {
- constantParts = new Object[] { "{d'", obj.getValue().toString(), "'}" }; //$NON-NLS-1$ //$NON-NLS-2$
- }
+ constantParts = new String[] {"?"}; //$NON-NLS-1$
+ } else if (obj.isNull()) {
+ if (type.equals(DataTypeManager.DefaultDataClasses.BOOLEAN)) {
+ constantParts = new String[] {UNKNOWN};
+ } else {
+ constantParts = new String[] {"null"}; //$NON-NLS-1$
+ }
+ } else {
+ if (Number.class.isAssignableFrom(type)) {
+ constantParts = new String[] {obj.getValue().toString()};
+ } else if (type.equals(DataTypeManager.DefaultDataClasses.BOOLEAN)) {
+ constantParts = new String[] {obj.getValue().equals(Boolean.TRUE) ? TRUE : FALSE};
+ } else if (type.equals(DataTypeManager.DefaultDataClasses.TIMESTAMP)) {
+ constantParts = new String[] {"{ts'", obj.getValue().toString(), "'}"}; //$NON-NLS-1$ //$NON-NLS-2$
+ } else if (type.equals(DataTypeManager.DefaultDataClasses.TIME)) {
+ constantParts = new String[] {"{t'", obj.getValue().toString(), "'}"}; //$NON-NLS-1$ //$NON-NLS-2$
+ } else if (type.equals(DataTypeManager.DefaultDataClasses.DATE)) {
+ constantParts = new String[] {"{d'", obj.getValue().toString(), "'}"}; //$NON-NLS-1$ //$NON-NLS-2$
+ }
if (constantParts == null) {
- String strValue = obj.getValue().toString();
- strValue = escapeStringValue(strValue, "'"); //$NON-NLS-1$
- constantParts = new Object[] { "'", strValue, "'" }; //$NON-NLS-1$ //$NON-NLS-2$
+ String strValue = obj.getValue().toString();
+ strValue = escapeStringValue(strValue, "'"); //$NON-NLS-1$
+ constantParts = new String[] {"'", strValue, "'"}; //$NON-NLS-1$ //$NON-NLS-2$
}
}
- replaceStringParts(constantParts);
+ for (String string : constantParts) {
+ append(string);
+ }
}
- /**
- * Take a string literal and escape it as necessary. By default, this converts ' to ''.
- * @param str String literal value (unquoted), never null
- * @return Escaped string literal value
- */
- static String escapeStringValue(String str, String tick) {
+ /**
+ * Take a string literal and escape it as necessary. By default, this converts ' to ''.
+ *
+ * @param str String literal value (unquoted), never null
+ * @return Escaped string literal value
+ */
+ static String escapeStringValue( String str,
+ String tick ) {
return StringUtil.replaceAll(str, tick, tick + tick);
}
- public void visit(ElementSymbol obj) {
+ public void visit( ElementSymbol obj ) {
if (obj.getDisplayMode().equals(ElementSymbol.DisplayMode.SHORT_OUTPUT_NAME)) {
outputShortName(obj);
return;
@@ -1241,704 +1151,706 @@
}
outputDisplayName(name);
}
-
- private void outputShortName(ElementSymbol obj) {
- outputDisplayName(SingleElementSymbol.getShortName(obj.getOutputName()));
+
+ private void outputShortName( ElementSymbol obj ) {
+ outputDisplayName(SingleElementSymbol.getShortName(obj.getOutputName()));
}
- private void outputDisplayName(String name) {
+ private void outputDisplayName( String name ) {
String[] pathParts = name.split("\\."); //$NON-NLS-1$
for (int i = 0; i < pathParts.length; i++) {
if (i > 0) {
- parts.add(ElementSymbol.SEPARATOR);
+ append(ElementSymbol.SEPARATOR);
}
- parts.add(escapeSinglePart(pathParts[i]));
+ append(escapeSinglePart(pathParts[i]));
}
}
- public void visit(ExpressionSymbol obj) {
- parts.add(registerNode(obj.getExpression()));
+ public void visit( ExpressionSymbol obj ) {
+ visitNode(obj.getExpression());
}
- public void visit(Function obj) {
+ public void visit( Function obj ) {
String name = obj.getName();
Expression[] args = obj.getArgs();
- if(obj.isImplicit()) {
- // Hide this function, which is implicit
- parts.add(registerNode(args[0]));
+ if (obj.isImplicit()) {
+ // Hide this function, which is implicit
+ visitNode(args[0]);
- } else if(name.equalsIgnoreCase(CONVERT) || name.equalsIgnoreCase(CAST)) {
- parts.add(name);
- parts.add("("); //$NON-NLS-1$
+ } else if (name.equalsIgnoreCase(CONVERT) || name.equalsIgnoreCase(CAST)) {
+ append(name);
+ append("("); //$NON-NLS-1$
- if(args != null && args.length > 0) {
- parts.add(registerNode(args[0]));
+ if (args != null && args.length > 0) {
+ visitNode(args[0]);
- if(name.equalsIgnoreCase(CONVERT)) {
- parts.add(", "); //$NON-NLS-1$
- } else {
- parts.add(" "); //$NON-NLS-1$
- parts.add(AS);
- parts.add(" "); //$NON-NLS-1$
- }
+ if (name.equalsIgnoreCase(CONVERT)) {
+ append(", "); //$NON-NLS-1$
+ } else {
+ append(" "); //$NON-NLS-1$
+ append(AS);
+ append(" "); //$NON-NLS-1$
+ }
- if(args.length < 2 || args[1] == null || !(args[1] instanceof Constant)) {
- parts.add(UNDEFINED);
- } else {
- parts.add(((Constant)args[1]).getValue());
- }
- }
- parts.add(")"); //$NON-NLS-1$
+ if (args.length < 2 || args[1] == null || !(args[1] instanceof Constant)) {
+ append(UNDEFINED);
+ } else {
+ append(((Constant)args[1]).getValue());
+ }
+ }
+ append(")"); //$NON-NLS-1$
- } else if(name.equals("+") || name.equals("-") || name.equals("*") || name.equals("/") || name.equals("||")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- parts.add("("); //$NON-NLS-1$
+ } else if (name.equals("+") || name.equals("-") || name.equals("*") || name.equals("/") || name.equals("||")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ append("("); //$NON-NLS-1$
- if(args != null) {
- for(int i=0; i<args.length; i++) {
- parts.add(registerNode(args[i]));
- if(i < (args.length-1)) {
- parts.add(SPACE);
- parts.add(name);
- parts.add(SPACE);
- }
- }
- }
- parts.add(")"); //$NON-NLS-1$
+ if (args != null) {
+ for (int i = 0; i < args.length; i++) {
+ visitNode(args[i]);
+ if (i < (args.length - 1)) {
+ append(SPACE);
+ append(name);
+ append(SPACE);
+ }
+ }
+ }
+ append(")"); //$NON-NLS-1$
- } else if(name.equalsIgnoreCase(NonReserved.TIMESTAMPADD) || name.equalsIgnoreCase(NonReserved.TIMESTAMPDIFF)) {
- parts.add(name);
- parts.add("("); //$NON-NLS-1$
+ } else if (name.equalsIgnoreCase(NonReserved.TIMESTAMPADD) || name.equalsIgnoreCase(NonReserved.TIMESTAMPDIFF)) {
+ append(name);
+ append("("); //$NON-NLS-1$
- if(args != null && args.length > 0) {
- parts.add(((Constant)args[0]).getValue());
+ if (args != null && args.length > 0) {
+ append(((Constant)args[0]).getValue());
registerNodes(args, 1);
}
- parts.add(")"); //$NON-NLS-1$
+ append(")"); //$NON-NLS-1$
- } else if (name.equalsIgnoreCase(SourceSystemFunctions.XMLPI)){
- parts.add(name);
- parts.add("(NAME "); //$NON-NLS-1$
- outputDisplayName((String)((Constant)args[0]).getValue());
- registerNodes(args, 1);
- parts.add(")"); //$NON-NLS-1$
- } else {
- parts.add(name);
- parts.add("("); //$NON-NLS-1$
- registerNodes(args, 0);
- parts.add(")"); //$NON-NLS-1$
- }
+ } else if (name.equalsIgnoreCase(SourceSystemFunctions.XMLPI)) {
+ append(name);
+ append("(NAME "); //$NON-NLS-1$
+ outputDisplayName((String)((Constant)args[0]).getValue());
+ registerNodes(args, 1);
+ append(")"); //$NON-NLS-1$
+ } else {
+ append(name);
+ append("("); //$NON-NLS-1$
+ registerNodes(args, 0);
+ append(")"); //$NON-NLS-1$
+ }
}
-
- private void registerNodes(LanguageObject[] objects, int begin) {
- registerNodes(Arrays.asList(objects), begin);
+
+ private void registerNodes( LanguageObject[] objects,
+ int begin ) {
+ registerNodes(Arrays.asList(objects), begin);
}
-
- private void registerNodes(List<? extends LanguageObject> objects, int begin) {
- for (int i = begin; i < objects.size(); i++) {
- if (i > 0) {
- parts.add(", "); //$NON-NLS-1$
- }
- parts.add(registerNode(objects.get(i)));
- }
+
+ private void registerNodes( List<? extends LanguageObject> objects,
+ int begin ) {
+ for (int i = begin; i < objects.size(); i++) {
+ if (i > 0) {
+ append(", "); //$NON-NLS-1$
+ }
+ visitNode(objects.get(i));
+ }
}
- public void visit(GroupSymbol obj) {
+ public void visit( GroupSymbol obj ) {
String alias = null;
String fullGroup = obj.getOutputName();
- if(obj.getOutputDefinition() != null) {
+ if (obj.getOutputDefinition() != null) {
alias = obj.getOutputName();
fullGroup = obj.getOutputDefinition();
}
-
+
outputDisplayName(fullGroup);
- if(alias != null) {
- parts.add(SPACE);
- parts.add(AS);
- parts.add(SPACE);
- parts.add(escapeSinglePart(alias));
+ if (alias != null) {
+ append(SPACE);
+ append(AS);
+ append(SPACE);
+ append(escapeSinglePart(alias));
}
}
- public void visit(Reference obj) {
+ public void visit( Reference obj ) {
if (!obj.isPositional() && obj.getExpression() != null) {
- replaceStringParts(new Object[] { obj.getExpression().toString() });
+ visitNode(obj.getExpression());
} else {
- replaceStringParts(new Object[] { "?" }); //$NON-NLS-1$
+ append("?"); //$NON-NLS-1$
}
}
// ############ Visitor methods for storedprocedure language objects ####################
- public void visit(Block obj) {
- List statements = obj.getStatements();
- if(statements.size() == 1) {
- replaceStringParts(new Object[] { BEGIN, "\n", //$NON-NLS-1$
- registerNode((Statement)obj.getStatements().get(0)), "\n", END}); //$NON-NLS-1$
- } else if(statements.size() > 1) {
- List parts = new ArrayList();
- // Add first clause
- parts.add(BEGIN);
- parts.add("\n"); //$NON-NLS-1$
- Iterator stmtIter = statements.iterator();
- while(stmtIter.hasNext()) {
- // Add each statement
- parts.add(registerNode((Statement) stmtIter.next()));
- parts.add("\n"); //$NON-NLS-1$
- }
- parts.add(END);
- replaceStringParts(parts.toArray());
- } else {
- // Shouldn't happen, but being tolerant
- replaceStringParts(new Object[] { BEGIN, "\n", //$NON-NLS-1$
- END });
+ public void visit( Block obj ) {
+ List statements = obj.getStatements();
+ // Add first clause
+ append(BEGIN);
+ append("\n"); //$NON-NLS-1$
+ Iterator stmtIter = statements.iterator();
+ while (stmtIter.hasNext()) {
+ // Add each statement
+ addTabs(1);
+ visitNode((Statement)stmtIter.next());
+ append("\n"); //$NON-NLS-1$
}
+ addTabs(0);
+ append(END);
}
- public void visit(CommandStatement obj) {
- parts.add(registerNode(obj.getCommand()));
- parts.add(";"); //$NON-NLS-1$
+ protected void addTabs( int level ) {
}
- public void visit(CreateUpdateProcedureCommand obj) {
- parts.add(CREATE);
- parts.add(SPACE);
- if(!obj.isUpdateProcedure()){
- parts.add(VIRTUAL);
- parts.add(SPACE);
+ public void visit( CommandStatement obj ) {
+ visitNode(obj.getCommand());
+ append(";"); //$NON-NLS-1$
+ }
+
+ public void visit( CreateUpdateProcedureCommand obj ) {
+ append(CREATE);
+ append(SPACE);
+ if (!obj.isUpdateProcedure()) {
+ append(VIRTUAL);
+ append(SPACE);
}
- parts.add(PROCEDURE);
- parts.add("\n"); //$NON-NLS-1$
- parts.add(registerNode(obj.getBlock()));
+ append(PROCEDURE);
+ append("\n"); //$NON-NLS-1$
+ addTabs(0);
+ visitNode(obj.getBlock());
}
- public void visit(DeclareStatement obj) {
- parts.add(DECLARE);
- parts.add(SPACE);
- parts.add(obj.getVariableType());
- parts.add(SPACE);
+ public void visit( DeclareStatement obj ) {
+ append(DECLARE);
+ append(SPACE);
+ append(obj.getVariableType());
+ append(SPACE);
createAssignment(obj);
}
- /**
+ /**
* @param obj
* @param parts
*/
- private void createAssignment(AssignmentStatement obj) {
- parts.add(registerNode(obj.getVariable()));
- if (obj.getValue() != null) {
- parts.add(" = "); //$NON-NLS-1$
+ private void createAssignment( AssignmentStatement obj ) {
+ visitNode(obj.getVariable());
+ if (obj.getExpression() != null) {
+ append(" = "); //$NON-NLS-1$
addStatementArgument(obj.getExpression());
}
- parts.add(";"); //$NON-NLS-1$
+ append(";"); //$NON-NLS-1$
}
- private void addStatementArgument(Expression expr) {
- if (expr instanceof ScalarSubquery) {
- parts.add(registerNode(((ScalarSubquery)expr).getCommand()));
- } else {
- parts.add(registerNode(expr));
- }
- }
+ private void addStatementArgument( Expression expr ) {
+ if (expr instanceof ScalarSubquery) {
+ visitNode(((ScalarSubquery)expr).getCommand());
+ } else {
+ visitNode(expr);
+ }
+ }
- public void visit(IfStatement obj) {
- parts.add(IF);
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(obj.getCondition()));
- parts.add(")\n"); //$NON-NLS-1$
- parts.add(registerNode(obj.getIfBlock()));
- if(obj.hasElseBlock()) {
- parts.add("\n"); //$NON-NLS-1$
- parts.add(ELSE);
- parts.add("\n"); //$NON-NLS-1$
- parts.add(registerNode(obj.getElseBlock()));
+ public void visit( IfStatement obj ) {
+ append(IF);
+ append("("); //$NON-NLS-1$
+ visitNode(obj.getCondition());
+ append(")\n"); //$NON-NLS-1$
+ addTabs(0);
+ visitNode(obj.getIfBlock());
+ if (obj.hasElseBlock()) {
+ append("\n"); //$NON-NLS-1$
+ addTabs(0);
+ append(ELSE);
+ append("\n"); //$NON-NLS-1$
+ addTabs(0);
+ visitNode(obj.getElseBlock());
}
}
- public void visit(AssignmentStatement obj) {
+ public void visit( AssignmentStatement obj ) {
createAssignment(obj);
}
- public void visit(HasCriteria obj) {
- parts.add( HAS);
- parts.add(SPACE);
- parts.add(registerNode(obj.getSelector()));
+ public void visit( HasCriteria obj ) {
+ append(HAS);
+ append(SPACE);
+ visitNode(obj.getSelector());
}
- public void visit(TranslateCriteria obj) {
- parts.add(TRANSLATE);
- parts.add(SPACE);
- parts.add(registerNode(obj.getSelector()));
+ public void visit( TranslateCriteria obj ) {
+ append(TRANSLATE);
+ append(SPACE);
+ visitNode(obj.getSelector());
- if(obj.hasTranslations()) {
- parts.add(SPACE);
- parts.add(WITH);
- parts.add(SPACE);
- parts.add("("); //$NON-NLS-1$
- Iterator critIter = obj.getTranslations().iterator();
+ if (obj.hasTranslations()) {
+ append(SPACE);
+ append(WITH);
+ append(SPACE);
+ append("("); //$NON-NLS-1$
+ Iterator critIter = obj.getTranslations().iterator();
- while(critIter.hasNext()) {
- parts.add(registerNode((Criteria)critIter.next()));
- if(critIter.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
- }
- if(!critIter.hasNext()) {
- parts.add(")"); //$NON-NLS-1$
- }
- }
+ while (critIter.hasNext()) {
+ visitNode((Criteria)critIter.next());
+ if (critIter.hasNext()) {
+ append(", "); //$NON-NLS-1$
+ }
+ if (!critIter.hasNext()) {
+ append(")"); //$NON-NLS-1$
+ }
+ }
}
}
- public void visit(CriteriaSelector obj) {
+ public void visit( CriteriaSelector obj ) {
int selectorType = obj.getSelectorType();
- switch(selectorType) {
- case CriteriaSelector.COMPARE_EQ:
- parts.add("= "); //$NON-NLS-1$
- break;
- case CriteriaSelector.COMPARE_GE:
- parts.add(">= "); //$NON-NLS-1$
- break;
- case CriteriaSelector.COMPARE_GT:
- parts.add("> "); //$NON-NLS-1$
- break;
- case CriteriaSelector.COMPARE_LE:
- parts.add("<= "); //$NON-NLS-1$
- break;
- case CriteriaSelector.COMPARE_LT:
- parts.add("< "); //$NON-NLS-1$
- break;
- case CriteriaSelector.COMPARE_NE:
- parts.add("<> "); //$NON-NLS-1$
- break;
- case CriteriaSelector.IN:
- parts.add(IN);
- parts.add(SPACE);
- break;
- case CriteriaSelector.IS_NULL:
- parts.add(IS);
- parts.add(SPACE);
- parts.add(NULL);
- parts.add(SPACE);
- break;
+ switch (selectorType) {
+ case CriteriaSelector.COMPARE_EQ:
+ append("= "); //$NON-NLS-1$
+ break;
+ case CriteriaSelector.COMPARE_GE:
+ append(">= "); //$NON-NLS-1$
+ break;
+ case CriteriaSelector.COMPARE_GT:
+ append("> "); //$NON-NLS-1$
+ break;
+ case CriteriaSelector.COMPARE_LE:
+ append("<= "); //$NON-NLS-1$
+ break;
+ case CriteriaSelector.COMPARE_LT:
+ append("< "); //$NON-NLS-1$
+ break;
+ case CriteriaSelector.COMPARE_NE:
+ append("<> "); //$NON-NLS-1$
+ break;
+ case CriteriaSelector.IN:
+ append(IN);
+ append(SPACE);
+ break;
+ case CriteriaSelector.IS_NULL:
+ append(IS);
+ append(SPACE);
+ append(NULL);
+ append(SPACE);
+ break;
case CriteriaSelector.LIKE:
- parts.add(LIKE);
- parts.add(SPACE);
+ append(LIKE);
+ append(SPACE);
break;
case CriteriaSelector.BETWEEN:
- parts.add(BETWEEN);
- parts.add(SPACE);
+ append(BETWEEN);
+ append(SPACE);
break;
}
- parts.add(CRITERIA);
- if(obj.hasElements()) {
- parts.add(SPACE);
- parts.add(ON);
- parts.add(SPACE);
- parts.add("("); //$NON-NLS-1$
+ append(CRITERIA);
+ if (obj.hasElements()) {
+ append(SPACE);
+ append(ON);
+ append(SPACE);
+ append("("); //$NON-NLS-1$
- Iterator elmtIter = obj.getElements().iterator();
- while(elmtIter.hasNext()) {
- parts.add(registerNode((ElementSymbol)elmtIter.next()));
- if(elmtIter.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
- }
- }
- parts.add(")"); //$NON-NLS-1$
- }
+ Iterator elmtIter = obj.getElements().iterator();
+ while (elmtIter.hasNext()) {
+ visitNode((ElementSymbol)elmtIter.next());
+ if (elmtIter.hasNext()) {
+ append(", "); //$NON-NLS-1$
+ }
+ }
+ append(")"); //$NON-NLS-1$
+ }
}
- public void visit(RaiseErrorStatement obj) {
- parts.add(ERROR);
- parts.add(SPACE);
+ public void visit( RaiseErrorStatement obj ) {
+ append(ERROR);
+ append(SPACE);
addStatementArgument(obj.getExpression());
- parts.add(";"); //$NON-NLS-1$
+ append(";"); //$NON-NLS-1$
}
- public void visit(BreakStatement obj) {
- parts.add(BREAK);
- parts.add(";"); //$NON-NLS-1$
+ public void visit( BreakStatement obj ) {
+ append(BREAK);
+ append(";"); //$NON-NLS-1$
}
- public void visit(ContinueStatement obj) {
- parts.add(CONTINUE);
- parts.add(";"); //$NON-NLS-1$
+ public void visit( ContinueStatement obj ) {
+ append(CONTINUE);
+ append(";"); //$NON-NLS-1$
}
- public void visit(LoopStatement obj) {
- parts.add(LOOP);
- parts.add(" "); //$NON-NLS-1$
- parts.add(ON);
- parts.add(" ("); //$NON-NLS-1$
- parts.add(registerNode(obj.getCommand()));
- parts.add(") "); //$NON-NLS-1$
- parts.add(AS);
- parts.add(" "); //$NON-NLS-1$
- parts.add(obj.getCursorName());
- parts.add("\n"); //$NON-NLS-1$
- parts.add(registerNode(obj.getBlock()));
+ public void visit( LoopStatement obj ) {
+ append(LOOP);
+ append(" "); //$NON-NLS-1$
+ append(ON);
+ append(" ("); //$NON-NLS-1$
+ visitNode(obj.getCommand());
+ append(") "); //$NON-NLS-1$
+ append(AS);
+ append(" "); //$NON-NLS-1$
+ append(obj.getCursorName());
+ append("\n"); //$NON-NLS-1$
+ addTabs(0);
+ visitNode(obj.getBlock());
}
- public void visit(WhileStatement obj) {
- parts.add(WHILE);
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(obj.getCondition()));
- parts.add(")\n"); //$NON-NLS-1$
- parts.add(registerNode(obj.getBlock()));
+ public void visit( WhileStatement obj ) {
+ append(WHILE);
+ append("("); //$NON-NLS-1$
+ visitNode(obj.getCondition());
+ append(")\n"); //$NON-NLS-1$
+ addTabs(0);
+ visitNode(obj.getBlock());
}
- public void visit(ExistsCriteria obj) {
+ public void visit( ExistsCriteria obj ) {
// operator and beginning of list
- parts.add(EXISTS);
- parts.add(" ("); //$NON-NLS-1$
- parts.add(registerNode(obj.getCommand()));
- parts.add(")"); //$NON-NLS-1$
+ append(EXISTS);
+ append(" ("); //$NON-NLS-1$
+ visitNode(obj.getCommand());
+ append(")"); //$NON-NLS-1$
}
- public void visit(SubqueryCompareCriteria obj){
+ public void visit( SubqueryCompareCriteria obj ) {
Expression leftExpression = obj.getLeftExpression();
- parts.add(registerNode(leftExpression));
+ visitNode(leftExpression);
String operator = obj.getOperatorAsString();
String quantifier = obj.getPredicateQuantifierAsString();
// operator and beginning of list
- parts.add(SPACE);
- parts.add(operator);
- parts.add(SPACE);
- parts.add(quantifier);
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(obj.getCommand()));
- parts.add(")"); //$NON-NLS-1$
+ append(SPACE);
+ append(operator);
+ append(SPACE);
+ append(quantifier);
+ append("("); //$NON-NLS-1$
+ visitNode(obj.getCommand());
+ append(")"); //$NON-NLS-1$
}
- public void visit(ScalarSubquery obj) {
+ public void visit( ScalarSubquery obj ) {
// operator and beginning of list
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(obj.getCommand()));
- parts.add(")"); //$NON-NLS-1$
+ append("("); //$NON-NLS-1$
+ visitNode(obj.getCommand());
+ append(")"); //$NON-NLS-1$
}
-
+
@Override
- public void visit(XMLAttributes obj) {
- parts.add(XMLATTRIBUTES);
- parts.add("("); //$NON-NLS-1$
- registerNodes(obj.getArgs(), 0);
- parts.add(")"); //$NON-NLS-1$
+ public void visit( XMLAttributes obj ) {
+ append(XMLATTRIBUTES);
+ append("("); //$NON-NLS-1$
+ registerNodes(obj.getArgs(), 0);
+ append(")"); //$NON-NLS-1$
}
-
+
@Override
- public void visit(XMLElement obj) {
- parts.add(XMLELEMENT);
- parts.add("(NAME "); //$NON-NLS-1$
- outputDisplayName(obj.getName());
- if (obj.getNamespaces() != null) {
- parts.add(", "); //$NON-NLS-1$
- parts.add(registerNode(obj.getNamespaces()));
- }
- if (obj.getAttributes() != null) {
- parts.add(", "); //$NON-NLS-1$
- parts.add(registerNode(obj.getAttributes()));
- }
- if (!obj.getContent().isEmpty()) {
- parts.add(", "); //$NON-NLS-1$
- }
- registerNodes(obj.getContent(), 0);
- parts.add(")"); //$NON-NLS-1$
+ public void visit( XMLElement obj ) {
+ append(XMLELEMENT);
+ append("(NAME "); //$NON-NLS-1$
+ outputDisplayName(obj.getName());
+ if (obj.getNamespaces() != null) {
+ append(", "); //$NON-NLS-1$
+ visitNode(obj.getNamespaces());
+ }
+ if (obj.getAttributes() != null) {
+ append(", "); //$NON-NLS-1$
+ visitNode(obj.getAttributes());
+ }
+ if (!obj.getContent().isEmpty()) {
+ append(", "); //$NON-NLS-1$
+ }
+ registerNodes(obj.getContent(), 0);
+ append(")"); //$NON-NLS-1$
}
-
+
@Override
- public void visit(XMLForest obj) {
- parts.add(XMLFOREST);
- parts.add("("); //$NON-NLS-1$
- if (obj.getNamespaces() != null) {
- parts.add(registerNode(obj.getNamespaces()));
- parts.add(", "); //$NON-NLS-1$
- }
- registerNodes(obj.getArgs(), 0);
- parts.add(")"); //$NON-NLS-1$
+ public void visit( XMLForest obj ) {
+ append(XMLFOREST);
+ append("("); //$NON-NLS-1$
+ if (obj.getNamespaces() != null) {
+ visitNode(obj.getNamespaces());
+ append(", "); //$NON-NLS-1$
+ }
+ registerNodes(obj.getArgs(), 0);
+ append(")"); //$NON-NLS-1$
}
-
+
@Override
- public void visit(XMLNamespaces obj) {
- parts.add(XMLNAMESPACES);
- parts.add("("); //$NON-NLS-1$
- for (Iterator<NamespaceItem> items = obj.getNamespaceItems().iterator(); items.hasNext();) {
- NamespaceItem item = items.next();
- if (item.getPrefix() == null) {
- if (item.getUri() == null) {
- parts.add("NO DEFAULT"); //$NON-NLS-1$
- } else {
- parts.add("DEFAULT "); //$NON-NLS-1$
- parts.add(registerNode(new Constant(item.getUri())));
- }
- } else {
- parts.add(registerNode(new Constant(item.getUri())));
- parts.add(" AS "); //$NON-NLS-1$
- outputDisplayName(item.getPrefix());
- }
- if (items.hasNext()) {
- parts.add(", "); //$NON-NLS-1$
- }
- }
- parts.add(")"); //$NON-NLS-1$
+ public void visit( XMLNamespaces obj ) {
+ append(XMLNAMESPACES);
+ append("("); //$NON-NLS-1$
+ for (Iterator<NamespaceItem> items = obj.getNamespaceItems().iterator(); items.hasNext();) {
+ NamespaceItem item = items.next();
+ if (item.getPrefix() == null) {
+ if (item.getUri() == null) {
+ append("NO DEFAULT"); //$NON-NLS-1$
+ } else {
+ append("DEFAULT "); //$NON-NLS-1$
+ visitNode(new Constant(item.getUri()));
+ }
+ } else {
+ visitNode(new Constant(item.getUri()));
+ append(" AS "); //$NON-NLS-1$
+ outputDisplayName(item.getPrefix());
+ }
+ if (items.hasNext()) {
+ append(", "); //$NON-NLS-1$
+ }
+ }
+ append(")"); //$NON-NLS-1$
}
-
- public void visit(Limit obj) {
- parts.add(LIMIT);
+
+ public void visit( Limit obj ) {
+ append(LIMIT);
if (obj.getOffset() != null) {
- parts.add(SPACE);
- parts.add(registerNode(obj.getOffset()));
- parts.add(","); //$NON-NLS-1$
+ append(SPACE);
+ visitNode(obj.getOffset());
+ append(","); //$NON-NLS-1$
}
- parts.add(SPACE);
- parts.add(registerNode(obj.getRowLimit()));
+ append(SPACE);
+ visitNode(obj.getRowLimit());
}
-
+
@Override
- public void visit(TextTable obj) {
- parts.add("TEXTTABLE("); //$NON-NLS-1$
- parts.add(registerNode(obj.getFile()));
- parts.add(SPACE);
- parts.add(NonReserved.COLUMNS);
-
- for (Iterator<TextColumn> cols = obj.getColumns().iterator(); cols.hasNext();) {
- TextColumn col = cols.next();
- parts.add(SPACE);
- outputDisplayName(col.getName());
- parts.add(SPACE);
- parts.add(col.getType());
- if (col.getWidth() != null) {
- parts.add(SPACE);
- parts.add(NonReserved.WIDTH);
- parts.add(SPACE);
- parts.add(col.getWidth());
- }
- if (cols.hasNext()) {
- parts.add(","); //$NON-NLS-1$
- }
- }
- if (obj.getDelimiter() != null) {
- parts.add(SPACE);
- parts.add(NonReserved.DELIMITER);
- parts.add(SPACE);
- parts.add(registerNode(new Constant(obj.getDelimiter())));
- }
- if (obj.getQuote() != null) {
- parts.add(SPACE);
- if (obj.isEscape()) {
- parts.add(ESCAPE);
- } else {
- parts.add(NonReserved.QUOTE);
- }
- parts.add(SPACE);
- parts.add(registerNode(new Constant(obj.getQuote())));
- }
- if (obj.getHeader() != null) {
- parts.add(SPACE);
- parts.add(NonReserved.HEADER);
- if (1 != obj.getHeader()) {
- parts.add(SPACE);
- parts.add(obj.getHeader());
- }
- }
- if (obj.getSkip() != null) {
- parts.add(SPACE);
- parts.add("SKIP"); //$NON-NLS-1$
- parts.add(SPACE);
- parts.add(obj.getSkip());
- }
- parts.add(")");//$NON-NLS-1$
- parts.add(SPACE);
- parts.add(AS);
- parts.add(SPACE);
- outputDisplayName(obj.getName());
+ public void visit( TextTable obj ) {
+ append("TEXTTABLE("); //$NON-NLS-1$
+ visitNode(obj.getFile());
+ append(SPACE);
+ append(NonReserved.COLUMNS);
+
+ for (Iterator<TextColumn> cols = obj.getColumns().iterator(); cols.hasNext();) {
+ TextColumn col = cols.next();
+ append(SPACE);
+ outputDisplayName(col.getName());
+ append(SPACE);
+ append(col.getType());
+ if (col.getWidth() != null) {
+ append(SPACE);
+ append(NonReserved.WIDTH);
+ append(SPACE);
+ append(col.getWidth());
+ }
+ if (cols.hasNext()) {
+ append(","); //$NON-NLS-1$
+ }
+ }
+ if (obj.getDelimiter() != null) {
+ append(SPACE);
+ append(NonReserved.DELIMITER);
+ append(SPACE);
+ visitNode(new Constant(obj.getDelimiter()));
+ }
+ if (obj.getQuote() != null) {
+ append(SPACE);
+ if (obj.isEscape()) {
+ append(ESCAPE);
+ } else {
+ append(NonReserved.QUOTE);
+ }
+ append(SPACE);
+ visitNode(new Constant(obj.getQuote()));
+ }
+ if (obj.getHeader() != null) {
+ append(SPACE);
+ append(NonReserved.HEADER);
+ if (1 != obj.getHeader()) {
+ append(SPACE);
+ append(obj.getHeader());
+ }
+ }
+ if (obj.getSkip() != null) {
+ append(SPACE);
+ append("SKIP"); //$NON-NLS-1$
+ append(SPACE);
+ append(obj.getSkip());
+ }
+ append(")");//$NON-NLS-1$
+ append(SPACE);
+ append(AS);
+ append(SPACE);
+ outputDisplayName(obj.getName());
}
@Override
- public void visit(XMLTable obj) {
- parts.add("XMLTABLE("); //$NON-NLS-1$
- if (obj.getNamespaces() != null) {
- parts.add(registerNode(obj.getNamespaces()));
- parts.add(","); //$NON-NLS-1$
- parts.add(SPACE);
- }
- parts.add(new Constant(obj.getXquery()));
- if (!obj.getPassing().isEmpty()) {
- parts.add(SPACE);
- parts.add(NonReserved.PASSING);
- parts.add(SPACE);
- registerNodes(obj.getPassing(), 0);
- }
- if (!obj.getColumns().isEmpty()) {
- parts.add(SPACE);
- parts.add(NonReserved.COLUMNS);
- for (Iterator<XMLColumn> cols = obj.getColumns().iterator(); cols.hasNext();) {
- XMLColumn col = cols.next();
- parts.add(SPACE);
- outputDisplayName(col.getName());
- parts.add(SPACE);
- if (col.isOrdinal()) {
- parts.add(FOR);
- parts.add(SPACE);
- parts.add(NonReserved.ORDINALITY);
- } else {
- parts.add(col.getType());
- if (col.getDefaultExpression() != null) {
- parts.add(SPACE);
- parts.add(DEFAULT);
- parts.add(SPACE);
- parts.add(registerNode(col.getDefaultExpression()));
- }
- if (col.getPath() != null) {
- parts.add(SPACE);
- parts.add(NonReserved.PATH);
- parts.add(SPACE);
- parts.add(new Constant(col.getPath()));
- }
- }
- if (cols.hasNext()) {
- parts.add(","); //$NON-NLS-1$
- }
- }
- }
- parts.add(")");//$NON-NLS-1$
- parts.add(SPACE);
- parts.add(AS);
- parts.add(SPACE);
- outputDisplayName(obj.getName());
+ public void visit( XMLTable obj ) {
+ append("XMLTABLE("); //$NON-NLS-1$
+ if (obj.getNamespaces() != null) {
+ visitNode(obj.getNamespaces());
+ append(","); //$NON-NLS-1$
+ append(SPACE);
+ }
+ visitNode(new Constant(obj.getXquery()));
+ if (!obj.getPassing().isEmpty()) {
+ append(SPACE);
+ append(NonReserved.PASSING);
+ append(SPACE);
+ registerNodes(obj.getPassing(), 0);
+ }
+ if (!obj.getColumns().isEmpty()) {
+ append(SPACE);
+ append(NonReserved.COLUMNS);
+ for (Iterator<XMLColumn> cols = obj.getColumns().iterator(); cols.hasNext();) {
+ XMLColumn col = cols.next();
+ append(SPACE);
+ outputDisplayName(col.getName());
+ append(SPACE);
+ if (col.isOrdinal()) {
+ append(FOR);
+ append(SPACE);
+ append(NonReserved.ORDINALITY);
+ } else {
+ append(col.getType());
+ if (col.getDefaultExpression() != null) {
+ append(SPACE);
+ append(DEFAULT);
+ append(SPACE);
+ visitNode(col.getDefaultExpression());
+ }
+ if (col.getPath() != null) {
+ append(SPACE);
+ append(NonReserved.PATH);
+ append(SPACE);
+ visitNode(new Constant(col.getPath()));
+ }
+ }
+ if (cols.hasNext()) {
+ append(","); //$NON-NLS-1$
+ }
+ }
+ }
+ append(")");//$NON-NLS-1$
+ append(SPACE);
+ append(AS);
+ append(SPACE);
+ outputDisplayName(obj.getName());
}
-
+
@Override
- public void visit(XMLQuery obj) {
- parts.add("XMLQUERY("); //$NON-NLS-1$
- if (obj.getNamespaces() != null) {
- parts.add(registerNode(obj.getNamespaces()));
- parts.add(","); //$NON-NLS-1$
- parts.add(SPACE);
- }
- parts.add(new Constant(obj.getXquery()));
- if (!obj.getPassing().isEmpty()) {
- parts.add(SPACE);
- parts.add(NonReserved.PASSING);
- parts.add(SPACE);
- registerNodes(obj.getPassing(), 0);
- }
- if (obj.getEmptyOnEmpty() != null) {
- parts.add(SPACE);
- if (obj.getEmptyOnEmpty()) {
- parts.add(NonReserved.EMPTY);
- } else {
- parts.add(NULL);
- }
- parts.add(SPACE);
- parts.add(ON);
- parts.add(SPACE);
- parts.add(NonReserved.EMPTY);
- }
- parts.add(")");//$NON-NLS-1$
+ public void visit( XMLQuery obj ) {
+ append("XMLQUERY("); //$NON-NLS-1$
+ if (obj.getNamespaces() != null) {
+ visitNode(obj.getNamespaces());
+ append(","); //$NON-NLS-1$
+ append(SPACE);
+ }
+ visitNode(new Constant(obj.getXquery()));
+ if (!obj.getPassing().isEmpty()) {
+ append(SPACE);
+ append(NonReserved.PASSING);
+ append(SPACE);
+ registerNodes(obj.getPassing(), 0);
+ }
+ if (obj.getEmptyOnEmpty() != null) {
+ append(SPACE);
+ if (obj.getEmptyOnEmpty()) {
+ append(NonReserved.EMPTY);
+ } else {
+ append(NULL);
+ }
+ append(SPACE);
+ append(ON);
+ append(SPACE);
+ append(NonReserved.EMPTY);
+ }
+ append(")");//$NON-NLS-1$
}
-
+
@Override
- public void visit(DerivedColumn obj) {
- parts.add(registerNode(obj.getExpression()));
- if (obj.getAlias() != null) {
- parts.add(SPACE);
- parts.add(AS);
- parts.add(SPACE);
- outputDisplayName(obj.getAlias());
- }
+ public void visit( DerivedColumn obj ) {
+ visitNode(obj.getExpression());
+ if (obj.getAlias() != null) {
+ append(SPACE);
+ append(AS);
+ append(SPACE);
+ outputDisplayName(obj.getAlias());
+ }
}
-
+
@Override
- public void visit(XMLSerialize obj) {
- parts.add(XMLSERIALIZE);
- parts.add(Tokens.LPAREN);
- if (obj.isDocument() != null) {
- if (obj.isDocument()) {
- parts.add(NonReserved.DOCUMENT);
- } else {
- parts.add(NonReserved.CONTENT);
- }
- parts.add(SPACE);
- }
- parts.add(registerNode(obj.getExpression()));
- if (obj.getTypeString() != null) {
- parts.add(SPACE);
- parts.add(AS);
- parts.add(SPACE);
- parts.add(obj.getTypeString());
- }
- parts.add(Tokens.RPAREN);
+ public void visit( XMLSerialize obj ) {
+ append(XMLSERIALIZE);
+ append(Tokens.LPAREN);
+ if (obj.isDocument() != null) {
+ if (obj.isDocument()) {
+ append(NonReserved.DOCUMENT);
+ } else {
+ append(NonReserved.CONTENT);
+ }
+ append(SPACE);
+ }
+ visitNode(obj.getExpression());
+ if (obj.getTypeString() != null) {
+ append(SPACE);
+ append(AS);
+ append(SPACE);
+ append(obj.getTypeString());
+ }
+ append(Tokens.RPAREN);
}
-
+
@Override
- public void visit(QueryString obj) {
- parts.add(NonReserved.QUERYSTRING);
- parts.add("("); //$NON-NLS-1$
- parts.add(registerNode(obj.getPath()));
- if (!obj.getArgs().isEmpty()) {
- parts.add(","); //$NON-NLS-1$
- parts.add(SPACE);
- registerNodes(obj.getArgs(), 0);
- }
- parts.add(")"); //$NON-NLS-1$
+ public void visit( QueryString obj ) {
+ append(NonReserved.QUERYSTRING);
+ append("("); //$NON-NLS-1$
+ visitNode(obj.getPath());
+ if (!obj.getArgs().isEmpty()) {
+ append(","); //$NON-NLS-1$
+ append(SPACE);
+ registerNodes(obj.getArgs(), 0);
+ }
+ append(")"); //$NON-NLS-1$
}
-
+
@Override
- public void visit(XMLParse obj) {
- parts.add(XMLPARSE);
- parts.add(Tokens.LPAREN);
- if (obj.isDocument()) {
- parts.add(NonReserved.DOCUMENT);
- } else {
- parts.add(NonReserved.CONTENT);
- }
- parts.add(SPACE);
- parts.add(registerNode(obj.getExpression()));
- if (obj.isWellFormed()) {
- parts.add(SPACE);
- parts.add(NonReserved.WELLFORMED);
- }
- parts.add(Tokens.RPAREN);
+ public void visit( XMLParse obj ) {
+ append(XMLPARSE);
+ append(Tokens.LPAREN);
+ if (obj.isDocument()) {
+ append(NonReserved.DOCUMENT);
+ } else {
+ append(NonReserved.CONTENT);
+ }
+ append(SPACE);
+ visitNode(obj.getExpression());
+ if (obj.isWellFormed()) {
+ append(SPACE);
+ append(NonReserved.WELLFORMED);
+ }
+ append(Tokens.RPAREN);
}
-
+
@Override
- public void visit(ExpressionCriteria obj) {
- obj.getExpression().acceptVisitor(this);
+ public void visit( ExpressionCriteria obj ) {
+ visitNode(obj.getExpression());
}
- public static String escapeSinglePart(String part) {
- if(isReservedWord(part)) {
- return ID_ESCAPE_CHAR + part + ID_ESCAPE_CHAR;
- }
- boolean escape = true;
- char start = part.charAt(0);
- if (start == '#' || start == '@' || StringUtil.isLetter(start)) {
- escape = false;
- for (int i = 1; !escape && i < part.length(); i++) {
- char c = part.charAt(i);
- escape = !StringUtil.isLetterOrDigit(c) && c != '_';
- }
- }
- if (escape) {
- return ID_ESCAPE_CHAR + escapeStringValue(part, "\"") + ID_ESCAPE_CHAR; //$NON-NLS-1$
- }
- return part;
+ public static String escapeSinglePart( String part ) {
+ if (isReservedWord(part)) {
+ return ID_ESCAPE_CHAR + part + ID_ESCAPE_CHAR;
+ }
+ boolean escape = true;
+ char start = part.charAt(0);
+ if (start == '#' || start == '@' || StringUtil.isLetter(start)) {
+ escape = false;
+ for (int i = 1; !escape && i < part.length(); i++) {
+ char c = part.charAt(i);
+ escape = !StringUtil.isLetterOrDigit(c) && c != '_';
+ }
+ }
+ if (escape) {
+ return ID_ESCAPE_CHAR + escapeStringValue(part, "\"") + ID_ESCAPE_CHAR; //$NON-NLS-1$
+ }
+ return part;
}
/**
- * Check whether a string is considered a reserved word or not. Subclasses
- * may override to change definition of reserved word.
+ * Check whether a string is considered a reserved word or not. Subclasses may override to change definition of reserved word.
+ *
* @param string String to check
* @return True if reserved word
*/
- static boolean isReservedWord(String string) {
- if(string == null) {
- return false;
- }
- return SQLConstants.isReservedWord(string);
+ static boolean isReservedWord( String string ) {
+ if (string == null) {
+ return false;
+ }
+ return SQLConstants.isReservedWord(string);
}
-
+
}
Modified: branches/7.1.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
===================================================================
--- branches/7.1.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java 2010-08-23 17:53:50 UTC (rev 2484)
+++ branches/7.1.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java 2010-08-23 19:19:45 UTC (rev 2485)
@@ -4667,7 +4667,7 @@
ProcessorPlan plan = helpPlan(sql,
FakeMetadataFactory.exampleBQTCached(),
null, capFinder,
- new String[] {"(SELECT g_2.intkey AS c_0, 'a' AS c_1 FROM BQT1.SmallA AS g_2 UNION ALL SELECT g_1.IntKey AS c_0, 'b' AS c_1 FROM BQT1.SmallA AS g_1) UNION ALL SELECT g_0.IntKey AS c_0, 'c' AS c_1 FROM BQT1.SmallA AS g_0"}, //$NON-NLS-1$
+ new String[] {"SELECT g_2.intkey AS c_0, 'a' AS c_1 FROM BQT1.SmallA AS g_2 UNION ALL SELECT g_1.IntKey AS c_0, 'b' AS c_1 FROM BQT1.SmallA AS g_1 UNION ALL SELECT g_0.IntKey AS c_0, 'c' AS c_1 FROM BQT1.SmallA AS g_0"}, //$NON-NLS-1$
ComparisonMode.EXACT_COMMAND_STRING );
checkNodeTypes(plan, FULL_PUSHDOWN);
Modified: branches/7.1.x/engine/src/test/java/org/teiid/query/parser/TestSetQueryParsing.java
===================================================================
--- branches/7.1.x/engine/src/test/java/org/teiid/query/parser/TestSetQueryParsing.java 2010-08-23 17:53:50 UTC (rev 2484)
+++ branches/7.1.x/engine/src/test/java/org/teiid/query/parser/TestSetQueryParsing.java 2010-08-23 19:19:45 UTC (rev 2485)
@@ -197,7 +197,7 @@
setQuery = new SetQuery(Operation.UNION, false, setQuery, query);
TestParser.helpTest("select c1 from g1 union select c2 from g2 union select c3 from g3", //$NON-NLS-1$
- "(SELECT c1 FROM g1 UNION SELECT c2 FROM g2) UNION SELECT c3 FROM g3", //$NON-NLS-1$
+ "SELECT c1 FROM g1 UNION SELECT c2 FROM g2 UNION SELECT c3 FROM g3", //$NON-NLS-1$
setQuery);
}
@@ -258,7 +258,7 @@
setQuery = new SetQuery(SetQuery.Operation.UNION, false, setQuery, query);
TestParser.helpTest("select c1 from g1 union select c2 from g2 union all select c3 from g3 union select c4 from g4", //$NON-NLS-1$
- "((SELECT c1 FROM g1 UNION SELECT c2 FROM g2) UNION ALL SELECT c3 FROM g3) UNION SELECT c4 FROM g4", //$NON-NLS-1$
+ "SELECT c1 FROM g1 UNION SELECT c2 FROM g2 UNION ALL SELECT c3 FROM g3 UNION SELECT c4 FROM g4", //$NON-NLS-1$
setQuery);
}
15 years, 4 months
- 1
- 0
Teiid 7.1.x - Continuous Build - Build # 2 - Unstable!
by jboss-qa-internal＠redhat.com
Teiid 7.1.x - Continuous Build - Build # 2 - Unstable:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid%207.1.x%20-%20Continuous%20Bu... to view the results.
15 years, 4 months
- 1
- 1
teiid SVN: r2484 - branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-08-23 13:53:50 -0400 (Mon, 23 Aug 2010)
New Revision: 2484
Modified:
branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
Log:
TEIID-1211 updating the load balancing doc
Modified: branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
===================================================================
--- branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2010-08-23 17:44:19 UTC (rev 2483)
+++ branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2010-08-23 17:53:50 UTC (rev 2484)
@@ -532,6 +532,8 @@
The default setting is to maintain 16 connections (see <code>org.teiid.sockets.maxCachedInstances</code> in the client jar's teiid-client-settings.properties file.
If you're client is connecting to large numbers of Teiid instances and you're using post connection time load balancing, then consider increasing the number of cached instances.
You may either set an analogous system property or create another version of teiid-client-settings.properties file and place it into the classpath ahead of the client jar.</para>
+ <note><para>Session level temporary tables, currently running transactions, session level cache entries, and PreparedPlans for a given session will not be available on other cluster members.
+ Therefore, it is recommended that post connection time load balancing is only used when the logical connection could have been closed, but the actual connection is reused (the typical connection pool pattern).</para></note>
</section>
<section id="advancedconfig">
<title>Advanced Configuration</title>
15 years, 4 months
- 1
- 0
teiid SVN: r2483 - in branches/7.1.x: client/src/main/java/org/teiid/jdbc and 8 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-08-23 13:44:19 -0400 (Mon, 23 Aug 2010)
New Revision: 2483
Added:
branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/dataroles.xml
Removed:
branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/entitlements.xml
Modified:
branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
branches/7.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
branches/7.1.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java
branches/7.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java
branches/7.1.x/client/src/main/java/org/teiid/net/HostInfo.java
branches/7.1.x/client/src/main/java/org/teiid/net/ServerConnection.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java
branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestAdminApiServerDiscovery.java
branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
branches/7.1.x/documentation/reference/src/main/docbook/en-US/Reference.xml
branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
Log:
TEIID-1211 refining load balancing support utilizing a set statement.
Modified: branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html 2010-08-23 17:44:19 UTC (rev 2483)
@@ -26,31 +26,7 @@
</UL>
<H2><A NAME="Highlights"></A>Highlights</H2>
<UL>
- <LI><B>ODBC Support</B> - Support for ODBC access is now available through PostgreSQL ODBC driver clients. See the Client Developer's Guide for more on how
- to use Teiid's ODBC access.
- <LI><B>Native Materialized Tables</B> - views marked as materialized without a target table will be materialized internally by Teiid. Materialized view tables will
- be indexed by the primary key of the view if present and can be controlled through the expanded cache hint.
- There are also new system procedures refreshMatView and refreshMatViewRow to refresh internal materialized view contents.
- <LI><B>Expanded Cache Hint</B> - The cache hint can now specify pref_mem to indicate that data should prefer to be held in memory, ttl to indicate the time-to-live,
- and updatable to indicate that a materialized view with a primary key can be updated by row with the refreshMatViewRow system procedure.
- <LI><B>SQL Support</B>
- <ul>
- <li>Added NULLS FIST/LAST handling - including pushdown support.
- <li>Added enhanced numeric stat aggregate functions STDDEV_POP, STDDEV_SAMP, VAR_POP, VAR_SAMP, with pushdown and aggregate decomposition.
- <li>Added support for the boolean aggregate functions ANY, SOME, EVERY.
- <li>Added support for using boolean value expression as both criteria and expressions, e.g. "... where boolean_value" or "select x = 1 as boolean_value ...".
- <li>Changed named procedure syntax to accept param=>value, rather than param=value.
- <li>Added PRIMARY KEY and the associated index support to temp tables.
- </ul>
- <LI>
- <LI><B>Parallel Source Queries</B> - reestablished parallel execution of source queries within a query plan along with a prioritized work system to help prevent resource contention.
- <LI><B>Improved Insert Support</B> - Cross source inserts using a query expression can defer to the source to perform the entire insert atomically with source controlled batching.
- See maxPreparedInsertBatchSize on any JDBC translator supporting the InsertWithIterator capability.
- <LI><B>SHOW Statement</B> - added client handling for the SHOW statement to retrieve query plan information and see parameter values.
- <LI><B>User Identity</B> - Teiid DataSources in JBossAS connecting to a local Teiid instance can preserve the thread's user identity, rather than requiring
- a new authentication. See TeiidDataSource.setPassthroughAuthentication.
- <LI><B>VDB Versioning</B> - The VDB version may be determined by the deployed file name. The expected pattern is <VDB Name>.<Version>.vdb. See the Admin Guide
- for more on how to use VDB versioning.
+ <LI><B>Refined Load Balancing and Fail Over</B> - clients can use use the statement "SET NEWINSTANCE TRUE" to allow their connection to select a new server instance. See the Client Developer's Guide for more information.
</UL>
<h2><a name="Compatibility">Compatibility Issues</a></h2>
@@ -155,174 +131,7 @@
<h2><a name="Details">Detailed Release Notes</a></h2>
Detailed Release Notes - Teiid - Version ${project.version}
-<h2> Bug
-</h2>
-<ul>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-76'>TEIID-76</a>] - Attempting to execute a procedure from MM to MM returns error "<procedure>() does not exist"
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-108'>TEIID-108</a>] - xsd type conversion should be consistent
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1107'>TEIID-1107</a>] - Add support for raising criteria if it has been pushed too far
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1140'>TEIID-1140</a>] - Unnecessary jars in the Teiid deployment
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1141'>TEIID-1141</a>] - getCatalogs call on DatabaseMetadata is returning no rows
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1144'>TEIID-1144</a>] - PostgreSQL (simple capabilities) returning an unexpected number of rows
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1145'>TEIID-1145</a>] - Unable to deploy VDB with virtual BQT2 model
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1147'>TEIID-1147</a>] - Sybase concat function handling
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1149'>TEIID-1149</a>] - Importing tables from a deployed VDB does not import columns
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1152'>TEIID-1152</a>] - Jopr Plugin Needs to Handle Secure ProfileService Connection
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1153'>TEIID-1153</a>] - Turned of ProfileService authenticatiion and it caused an NPE in the Teiid RHQ Plugin
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1157'>TEIID-1157</a>] - NPE with texttable planning
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1166'>TEIID-1166</a>] - Receiving ASSERTION FAILED: expected reference to be not null from SQL query with sub-select
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1169'>TEIID-1169</a>] - VDBs are not being displayed in Jopr
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1172'>TEIID-1172</a>] - Loopback translator fails to be invoked when a property is set
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1178'>TEIID-1178</a>] - Jopr VDB loading error when Data Source is not available
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1180'>TEIID-1180</a>] - the deprecated input group qualifier should be replaced with inputs
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1181'>TEIID-1181</a>] - Teiid Pushdown queries producing unexpected results (Sybase 12.5)
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1182'>TEIID-1182</a>] - UDF model is not being loaded if the file is not placed in the root location of VDB
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1183'>TEIID-1183</a>] - Cannot create a SalesForce datasource throught the admin API.
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1185'>TEIID-1185</a>] - Shutting down JBoss AS server causes NPE in ClusterableCacheFactory
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1186'>TEIID-1186</a>] - broken internal link in Teiid Reference Documentation
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1188'>TEIID-1188</a>] - Error while reading the template properties for LDAP
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1192'>TEIID-1192</a>] - JDBC driver doesn't accept underscores _ in server names
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1200'>TEIID-1200</a>] - Non-parsable SQL in transformation provides no help to user - NPE in stack trace
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1201'>TEIID-1201</a>] - Property 'Url' with value 'vfsfile:/home/pnittel/Teiid71/jboss-5.1.0.GA/server/default/deploy/EyeTuneZ-vdb.xml' is not a valid URL
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1203'>TEIID-1203</a>] - "connector-ws" is not visible as one of the avaialble connectors
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1206'>TEIID-1206</a>] - NPE during the JDBC Metadata read when "resultSetCacheMode=true" turned on
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1208'>TEIID-1208</a>] - VDB "getStatus" through Admin API always returning "INACTIVE"
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1216'>TEIID-1216</a>] - Cannot pass xml result from one select as critera to another select
-</li>
-</ul>
-
-<h2> Feature Request
-</h2>
-<ul>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-168'>TEIID-168</a>] - Refine caching behavior
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-250'>TEIID-250</a>] - Enable Axis data compression in SFDC Connector, per SFDC API guidelines
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-715'>TEIID-715</a>] - Add support for nulls first/last
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-829'>TEIID-829</a>] - revamp code table caching
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-860'>TEIID-860</a>] - Add odbc support
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-886'>TEIID-886</a>] - Request for more statistical functions in Teiid
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-892'>TEIID-892</a>] - Add a capability to control bulk insert batch size
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-908'>TEIID-908</a>] - Enable access to the query plan without reference to Teiid classes.
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-968'>TEIID-968</a>] - Timestamp literals with fractional seconds result in source query execution performance when being compared to less percise time types
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1006'>TEIID-1006</a>] - Dynamic vdb metadata load enhancements
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1028'>TEIID-1028</a>] - Make Materialized Views first class objects in the system
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1048'>TEIID-1048</a>] - Embedded Connection should support the pass though authentication
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1151'>TEIID-1151</a>] - Re-enable multi-threaded source query execution
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1155'>TEIID-1155</a>] - Allow boolean value expressions to be used as criteria or expressions
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1167'>TEIID-1167</a>] - Add support for primary key handling in temp tables
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1177'>TEIID-1177</a>] - Allow for implicit temp table definition with just a query, omitting the columns
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1179'>TEIID-1179</a>] - Add a CommandContext interface to the teiid api
-</li>
-</ul>
-<h2> Patch
-</h2>
-<ul>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1184'>TEIID-1184</a>] - Patch to refactor numbered <sect> tags in documentation to <section>
-</li>
-</ul>
-
-<h2> Quality Risk
-</h2>
-<ul>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-954'>TEIID-954</a>] - Need method to control max amount of buffer disk space
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1150'>TEIID-1150</a>] - Introduce alternative named parameter syntax
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1154'>TEIID-1154</a>] - Remove JDOM
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1187'>TEIID-1187</a>] - Refine vdb version logic
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1190'>TEIID-1190</a>] - Procedure logic clean up
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1199'>TEIID-1199</a>] - Use consistent names for security concepts
-</li>
-</ul>
-
-<h2> Task
-</h2>
-<ul>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-749'>TEIID-749</a>] - Replace the TestNoArgConnector Test with an integration test.
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-882'>TEIID-882</a>] - Look into using javax.xml.xpath in the XML-Relational connectors.
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-996'>TEIID-996</a>] - Administration of the granular entitlements to data elements should be supported using the management console.
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1055'>TEIID-1055</a>] - Secure profile service access
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1142'>TEIID-1142</a>] - Teiid should work with EAP 5.1
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1143'>TEIID-1143</a>] - Remove the version number from the RAR files, to promote easy migration between the versions
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1160'>TEIID-1160</a>] - Add Support for Discovery of Dynamic VDBs in Teiid Jopr Plugin
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1165'>TEIID-1165</a>] - Upgrade to Netty 3.2.0 final
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1173'>TEIID-1173</a>] - Provide a facility to create "empty" VDBs for preview purpose
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1174'>TEIID-1174</a>] - Allow '-' character in VDB names.
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1194'>TEIID-1194</a>] - Document the recommended approach to using Teiid entitlements
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1207'>TEIID-1207</a>] - Fix Yahoo Translator to work with "Dynamic Portfoilo" example
-</li>
-</ul>
-
-<h2> Sub-task
-</h2>
-<ul>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-958'>TEIID-958</a>] - Provide ability to monitor buffer manager disk space usage and free space
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1189'>TEIID-1189</a>] - JOPR support for multiple versions
-</li>
-<li>[<a href='https://jira.jboss.org/browse/TEIID-1198'>TEIID-1198</a>] - Allow specifying the VDB version as part of the VDB name in the JDBC URL connection string.
-</li>
-</ul>
-
<h2><a name="Documentation">Documentation and Help</a></h2>
The <a href="http://www.jboss.org/teiid/">Teiid community project</a> is hosted on jboss.org.
Modified: branches/7.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -900,10 +900,7 @@
logger.log(Level.WARNING, JDBCPlugin.Util.getString("MMXAConnection.rolling_back_error"), e); //$NON-NLS-1$
}
- //perform load balancing
- if (this.serverConn instanceof SocketServerConnection) {
- ((SocketServerConnection)this.serverConn).selectNewServerInstance();
- }
+ this.serverConn.cleanUp();
}
public boolean isSameProcess(ConnectionImpl conn) throws CommunicationException {
Modified: branches/7.1.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -100,5 +100,7 @@
*/
public static final String NOEXEC = "NOEXEC"; //$NON-NLS-1$
+ public static final String NEWINSTANCE = "NEWINSTANCE"; //$NON-NLS-1$
+
}
\ No newline at end of file
Modified: branches/7.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -395,7 +395,11 @@
}
String key = match.group(1);
String value = match.group(2);
- JDBCURL.addNormalizedProperty(key, value, this.driverConnection.getExecutionProperties());
+ if (ExecutionProperties.NEWINSTANCE.equalsIgnoreCase(key) && Boolean.valueOf(value)) {
+ this.getMMConnection().getServerConnection().cleanUp();
+ } else {
+ JDBCURL.addNormalizedProperty(key, value, this.driverConnection.getExecutionProperties());
+ }
this.updateCounts = new int[] {0};
return;
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/HostInfo.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/HostInfo.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/HostInfo.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -32,6 +32,10 @@
/**
* Defines the hostname/port or {@link InetAddress} to connect to a host.
+ *
+ * Similar to an {@link InetSocketAddress} except that it can be constructed
+ * fully resolved, with an {@link InetAddress} and a hostname.
+ *
* @since 4.2
*/
public class HostInfo {
@@ -41,12 +45,23 @@
private InetAddress inetAddress;
private boolean ssl;
+ /**
+ * Construct a fully resolved {@link HostInfo}.
+ * @param hostName
+ * @param addr
+ */
public HostInfo(String hostName, InetSocketAddress addr) {
this.hostName = hostName;
this.portNumber = addr.getPort();
this.inetAddress = addr.getAddress();
}
+ /**
+ * Construct a {@link HostInfo} that can resolve each
+ * time an {@link InetAddress} is asked for.
+ * @param host
+ * @param port
+ */
public HostInfo (String host, int port) {
ArgCheck.isNotNull(host);
this.hostName = host.toLowerCase();
@@ -101,6 +116,9 @@
if (inetAddress != null && hostInfo.inetAddress != null) {
return inetAddress.equals(hostInfo.inetAddress);
}
+ if (ssl != hostInfo.ssl) {
+ return false;
+ }
return hostName.equals(hostInfo.getHostName());
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/ServerConnection.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/ServerConnection.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/ServerConnection.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -38,4 +38,6 @@
boolean isSameInstance(ServerConnection conn) throws CommunicationException;
+ void cleanUp();
+
}
\ No newline at end of file
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -44,7 +44,8 @@
void init(TeiidURL url, Properties p);
/**
- * Get the currently known hosts.
+ * Get the currently known hosts. Will be called prior to connecting and after
+ * authentication for each connection.
* @param result, the current {@link LogonResult} - may be null if unauthenticated
* @param instance, the currently connected instance - may be null if not connected
* @return
@@ -67,5 +68,14 @@
* Shutdown this {@link ServerDiscovery}
*/
void shutdown();
+
+ /**
+ * Select the next instance to try. The entry should be removed from the list
+ * when no more attempts are desired.
+ * and not return null.
+ * @param hosts
+ * @return a non-null HostInfo to try
+ */
+ HostInfo selectNextInstance(List<HostInfo> hosts);
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -28,7 +28,6 @@
import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.HashSet;
@@ -114,7 +113,7 @@
List<HostInfo> hostCopy = new ArrayList<HostInfo>(hostKeys);
int knownHosts = hostKeys.size();
while (hostKeys.size() > 0) {
- HostInfo hostInfo = hostKeys.remove((int) (Math.random() * hostKeys.size()));
+ HostInfo hostInfo = this.serverDiscovery.selectNextInstance(hostKeys);
Exception ex = null;
try {
@@ -165,9 +164,6 @@
private ILogon connect(HostInfo hostInfo) throws CommunicationException,
IOException {
- if (!hostInfo.isResolved()) {
- hostInfo = new HostInfo(hostInfo.getHostName(), new InetSocketAddress(hostInfo.getInetAddress(), hostInfo.getPortNumber()));
- }
hostInfo.setSsl(secure);
this.serverInstance = connectionFactory.getServerInstance(hostInfo);
this.logonResult = logonResults.get(hostInfo);
@@ -305,7 +301,7 @@
}
}
- public void selectNewServerInstance() {
+ public void cleanUp() {
closeServerInstance();
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -31,7 +31,8 @@
/**
- * Simple URL discovery strategy
+ * Simple URL discovery strategy with a random load balancing policy
+ * TOOD: add black listing support
*/
public class UrlServerDiscovery implements ServerDiscovery {
@@ -70,4 +71,9 @@
}
+ @Override
+ public HostInfo selectNextInstance(List<HostInfo> hosts) {
+ return hosts.remove((int) (Math.random() * hosts.size()));
+ }
+
}
Modified: branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestAdminApiServerDiscovery.java
===================================================================
--- branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestAdminApiServerDiscovery.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestAdminApiServerDiscovery.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -64,7 +64,7 @@
processes.add(p2);
Mockito.stub(serverAdmin.getProcesses("*")).toReturn(processes); //$NON-NLS-1$
Mockito.stub(instance.getService(Admin.class)).toReturn(serverAdmin);
- Mockito.stub(instance.getHostInfo().getHostName()).toReturn("foo"); //$NON-NLS-1$
+ Mockito.stub(instance.getHostInfo()).toReturn(knownHost);
discovery.connectionSuccessful(knownHost);
List<HostInfo> knownHosts = discovery.getKnownHosts(new LogonResult(), instance);
Modified: branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
===================================================================
--- branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2010-08-23 17:44:19 UTC (rev 2483)
@@ -278,15 +278,15 @@
</entry>
<entry>Server where the Teiid runtime installed</entry>
</row>
- <!-- <row>
+ <row>
<entry>
<code>AlternateServers</code>
</entry>
<entry>
<code>String</code>
</entry>
- <entry>Optional , delimited list of host:port entries. See the <link linkend="multiple_hosts">multiple hosts</link> section for more information.</entry>
- </row> -->
+ <entry>Optional delimited list of host:port entries. See the <link linkend="multiple_hosts">multiple hosts</link> section for more information.</entry>
+ </row>
<row>
<entry>
<code>AdditionalProperties</code>
@@ -488,27 +488,61 @@
<section id="multiple_hosts">
<title>Using Multiple Hosts</title>
- <para>A group of Teiid Servers in the same AS cluster may be connected using connection time failover and load-balancing.
- To enable this feature the client needs to specify multiple host name and port number combinations on the URL connection string.
- The client will randomly pick any one the Teiid server from the list and will have session established with that server.
- If that server cannot be contacted, then a connection will be attempted to each of the remaining servers in random order.</para>
-
- <!-- If the "autoFailover" connection property is set to "true", a failure with the connected server will cause the client to automatically failover
- to other available servers. Even if autoFailover is not set, when using a managed DataSource based connection, the connection will randomly select a new server instance when it is returned to the pool.</para>
- -->
- <example><title>Example URL connection string</title><programlisting><![CDATA[jdbc:teiid:<vdb-name>@mm://host1:31000, host1:31001, host2:31000;version=2]]></programlisting></example>
-
- <!-- <para>Currently when the fail over happens, the user is re-authenticated with the new server. The clustering
- feature coming up in the Teiid 7.1 release will define how the transparent session fail over will occur with out the
- re-authentication.</para>
-
- <para>You can also use this feature to distribute the query load among various avaialble Teiid Servers available.
- Load balancing happens automatically, when you are using a data source along with connection pooling. Each time a connection is
- grabbed from the pool, it will randomly select a Teiid Server to distribute the load. Note, that load balacing feature
- is not avaialble if you are using Teiid Driver to make your connection.</para>-->
-
- <para>If you are using DataSource to connect to Teiid Server, use "AlternateServers" property/method to define the failover servers.
- Check out the Javadoc on the format of the string.</para>
+ <para>A group of Teiid Servers in the same JBoss AS cluster may be connected using failover and load-balancing features.
+ To enable theses features in their simplest form, the client needs to specify multiple host name and port number combinations on the URL connection string.
+ <example><title>Example URL connection string</title><programlisting><![CDATA[jdbc:teiid:<vdb-name>@mm://host1:31000,host1:31001,host2:31000;version=2]]></programlisting></example>
+ </para>
+ <para>If you are using a DataSource to connect to Teiid Server, use the "AlternateServers" property/method to define the failover servers. The format is also a comma separated list of host:port combinations.</para>
+ <para>The client will randomly pick one the Teiid server from the list and establish a session with that server.
+ If that server cannot be contacted, then a connection will be attempted to each of the remaining servers in random order.
+ This allows for both connection time fail-over and random server selection load balancing.
+ </para>
+ <section id="failover">
+ <title>Fail Over</title>
+ <para>Post connection fail over will be sued if you're using an admin connection (such as what is used by AdminShell) or if the autoFailover connection property is set to true.
+ Post connection failover works by sending a ping, at most every second, to test the connection prior to use. If the ping fails, a new instance will be selected prior to the operation being attempted.
+ This is not true "transparent application failover" as the client will not restart the transaction/query/recreate session scoped temp tables, etc. So this feature should be used with caution by non-admin connections.</para>
+ </section>
+ <section id="loadbalancing">
+ <title>Load Balancing</title>
+ <para>Post connection load balancing can be utilized in one of two ways. First if you are using <code>TeiidDataSource</code> and the Connections returned by
+ Teiid <code>PooledConnections</code> have their <code>close</code> method called, then a new server instance will be selected automatically.
+ However when using driver based connections or even when using <code>TeiidDataSource</code> in a connection pool (such as JBoss AS), the automatic load balancing will not happen.
+ Second you can explicitly trigger load balancing through the use of the set statement: <programlisting>SET NEWINSTANCE TRUE</programlisting>
+ Typically you will not need want to issue this statement manually, but instead use it as the connection test query on your DataSource configuration.
+ <example>
+ <title>JBoss AS DataSource With Post Connection Load Balancing</title>
+ <programlisting><![CDATA[<datasources>
+ <local-tx-datasource>
+ <jndi-name>TEIID-DS</jndi-name>
+ <connection-url>jdbc:metamatrix:myVDB@mm://localhost:31000,mm://localhost:32000</connection-url>
+ <driver-class>org.teiid.jdbc.TeiidDriver</driver-class>
+ <user-name>admin</user-name>
+ <password>teiid</password>
+
+ <!-- pool and other JBoss datasource properties -->
+ <check-valid-connection-sql>SET NEWINSTANCE TRUE</check-valid-connection-sql>
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ </local-tx-datasource>
+</datasources>]]></programlisting>
+</example>
+ </para>
+ <para>Teiid by default maintians a pool of extra socket connections that are reused. For load balancing, this reduces the potential cost of switching a connection to another server instance.
+ The default setting is to maintain 16 connections (see <code>org.teiid.sockets.maxCachedInstances</code> in the client jar's teiid-client-settings.properties file.
+ If you're client is connecting to large numbers of Teiid instances and you're using post connection time load balancing, then consider increasing the number of cached instances.
+ You may either set an analogous system property or create another version of teiid-client-settings.properties file and place it into the classpath ahead of the client jar.</para>
+ </section>
+ <section id="advancedconfig">
+ <title>Advanced Configuration</title>
+ <para>Server discovery, load balancing, fail over, retry, retry delay, etc. may be customize if the default policy is not sufficient.
+ See the <code>org.teiid.net.socket.ServerDiscovery</code> interface and default implementaion <code>org.teiid.net.socket.UrlServerDiscovery</code> for how to start with your customization.
+ The <code>UrlServerDiscovery</code> implemenation provides the following: discovery of servers from the URL hosts (DataSource server/alternativeServers), random selection for load balancing and failover, 1 connection attempt per host, no biasing, black listing, or other advanced features.
+ Typically you'll want to extend the <code>UrlServerDiscovery</code> so that it can be used as the fallback strategy and to only implement the necessary changed methods.
+ It's important to consider that 1 <code>ServerDiscovery</code> instance will be created for each connection. Any sharing of information between instances should be done through static state or some other shared lookup.
+ </para>
+ <para>Your customized server discovery class will then need to be referenced by the discoveryStategy connection/DataSource property by its full class name.</para>
+ </section>
</section>
</chapter>
\ No newline at end of file
Modified: branches/7.1.x/documentation/reference/src/main/docbook/en-US/Reference.xml
===================================================================
--- branches/7.1.x/documentation/reference/src/main/docbook/en-US/Reference.xml 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/documentation/reference/src/main/docbook/en-US/Reference.xml 2010-08-23 17:44:19 UTC (rev 2483)
@@ -53,7 +53,7 @@
<xi:include href="content/scalar_functions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="content/procedures.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="content/transaction_support.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="content/entitlements.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="content/dataroles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="content/system_schema.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="content/translators.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="content/federated_planning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Copied: branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/dataroles.xml (from rev 2478, branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/entitlements.xml)
===================================================================
--- branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/dataroles.xml (rev 0)
+++ branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/dataroles.xml 2010-08-23 17:44:19 UTC (rev 2483)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
+%CustomDTD;
+]>
+<chapter id="dataroles">
+ <title>Data Roles</title>
+ <para>Data roles, also called entitlements, are sets of permissions that are defined
+ per VDB that dictate data access (create, read, update, delete). The use of data roles is controlled system wide with the property in
+ <code><jboss-install>/server/<profile>/deploy/teiid/teiid-jboss-beans.xml</code> file
+ in bean configuration section of <code>RuntimeEngineDeployer</code> with property <code>useDataRoles</code>.</para>
+
+ <para>Once data roles are enabled, the access permissions defined in a VDB will be enforced by the Teiid Server.
+ </para>
+
+ <warning><para>Teiid uses a deny by default permission system, so all VDBs deployed to the server will need roles granting access with this feature enabled.</para></warning>
+
+ <section>
+ <title>Permissions</title>
+
+ <para>CREATE, READ, UPDATE, DELETE (CRUD) permissions can be set for any resource path in a VDB.
+ A resource path can be as specific as the fully qualified name of a column or as general a top level model (schema) name.
+ Permissions granted to a particular path apply to it and any resource paths that share the same partial name.
+ For example, granting read to "model" will also grant read to "model.table", "model.table.column", etc.
+ Allowing or denying a particular action is determined by searching for permissions from the most to least specific resource paths.
+ The first permission found with a specific allow or deny will be used.
+ Thus it is possible to set very general permissions at high-level resource path names and to override only as necessary at more specific resource paths.
+ </para>
+
+ <para>Permission grants are only needed for resources that are visible.
+ All non-visible, typically physical, models in a VDB are automatically
+ inaccessible by user level requests. Permissions are also only applied
+ to the columns and tables in the user query - not to every resource
+ accessed transitively through views and procedures.
+ It is important therefore to ensure that permission grants are applied
+ consistently across visible models that access the same resources.
+ </para>
+
+ <orderedlist>
+ <para>To process a <emphasis>SELECT</emphasis> statement or a stored procedure execution, the user account requires the following access rights:</para>
+ <listitem> <para><emphasis>READ</emphasis> - on the Table(s) being accessed or the procedure being called.</para></listitem>
+ <listitem> <para><emphasis>READ</emphasis> - on every column referenced.</para></listitem>
+ </orderedlist>
+
+ <orderedlist>
+ <para>To process an <emphasis>INSERT</emphasis> statement, the user account requires the following access rights:</para>
+ <listitem> <para><emphasis>CREATE</emphasis> - on the Table being inserted into.</para></listitem>
+ <listitem> <para><emphasis>CREATE</emphasis> - on every column being inserted on that Table.</para></listitem>
+ </orderedlist>
+
+ <orderedlist>
+ <para>To process an <emphasis>UPDATE</emphasis> statement, the user account requires the following access rights:</para>
+ <listitem> <para><emphasis>UPDATE</emphasis> - on the Table being updated.</para></listitem>
+ <listitem> <para><emphasis>UPDATE</emphasis> - on every column being updated on that Table.</para></listitem>
+ <listitem> <para><emphasis>READ</emphasis> - on every column referenced in the criteria.</para></listitem>
+ </orderedlist>
+
+ <orderedlist>
+ <para>To process a <emphasis>DELETE</emphasis> statement, the user account requires the following access rights:</para>
+ <listitem> <para><emphasis>DELETE</emphasis> - on the Table being deleted.</para></listitem>
+ <listitem> <para><emphasis>READ</emphasis> - on every column referenced in the criteria.</para></listitem>
+ </orderedlist>
+
+ <orderedlist>
+ <para>To process a <emphasis>EXEC</emphasis> statement, the user account requires the following access rights:</para>
+ <listitem> <para><emphasis>READ</emphasis> - on the Procedure being executed.</para></listitem>
+ </orderedlist>
+
+ </section>
+
+ <section>
+ <title>XML Definition</title>
+ <para>Data roles are defined inside the <code>vdb.xml</code> file (inside the .vdb Zip archive under META-INF/vdb.xml) if you used Designer.
+ This example will show a sample "vdb.xml" file with few simple data rules.</para>
+
+ <para>For example, if a VDB defines a table "TableA" in schema "modelName" with columns (column1, column2) - note that the column types do not matter. And we wish to define three roles "RoleA", "RoleB", "RoleC" with following permissions:
+ <orderedlist>
+ <listitem><para>RoleA has privileges to read, write access to TableA, but can not delete.</para></listitem>
+ <listitem><para>RoleB has no privileges that allow access to TableA</para></listitem>
+ <listitem><para>RoleC has privileges that only allow read access to TableA.column1</para></listitem>
+ </orderedlist>
+ </para>
+ <example><title>vdb.xml defining RoleA, RoleB, and RoleC</title>
+ <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<vdb name="sample" version="1">
+
+ <model name="modelName">
+ <source name="source-name" translator-name="oracle" connection-jndi-name="java:myDS" />
+ </model>
+
+ <data-role name="RoleA">
+ <description>Allow all, except Delete</description>
+
+ <permission>
+ <resource-name>modelName.TableA</resource-name>
+ <allow-create>true</allow-create>
+ <allow-read>true</allow-read>
+ <allow-update>true</allow-update>
+ </permission>
+
+ <permission>
+ <resource-name>modelName.TableA.colum1</resource-name>
+ <allow-create>true</allow-create>
+ <allow-read>true</allow-read>
+ <allow-update>true</allow-update>
+ </permission>
+
+ <permission>
+ <resource-name>modelName.TableA.column2</resource-name>
+ <allow-create>true</allow-create>
+ <allow-read>true</allow-read>
+ <allow-update>true</allow-update>
+ </permission>
+
+ <mapped-role-name>role1</mapped-role-name>
+
+ </data-role>
+
+ <data-role name="RoleC">
+ <description>Allow read only</description>
+
+ <permission>
+ <resource-name>modelName.TableA</resource-name>
+ <allow-read>true</allow-read>
+ </permission>
+
+ <permission>
+ <resource-name>modelName.TableA.colum1</resource-name>
+ <allow-read>true</allow-read>
+ </permission>
+
+ <mapped-role-name>role2</mapped-role-name>
+ </data-role>
+</vdb>]]></programlisting>
+</example>
+ <para>The above XML defined two data roles, "RoleA" which allows everything except delete on the table, "RoleC" that
+ allows only read operation on the table. Since Teiid uses deny by default, there is no explicit data-role entry needed for "RoleB". The "mapped-role-name" defines the JAAS "role" to whom these policies are applicable.</para>
+
+ <para>For assigning roles to your users in the JBoss AS,
+ check out the instructions for the selected Login Module. Check the "Admin Guide" for configuring Login Modules.</para>
+
+ <para>The "vdb.xml" file is checked against the schema file <code>vdb-deployer.xsd</code>, check the documents sections of the Teiid kit
+ to find a copy of the schema file.</para>
+
+ </section>
+
+</chapter>
\ No newline at end of file
Property changes on: branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/dataroles.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/entitlements.xml
===================================================================
--- branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/entitlements.xml 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/entitlements.xml 2010-08-23 17:44:19 UTC (rev 2483)
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd">
-%CustomDTD;
-]>
-<chapter id="entitlements">
- <title>Data Roles</title>
- <para>Data roles, also called entitlements, are sets of permissions that are defined
- per VDB that dictate data access (create, read, update, delete). The use of data roles is controlled system wide with the property in
- <code><jboss-install>/server/<profile>/deploy/teiid/teiid-jboss-beans.xml</code> file
- in bean configuration section of <code>RuntimeEngineDeployer</code> with property <code>useDataRoles</code>.</para>
-
- <para>Once data roles are enabled, the access permissions defined in a VDB will be enforced by the Teiid Server.
- </para>
-
- <warning><para>Teiid uses a deny by default permission system, so all VDBs deployed to the server will need roles granting access with this feature enabled.</para></warning>
-
- <section>
- <title>Permissions</title>
-
- <para>CREATE, READ, UPDATE, DELETE (CRUD) permissions can be set for any resource path in a VDB.
- A resource path can be as specific as the fully qualified name of a column or as general a top level model (schema) name.
- Permissions granted to a particular path apply to it and any resource paths that share the same partial name.
- For example, granting read to "model" will also grant read to "model.table", "model.table.column", etc.
- Allowing or denying a particular action is determined by searching for permissions from the most to least specific resource paths.
- The first permission found with a specific allow or deny will be used.
- Thus it is possible to set very general permissions at high-level resource path names and to override only as necessary at more specific resource paths.
- </para>
-
- <para>Permission grants are only needed for resources that are visible.
- All non-visible, typically physical, models in a VDB are automatically
- inaccessible by user level requests. Permissions are also only applied
- to the columns and tables in the user query - not to every resource
- accessed transitively through views and procedures.
- It is important therefore to ensure that permission grants are applied
- consistently across visible models that access the same resources.
- </para>
-
- <orderedlist>
- <para>To process a <emphasis>SELECT</emphasis> statement or a stored procedure execution, the user account requires the following access rights:</para>
- <listitem> <para><emphasis>READ</emphasis> - on the Table(s) being accessed or the procedure being called.</para></listitem>
- <listitem> <para><emphasis>READ</emphasis> - on every column referenced.</para></listitem>
- </orderedlist>
-
- <orderedlist>
- <para>To process an <emphasis>INSERT</emphasis> statement, the user account requires the following access rights:</para>
- <listitem> <para><emphasis>CREATE</emphasis> - on the Table being inserted into.</para></listitem>
- <listitem> <para><emphasis>CREATE</emphasis> - on every column being inserted on that Table.</para></listitem>
- </orderedlist>
-
- <orderedlist>
- <para>To process an <emphasis>UPDATE</emphasis> statement, the user account requires the following access rights:</para>
- <listitem> <para><emphasis>UPDATE</emphasis> - on the Table being updated.</para></listitem>
- <listitem> <para><emphasis>UPDATE</emphasis> - on every column being updated on that Table.</para></listitem>
- <listitem> <para><emphasis>READ</emphasis> - on every column referenced in the criteria.</para></listitem>
- </orderedlist>
-
- <orderedlist>
- <para>To process a <emphasis>DELETE</emphasis> statement, the user account requires the following access rights:</para>
- <listitem> <para><emphasis>DELETE</emphasis> - on the Table being deleted.</para></listitem>
- <listitem> <para><emphasis>READ</emphasis> - on every column referenced in the criteria.</para></listitem>
- </orderedlist>
-
- <orderedlist>
- <para>To process a <emphasis>EXEC</emphasis> statement, the user account requires the following access rights:</para>
- <listitem> <para><emphasis>READ</emphasis> - on the Procedure being executed.</para></listitem>
- </orderedlist>
-
- </section>
-
- <section>
- <title>XML Definition</title>
- <para>Data roles are defined inside the <code>vdb.xml</code> file (inside the .vdb Zip archive under META-INF/vdb.xml) if you used Designer.
- This example will show a sample "vdb.xml" file with few simple data rules.</para>
-
- <para>For example, if a VDB defines a table "TableA" in schema "modelName" with columns (column1, column2) - note that the column types do not matter. And we wish to define three roles "RoleA", "RoleB", "RoleC" with following permissions:
- <orderedlist>
- <listitem><para>RoleA has privileges to read, write access to TableA, but can not delete.</para></listitem>
- <listitem><para>RoleB has no privileges that allow access to TableA</para></listitem>
- <listitem><para>RoleC has privileges that only allow read access to TableA.column1</para></listitem>
- </orderedlist>
- </para>
- <example><title>vdb.xml defining RoleA, RoleB, and RoleC</title>
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<vdb name="sample" version="1">
-
- <model name="modelName">
- <source name="source-name" translator-name="oracle" connection-jndi-name="java:myDS" />
- </model>
-
- <data-role name="RoleA">
- <description>Allow all, except Delete</description>
-
- <permission>
- <resource-name>modelName.TableA</resource-name>
- <allow-create>true</allow-create>
- <allow-read>true</allow-read>
- <allow-update>true</allow-update>
- </permission>
-
- <permission>
- <resource-name>modelName.TableA.colum1</resource-name>
- <allow-create>true</allow-create>
- <allow-read>true</allow-read>
- <allow-update>true</allow-update>
- </permission>
-
- <permission>
- <resource-name>modelName.TableA.column2</resource-name>
- <allow-create>true</allow-create>
- <allow-read>true</allow-read>
- <allow-update>true</allow-update>
- </permission>
-
- <mapped-role-name>role1</mapped-role-name>
-
- </data-role>
-
- <data-role name="RoleC">
- <description>Allow read only</description>
-
- <permission>
- <resource-name>modelName.TableA</resource-name>
- <allow-read>true</allow-read>
- </permission>
-
- <permission>
- <resource-name>modelName.TableA.colum1</resource-name>
- <allow-read>true</allow-read>
- </permission>
-
- <mapped-role-name>role2</mapped-role-name>
- </data-role>
-</vdb>]]></programlisting>
-</example>
- <para>The above XML defined two data roles, "RoleA" which allows everything except delete on the table, "RoleC" that
- allows only read operation on the table. Since Teiid uses deny by default, there is no explicit data-role entry needed for "RoleB". The "mapped-role-name" defines the JAAS "role" to whom these policies are applicable.</para>
-
- <para>For assigning roles to your users in the JBoss AS,
- check out the instructions for the selected Login Module. Check the "Admin Guide" for configuring Login Modules.</para>
-
- <para>The "vdb.xml" file is checked against the schema file <code>vdb-deployer.xsd</code>, check the documents sections of the Teiid kit
- to find a copy of the schema file.</para>
-
- </section>
-
-</chapter>
\ No newline at end of file
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -38,7 +38,6 @@
import org.teiid.client.security.LogonException;
import org.teiid.client.security.LogonResult;
import org.teiid.client.util.ExceptionUtil;
-import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.dqp.internal.process.DQPWorkContext;
@@ -165,4 +164,9 @@
public boolean isSameInstance(ServerConnection conn) throws CommunicationException {
return (conn instanceof LocalServerConnection);
}
+
+ @Override
+ public void cleanUp() {
+
+ }
}
Modified: branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
===================================================================
--- branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2010-08-20 22:18:46 UTC (rev 2482)
+++ branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2010-08-23 17:44:19 UTC (rev 2483)
@@ -35,11 +35,14 @@
import org.junit.Before;
import org.junit.Test;
import org.teiid.client.security.ILogon;
+import org.teiid.client.security.InvalidSessionException;
import org.teiid.client.security.LogonException;
import org.teiid.client.security.LogonResult;
import org.teiid.client.security.SessionToken;
+import org.teiid.client.util.ResultsFuture;
import org.teiid.common.buffer.BufferManagerFactory;
import org.teiid.core.ComponentNotFoundException;
+import org.teiid.core.TeiidComponentException;
import org.teiid.core.crypto.NullCryptor;
import org.teiid.core.util.ObjectConverterUtil;
import org.teiid.dqp.service.SessionService;
@@ -155,6 +158,18 @@
throws LogonException, ComponentNotFoundException {
return new LogonResult(new SessionToken("dummy"), "x", 1, "z");
}
+
+ @Override
+ public ResultsFuture<?> ping() throws InvalidSessionException,
+ TeiidComponentException {
+ return ResultsFuture.NULL_FUTURE;
+ }
+
+ @Override
+ public void assertIdentity(SessionToken checkSession)
+ throws InvalidSessionException, TeiidComponentException {
+ return;
+ }
}, null);
server.registerClientService(FakeService.class, new TestSocketRemoting.FakeServiceImpl(), null);
@@ -206,4 +221,19 @@
helpEstablishConnection(true, config, p);
}
+ @Test public void testSelectNewInstance() throws Exception {
+ SSLConfiguration config = new SSLConfiguration();
+ Properties p = new Properties();
+ SocketServerConnection conn = helpEstablishConnection(false, config, p);
+ SocketListenerStats stats = listener.getStats();
+ assertEquals(2, stats.objectsRead); // handshake response, logon,
+ assertEquals(1, stats.sockets);
+ conn.cleanUp();
+ assertTrue(conn.isOpen(1000));
+ stats = listener.getStats();
+ assertEquals(5, stats.objectsRead); // ping (pool test), assert identity, ping (isOpen)
+ assertEquals(1, stats.sockets);
+ conn.close();
+ }
+
}
15 years, 4 months
- 1
- 0
Teiid-NightlyBuild - Build # 923 - Failure!
by jboss-qa-internal＠redhat.com
Teiid-NightlyBuild - Build # 923 - Failure:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-NightlyBuild/923/ to view the results.
15 years, 4 months
- 1
- 1
teiid SVN: r2482 - in branches/7.1.x: client/src/main/java/org/teiid/client/security and 6 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-08-20 18:18:46 -0400 (Fri, 20 Aug 2010)
New Revision: 2482
Modified:
branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java
branches/7.1.x/client/src/main/java/org/teiid/client/security/ILogon.java
branches/7.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
branches/7.1.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java
branches/7.1.x/client/src/main/java/org/teiid/net/HostInfo.java
branches/7.1.x/client/src/main/java/org/teiid/net/ServerConnection.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/AdminApiServerDiscovery.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestAdminApiServerDiscovery.java
branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java
branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestSocketServerInstanceImpl.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/LogonImpl.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketListener.java
branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java
Log:
TEIID-1211 TEIID-1204 reimplementing loadbalancing and failover logic. this initial checkin mainly addresses failover
Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -27,11 +27,9 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.Properties;
-import java.util.concurrent.ExecutionException;
import org.teiid.client.security.LogonException;
import org.teiid.client.util.ExceptionUtil;
-import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.PropertiesUtils;
import org.teiid.net.CommunicationException;
@@ -51,42 +49,23 @@
private static final int DEFAULT_BOUNCE_WAIT = 2000;
- private final class ReconnectingProxy implements InvocationHandler {
+ private final class AdminProxy implements InvocationHandler {
private Admin target;
private ServerConnection registry;
private Properties p;
private boolean closed;
- public ReconnectingProxy(Properties p) throws ConnectionException, CommunicationException {
+ public AdminProxy(Properties p) throws ConnectionException, CommunicationException {
this.p = p;
this.registry = serverConnectionFactory.getConnection(p);
this.target = registry.getService(Admin.class);
}
- private synchronized Admin getTarget() throws AdminComponentException, CommunicationException {
+ private synchronized Admin getTarget() throws AdminComponentException {
if (closed) {
throw new AdminComponentException(NetPlugin.Util.getString("ERR.014.001.0001")); //$NON-NLS-1$
}
- if (target != null) {
- ResultsFuture<?> ping = registry.isOpen();
- if (ping != null) {
- try {
- ping.get();
- return target;
- } catch (InterruptedException e) {
- throw new CommunicationException(e);
- } catch (ExecutionException e) {
- //assume recoverable
- }
- }
- }
- try {
- registry = serverConnectionFactory.getConnection(p);
- } catch (ConnectionException e) {
- throw new AdminComponentException(e);
- }
- target = registry.getService(Admin.class);
return target;
}
@@ -97,7 +76,6 @@
close();
return null;
}
- Throwable t = null;
try {
return method.invoke(getTarget(), args);
} catch (InvocationTargetException e) {
@@ -109,10 +87,7 @@
}
}
throw e.getTargetException();
- } catch (CommunicationException e) {
- t = e;
}
- throw t;
}
public synchronized void close() {
@@ -231,7 +206,7 @@
p.setProperty(TeiidURL.CONNECTION.ADMIN, Boolean.TRUE.toString());
try {
- Admin serverAdmin = (Admin)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] { Admin.class }, new ReconnectingProxy(p));
+ Admin serverAdmin = (Admin)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] { Admin.class }, new AdminProxy(p));
return serverAdmin;
} catch (ConnectionException e) {
throw new AdminComponentException(e);
Modified: branches/7.1.x/client/src/main/java/org/teiid/client/security/ILogon.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/client/security/ILogon.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/client/security/ILogon.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -21,11 +21,13 @@
*/
package org.teiid.client.security;
+import java.util.Collection;
import java.util.Properties;
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.ComponentNotFoundException;
import org.teiid.core.TeiidComponentException;
+import org.teiid.net.CommunicationException;
/**
@@ -33,7 +35,7 @@
*/
public interface ILogon {
LogonResult logon(Properties connectionProperties)
- throws LogonException, TeiidComponentException;
+ throws LogonException, TeiidComponentException, CommunicationException;
/**
* Ping the server to see if the client-server connection is alive.
@@ -41,8 +43,10 @@
* @throws ComponentNotFoundException if can't find the Session service.
*/
ResultsFuture<?> ping()
- throws InvalidSessionException, TeiidComponentException;
+ throws InvalidSessionException, TeiidComponentException, CommunicationException;
+ ResultsFuture<?> ping(Collection<String> sessions)
+ throws TeiidComponentException, CommunicationException;
/**
* Log off the specified session.
@@ -51,5 +55,5 @@
*/
ResultsFuture<?> logoff() throws InvalidSessionException, TeiidComponentException;
- void assertIdentity(SessionToken sessionId) throws InvalidSessionException, TeiidComponentException;
+ void assertIdentity(SessionToken sessionId) throws InvalidSessionException, TeiidComponentException, CommunicationException;
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -45,9 +45,6 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -878,20 +875,7 @@
}
public boolean isValid(int timeout) throws SQLException {
- ResultsFuture<?> future = this.getServerConnection().isOpen();
- if (future == null) {
- return false;
- }
- try {
- future.get(timeout, TimeUnit.SECONDS);
- return true;
- } catch (InterruptedException e) {
- return false;
- } catch (ExecutionException e) {
- return false;
- } catch (TimeoutException e) {
- return false;
- }
+ return this.getServerConnection().isOpen(timeout * 1000);
}
public void recycleConnection() {
@@ -918,7 +902,7 @@
//perform load balancing
if (this.serverConn instanceof SocketServerConnection) {
- ((SocketServerConnection)this.serverConn).selectNewServerInstance(this.getDQP());
+ ((SocketServerConnection)this.serverConn).selectNewServerInstance();
}
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -80,7 +80,7 @@
ex = ExceptionUtil.getExceptionOfType(e, CommunicationException.class);
if (ex instanceof SingleInstanceCommunicationException) {
ServerConnection sc = proxiedConnection.getServerConnection();
- if (sc.isOpen() != null) {
+ if (!sc.isOpen(ServerConnection.PING_INTERVAL)) {
ex = null;
}
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/HostInfo.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/HostInfo.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/HostInfo.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -23,6 +23,7 @@
package org.teiid.net;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import org.teiid.core.util.ArgCheck;
@@ -38,12 +39,12 @@
private String hostName;
private int portNumber = 0;
private InetAddress inetAddress;
-
- public InetAddress getInetAddress() throws UnknownHostException {
- if (inetAddress != null) {
- return inetAddress;
- }
- return InetAddress.getByName(this.hostName);
+ private boolean ssl;
+
+ public HostInfo(String hostName, InetSocketAddress addr) {
+ this.hostName = hostName;
+ this.portNumber = addr.getPort();
+ this.inetAddress = addr.getAddress();
}
public HostInfo (String host, int port) {
@@ -61,6 +62,13 @@
}
}
+ public InetAddress getInetAddress() throws UnknownHostException {
+ if (inetAddress != null) {
+ return inetAddress;
+ }
+ return InetAddress.getByName(this.hostName);
+ }
+
public String getHostName() {
return hostName;
}
@@ -87,7 +95,13 @@
return false;
}
HostInfo hostInfo = (HostInfo) obj;
- return hostName.equals(hostInfo.getHostName()) && portNumber == hostInfo.getPortNumber();
+ if (portNumber != hostInfo.getPortNumber()) {
+ return false;
+ }
+ if (inetAddress != null && hostInfo.inetAddress != null) {
+ return inetAddress.equals(hostInfo.inetAddress);
+ }
+ return hostName.equals(hostInfo.getHostName());
}
/**
@@ -98,5 +112,17 @@
int hc = HashCodeUtil.hashCode(0, hostName);
return HashCodeUtil.hashCode(hc, portNumber);
}
+
+ public boolean isResolved() {
+ return this.inetAddress != null;
+ }
+
+ public boolean isSsl() {
+ return ssl;
+ }
+
+ public void setSsl(boolean ssl) {
+ this.ssl = ssl;
+ }
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/ServerConnection.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/ServerConnection.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/ServerConnection.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -23,7 +23,6 @@
package org.teiid.net;
import org.teiid.client.security.LogonResult;
-import org.teiid.client.util.ResultsFuture;
public interface ServerConnection {
@@ -33,7 +32,7 @@
void close();
- ResultsFuture<?> isOpen();
+ boolean isOpen(long msToTest);
LogonResult getLogonResult();
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/AdminApiServerDiscovery.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/AdminApiServerDiscovery.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/AdminApiServerDiscovery.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -82,7 +82,7 @@
&& (info.lastDiscoveryTime < System.currentTimeMillis() - DISCOVERY_TIMEOUT || info.knownHosts.isEmpty())) {
Admin serverAdmin = instance.getService(Admin.class);
try {
- Collection<ProcessObject> processes = serverAdmin.getProcesses("*");
+ Collection<ProcessObject> processes = serverAdmin.getProcesses("*"); //$NON-NLS-1$
info.knownHosts.clear();
for (ProcessObject processObject : processes) {
if (!processObject.isEnabled() || !processObject.isRunning()) {
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -50,8 +50,8 @@
/**
* @param version The version to set.
*/
- public void setVersion(String version) {
- this.version = version;
+ public void setVersion() {
+ this.version = ApplicationInfo.getInstance().getMajorReleaseNumber();
}
/**
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -26,22 +26,18 @@
package org.teiid.net.socket;
import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.net.SocketAddress;
+import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -52,6 +48,7 @@
import org.teiid.client.util.ExceptionUtil;
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidException;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.HostInfo;
@@ -66,8 +63,7 @@
*/
public class SocketServerConnection implements ServerConnection {
- private static final int RETRY_COUNT = 3;
-
+ private static final int FAILOVER_PING_INTERVAL = 1000;
private SocketServerInstanceFactory connectionFactory;
private ServerDiscovery serverDiscovery;
private static Logger log = Logger.getLogger("org.teiid.client.sockets"); //$NON-NLS-1$
@@ -76,72 +72,44 @@
private Properties connProps;
private SocketServerInstance serverInstance;
- private volatile LogonResult logonResult;
+ private LogonResult logonResult;
+ private Map<HostInfo, LogonResult> logonResults = new ConcurrentHashMap<HostInfo, LogonResult>();
private ILogon logon;
- private Timer pingTimer;
private boolean closed;
private boolean failOver;
+ private long lastPing = System.currentTimeMillis();
+ private int pingFailOverInterval = FAILOVER_PING_INTERVAL;
public SocketServerConnection(
SocketServerInstanceFactory connectionFactory, boolean secure,
- ServerDiscovery serverDiscovery, Properties connProps,
- Timer pingTimer) throws CommunicationException, ConnectionException {
+ ServerDiscovery serverDiscovery, Properties connProps) throws CommunicationException, ConnectionException {
this.connectionFactory = connectionFactory;
this.serverDiscovery = serverDiscovery;
this.connProps = connProps;
this.secure = secure;
+ //ILogon that is allowed to failover
this.logon = this.getService(ILogon.class);
this.failOver = Boolean.valueOf(connProps.getProperty(TeiidURL.CONNECTION.AUTO_FAILOVER)).booleanValue();
-
- authenticate();
-
- this.pingTimer = pingTimer;
- schedulePing();
+ this.failOver |= Boolean.valueOf(connProps.getProperty(TeiidURL.CONNECTION.ADMIN)).booleanValue();
+ selectServerInstance();
}
-
- private void schedulePing() {
- if (this.pingTimer != null) {
- this.pingTimer.schedule(new TimerTask() {
-
- private ResultsFuture<?> ping;
-
- @Override
- public void run() {
- if (ping == null) {
- ping = isOpen();
- }
- if (ping != null) {
- try {
- ping.get(1, TimeUnit.SECONDS);
- ping = null;
- return;
- } catch (TimeoutException e) {
- return;
- } catch (Throwable e) {
- handlePingError(e);
- }
- }
- this.cancel();
- }
-
- }, PING_INTERVAL, PING_INTERVAL);
- }
- }
/**
* Implements a sticky random selection policy
* TODO: make this customizable
* TODO: put more information on hostinfo as to process response time, last successful connect, etc.
+ * @throws ConnectionException
*/
public synchronized SocketServerInstance selectServerInstance()
- throws CommunicationException {
+ throws CommunicationException, ConnectionException {
if (closed) {
throw new CommunicationException(NetPlugin.Util.getString("SocketServerConnection.closed")); //$NON-NLS-1$
}
if (this.serverInstance != null && (!failOver || this.serverInstance.isOpen())) {
return this.serverInstance;
}
- List<HostInfo> hostKeys = new ArrayList<HostInfo>(this.serverDiscovery.getKnownHosts(logonResult, this.serverInstance));
+ List<HostInfo> hostKeys = new ArrayList<HostInfo>(this.serverDiscovery.getKnownHosts(logonResult, null));
+ boolean discoverHosts = true;
closeServerInstance();
List<HostInfo> hostCopy = new ArrayList<HostInfo>(hostKeys);
int knownHosts = hostKeys.size();
@@ -150,23 +118,38 @@
Exception ex = null;
try {
- SocketServerInstance instance = connectionFactory.getServerInstance(hostInfo, secure);
- this.serverInstance = instance;
- if (this.logonResult != null) {
- ILogon newLogon = instance.getService(ILogon.class);
- newLogon.assertIdentity(logonResult.getSessionToken());
+ ILogon newLogon = connect(hostInfo);
+ if (this.logonResult == null) {
+ try {
+ this.logonResult = newLogon.logon(connProps);
+ this.logonResults.put(this.serverInstance.getHostInfo(), this.logonResult);
+ this.connectionFactory.connected(this.serverInstance, this.logonResult.getSessionToken());
+ this.serverDiscovery.connectionSuccessful(hostInfo);
+ if (discoverHosts) {
+ List<HostInfo> updatedHosts = this.serverDiscovery.getKnownHosts(logonResult, this.serverInstance);
+ if (updatedHosts.size() > 1 && new HashSet<HostInfo>(updatedHosts).size() > new HashSet<HostInfo>(hostCopy).size()) {
+ hostKeys = updatedHosts;
+ closeServerInstance();
+ discoverHosts = false;
+ continue;
+ }
+ }
+ } catch (LogonException e) {
+ // Propagate the original message as it contains the message we want
+ // to give to the user
+ throw new ConnectionException(e, e.getMessage());
+ } catch (TeiidComponentException e) {
+ if (e.getCause() instanceof CommunicationException) {
+ throw (CommunicationException)e.getCause();
+ }
+ throw new CommunicationException(e, NetPlugin.Util.getString("PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to")); //$NON-NLS-1$
+ }
}
- this.serverDiscovery.connectionSuccessful(hostInfo);
return this.serverInstance;
} catch (IOException e) {
ex = e;
- } catch (InvalidSessionException e) {
- shutdown(false);
- throw new CommunicationException(e,NetPlugin.Util.getString("SocketServerInstance.Connection_Error.Connect_Failed", hostInfo.getHostName(), String.valueOf(hostInfo.getPortNumber()), e.getMessage())); //$NON-NLS-1$
} catch (SingleInstanceCommunicationException e) {
ex = e;
- } catch (TeiidComponentException e) {
- ex = e;
}
this.serverDiscovery.markInstanceAsBad(hostInfo);
if (knownHosts == 1) { //just a single host, use the exception
@@ -179,133 +162,127 @@
}
throw new CommunicationException(NetPlugin.Util.getString("SocketServerInstancePool.No_valid_host_available", hostCopy.toString())); //$NON-NLS-1$
}
-
- public synchronized void authenticate() throws ConnectionException, CommunicationException {
- this.logonResult = null;
- // Log on to server
- try {
- this.logonResult = logon.logon(connProps);
- List<HostInfo> knownHosts = this.serverDiscovery.getKnownHosts(logonResult, this.serverInstance);
- if (knownHosts.size() > 1 && !new HashSet<HostInfo>(knownHosts).equals(new HashSet<HostInfo>(this.serverDiscovery.getKnownHosts(logonResult, null)))) {
- //if there are multiple instances, allow for load-balancing
- closeServerInstance();
- }
- return;
- } catch (LogonException e) {
- // Propagate the original message as it contains the message we want
- // to give to the user
- throw new ConnectionException(e, e.getMessage());
- } catch (TeiidComponentException e) {
- if (e.getCause() instanceof CommunicationException) {
- throw (CommunicationException)e.getCause();
- }
- throw new CommunicationException(e, NetPlugin.Util.getString("PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to")); //$NON-NLS-1$
- }
- }
-
- class ServerConnectionInvocationHandler implements InvocationHandler {
-
- private Class<?> targetClass;
- private Object target;
-
- public ServerConnectionInvocationHandler(Class<?> targetClass) {
- this.targetClass = targetClass;
+
+ private ILogon connect(HostInfo hostInfo) throws CommunicationException,
+ IOException {
+ if (!hostInfo.isResolved()) {
+ hostInfo = new HostInfo(hostInfo.getHostName(), new InetSocketAddress(hostInfo.getInetAddress(), hostInfo.getPortNumber()));
}
-
- private synchronized Object getTarget() throws CommunicationException {
- if (this.target == null) {
- this.target = selectServerInstance().getService(targetClass);
+ hostInfo.setSsl(secure);
+ this.serverInstance = connectionFactory.getServerInstance(hostInfo);
+ this.logonResult = logonResults.get(hostInfo);
+ ILogon newLogon = this.serverInstance.getService(ILogon.class);
+ if (this.logonResult != null) {
+ try {
+ newLogon.assertIdentity(logonResult.getSessionToken());
+ } catch (TeiidException e) {
+ // session is no longer valid
+ disconnect();
}
- return this.target;
}
-
- public Object invoke(Object proxy, Method method, Object[] args)
- throws Throwable {
- Throwable exception = null;
- for (int i = 0; i < RETRY_COUNT; i++) {
- try {
- return method.invoke(getTarget(), args);
- } catch (InvocationTargetException t) {
- exception = t.getTargetException();
- } catch (Throwable t) {
- exception = t;
- }
- if (!failOver || ExceptionUtil.getExceptionOfType(exception, SingleInstanceCommunicationException.class) == null) {
- break;
- }
- invalidateTarget();
- //TODO: look for invalid session exception
- }
- throw ExceptionUtil.convertException(method, exception);
- }
-
- private synchronized void invalidateTarget() {
- this.target = null;
- }
-
+ return newLogon;
}
-
+
public <T> T getService(Class<T> iface) {
- return iface.cast(Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new ServerConnectionInvocationHandler(iface)));
+ return iface.cast(Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new SocketServerInstanceImpl.RemoteInvocationHandler(iface) {
+ @Override
+ protected SocketServerInstance getInstance() throws CommunicationException {
+ if (failOver && System.currentTimeMillis() - lastPing > pingFailOverInterval) {
+ try {
+ ResultsFuture<?> future = selectServerInstance().getService(ILogon.class).ping();
+ future.get();
+ } catch (SingleInstanceCommunicationException e) {
+ closeServerInstance();
+ } catch (CommunicationException e) {
+ throw e;
+ } catch (InvalidSessionException e) {
+ disconnect();
+ closeServerInstance();
+ } catch (Exception e) {
+ closeServerInstance();
+ }
+ }
+ lastPing = System.currentTimeMillis();
+ try {
+ return selectServerInstance();
+ } catch (ConnectionException e) {
+ throw new CommunicationException(e);
+ }
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args)
+ throws Throwable {
+ try {
+ return super.invoke(proxy, method, args);
+ } catch (Exception e) {
+ if (ExceptionUtil.getExceptionOfType(e, InvalidSessionException.class) != null) {
+ disconnect();
+ }
+ throw e;
+ }
+ }
+
+ }));
}
+
public synchronized void close() {
- shutdown(true);
- }
- private synchronized void shutdown(boolean logoff) {
if (this.closed) {
return;
}
- if (logoff) {
+ if (this.serverInstance != null) {
+ logoff();
+ }
+
+ for (Map.Entry<HostInfo, LogonResult> logonEntry : logonResults.entrySet()) {
try {
- //make a best effort to send the logoff
- Future<?> writeFuture = this.logon.logoff();
- writeFuture.get(5000, TimeUnit.MILLISECONDS);
- } catch (InvalidSessionException e) {
- //ignore
- } catch (InterruptedException e) {
- //ignore
- } catch (ExecutionException e) {
- //ignore
- } catch (TimeoutException e) {
- //ignore
- } catch (TeiidComponentException e) {
- //ignore
+ connect(logonEntry.getKey());
+ logoff();
+ } catch (Exception e) {
+
}
}
- closeServerInstance();
-
this.closed = true;
this.serverDiscovery.shutdown();
}
+
+ private void logoff() {
+ disconnect();
+ try {
+ //make a best effort to send the logoff
+ Future<?> writeFuture = this.serverInstance.getService(ILogon.class).logoff();
+ writeFuture.get(5000, TimeUnit.MILLISECONDS);
+ } catch (Exception e) {
+ //ignore
+ }
+ closeServerInstance();
+ }
+
+ private void disconnect() {
+ this.logonResults.remove(this.serverInstance.getHostInfo());
+ if (this.logonResult != null) {
+ this.connectionFactory.disconnected(this.serverInstance, this.logonResult.getSessionToken());
+ }
+ }
- public synchronized ResultsFuture<?> isOpen() {
+ private synchronized ResultsFuture<?> isOpen() throws CommunicationException, InvalidSessionException, TeiidComponentException {
if (this.closed) {
- return null;
+ throw new CommunicationException();
}
+ return logon.ping();
+ }
+
+ public boolean isOpen(long msToTest) {
try {
- if (!selectServerInstance().isOpen()) {
- return null;
- }
- } catch (CommunicationException e) {
- return null;
- }
- try {
- return logon.ping();
+ ResultsFuture<?> future = isOpen();
+ future.get(msToTest, TimeUnit.MILLISECONDS);
+ return true;
} catch (Throwable th) {
- return null;
+ return false;
}
}
- private void handlePingError(Throwable th) {
- if (ExceptionUtil.getExceptionOfType(th, InvalidSessionException.class) != null) {
- shutdown(false);
- } else {
- close();
- }
- }
-
public LogonResult getLogonResult() {
return logonResult;
}
@@ -321,20 +298,22 @@
if (!(otherService instanceof SocketServerConnection)) {
return false;
}
- SocketAddress address = selectServerInstance().getRemoteAddress();
- if (address == null) {
- return false;
+ try {
+ return selectServerInstance().getHostInfo().equals(((SocketServerConnection)otherService).selectServerInstance().getHostInfo());
+ } catch (ConnectionException e) {
+ throw new CommunicationException(e);
}
- return address.equals(((SocketServerConnection)otherService).selectServerInstance().getRemoteAddress());
}
- public void selectNewServerInstance(Object service) {
+ public void selectNewServerInstance() {
closeServerInstance();
- ServerConnectionInvocationHandler handler = (ServerConnectionInvocationHandler)Proxy.getInvocationHandler(service);
- handler.invalidateTarget();
}
public void setFailOver(boolean failOver) {
this.failOver = failOver;
}
+
+ public void setFailOverPingInterval(int pingFailOverInterval) {
+ this.pingFailOverInterval = pingFailOverInterval;
+ }
}
\ No newline at end of file
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -30,11 +30,16 @@
import java.lang.reflect.Proxy;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.Timer;
+import java.util.TimerTask;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -42,12 +47,15 @@
import java.util.logging.Logger;
import org.teiid.client.security.ILogon;
+import org.teiid.client.security.InvalidSessionException;
+import org.teiid.client.security.SessionToken;
import org.teiid.core.TeiidException;
import org.teiid.core.util.PropertiesUtils;
import org.teiid.core.util.ReflectionHelper;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.HostInfo;
+import org.teiid.net.ServerConnection;
import org.teiid.net.ServerConnectionFactory;
import org.teiid.net.TeiidURL;
@@ -106,13 +114,11 @@
private static class CachedInstance {
HostInfo info;
Integer instance;
- boolean ssl;
SocketServerInstance actual;
SocketServerInstance proxy;
- public CachedInstance(HostInfo info, boolean ssl) {
+ public CachedInstance(HostInfo info) {
this.info = info;
- this.ssl = ssl;
}
@Override
@@ -129,7 +135,7 @@
return false;
}
CachedInstance other = (CachedInstance) obj;
- if (!info.equals(other.info) || ssl != other.ssl) {
+ if (!info.equals(other.info)) {
return false;
}
if (instance == null || other.instance == null) {
@@ -142,6 +148,8 @@
private ObjectChannelFactory channelFactory;
private Timer pingTimer;
+ private HashMap<HostInfo, Set<SessionToken>> sessions = new HashMap<HostInfo, Set<SessionToken>>();
+
//instance pooling
private AtomicInteger instanceCount = new AtomicInteger();
private Map<CachedInstance, CachedInstance> instancePool = new LinkedHashMap<CachedInstance, CachedInstance>();
@@ -180,15 +188,58 @@
public void initialize(Properties info) {
PropertiesUtils.setBeanProperties(this, info, "org.teiid.sockets"); //$NON-NLS-1$
this.pingTimer = new Timer("SocketPing", true); //$NON-NLS-1$
+ this.pingTimer.schedule(new TimerTask() {
+
+ @Override
+ public void run() {
+ Set<Map.Entry<HostInfo, Set<SessionToken>>> sessionEntries = null;
+ synchronized (sessions) {
+ sessionEntries = new HashSet<Map.Entry<HostInfo, Set<SessionToken>>>(sessions.entrySet());
+ }
+ for (Map.Entry<HostInfo, Set<SessionToken>> entry : sessionEntries) {
+ SocketServerInstance instance = null;
+ HashSet<SessionToken> entries = null;
+ synchronized (sessions) {
+ entries = new HashSet<SessionToken>(entry.getValue());
+ }
+ try {
+ instance = getServerInstance(entry.getKey());
+ ILogon logon = instance.getService(ILogon.class);
+ if ("7.1.1".compareTo(instance.getServerVersion()) > 0) { //$NON-NLS-1$
+ for (SessionToken session : entries) {
+ try {
+ logon.assertIdentity(session);
+ logon.ping();
+ } catch (InvalidSessionException e) {
+ }
+ }
+ } else {
+ ArrayList<String> sessionStrings = new ArrayList<String>(entry.getValue().size());
+ for (SessionToken session : entries) {
+ sessionStrings.add(session.getSessionID());
+ }
+ logon.ping(sessionStrings);
+ }
+ } catch (Exception e) {
+ log.log(Level.WARNING, "Error performing keep-alive ping", e); //$NON-NLS-1$
+ } finally {
+ if (instance != null) {
+ instance.shutdown();
+ }
+ }
+ }
+ }
+ }, ServerConnection.PING_INTERVAL, ServerConnection.PING_INTERVAL);
this.channelFactory = new OioOjbectChannelFactory(info);
}
-
- public SocketServerInstance getServerInstance(HostInfo info, boolean ssl) throws CommunicationException, IOException {
+
+ @Override
+ public SocketServerInstance getServerInstance(HostInfo info) throws CommunicationException, IOException {
CachedInstance key = null;
- CachedInstance instance = null;
boolean useCache = this.maxCachedInstances > 0;
if (useCache) {
- key = new CachedInstance(info, ssl);
+ CachedInstance instance = null;
+ key = new CachedInstance(info);
synchronized (instancePool) {
instance = instancePool.remove(key);
}
@@ -197,7 +248,7 @@
boolean valid = false;
try {
Future<?> success = logon.ping();
- success.get(this.channelFactory.getSoTimeout(), TimeUnit.MICROSECONDS);
+ success.get(this.channelFactory.getSoTimeout(), TimeUnit.MILLISECONDS);
valid = true;
} catch (Exception e) {
log.log(Level.FINE, "Error performing ping, will select another instance", e); //$NON-NLS-1$
@@ -219,7 +270,7 @@
}
}
}
- SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(info, ssl, getSynchronousTtl());
+ SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(info, getSynchronousTtl());
ssii.connect(this.channelFactory);
if (useCache) {
key.actual = ssii;
@@ -256,7 +307,7 @@
discovery.init(url, connectionProperties);
- return new SocketServerConnection(this, url.isUsingSSL(), discovery, connectionProperties, pingTimer);
+ return new SocketServerConnection(this, url.isUsingSSL(), discovery, connectionProperties);
}
static void updateConnectionProperties(Properties connectionProperties) {
@@ -284,5 +335,30 @@
public void setMaxCachedInstances(int maxCachedInstances) {
this.maxCachedInstances = maxCachedInstances;
}
+
+ @Override
+ public void connected(SocketServerInstance instance, SessionToken session) {
+ synchronized (sessions) {
+ Set<SessionToken> instanceSessions = sessions.get(instance.getHostInfo());
+ if (instanceSessions == null) {
+ instanceSessions = new HashSet<SessionToken>();
+ sessions.put(instance.getHostInfo(), instanceSessions);
+ }
+ instanceSessions.add(session);
+ }
+ }
+
+ @Override
+ public void disconnected(SocketServerInstance instance, SessionToken session) {
+ synchronized (sessions) {
+ Set<SessionToken> instanceSessions = sessions.get(instance.getHostInfo());
+ if (instanceSessions != null) {
+ instanceSessions.remove(session);
+ if (instanceSessions.isEmpty()) {
+ sessions.remove(instance.getHostInfo());
+ }
+ }
+ }
+ }
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -22,9 +22,14 @@
package org.teiid.net.socket;
-import java.net.SocketAddress;
+import java.io.Serializable;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.teiid.client.util.ResultsFuture;
+import org.teiid.client.util.ResultsReceiver;
import org.teiid.core.crypto.Cryptor;
+import org.teiid.net.CommunicationException;
import org.teiid.net.HostInfo;
@@ -33,8 +38,6 @@
<T> T getService(Class<T> iface);
void shutdown();
-
- SocketAddress getRemoteAddress();
HostInfo getHostInfo();
@@ -42,4 +45,12 @@
Cryptor getCryptor();
+ long getSynchTimeout();
+
+ void send(Message message, ResultsReceiver<Object> receiver, Serializable key) throws CommunicationException, InterruptedException;
+
+ void read(long timeout, TimeUnit unit, ResultsFuture<?> resultsFuture) throws TimeoutException, InterruptedException;
+
+ String getServerVersion();
+
}
\ No newline at end of file
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -24,12 +24,17 @@
import java.io.IOException;
+import org.teiid.client.security.SessionToken;
import org.teiid.net.CommunicationException;
import org.teiid.net.HostInfo;
public interface SocketServerInstanceFactory {
- SocketServerInstance getServerInstance(HostInfo info, boolean ssl) throws CommunicationException, IOException;
+ SocketServerInstance getServerInstance(HostInfo info) throws CommunicationException, IOException;
+
+ void connected(SocketServerInstance instance, SessionToken session);
+
+ void disconnected(SocketServerInstance instance, SessionToken session);
}
\ No newline at end of file
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -30,7 +30,6 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.InetSocketAddress;
-import java.net.SocketAddress;
import java.net.SocketTimeoutException;
import java.util.Iterator;
import java.util.Map;
@@ -53,7 +52,6 @@
import org.teiid.core.crypto.Cryptor;
import org.teiid.core.crypto.DhKeyGenerator;
import org.teiid.core.crypto.NullCryptor;
-import org.teiid.core.util.ApplicationInfo;
import org.teiid.net.CommunicationException;
import org.teiid.net.HostInfo;
import org.teiid.net.NetPlugin;
@@ -69,31 +67,28 @@
static final int HANDSHAKE_RETRIES = 10;
private static Logger log = Logger.getLogger("org.teiid.client.sockets"); //$NON-NLS-1$
- private AtomicInteger MESSAGE_ID = new AtomicInteger();
+ private static AtomicInteger MESSAGE_ID = new AtomicInteger();
private Map<Serializable, ResultsReceiver<Object>> asynchronousListeners = new ConcurrentHashMap<Serializable, ResultsReceiver<Object>>();
- private HostInfo hostInfo;
- private boolean ssl;
private long synchTimeout;
+ private HostInfo info;
private ObjectChannel socketChannel;
private Cryptor cryptor;
+ private String serverVersion;
private boolean hasReader;
- public SocketServerInstanceImpl() {
-
- }
-
- public SocketServerInstanceImpl(final HostInfo host, boolean ssl, long synchTimeout) {
- this.hostInfo = host;
- this.ssl = ssl;
+ public SocketServerInstanceImpl(HostInfo info, long synchTimeout) {
+ if (!info.isResolved()) {
+ throw new AssertionError("Expected HostInfo to be resolved"); //$NON-NLS-1$
+ }
+ this.info = info;
this.synchTimeout = synchTimeout;
}
public synchronized void connect(ObjectChannelFactory channelFactory) throws CommunicationException, IOException {
- InetSocketAddress address = new InetSocketAddress(hostInfo.getInetAddress(), hostInfo.getPortNumber());
- this.socketChannel = channelFactory.createObjectChannel(address, ssl);
+ this.socketChannel = channelFactory.createObjectChannel(new InetSocketAddress(info.getInetAddress(), info.getPortNumber()), info.isSsl());
try {
doHandshake();
} catch (CommunicationException e) {
@@ -105,20 +100,11 @@
}
}
- @Override
+ @Override
public HostInfo getHostInfo() {
- return this.hostInfo;
+ return info;
}
- @Override
- public SocketAddress getRemoteAddress() {
- return this.socketChannel.getRemoteAddress();
- }
-
- static String getVersionInfo() {
- return ApplicationInfo.getInstance().getMajorReleaseNumber();
- }
-
private void doHandshake() throws IOException, CommunicationException {
Handshake handshake = null;
for (int i = 0; i < HANDSHAKE_RETRIES; i++) {
@@ -143,9 +129,9 @@
/*if (!getVersionInfo().equals(handshake.getVersion())) {
throw new CommunicationException(NetPlugin.Util.getString("SocketServerInstanceImpl.version_mismatch", getVersionInfo(), handshake.getVersion())); //$NON-NLS-1$
}*/
+ serverVersion = handshake.getVersion();
+ handshake.setVersion();
- handshake.setVersion(getVersionInfo());
-
byte[] serverPublicKey = handshake.getPublicKey();
if (serverPublicKey != null) {
@@ -162,12 +148,17 @@
throw new CommunicationException(err);
}
}
+
+ @Override
+ public String getServerVersion() {
+ return serverVersion;
+ }
public boolean isOpen() {
return socketChannel.isOpen();
}
- protected void send(Message message, ResultsReceiver<Object> listener, Serializable messageKey)
+ public void send(Message message, ResultsReceiver<Object> listener, Serializable messageKey)
throws CommunicationException, InterruptedException {
if (listener != null) {
asynchronousListeners.put(messageKey, listener);
@@ -227,6 +218,7 @@
listener.receiveResults(messagePacket.getContents());
}
} else {
+ //TODO: could ping back
log.log(Level.FINE, "packet ignored:" + packet); //$NON-NLS-1$
}
}
@@ -242,7 +234,7 @@
return this.cryptor;
}
- void read(long timeout, TimeUnit unit, ResultsFuture<?> future) throws TimeoutException, InterruptedException {
+ public void read(long timeout, TimeUnit unit, ResultsFuture<?> future) throws TimeoutException, InterruptedException {
long timeoutMillis = (int)Math.min(unit.toMillis(timeout), Integer.MAX_VALUE);
long start = System.currentTimeMillis();
while (!future.isDone()) {
@@ -280,15 +272,24 @@
}
}
}
-
+
@SuppressWarnings("unchecked")
@Override
public <T> T getService(Class<T> iface) {
- return (T)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new RemoteInvocationHandler(iface));
+ return (T)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new RemoteInvocationHandler(iface) {
+ @Override
+ protected SocketServerInstanceImpl getInstance() {
+ return SocketServerInstanceImpl.this;
+ }
+ });
}
- public class RemoteInvocationHandler implements InvocationHandler {
+ public long getSynchTimeout() {
+ return synchTimeout;
+ }
+ public static abstract class RemoteInvocationHandler implements InvocationHandler {
+
private boolean secure;
private Class<?> targetClass;
@@ -302,17 +303,18 @@
throws Throwable {
Throwable t = null;
try {
+ final SocketServerInstance instance = getInstance();
Message message = new Message();
message.setContents(new ServiceInvocationStruct(args, method.getName(),
targetClass));
if (secure) {
- message.setContents(getCryptor().sealObject(message.getContents()));
+ message.setContents(instance.getCryptor().sealObject(message.getContents()));
}
ResultsFuture<Object> results = new ResultsFuture<Object>() {
@Override
protected Object convertResult() throws ExecutionException {
try {
- Object result = getCryptor().unsealObject((Serializable) super.convertResult());
+ Object result = instance.getCryptor().unsealObject(super.convertResult());
if (result instanceof ExceptionHolder) {
throw new ExecutionException(((ExceptionHolder)result).getException());
}
@@ -342,17 +344,17 @@
public Object get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException,
TimeoutException {
- read(timeout, unit, this);
+ instance.read(timeout, unit, this);
return super.get(timeout, unit);
}
};
final ResultsReceiver<Object> receiver = results.getResultsReceiver();
- send(message, receiver, Integer.valueOf(MESSAGE_ID.getAndIncrement()));
+ instance.send(message, receiver, Integer.valueOf(MESSAGE_ID.getAndIncrement()));
if (ResultsFuture.class.isAssignableFrom(method.getReturnType())) {
return results;
}
- return results.get(synchTimeout, TimeUnit.MILLISECONDS);
+ return results.get(instance.getSynchTimeout(), TimeUnit.MILLISECONDS);
} catch (ExecutionException e) {
t = e.getCause();
} catch (TimeoutException e) {
@@ -362,6 +364,8 @@
}
throw ExceptionUtil.convertException(method, t);
}
+
+ protected abstract SocketServerInstance getInstance() throws CommunicationException;
}
Modified: branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestAdminApiServerDiscovery.java
===================================================================
--- branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestAdminApiServerDiscovery.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestAdminApiServerDiscovery.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -35,7 +35,6 @@
import org.teiid.client.security.LogonResult;
import org.teiid.net.HostInfo;
import org.teiid.net.TeiidURL;
-import org.teiid.net.socket.SocketServerInstance;
public class TestAdminApiServerDiscovery extends TestCase {
@@ -65,7 +64,7 @@
processes.add(p2);
Mockito.stub(serverAdmin.getProcesses("*")).toReturn(processes); //$NON-NLS-1$
Mockito.stub(instance.getService(Admin.class)).toReturn(serverAdmin);
- Mockito.stub(instance.getHostInfo()).toReturn(knownHost);
+ Mockito.stub(instance.getHostInfo().getHostName()).toReturn("foo"); //$NON-NLS-1$
discovery.connectionSuccessful(knownHost);
List<HostInfo> knownHosts = discovery.getKnownHosts(new LogonResult(), instance);
Modified: branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java
===================================================================
--- branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -25,29 +25,30 @@
*/
package org.teiid.net.socket;
+import static org.junit.Assert.*;
+
import java.io.IOException;
-import java.net.InetSocketAddress;
+import java.io.Serializable;
+import java.util.Collection;
import java.util.Properties;
-import junit.framework.TestCase;
-
+import org.junit.Test;
import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
import org.teiid.client.security.ILogon;
import org.teiid.client.security.InvalidSessionException;
import org.teiid.client.security.LogonException;
import org.teiid.client.security.LogonResult;
import org.teiid.client.security.SessionToken;
import org.teiid.client.util.ResultsFuture;
+import org.teiid.client.util.ResultsReceiver;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.crypto.NullCryptor;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.HostInfo;
import org.teiid.net.TeiidURL;
-import org.teiid.net.socket.SocketServerConnection;
-import org.teiid.net.socket.SocketServerConnectionFactory;
-import org.teiid.net.socket.SocketServerInstance;
-import org.teiid.net.socket.SocketServerInstanceFactory;
/**
@@ -55,12 +56,16 @@
* @see SocketServerConnection
* @since Westport
*/
-public class TestSocketServerConnection extends TestCase {
+public class TestSocketServerConnection {
private static final class FakeILogon implements ILogon {
Throwable t;
+ public FakeILogon(Throwable t) {
+ this.t = t;
+ }
+
@Override
public void assertIdentity(SessionToken sessionId)
throws InvalidSessionException, TeiidComponentException {
@@ -83,15 +88,25 @@
@Override
public ResultsFuture<?> ping()
- throws InvalidSessionException,
- TeiidComponentException {
+ throws TeiidComponentException, CommunicationException {
if (t != null) {
+ if (t instanceof CommunicationException) {
+ CommunicationException ce = (CommunicationException)t;
+ t = null;
+ throw ce;
+ }
TeiidComponentException e = new TeiidComponentException(t);
t = null;
throw e;
}
- return null;
+ return ResultsFuture.NULL_FUTURE;
}
+
+ @Override
+ public ResultsFuture<?> ping(Collection<String> sessions)
+ throws TeiidComponentException, CommunicationException {
+ return ping();
+ }
}
/**
@@ -109,7 +124,7 @@
*
* @since Westport
*/
- public void testSocketServerConnection_PropertiesClientHost() throws Throwable {
+ @Test public void testSocketServerConnection_PropertiesClientHost() throws Throwable {
Properties p = new Properties();
SocketServerConnectionFactory.updateConnectionProperties(p);
@@ -118,25 +133,20 @@
assertTrue(p.containsKey(TeiidURL.CONNECTION.CLIENT_IP_ADDRESS));
}
- public void testLogonFailsWithMultipleHosts() throws Exception {
+ @Test public void testLogonFailsWithMultipleHosts() throws Exception {
Properties p = new Properties();
- SocketServerInstanceFactory instanceFactory = new SocketServerInstanceFactory() {
- @Override
- public SocketServerInstance getServerInstance(HostInfo info,
- boolean ssl) throws CommunicationException, IOException {
- throw new SingleInstanceCommunicationException();
- }
- };
+ SocketServerInstanceFactory instanceFactory = Mockito.mock(SocketServerInstanceFactory.class);
+ Mockito.stub(instanceFactory.getServerInstance((HostInfo)Mockito.anyObject())).toThrow(new SingleInstanceCommunicationException());
ServerDiscovery discovery = new UrlServerDiscovery(new TeiidURL("mm://host1:1,host2:2")); //$NON-NLS-1$
try {
- new SocketServerConnection(instanceFactory, false, discovery, p, null);
+ new SocketServerConnection(instanceFactory, false, discovery, p);
fail("exception expected"); //$NON-NLS-1$
} catch (CommunicationException e) {
assertEquals("No valid host available. Attempted connections to: [host1:1, host2:2]", e.getMessage()); //$NON-NLS-1$
}
}
- public void testLogon() throws Exception {
+ @Test public void testLogon() throws Exception {
SocketServerConnection connection = createConnection(null);
assertEquals(String.valueOf(1), connection.getLogonResult().getSessionID());
}
@@ -144,63 +154,83 @@
/**
* Since the original instance is still open, this will be a transparent retry
*/
- public void testRetry() throws Exception {
+ @Test public void testRetry() throws Exception {
SocketServerConnection connection = createConnection(new SingleInstanceCommunicationException());
connection.setFailOver(true);
+ connection.setFailOverPingInterval(50);
ILogon logon = connection.getService(ILogon.class);
+ Thread.sleep(70);
logon.ping();
}
- public void testImmediateFail() throws Exception {
+ @Test(expected=CommunicationException.class) public void testImmediateFail() throws Exception {
SocketServerConnection connection = createConnection(new CommunicationException());
ILogon logon = connection.getService(ILogon.class);
- try {
- logon.ping();
- fail("expected exception"); //$NON-NLS-1$
- } catch (TeiidComponentException e) {
-
- }
+ logon.ping();
}
- public void testImmediateFail1() throws Exception {
+ @Test(expected=CommunicationException.class) public void testImmediateFail1() throws Exception {
SocketServerConnection connection = createConnection(new CommunicationException());
connection.setFailOver(true);
ILogon logon = connection.getService(ILogon.class);
- try {
- logon.ping();
- fail("expected exception"); //$NON-NLS-1$
- } catch (TeiidComponentException e) {
-
- }
+ logon.ping();
}
private SocketServerConnection createConnection(final Throwable throwException) throws CommunicationException, ConnectionException {
return createConnection(throwException, new HostInfo("0.0.0.2", 1)); //$NON-NLS-1$
}
- private SocketServerConnection createConnection(final Throwable t, HostInfo hostInfo)
+ private SocketServerConnection createConnection(final Throwable t, final HostInfo hostInfo)
throws CommunicationException, ConnectionException {
Properties p = new Properties();
ServerDiscovery discovery = new UrlServerDiscovery(new TeiidURL(hostInfo.getHostName(), hostInfo.getPortNumber(), false));
SocketServerInstanceFactory instanceFactory = new SocketServerInstanceFactory() {
+ FakeILogon logon = new FakeILogon(t);
+
@Override
- public SocketServerInstance getServerInstance(final HostInfo info,
- boolean ssl) throws CommunicationException, IOException {
+ public SocketServerInstance getServerInstance(HostInfo info)
+ throws CommunicationException, IOException {
SocketServerInstance instance = Mockito.mock(SocketServerInstance.class);
Mockito.stub(instance.getCryptor()).toReturn(new NullCryptor());
- Mockito.stub(instance.getRemoteAddress()).toReturn(new InetSocketAddress(info.getInetAddress(), info.getPortNumber()));
- FakeILogon logon = new FakeILogon();
- logon.t = t;
+ Mockito.stub(instance.getHostInfo()).toReturn(hostInfo);
Mockito.stub(instance.getService(ILogon.class)).toReturn(logon);
+ if (t != null) {
+ try {
+ Mockito.doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation)
+ throws Throwable {
+ if (logon.t == null) {
+ return null;
+ }
+ throw logon.t;
+ }
+ }).when(instance).send((Message)Mockito.anyObject(), (ResultsReceiver<Object>)Mockito.anyObject(), (Serializable)Mockito.anyObject());
+ } catch (Exception e) {
+
+ }
+ }
Mockito.stub(instance.isOpen()).toReturn(true);
return instance;
}
+
+ @Override
+ public void connected(SocketServerInstance instance,
+ SessionToken session) {
+
+ }
+
+ @Override
+ public void disconnected(SocketServerInstance instance,
+ SessionToken session) {
+
+ }
};
- SocketServerConnection connection = new SocketServerConnection(instanceFactory, false, discovery, p, null);
+ SocketServerConnection connection = new SocketServerConnection(instanceFactory, false, discovery, p);
return connection;
}
- public void testIsSameInstance() throws Exception {
+ @Test public void testIsSameInstance() throws Exception {
SocketServerConnection conn = createConnection(null, new HostInfo("0.0.0.0", 1)); //$NON-NLS-1$
SocketServerConnection conn1 = createConnection(null, new HostInfo("0.0.0.1", 1)); //$NON-NLS-1$
Modified: branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestSocketServerInstanceImpl.java
===================================================================
--- branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestSocketServerInstanceImpl.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/client/src/test/java/org/teiid/net/socket/TestSocketServerInstanceImpl.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -34,17 +34,14 @@
import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException;
-import org.junit.Ignore;
import org.junit.Test;
import org.teiid.client.security.ILogon;
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidComponentException;
import org.teiid.net.CommunicationException;
import org.teiid.net.HostInfo;
-import org.teiid.net.socket.ObjectChannelFactory;
-import org.teiid.net.socket.SocketServerInstanceImpl;
-
+@SuppressWarnings("nls")
public class TestSocketServerInstanceImpl {
private static class FakeObjectChannel implements ObjectChannel, ObjectChannelFactory {
@@ -127,7 +124,8 @@
private SocketServerInstanceImpl createInstance(ObjectChannelFactory channelFactory)
throws CommunicationException, IOException {
- SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(new HostInfo("0.0.0.0", 1), false, 1); //$NON-NLS-1$
+ HostInfo info = new HostInfo("0.0.0.0", 1);
+ SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(info, 1);
ssii.connect(channelFactory);
return ssii;
}
@@ -147,17 +145,4 @@
}
}
- @Ignore
- @Test public void testVersionMismatch() throws Exception {
- Handshake h = new Handshake();
- h.setVersion("foo"); //$NON-NLS-1$
- final FakeObjectChannel channel = new FakeObjectChannel(Arrays.asList(h));
- try {
- createInstance(channel);
- fail("exception expected"); //$NON-NLS-1$
- } catch (CommunicationException e) {
- assertTrue(e.getMessage().startsWith("Handshake failed due to version mismatch")); //$NON-NLS-1$
- }
- }
-
}
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -123,11 +123,11 @@
}
@Override
- public ResultsFuture<?> isOpen() {
+ public boolean isOpen(long msToTest) {
if (shutdown) {
- return null;
+ return false;
}
- return ResultsFuture.NULL_FUTURE;
+ return true;
}
public void close() {
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/LogonImpl.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -22,6 +22,7 @@
package org.teiid.transport;
+import java.util.Collection;
import java.util.Properties;
import javax.security.auth.login.LoginException;
@@ -41,6 +42,7 @@
import org.teiid.dqp.service.SessionServiceException;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.net.CommunicationException;
import org.teiid.net.TeiidURL;
import org.teiid.security.Credentials;
@@ -107,6 +109,18 @@
LogManager.logTrace(LogConstants.CTX_SECURITY, "Ping", id); //$NON-NLS-1$
return ResultsFuture.NULL_FUTURE;
}
+
+ @Override
+ public ResultsFuture<?> ping(Collection<String> sessions)
+ throws TeiidComponentException, CommunicationException {
+ for (String string : sessions) {
+ try {
+ this.service.pingServer(string);
+ } catch (InvalidSessionException e) {
+ }
+ }
+ return ResultsFuture.NULL_FUTURE;
+ }
@Override
public void assertIdentity(SessionToken checkSession) throws InvalidSessionException, TeiidComponentException {
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -39,7 +39,6 @@
import org.jboss.netty.channel.ChannelDownstreamHandler;
import org.jboss.netty.channel.ChannelEvent;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.MessageEvent;
import org.teiid.core.util.ReflectionHelper;
@@ -54,7 +53,6 @@
* Some parts of this code is taken from H2's implementation of ODBC
*/
@SuppressWarnings("nls")
-@ChannelPipelineCoverage("one")
public class PgBackendProtocol implements ChannelDownstreamHandler, ODBCClientRemote {
private static final int PG_TYPE_VARCHAR = 1043;
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -34,7 +34,6 @@
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.handler.codec.frame.FrameDecoder;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
@@ -46,7 +45,6 @@
* Some parts of this code is taken from H2's implementation of ODBC
*/
@SuppressWarnings("nls")
-@ChannelPipelineCoverage("one")
public class PgFrontendProtocol extends FrameDecoder {
private int maxObjectSize;
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -42,13 +42,13 @@
import org.jboss.netty.channel.ChannelFutureListener;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.DefaultChannelPipeline;
import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.channel.ChannelHandler.Sharable;
import org.jboss.netty.handler.ssl.SslHandler;
import org.jboss.netty.handler.stream.ChunkedWriteHandler;
import org.teiid.common.buffer.StorageManager;
@@ -62,7 +62,7 @@
* Main class for creating Netty Nio Channels
*/
-(a)ChannelPipelineCoverage(ChannelPipelineCoverage.ALL)
+@Sharable
public class SSLAwareChannelHandler extends SimpleChannelHandler implements ChannelPipelineFactory {
public class ObjectChannelImpl implements ObjectChannel {
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -94,7 +94,6 @@
public void onConnection() throws CommunicationException {
Handshake handshake = new Handshake();
- handshake.setVersion(SocketListener.getVersionInfo());
if (usingEncryption) {
keyGen = new DhKeyGenerator();
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketListener.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketListener.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketListener.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -31,7 +31,6 @@
import org.jboss.netty.channel.ChannelFactory;
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
import org.teiid.common.buffer.StorageManager;
-import org.teiid.core.util.ApplicationInfo;
import org.teiid.core.util.NamedThreadFactory;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
@@ -99,10 +98,6 @@
return ((InetSocketAddress)this.serverChanel.getLocalAddress()).getPort();
}
- static String getVersionInfo() {
- return ApplicationInfo.getInstance().getMajorReleaseNumber();
- }
-
public void stop() {
this.serverChanel.close();
this.nettyPool.shutdownNow();
Modified: branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
===================================================================
--- branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -37,6 +37,7 @@
import org.teiid.client.security.ILogon;
import org.teiid.client.security.LogonException;
import org.teiid.client.security.LogonResult;
+import org.teiid.client.security.SessionToken;
import org.teiid.common.buffer.BufferManagerFactory;
import org.teiid.core.ComponentNotFoundException;
import org.teiid.core.crypto.NullCryptor;
@@ -69,19 +70,14 @@
}
}
- @Test public void testFailedConnect() throws Exception {
+ @Test(expected=CommunicationException.class) public void testFailedConnect() throws Exception {
SSLConfiguration config = new SSLConfiguration();
listener = new SocketListener(addr.getPort(), addr.getAddress().getHostAddress(),1024, 1024, 1, config, null, BufferManagerFactory.getStandaloneBufferManager());
- try {
- Properties p = new Properties();
- String url = new TeiidURL(addr.getHostName(), listener.getPort() - 1, false).getAppServerURL();
- p.setProperty(TeiidURL.CONNECTION.SERVER_URL, url); //wrong port
- SocketServerConnectionFactory.getInstance().getConnection(p);
- fail("exception expected"); //$NON-NLS-1$
- } catch (CommunicationException e) {
-
- }
+ Properties p = new Properties();
+ String url = new TeiidURL(addr.getHostName(), listener.getPort() - 1, false).getAppServerURL();
+ p.setProperty(TeiidURL.CONNECTION.SERVER_URL, url); //wrong port
+ SocketServerConnectionFactory.getInstance().getConnection(p);
}
@Test public void testConnectWithoutPooling() throws Exception {
@@ -157,7 +153,7 @@
@Override
public LogonResult logon(Properties connProps)
throws LogonException, ComponentNotFoundException {
- return new LogonResult();
+ return new LogonResult(new SessionToken("dummy"), "x", 1, "z");
}
}, null);
Modified: branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java
===================================================================
--- branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java 2010-08-19 15:30:38 UTC (rev 2481)
+++ branches/7.1.x/runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java 2010-08-20 22:18:46 UTC (rev 2482)
@@ -29,6 +29,10 @@
import java.io.Reader;
import java.io.Serializable;
import java.io.StringReader;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
import java.util.Properties;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -60,7 +64,7 @@
import org.teiid.net.socket.SocketServerInstanceImpl;
import org.teiid.net.socket.UrlServerDiscovery;
-
+@SuppressWarnings("nls")
public class TestSocketRemoting {
public interface FakeService {
@@ -104,15 +108,11 @@
ClientServiceRegistryImpl server;
private ResultsReceiver<Object> listener;
- public FakeClientServerInstance(ClientServiceRegistryImpl server) {
- super();
+ public FakeClientServerInstance(ClientServiceRegistryImpl server) throws UnknownHostException {
+ super(new HostInfo("foo", new InetSocketAddress(InetAddress.getLocalHost(), 1)), 1000);
this.server = server;
}
-
- public HostInfo getHostInfo() {
- return new HostInfo("fake", 1); //$NON-NLS-1$
- }
-
+
public boolean isOpen() {
return true;
}
@@ -182,6 +182,12 @@
}
@Override
+ public ResultsFuture<?> ping(Collection<String> sessions)
+ throws TeiidComponentException, CommunicationException {
+ return null;
+ }
+
+ @Override
public void assertIdentity(SessionToken sessionId)
throws InvalidSessionException,
TeiidComponentException {
@@ -226,12 +232,24 @@
SocketServerConnection connection = new SocketServerConnection(new SocketServerInstanceFactory() {
@Override
- public SocketServerInstance getServerInstance(HostInfo info,
- boolean ssl) throws CommunicationException, IOException {
+ public SocketServerInstance getServerInstance(HostInfo info)
+ throws CommunicationException, IOException {
return serverInstance;
}
- }, false, new UrlServerDiscovery(new TeiidURL("foo", 1, false)), new Properties(), null); //$NON-NLS-1$
+ @Override
+ public void connected(SocketServerInstance instance,
+ SessionToken session) {
+
+ }
+
+ @Override
+ public void disconnected(SocketServerInstance instance,
+ SessionToken session) {
+
+ }
+
+ }, false, new UrlServerDiscovery(new TeiidURL("0.0.0.0", 1, false)), new Properties()); //$NON-NLS-1$
return connection;
}
15 years, 4 months
- 1
- 0
teiid SVN: r2481 - branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-08-19 11:30:38 -0400 (Thu, 19 Aug 2010)
New Revision: 2481
Modified:
branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
Log:
TEIID-1218 fixing adminshell help text
Modified: branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
===================================================================
--- branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2010-08-18 14:07:14 UTC (rev 2480)
+++ branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2010-08-19 15:30:38 UTC (rev 2481)
@@ -154,11 +154,11 @@
return getAdmin().getCacheTypes();
}
- @Doc(text = "Cancel a request")
+ @Doc(text = "Change a VDB Connection Type")
public static void changeVDBConnectionType(
@Doc(text = "vdb name") String vdbName,
@Doc(text = "vdb version") int vdbVersion,
- @Doc(text = "Connection Type") String type)
+ @Doc(text = "Connection Type (NONE, BY_VERSION, or ANY") String type)
throws AdminException {
getAdmin().changeVDBConnectionType(vdbName, vdbVersion, ConnectionType.valueOf(type));
}
15 years, 4 months
- 1
- 0
Teiid-NightlyBuild - Build # 919 - Unstable!
by jboss-qa-internal＠redhat.com
Teiid-NightlyBuild - Build # 919 - Unstable:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-NightlyBuild/919/ to view the results.
15 years, 4 months
- 1
- 2
Teiid - Continuous Build - Build # 1272 - Unstable!
by jboss-qa-internal＠redhat.com
Teiid - Continuous Build - Build # 1272 - Unstable:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid%20-%20Continuous%20Build/1272/ to view the results.
15 years, 4 months
- 1
- 1
teiid SVN: r2480 - in trunk: test-integration/common/src/test/java/org/teiid/jdbc and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-08-18 10:07:14 -0400 (Wed, 18 Aug 2010)
New Revision: 2480
Modified:
trunk/documentation/docbook/custom.dtd
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java
Log:
updating to 7.2
Modified: trunk/documentation/docbook/custom.dtd
===================================================================
--- trunk/documentation/docbook/custom.dtd 2010-08-18 01:19:41 UTC (rev 2479)
+++ trunk/documentation/docbook/custom.dtd 2010-08-18 14:07:14 UTC (rev 2480)
@@ -1,4 +1,4 @@
-<!ENTITY versionNumber "7.1">
+<!ENTITY versionNumber "7.2">
<!ENTITY copyrightYear "2009">
<!ENTITY copyrightHolder "Red Hat, Inc.">
<!ENTITY url "http://www.jboss.org/teiid/">
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java 2010-08-18 01:19:41 UTC (rev 2479)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java 2010-08-18 14:07:14 UTC (rev 2480)
@@ -895,7 +895,7 @@
expected.put("getCatalogSeparator", ""); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getCatalogTerm", "VirtualDatabase"); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getDatabaseProductName", "Teiid Embedded"); //$NON-NLS-1$ //$NON-NLS-2$
- expected.put("getDatabaseProductVersion", "7.1"); //$NON-NLS-1$ //$NON-NLS-2$
+ expected.put("getDatabaseProductVersion", "7.2"); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getDriverName", "Teiid JDBC Driver"); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getDriverVersion", ApplicationInfo.getInstance().getMajorReleaseVersion()+"."+ApplicationInfo.getInstance().getMinorReleaseVersion()); //$NON-NLS-1$ //$NON-NLS-2$
expected.put("getExtraNameCharacters", ".@"); //$NON-NLS-1$ //$NON-NLS-2$
15 years, 4 months
- 1
- 0