fix return type on square bracket filtering (new parser)

now expressions like SELECT out()[1, 2, 3] as foo … SELECT out()[1-3] as foo … SELECT out()[name = ‘foo’] as foo … return a list as the value of foo. The only exception is single number as a selector, eg. SELECT out()[1] as foo … in this case foo will be the single value, not a list
orientechnologies · Sep 17, 2015 · 0223753 · 0223753
1 parent 27f2058
commit 0223753
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 19 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OArrayRangeSelector.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OArrayRangeSelector.java
@@ -54,7 +54,7 @@ public Object execute(OIdentifiable iCurrentRecord, Object result, OCommandConte
       return null;
     }
     if (!OMultiValue.isMultiValue(result)) {
-      return result;// is this correct?
+      return null;
     }
     Integer lFrom = from;
     if (fromSelector != null) {
@@ -83,7 +83,7 @@ public Object execute(OIdentifiable iCurrentRecord, Object result, OCommandConte
 
     lTo = Math.min(lTo, arrayResult.length);
 
-    return Arrays.copyOfRange(arrayResult, lFrom, lTo);
+    return Arrays.asList(Arrays.copyOfRange(arrayResult, lFrom, lTo));
   }
 
 }

diff --git a/...rc/main/java/com/orientechnologies/orient/core/sql/parser/OArraySingleValuesSelector.java b/...rc/main/java/com/orientechnologies/orient/core/sql/parser/OArraySingleValuesSelector.java
@@ -47,7 +47,7 @@ public Object execute(OIdentifiable iCurrentRecord, Object iResult, OCommandCont
       }
       result.add(OMultiValue.getValue(iResult, index));
     }
-    return result.toArray();
+    return result;
   }
 
 }

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OModifier.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OModifier.java
@@ -5,6 +5,10 @@
 import com.orientechnologies.orient.core.command.OCommandContext;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 public class OModifier extends SimpleNode {
@@ -64,7 +68,7 @@ public Object execute(OIdentifiable iCurrentRecord, Object result, OCommandConte
     } else if (arrayRange != null) {
       return arrayRange.execute(iCurrentRecord, result, ctx);
     } else if (condition != null) {
-      throw new UnsupportedOperationException("implement OModifier!");
+      return filterByCondition(iCurrentRecord, result, ctx);
     } else if (arraySingleValues != null) {
       return arraySingleValues.execute(iCurrentRecord, result, ctx);
     } else {
@@ -76,5 +80,33 @@ public Object execute(OIdentifiable iCurrentRecord, Object result, OCommandConte
     }
     return result;
   }
+
+  private Object filterByCondition(OIdentifiable iCurrentRecord, Object iResult, OCommandContext ctx) {
+    if(iResult==null){
+      return null;
+    }
+    List<Object> result = new ArrayList<Object>();
+    if(iResult.getClass().isArray()){
+      for(int i=0;i< Array.getLength(iResult); i++){
+        Object item = Array.get(iResult, i);
+        if(condition.evaluate(item, ctx)){
+          result.add(item);
+        }
+      }
+      return result;
+    }
+    if(iResult instanceof Iterable){
+      iResult = ((Iterable) iResult).iterator();
+    }
+    if(iResult instanceof Iterator){
+      while(((Iterator) iResult).hasNext()){
+        Object item = ((Iterator) iResult).next();
+        if(condition.evaluate(item, ctx)){
+          result.add(item);
+        }
+      }
+    }
+    return result;
+  }
 }
 /* JavaCC - OriginalChecksum=39c21495d02f9b5007b4a2d6915496e1 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OOrBlock.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OOrBlock.java
@@ -6,6 +6,7 @@
 import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
+import com.orientechnologies.orient.core.record.impl.ODocument;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,6 +37,17 @@ public boolean evaluate(OIdentifiable currentRecord, OCommandContext ctx) {
     return false;
   }
 
+  public boolean evaluate(Object currentRecord, OCommandContext ctx) {
+    if (currentRecord instanceof OIdentifiable) {
+      return evaluate((OIdentifiable) currentRecord, ctx);
+    } else if (currentRecord instanceof Map) {
+      ODocument doc = new ODocument();
+      doc.fromMap((Map<String, Object>) currentRecord);
+      return evaluate(doc, ctx);
+    }
+    return false;
+  }
+
   public List<OBooleanExpression> getSubBlocks() {
     return subBlocks;
   }

diff --git a/...db/src/test/java/com/orientechnologies/orient/graph/sql/OMatchStatementExecutionTest.java b/...db/src/test/java/com/orientechnologies/orient/graph/sql/OMatchStatementExecutionTest.java
@@ -6,6 +6,7 @@
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.sql.OCommandSQL;
+import com.tinkerpop.blueprints.Vertex;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -631,41 +632,40 @@ public void testArrayNumber() {
     ODocument doc = (ODocument) result.get(0);
     Object foo = doc.field("foo");
     assertNotNull(foo);
-    assertFalse(foo.getClass().isArray());
-//    assertEquals(1, ((Object[])foo).length);
+    assertTrue(foo instanceof Vertex);
   }
 
+
   @Test
-  public void testArraySingleSelectors1() {
+  public void testArraySingleSelectors2() {
     StringBuilder query = new StringBuilder();
     query.append("match ");
     query.append("{class:TriangleV, as: friend1, where: (uid = 0)}");
-    query.append("return friend1.out('TriangleE')[0-1] as foo" );
+    query.append("return friend1.out('TriangleE')[0,1] as foo" );
 
     List<?> result = db.command(new OCommandSQL(query.toString())).execute();
     assertEquals(1, result.size());
     ODocument doc = (ODocument) result.get(0);
     Object foo = doc.field("foo");
     assertNotNull(foo);
-    assertTrue(foo.getClass().isArray());
-    assertEquals(1, ((Object[])foo).length);
+    assertTrue(foo instanceof List);
+    assertEquals(2, ((List)foo).size());
   }
 
-
   @Test
-  public void testArraySingleSelectors2() {
+  public void testArrayRangeSelectors1() {
     StringBuilder query = new StringBuilder();
     query.append("match ");
     query.append("{class:TriangleV, as: friend1, where: (uid = 0)}");
-    query.append("return friend1.out('TriangleE')[0,1] as foo" );
+    query.append("return friend1.out('TriangleE')[0-1] as foo" );
 
     List<?> result = db.command(new OCommandSQL(query.toString())).execute();
     assertEquals(1, result.size());
     ODocument doc = (ODocument) result.get(0);
     Object foo = doc.field("foo");
     assertNotNull(foo);
-    assertTrue(foo.getClass().isArray());
-    assertEquals(2, ((Object[])foo).length);
+    assertTrue(foo instanceof List);
+    assertEquals(1, ((List)foo).size());
   }
 
   @Test
@@ -680,8 +680,8 @@ public void testArrayRange2() {
     ODocument doc = (ODocument) result.get(0);
     Object foo = doc.field("foo");
     assertNotNull(foo);
-    assertTrue(foo.getClass().isArray());
-    assertEquals(2, ((Object[])foo).length);
+    assertTrue(foo instanceof List);
+    assertEquals(2, ((List)foo).size());
   }
 
 
@@ -697,8 +697,26 @@ public void testArrayRange3() {
     ODocument doc = (ODocument) result.get(0);
     Object foo = doc.field("foo");
     assertNotNull(foo);
-    assertTrue(foo.getClass().isArray());
-    assertEquals(2, ((Object[])foo).length);
+    assertTrue(foo instanceof List);
+    assertEquals(2, ((List)foo).size());
+  }
+
+  @Test
+  public void testConditionInSquareBrackets() {
+    StringBuilder query = new StringBuilder();
+    query.append("match ");
+    query.append("{class:TriangleV, as: friend1, where: (uid = 0)}");
+    query.append("return friend1.out('TriangleE')[uid = 2] as foo" );
+
+    List<?> result = db.command(new OCommandSQL(query.toString())).execute();
+    assertEquals(1, result.size());
+    ODocument doc = (ODocument) result.get(0);
+    Object foo = doc.field("foo");
+    assertNotNull(foo);
+    assertTrue(foo instanceof List);
+    assertEquals(1, ((List) foo).size());
+    Vertex resultVertex = (Vertex) ((List)foo).get(0);
+    assertEquals(2, resultVertex.getProperty("uid"));
   }
 
   private long indexUsages(ODatabaseDocumentTx db) {