BUG-38021: add the superType check for loop expressions; also did some cleanup,…

repository/src/main/java/org/apache/hadoop/metadata/discovery/graph/DefaultGraphPersistenceStrategy.java

@@ -22,6 +22,7 @@ import com.thinkaurelius.titan.core.TitanVertex;
 import org.apache.hadoop.metadata.MetadataException;
 import org.apache.hadoop.metadata.query.Expressions;
 import org.apache.hadoop.metadata.query.GraphPersistenceStrategies;
+import org.apache.hadoop.metadata.query.GraphPersistenceStrategies$class;
 import org.apache.hadoop.metadata.query.TypeUtils;
 import org.apache.hadoop.metadata.repository.MetadataRepository;
 import org.apache.hadoop.metadata.repository.Constants;
@@ -168,33 +169,12 @@ public class DefaultGraphPersistenceStrategy implements GraphPersistenceStrategi
 
     @Override
     public String gremlinCompOp(Expressions.ComparisonExpression op) {
-        switch (op.symbol()) {
-            case "=":
-                return "T.eq";
-
-            case "!=":
-                return "T.neq";
-
-            case ">":
-                return "T.gt";
-
-            case ">=":
-                return "T.gte";
-
-            case "<":
-                return "T.lt";
-
-            case "<=":
-                return "T.lte";
-
-            default:
-                throw new RuntimeException(("Comparison operator not supported in Gremlin: " + op));
-        }
+        return GraphPersistenceStrategies$class.gremlinCompOp(this, op);
     }
 
     @Override
     public String loopObjectExpression(IDataType<?> dataType) {
-        return "{it.object." + typeAttributeName() + " == '" + dataType.getName() + "'}";
+        return GraphPersistenceStrategies$class.loopObjectExpression(this, dataType);
     }
 
     @Override
@@ -206,4 +186,9 @@ public class DefaultGraphPersistenceStrategy implements GraphPersistenceStrategi
     @Override
     public String idAttributeName() { return metadataRepository.getIdAttributeName(); }
 
+    @Override
+    public String typeTestExpression(String typeName) {
+        return GraphPersistenceStrategies$class.typeTestExpression(this, typeName);
+    }
+
 }

repository/src/main/scala/org/apache/hadoop/metadata/query/GraphPersistenceStrategies.scala

@@ -112,8 +112,19 @@ trait GraphPersistenceStrategies {
     }
 
     def loopObjectExpression(dataType: IDataType[_]) = {
-        s"{it.object.'${typeAttributeName}' == '${dataType.getName}'}"
+      _typeTestExpression(dataType.getName, "it.object")
     }
+
+    def typeTestExpression(typeName : String) :String = {
+      _typeTestExpression(typeName, "it")
+    }
+
+  private def _typeTestExpression(typeName: String, itRef: String): String = {
+    s"""{(${itRef}.'${typeAttributeName}' == '${typeName}') |
+       |(${itRef}.'${superTypeAttributeName}' ?
+       |${itRef}.'${superTypeAttributeName}'.contains('${typeName}') : false)}""".
+      stripMargin.replace(System.getProperty("line.separator"), "")
+  }
 }
 
 object GraphPersistenceStrategy1 extends GraphPersistenceStrategies {

repository/src/main/scala/org/apache/hadoop/metadata/query/GremlinQuery.scala

@@ -185,13 +185,9 @@ class GremlinTranslator(expr: Expression,
 
     private def genQuery(expr: Expression, inSelect: Boolean): String = expr match {
         case ClassExpression(clsName) =>
-            val typeName = gPersistenceBehavior.typeAttributeName
-            val superTypeName = gPersistenceBehavior.superTypeAttributeName
-            s"""filter{(it.$typeName == "$clsName") | (it.$superTypeName ? it.$superTypeName.contains("$clsName") : false)}"""
+            s"""filter${gPersistenceBehavior.typeTestExpression(clsName)}"""
         case TraitExpression(clsName) =>
-            val typeName = gPersistenceBehavior.typeAttributeName
-            val superTypeName = gPersistenceBehavior.superTypeAttributeName
-            s"""filter{(it.$typeName == "$clsName") | (it.$superTypeName ? it.$superTypeName.contains("$clsName") : false)}"""
+            s"""filter${gPersistenceBehavior.typeTestExpression(clsName)}"""
         case fe@FieldExpression(fieldName, fInfo, child) if fe.dataType.getTypeCategory == TypeCategory.PRIMITIVE => {
             val fN = "\"" + gPersistenceBehavior.fieldNameInVertex(fInfo.dataType, fInfo.attrInfo) + "\""
             child match {