SQLParser : interpretation fix in create index command, improve select performance : better use of index OSearchResult

jsorel · jsorel · commit c01e47e58efa · 2013-02-18T13:22:07.000+01:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/command/OCommandCreateIndex.java b/core/src/main/java/com/orientechnologies/orient/core/sql/command/OCommandCreateIndex.java
@@ -82,7 +82,7 @@ public OCommandCreateIndex parse(final OCommandRequest iRequest) {
       final List<OSQLParser.ReferenceContext> words = ctx.reference();
       oClass = findClass(words.get(0).getText());
       fields = new String[words.size()-1];
-      for(int k=1;k<fields.length;k++){
+      for(int k=1;k<words.size();k++){
         fields[k-1] = visitAsString(words.get(k));
       }
     }
@@ -100,8 +100,8 @@ public OCommandCreateIndex parse(final OCommandRequest iRequest) {
         final String text = visitAsString(candidate.reference(i));
         keyTypes.add(OType.valueOf(text));
       }
-      this.keyTypes = keyTypes.toArray(new OType[0]);
-      if (this.fields.length != this.keyTypes.length) {
+      this.keyTypes = (keyTypes.isEmpty()) ? null : keyTypes.toArray(new OType[0]);
+      if (this.keyTypes != null && (this.fields.length != this.keyTypes.length)) {
           throw new OCommandSQLParsingException("Count of fields doesn't match with count of property types. " + "Fields: "
               + Arrays.toString(this.fields) + "; Types: " + Arrays.toString(this.keyTypes));
         }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/command/OCommandSelect.java b/core/src/main/java/com/orientechnologies/orient/core/sql/command/OCommandSelect.java
@@ -265,8 +265,8 @@ private void search(final List<OExpression> projections, final long skip, final
     }else{
       //merge safe and candidates list
       final Collection<OIdentifiable> included = searchResult.getIncluded();
-      final Collection<OIdentifiable> candidates = searchResult.getIncluded();
-      final Collection<OIdentifiable> excluded = searchResult.getIncluded();
+      final Collection<OIdentifiable> candidates = searchResult.getCandidates();
+      final Collection<OIdentifiable> excluded = searchResult.getExcluded();
       
       if(included == OSearchResult.ALL){
         //guarantee all result match, we can safely ignore the filter
@@ -276,6 +276,10 @@ private void search(final List<OExpression> projections, final long skip, final
         //guarantee no result match, we can complete skip the search
         target = Collections.EMPTY_LIST;
         simplifiedFilter = OExpression.EXCLUDE;
+      }else if(included != null && (candidates==null || candidates.isEmpty()) ){
+        //we have only included results, filter can be skipped
+        target = source.createIteratorFilterCandidates(included);
+        simplifiedFilter = OExpression.INCLUDE;
       }else{
         //reduce the search
         if(included != null || candidates != null){
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/model/OName.java b/core/src/main/java/com/orientechnologies/orient/core/sql/model/OName.java
@@ -36,6 +36,10 @@ public OName(String name) {
   
   public OName(String alias, String name) {
     super(alias);
+    //by default name expression has the same alias
+    if(alias == null){
+      setAlias(name);
+    }
     this.name = name;
   }
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/model/OQuerySource.java b/core/src/main/java/com/orientechnologies/orient/core/sql/model/OQuerySource.java
@@ -37,6 +37,7 @@
 import com.orientechnologies.orient.core.sql.parser.SQLGrammarUtils;
 import static com.orientechnologies.orient.core.sql.parser.SQLGrammarUtils.*;
 import java.util.AbstractCollection;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -112,6 +113,28 @@ public Iterable<OIdentifiable> createIteratorFilterCandidates(Collection<OIdenti
       final Set<OIdentifiable> cross = new HashSet<OIdentifiable>(ids);
       cross.retainAll((Collection)targetRecords);
       return cross;
+    }else if(targetClasse != null){
+      if(targetCluster == null){
+        //we can simply copy the given list
+        final Set<OIdentifiable> copy = new HashSet<OIdentifiable>(ids);
+        return copy;
+      }else{
+        //exclude ids which are not in the searched cluster
+        final ODatabaseRecord db = getDatabase();
+        final int[] clIds = new int[]{db.getClusterIdByName(targetCluster)};
+        final Set<OIdentifiable> copy = new HashSet<OIdentifiable>();
+        idloop:
+        for(OIdentifiable id : ids){
+          final int idc = id.getIdentity().getClusterId();
+          for(int cid : clIds){
+            if(cid == idc){
+              copy.add(id);
+              continue idloop;
+            }
+          }
+        }
+        return copy;        
+      }
     }
     
     //can't not optimize, wrap the full iterator and exclude wrong results
@@ -200,7 +223,7 @@ private ClippedCollection(Iterable<? extends OIdentifiable> source, Collection<O
     
     @Override
     public Iterator<OIdentifiable> iterator() {
-      throw new UnsupportedOperationException("Not supported yet.");
+      return new ClippedIterator();
     }
 
     @Override
diff --git a/core/src/test/java/com/orientechnologies/orient/core/sql/command/SelectTest.java b/core/src/test/java/com/orientechnologies/orient/core/sql/command/SelectTest.java
@@ -189,10 +189,10 @@ public void selectField(){
     final List<ODocument> docs = db.query(query);
     assertEquals(docs.size(), 4);
     assertEquals(docs.get(0).fieldNames().length, 1);
-    assertEquals(docs.get(0).field("0"), "tempo");
-    assertEquals(docs.get(1).field("0"), "fiesta");
-    assertEquals(docs.get(2).field("0"), null);
-    assertEquals(docs.get(3).field("0"), "supreme");
+    assertEquals(docs.get(0).field("name"), "tempo");
+    assertEquals(docs.get(1).field("name"), "fiesta");
+    assertEquals(docs.get(2).field("name"), null);
+    assertEquals(docs.get(3).field("name"), "supreme");
   }
   
   @Test

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public OCommandCreateIndex parse(final OCommandRequest iRequest) {`
`82`	`82`	`final List<OSQLParser.ReferenceContext> words = ctx.reference();`
`83`	`83`	`oClass = findClass(words.get(0).getText());`
`84`	`84`	`fields = new String[words.size()-1];`
`85`		`- for(int k=1;k<fields.length;k++){`
	`85`	`+ for(int k=1;k<words.size();k++){`
`86`	`86`	`fields[k-1] = visitAsString(words.get(k));`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -100,8 +100,8 @@ public OCommandCreateIndex parse(final OCommandRequest iRequest) {`
`100`	`100`	`final String text = visitAsString(candidate.reference(i));`
`101`	`101`	`keyTypes.add(OType.valueOf(text));`
`102`	`102`	`}`
`103`		`- this.keyTypes = keyTypes.toArray(new OType[0]);`
`104`		`- if (this.fields.length != this.keyTypes.length) {`
	`103`	`+ this.keyTypes = (keyTypes.isEmpty()) ? null : keyTypes.toArray(new OType[0]);`
	`104`	`+ if (this.keyTypes != null && (this.fields.length != this.keyTypes.length)) {`
`105`	`105`	`throw new OCommandSQLParsingException("Count of fields doesn't match with count of property types. " + "Fields: "`
`106`	`106`	`+ Arrays.toString(this.fields) + "; Types: " + Arrays.toString(this.keyTypes));`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@ public OName(String name) {`
`36`	`36`
`37`	`37`	`public OName(String alias, String name) {`
`38`	`38`	`super(alias);`
	`39`	`+ //by default name expression has the same alias`
	`40`	`+ if(alias == null){`
	`41`	`+ setAlias(name);`
	`42`	`+ }`
`39`	`43`	`this.name = name;`
`40`	`44`	`}`
`41`	`45`