chore: fix TinkerPop unit test #2055
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #2055 +/- ##
============================================
+ Coverage 64.98% 68.35% +3.37%
- Complexity 976 979 +3
============================================
Files 481 481
Lines 39749 39807 +58
Branches 5582 5592 +10
============================================
+ Hits 25829 27212 +1383
+ Misses 11374 9954 -1420
- Partials 2546 2641 +95
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
zyxxoo
force-pushed
the
zy_dev
branch
3 times, most recently
from
f530722 to
2753e68
Compare
|
test fine in |
javeme
reviewed
Dec 19, 2022
hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java
Outdated
Show resolved
Hide resolved
hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java
Outdated
Show resolved
Hide resolved
| return (HugeGraph) graph.get(); | ||
| } | ||
|
|
||
| public static void trySetGraph(Step<?, ?> step, HugeGraph graph) { |
There was a problem hiding this comment.
seems don't need to set graph anymore, please refer to apache/tinkerpop#1699
There was a problem hiding this comment.
ok, I have add TODO
// TODO: remove these EmptyGraph judgments when upgrading tinkerpop to a fixed version
| @@ -51,6 +51,22 @@ public static List<ConditionQuery> flatten(ConditionQuery query) { | |||
| public static List<ConditionQuery> flatten(ConditionQuery query, | |||
| boolean supportIn) { | |||
| if (query.isFlattened() && !query.mayHasDupKeys(SPECIAL_KEYS)) { | |||
| Relations relations = new Relations(); | |||
| List<Condition> noRelations = new ArrayList<>(); | |||
There was a problem hiding this comment.
there are two type, the one is relation, and other, so maybe relation name is more suitable.
hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java
Outdated
Show resolved
Hide resolved
javeme
reviewed
Dec 19, 2022
hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java
Outdated
Show resolved
Hide resolved
hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java
Outdated
Show resolved
Hide resolved
hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java
Outdated
Show resolved
Hide resolved
hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java
Outdated
Show resolved
Hide resolved
zyxxoo
force-pushed
the
zy_dev
branch
2 times, most recently
from
d9ede1e to
805ae2a
Compare
zyxxoo
changed the title
zyxxoo
changed the title
zyxxoo
force-pushed
the
zy_dev
branch
2 times, most recently
from
e72ad2f to
5206283
Compare
javeme
reviewed
Dec 22, 2022
hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java
Outdated
Show resolved
Hide resolved
hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java
Outdated
Show resolved
Hide resolved
| @@ -104,6 +104,7 @@ public void apply(Traversal.Admin<?, ?> traversal) { | |||
| graphStep.queryInfo().aggregate(Aggregate.AggregateFunc.COUNT, null); | |||
| HugeCountStep<?> countStep = new HugeCountStep<>(traversal, graphStep); | |||
| for (Step<?, ?> origin : originSteps) { | |||
| TraversalHelper.copyLabels(origin, countStep, false); | |||
There was a problem hiding this comment.
is there a replaceStep method that contains a copyLabels call? otherwise add some comments for why?
javeme
reviewed
Dec 22, 2022
hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java
Outdated
Show resolved
Hide resolved
hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java
Outdated
Show resolved
Hide resolved
javeme
reviewed
Dec 22, 2022
Comment on lines
+215
to
+216
| boolean supportsPersistence = this.backendStoreFeatures().supportsPersistence(); | ||
| this.features = new HugeFeatures(this, supportsPersistence); |
There was a problem hiding this comment.
seems the ci fails due to this.backendStoreFeatures() call, try to move to line 222?
There was a problem hiding this comment.
here are backendStoreFeatures() call tx.readwrite cause ConnectionException, but Open method catch the exception, throw RuntimeException, so here need change the unit test
imbajin
approved these changes
Dec 26, 2022
javeme
reviewed
Dec 26, 2022
| g1.initBackend(); | ||
| g1.clearBackend(); | ||
|
|
||
| final HugeGraph[] g2 = new HugeGraph[1]; | ||
| Assert.assertThrows(ConnectionException.class, () -> { | ||
| Assert.assertThrows(RuntimeException.class, () -> { |
There was a problem hiding this comment.
can we keep the ConnectionException and update the throw-exception location?
javeme
approved these changes
Dec 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #2058