HugeGraph-1302: limit ids count in an IdQuery

Change-Id: Ife925e5b6a216a23974b77a2af3d87cb9f34e2b9
apache · Aug 9, 2018 · 30bbf0d · 30bbf0d
1 parent 78e0b98
commit 30bbf0d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 15 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdQuery.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdQuery.java
@@ -20,27 +20,25 @@
 package com.baidu.hugegraph.backend.query;
 
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.Set;
 
 import com.baidu.hugegraph.backend.id.Id;
 import com.baidu.hugegraph.structure.HugeElement;
 import com.baidu.hugegraph.type.HugeType;
 import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.InsertionOrderUtil;
 
 public class IdQuery extends Query {
 
     // The id(s) will be concated with `or`
-    private Set<Id> ids;
+    private Set<Id> ids = InsertionOrderUtil.newSet();
 
     public IdQuery(HugeType resultType) {
         super(resultType);
-        this.ids = new LinkedHashSet<>();
     }
 
     public IdQuery(HugeType resultType, Query originQuery) {
         super(resultType, originQuery);
-        this.ids = new LinkedHashSet<>();
     }
 
     public IdQuery(HugeType resultType, Set<Id> ids) {
@@ -69,12 +67,13 @@ public Set<Id> ids() {
     }
 
     public void resetIds() {
-        this.ids = new LinkedHashSet<>();
+        this.ids = InsertionOrderUtil.newSet();
     }
 
     public IdQuery query(Id id) {
         E.checkArgumentNotNull(id, "Query id can't be null");
         this.ids.add(id);
+        this.checkCapacity(this.ids.size());
         return this;
     }
 
@@ -93,7 +92,7 @@ public boolean test(HugeElement element) {
     @Override
     public IdQuery copy() {
         IdQuery query = (IdQuery) super.copy();
-        query.ids = new LinkedHashSet<>(this.ids);
+        query.ids = InsertionOrderUtil.newSet(this.ids);
         return query;
     }
 

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Query.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Query.java
@@ -177,6 +177,20 @@ public void capacity(long capacity) {
         this.capacity = capacity;
     }
 
+    public void checkCapacity(long count) {
+        // Throw BackendException if reach capacity
+        if (this.capacity != Query.NO_CAPACITY && count > this.capacity) {
+            final int MAX_CHARS = 256;
+            String query = this.toString();
+            if (query.length() > MAX_CHARS) {
+                query = query.substring(0, MAX_CHARS) + "...";
+            }
+            throw new BackendException(
+                      "Too many records(must <=%s) for a query: %s",
+                      this.capacity, query);
+        }
+    }
+
     public boolean showHidden() {
         return this.showHidden;
     }

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendEntryIterator.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendEntryIterator.java
@@ -22,7 +22,6 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import com.baidu.hugegraph.backend.BackendException;
 import com.baidu.hugegraph.backend.query.Query;
 import com.baidu.hugegraph.exception.NotSupportException;
 import com.baidu.hugegraph.iterator.Metadatable;
@@ -98,12 +97,7 @@ protected final long fetched() {
 
     protected final void checkCapacity() {
         // Stop if reach capacity
-        if (this.query.capacity() != Query.NO_CAPACITY &&
-            this.count > this.query.capacity()) {
-            throw new BackendException(
-                      "Too many records(must <=%s) for a query",
-                      this.query.capacity());
-        }
+        this.query.checkCapacity(this.count);
     }
 
     protected final boolean exceedLimit() {

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/InsertionOrderUtil.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/InsertionOrderUtil.java
@@ -32,11 +32,23 @@ public static <K, V> Map<K, V> newMap() {
         return new LinkedHashMap<>();
     }
 
+    public static <K, V> Map<K, V> newMap(Map<K, V> origin) {
+        return new LinkedHashMap<>(origin);
+    }
+
     public static <V> Set<V> newSet() {
         return new LinkedHashSet<>();
     }
 
+    public static <V> Set<V> newSet(Set<V> origin) {
+        return new LinkedHashSet<>(origin);
+    }
+
     public static <V> List<V> newList() {
         return new ArrayList<>();
     }
+
+    public static <V> List<V> newList(List<V> origin) {
+        return new ArrayList<>(origin);
+    }
 }
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/JsonUtil.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/JsonUtil.java
@@ -102,7 +102,9 @@ public static Object castNumber(Object object, Class<?> clazz) {
 
     private static class DateSerializer extends StdSerializer<Date> {
 
-        DateSerializer() {
+        private static final long serialVersionUID = -6615155657857746161L;
+
+        public DateSerializer() {
             super(Date.class);
         }
 
@@ -116,7 +118,9 @@ public void serialize(Date date, JsonGenerator jsonGenerator,
 
     private static class DateDeserializer extends StdDeserializer<Date> {
 
-        DateDeserializer() {
+        private static final long serialVersionUID = 1209944821349424949L;
+
+        public DateDeserializer() {
             super(Date.class);
         }