TEIID-5138

In domain mode there no requirement to open a new channel, fork of existing channel do same. When a channel is set up, one needs to define their own JGroups stack, which is not required. Also, that requires opening up a separate port. # Conflicts: # teiid-feature-pack/wildfly-integration-feature-pack/src/main/resources/content/bin/scripts/teiid-domain-mode-install.cli
teiid · Nov 14, 2017 · 9c9faaf · 9c9faaf
1 parent 56220c1
commit 9c9faaf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/api/src/main/java/org/teiid/language/SubqueryComparison.java b/api/src/main/java/org/teiid/language/SubqueryComparison.java
@@ -30,8 +30,7 @@ public class SubqueryComparison extends Condition implements Predicate, Subquery
 
 	public enum Quantifier {
 		SOME,
-		ALL,
-		ANY
+		ALL
 	}
 
     private Expression leftExpr;

diff --git a/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java b/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java
@@ -879,16 +879,19 @@ public void visit(SubqueryComparison obj) {
             default: buffer.append(UNDEFINED);
         }
         buffer.append(Tokens.SPACE);
+        appendQuantifier(obj);
+        buffer.append(Tokens.SPACE);
+        buffer.append(Tokens.LPAREN);        
+        append(obj.getSubquery());
+        buffer.append(Tokens.RPAREN);        
+    }
+
+    protected void appendQuantifier(SubqueryComparison obj) {
         switch(obj.getQuantifier()) {
             case ALL: buffer.append(ALL); break;
             case SOME: buffer.append(SOME); break;
-            case ANY: buffer.append(ANY); break;
             default: buffer.append(UNDEFINED);
         }
-        buffer.append(Tokens.SPACE);
-        buffer.append(Tokens.LPAREN);        
-        append(obj.getSubquery());
-        buffer.append(Tokens.RPAREN);        
     }
 
     public void visit(SubqueryIn obj) {

diff --git a/...bc/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PISQLConversionVisitor.java b/...bc/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PISQLConversionVisitor.java
@@ -217,12 +217,14 @@ private boolean isTVF(Procedure proc) {
         String value = proc.getProperty(PIMetadataProcessor.TVF, false);
         return Boolean.parseBoolean(value); 
     }
+
+    @Override
+    protected void appendQuantifier(SubqueryComparison obj) {
+        if(obj.getQuantifier() == Quantifier.SOME) {
+            buffer.append("ANY"); //$NON-NLS-1$
+        } else {
+            super.appendQuantifier(obj);
+        }
+    }
 
-	@Override
-    public void visit(SubqueryComparison obj) {
-		if(obj.getQuantifier() == Quantifier.SOME) {
-			obj.setQuantifier(Quantifier.ANY);
-		}
-		super.visit(obj);
-	}
 }