TEIID-4120 using the appropriate comparison for sdo functions

Conflicts: engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
teiid · Apr 6, 2016 · ac4c457 · ac4c457
1 parent 9aa35ca
commit ac4c457
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/...ranslator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java b/...ranslator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java
@@ -36,6 +36,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 import org.teiid.GeometryInputSource;
 import org.teiid.core.types.BinaryType;
@@ -88,6 +90,15 @@ public class OracleExecutionFactory extends JDBCExecutionFactory {
 	public static final String WITHIN_DISTANCE = "sdo_within_distance"; //$NON-NLS-1$
 	public static final String NEAREST_NEIGHBOR_DISTANCE = "sdo_nn_distance"; //$NON-NLS-1$
 	public static final String ORACLE_SDO = "Oracle-SDO"; //$NON-NLS-1$
+
+	private static final Set<String> STRING_BOOLEAN_FUNCTIONS = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+	static {
+		STRING_BOOLEAN_FUNCTIONS.addAll(
+				Arrays.asList(SourceSystemFunctions.ST_DISJOINT, SourceSystemFunctions.ST_CONTAINS, 
+						SourceSystemFunctions.ST_CROSSES, SourceSystemFunctions.ST_INTERSECTS, 
+						SourceSystemFunctions.ST_OVERLAPS, SourceSystemFunctions.ST_TOUCHES, 
+						SourceSystemFunctions.ST_EQUALS));
+	}
 
 	private final class DateAwareExtract extends ExtractFunctionModifier {
 		@Override
@@ -603,6 +614,15 @@ public void visit(Comparison obj) {
 	    				p.setType(FixedCharType.class);
     				}
     			}
+    			if (obj.getLeftExpression().getType() == TypeFacility.RUNTIME_TYPES.BOOLEAN 
+    					&& (obj.getLeftExpression() instanceof Function)
+    					&& obj.getRightExpression() instanceof Literal) {
+    				Function f = (Function)obj.getLeftExpression();
+    				if (STRING_BOOLEAN_FUNCTIONS.contains(f.getName())) {
+	    				Boolean b = (Boolean)((Literal)obj.getRightExpression()).getValue();
+	    				obj.setRightExpression(new Literal(b!=null?(b?"TRUE":"FALSE"):null, TypeFacility.RUNTIME_TYPES.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+    				}
+    			}
     			super.visit(obj);
     		}
 

diff --git a/.../translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java b/.../translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java
@@ -1217,6 +1217,13 @@ public void testGeometryIntersects() throws Exception {
         TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR);
     }
 
+    @Test
+    public void testGeometryComparison() throws Exception {
+        String input = "select shape from cola_markets where ST_Contains(shape, shape) and NOT ST_Intersects(shape, shape)"; //$NON-NLS-1$
+        String output = "SELECT SDO_UTIL.TO_GMLGEOMETRY(COLA_MARKETS.SHAPE) FROM COLA_MARKETS WHERE SDO_RELATE(COLA_MARKETS.SHAPE, COLA_MARKETS.SHAPE, 'mask=contains') = 'TRUE' AND SDO_RELATE(COLA_MARKETS.SHAPE, COLA_MARKETS.SHAPE, 'mask=anyinteract') <> 'TRUE'"; //$NON-NLS-1$
+        TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR);
+    }
+
     @Test
     public void testGeometryInsert() throws Exception {
         String input = "insert into cola_markets(name,shape) values('foo124', ST_GeomFromText('POINT (300 100)', 8307))"; //$NON-NLS-1$

diff --git a/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java b/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
@@ -1294,6 +1294,13 @@ private Criteria rewriteCriteria(NotCriteria criteria) throws TeiidComponentExce
         	return rewriteCriteria(((NotCriteria)innerCrit).getCriteria());
         }
         innerCrit = rewriteCriteria(innerCrit);
+        if (innerCrit instanceof Negatable) {
+        	((Negatable) innerCrit).negate();
+        	return rewriteCriteria(innerCrit);
+        }
+        if (innerCrit instanceof NotCriteria) {
+        	return rewriteCriteria(((NotCriteria)innerCrit).getCriteria());
+        }
         if(innerCrit == TRUE_CRITERIA) {
             return FALSE_CRITERIA;
         } else if(innerCrit == FALSE_CRITERIA) {

diff --git a/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java b/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
@@ -1765,4 +1765,9 @@ private void addTestData() {
 		helpTestRewriteCommand(sql, "SELECT (SELECT e1 FROM (SELECT e1 FROM pm1.g1) AS a LIMIT 2) FROM pm1.g2");
 	}
 
+	@Test public void testRewriteCritBooleanExpression() {
+        helpTestRewriteCriteria("not (pm1.g1.e3)", //$NON-NLS-1$
+                                "pm1.g1.e3 <> TRUE" );         //$NON-NLS-1$
+    }
+
 }