check releation return

Change-Id: I21c8b767784fe68487b334ba4d9cb4ddcc53a306
apache · Apr 17, 2019 · fe48ef4 · fe48ef4
1 parent 16b4ea3
commit fe48ef4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQuery.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQuery.java
@@ -412,20 +412,20 @@ public boolean isFlattened() {
         return true;
     }
 
-    public boolean hasDuplicateKeys(Set<HugeKeys> keys) {
+    public boolean mayHasDupKeys(Set<HugeKeys> keys) {
         Map<HugeKeys, Integer> keyCounts = new HashMap<>();
         for (Condition condition : this.conditions()) {
-            E.checkState(condition.isRelation(),
-                         "All conditions should be relations");
+            if (!condition.isRelation()) {
+                // Assume may exist duplicate keys when has nested conditions
+                return true;
+            }
             Relation relation = (Relation) condition;
             if (keys.contains(relation.key())) {
                 int keyCount = keyCounts.getOrDefault(relation.key(), 0);
-                keyCounts.put((HugeKeys) relation.key(), ++keyCount);
-            }
-        }
-        for (Integer keyCount : keyCounts.values()) {
-            if (keyCount > 1) {
-                return true;
+                if (++keyCount > 1) {
+                    return true;
+                }
+                keyCounts.put((HugeKeys) relation.key(), keyCount);
             }
         }
         return false;

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQueryFlatten.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQueryFlatten.java
@@ -43,7 +43,7 @@ public final class ConditionQueryFlatten {
     );
 
     public static List<ConditionQuery> flatten(ConditionQuery query) {
-        if (query.isFlattened() && !query.hasDuplicateKeys(SPECIAL_KEYS)) {
+        if (query.isFlattened() && !query.mayHasDupKeys(SPECIAL_KEYS)) {
             return Arrays.asList(query);
         }