Fix NO_LIMIT handling for key-value stores

Without fix could not reindex store with more than Integer.MAX_VALUE entries because `KeySelector.limit` is integer

Signed-off-by: Pavel Ershov <owner.mad.epa@gmail.com>
(cherry picked from commit 9e26fd3)
Signed-off-by: Oleksandr Porunov <alexandr.porunov@gmail.com>

Author: mad

janusgraph-core/src/main/java/org/janusgraph/diskstorage/keycolumnvalue/keyvalue/KeySelector.java

@@ -18,6 +18,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import org.janusgraph.diskstorage.StaticBuffer;
+import org.janusgraph.graphdb.query.Query;
 
 /**
  * A {@link KeySelector} utility that can be generated out of a given {@link KVQuery}
@@ -50,7 +51,7 @@ public boolean include(StaticBuffer key) {
     }
 
     public boolean reachedLimit() {
-        return count >= limit;
+        return Query.NO_LIMIT != limit && count >= limit;
     }
 
 }

janusgraph-core/src/main/java/org/janusgraph/graphdb/query/LimitAdjustingIterator.java

@@ -67,7 +67,7 @@ public LimitAdjustingIterator(final int maxLimit, final int currentLimit) {
     @Override
     public boolean hasNext() {
         if (iterator ==null) iterator = getNewIterator(currentLimit);
-        if (count < currentLimit)
+        if (currentLimit == Query.NO_LIMIT || count < currentLimit)
             return iterator.hasNext();
         if (currentLimit>=maxLimit) return false;
 

janusgraph-core/src/main/java/org/janusgraph/graphdb/query/ResultSetIterator.java

@@ -52,7 +52,7 @@ public boolean hasNext() {
 
     private R nextInternal() {
         R r = null;
-        if (count < limit && iterator.hasNext()) {
+        if ((limit == Query.NO_LIMIT || count < limit) && iterator.hasNext()) {
             r = iterator.next();
         } else {
             close();

janusgraph-core/src/main/java/org/janusgraph/graphdb/query/graph/MultiKeySliceQuery.java

@@ -51,7 +51,7 @@ public List<EntryList> execute(final BackendTransaction tx) {
             EntryList next =tx.indexQuery(ksq.updateLimit(getLimit()-total));
             result.add(next);
             total+=next.size();
-            if (total>=getLimit()) break;
+            if (total>=getLimit() && hasLimit()) break;
         }
         return result;
     }

janusgraph-core/src/main/java/org/janusgraph/graphdb/query/vertex/BasicVertexCentricQueryBuilder.java

@@ -383,12 +383,12 @@ public VertexList executeVertexIds(InternalVertex vertex, BaseVertexCentricQuery
                 VertexListInternal merge = null;
 
                 for (InternalVertex rep : representatives) {
-                    if (merge!=null && merge.size()>=baseQuery.getLimit()) break;
+                    if (merge!=null && merge.size()>=baseQuery.getLimit() && baseQuery.hasLimit()) break;
                     VertexList vertexList = executeIndividualVertexIds(rep,baseQuery);
                     if (merge==null) merge = (VertexListInternal)vertexList;
                     else merge.addAll(vertexList);
                 }
-                if (merge != null && merge.size()>baseQuery.getLimit()) {
+                if (merge != null && merge.size()>baseQuery.getLimit() && baseQuery.hasLimit()) {
                     merge = (VertexListInternal)merge.subList(0,baseQuery.getLimit());
                 }
                 return merge;

janusgraph-core/src/main/java/org/janusgraph/graphdb/util/MultiDistinctOrderedIterator.java

@@ -18,6 +18,7 @@
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
 import org.apache.tinkerpop.gremlin.util.function.MultiComparator;
+import org.janusgraph.graphdb.query.Query;
 import org.janusgraph.graphdb.tinkerpop.optimize.step.HasStepFolder.OrderEntry;
 
 import java.util.ArrayList;
@@ -58,7 +59,7 @@ public MultiDistinctOrderedIterator(final Integer lowLimit, final Integer highLi
 
     @Override
     public boolean hasNext() {
-        if (limit != null && count >= limit) {
+        if (limit != null && limit != Query.NO_LIMIT && count >= limit) {
             return false;
         }
         for (int i = 0; i < iterators.size(); i++) {

janusgraph-core/src/main/java/org/janusgraph/graphdb/util/MultiDistinctUnorderedIterator.java

@@ -16,6 +16,7 @@
 
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
+import org.janusgraph.graphdb.query.Query;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -44,7 +45,7 @@ public MultiDistinctUnorderedIterator(final int lowLimit, final int highLimit, f
 
     @Override
     protected E computeNext() {
-        if (count < limit) {
+        if (limit == Query.NO_LIMIT || count < limit) {
             while (iterator.hasNext()) {
                 E elem = iterator.next();
                 if (allElements.add(elem.id())) {