chore: fix TinkerPop unit test by zyxxoo · Pull Request #2055 · apache/hugegraph

zyxxoo · 2022-12-18T18:12:48Z

fix #2058

codecov · 2022-12-18T18:22:48Z

Codecov Report

Merging #2055 (225854c) into master (fc27f2c) will increase coverage by 3.37%.
The diff coverage is 39.74%.

@@             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

Impacted Files	Coverage Δ
...he/hugegraph/traversal/optimize/TraversalUtil.java	`59.41% <26.08%> (-3.27%)`	⬇️
...he/hugegraph/traversal/optimize/HugeGraphStep.java	`73.56% <33.33%> (-2.02%)`	⬇️
...hugegraph/backend/query/ConditionQueryFlatten.java	`75.39% <50.00%> (-0.34%)`	⬇️
...n/java/org/apache/hugegraph/StandardHugeGraph.java	`68.36% <100.00%> (+2.77%)`	⬆️
...a/org/apache/hugegraph/structure/HugeFeatures.java	`32.94% <100.00%> (+1.61%)`	⬆️
...raph/traversal/optimize/HugeCountStepStrategy.java	`81.81% <100.00%> (+0.56%)`	⬆️
...raph/traversal/optimize/HugeGraphStepStrategy.java	`100.00% <100.00%> (ø)`
...rc/main/java/org/apache/hugegraph/HugeFactory.java	`63.49% <0.00%> (-6.35%)`	⬇️
...gegraph/election/RoleElectionStateMachineImpl.java	`68.54% <0.00%> (-2.42%)`	⬇️
...a/org/apache/hugegraph/util/collection/IntSet.java	`73.72% <0.00%> (-1.28%)`	⬇️
... and 57 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

imbajin · 2022-12-19T05:49:00Z

test fine in release branch first, mark this as draft & enable it later

hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java

hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java

javeme · 2022-12-19T10:04:15Z

hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java

+        return (HugeGraph) graph.get();
+    }
+
+    public static void trySetGraph(Step<?, ?> step, HugeGraph graph) {


seems don't need to set graph anymore, please refer to apache/tinkerpop#1699

ok, I have add TODO
// TODO: remove these EmptyGraph judgments when upgrading tinkerpop to a fixed version

javeme · 2022-12-19T10:15:31Z

hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java

                                               boolean supportIn) {
        if (query.isFlattened() && !query.mayHasDupKeys(SPECIAL_KEYS)) {
+            Relations relations = new Relations();
+            List<Condition> noRelations = new ArrayList<>();


rename to conditions?

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

hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java

hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java

hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java

hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java

javeme · 2022-12-22T13:59:30Z

hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeCountStepStrategy.java

        graphStep.queryInfo().aggregate(Aggregate.AggregateFunc.COUNT, null);
        HugeCountStep<?> countStep = new HugeCountStep<>(traversal, graphStep);
        for (Step<?, ?> origin : originSteps) {
+            TraversalHelper.copyLabels(origin, countStep, false);


is there a replaceStep method that contains a copyLabels call? otherwise add some comments for why?

hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java

hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java

javeme · 2022-12-22T16:28:43Z

hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java

+            boolean supportsPersistence = this.backendStoreFeatures().supportsPersistence();
+            this.features = new HugeFeatures(this, supportsPersistence);


seems the ci fails due to this.backendStoreFeatures() call, try to move to line 222?

here are backendStoreFeatures() call tx.readwrite cause ConnectionException, but Open method catch the exception, throw RuntimeException, so here need change the unit test

javeme · 2022-12-26T13:40:45Z

hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java


        final HugeGraph[] g2 = new HugeGraph[1];
-        Assert.assertThrows(ConnectionException.class, () -> {
+        Assert.assertThrows(RuntimeException.class, () -> {


can we keep the ConnectionException and update the throw-exception location?

zyxxoo force-pushed the zy_dev branch 3 times, most recently from f530722 to 2753e68 Compare December 18, 2022 19:30

zyxxoo changed the title ~~chore: fix thinkpop unit test~~ chore: fix tinkerpop unit test Dec 18, 2022

zyxxoo changed the title ~~chore: fix tinkerpop unit test~~ chore: fix tinkerPop unit test Dec 18, 2022

zyxxoo force-pushed the zy_dev branch from 2753e68 to 3dbecab Compare December 19, 2022 03:13

imbajin marked this pull request as draft December 19, 2022 05:49

zyxxoo added 3 commits December 19, 2022 16:37

chore: don't support persistence for memory backend

2830974

chore: setup graph by first step graph when graph is null

b76394a

chore: apply relations optimize logic

cd76807

zyxxoo force-pushed the zy_dev branch from 2a6f07d to cd76807 Compare December 19, 2022 08:39

chore: don't support null properties

00e50be

javeme reviewed Dec 19, 2022

View reviewed changes

chore: reflactor code

c3317b1

zyxxoo force-pushed the zy_dev branch from 49e1d56 to c3317b1 Compare December 19, 2022 11:15

javeme reviewed Dec 19, 2022

View reviewed changes

imbajin marked this pull request as ready for review December 21, 2022 08:23

fix: g.V().has(empty).count() and g.V().count().as('a').select('a')

694a787

zyxxoo mentioned this pull request Dec 22, 2022

[Bug] TinkerPop unit test bug #2058

Closed

1 task

simon824 and others added 2 commits December 22, 2022 18:48

fix: specify the code generation directory for raft.proto (#2057)

1e4a910

chore: reflactor code

02963d5

zyxxoo force-pushed the zy_dev branch 2 times, most recently from d9ede1e to 805ae2a Compare December 22, 2022 11:50

zyxxoo changed the title ~~chore: fix tinkerPop unit test~~ chore: fix tinkerPop unit test schema no define Dec 22, 2022

zyxxoo changed the title ~~chore: fix tinkerPop unit test schema no define~~ chore: fix tinkerPop unit test Dec 22, 2022

zyxxoo force-pushed the zy_dev branch 2 times, most recently from e72ad2f to 5206283 Compare December 22, 2022 12:00

fix: tinkerpop unit schema no define

62f9fed

zyxxoo force-pushed the zy_dev branch from 5206283 to 62f9fed Compare December 22, 2022 13:36

javeme reviewed Dec 22, 2022

View reviewed changes

javeme changed the title ~~chore: fix tinkerPop unit test~~ chore: fix TinkerPop unit test Dec 22, 2022

chore: reflactor code

ae7266d

javeme reviewed Dec 22, 2022

View reviewed changes

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

chore: improve code

d2a494c

javeme reviewed Dec 22, 2022

View reviewed changes

zyxxoo changed the base branch from master to release-1.0.0 December 23, 2022 02:15

zyxxoo force-pushed the zy_dev branch from 7235376 to c15ce2e Compare December 23, 2022 02:16

fix: core test

9b5ee56

zyxxoo force-pushed the zy_dev branch from c15ce2e to 9b5ee56 Compare December 23, 2022 02:19

zyxxoo changed the base branch from release-1.0.0 to master December 26, 2022 05:49

Merge branch 'master' into zy_dev

4a71089

zyxxoo requested review from imbajin and javeme December 26, 2022 07:29

fix the style & clean some outdated code

225854c

imbajin force-pushed the zy_dev branch from a679fab to 225854c Compare December 26, 2022 12:50

imbajin approved these changes Dec 26, 2022

View reviewed changes

javeme reviewed Dec 26, 2022

View reviewed changes

javeme approved these changes Dec 26, 2022

View reviewed changes

javeme merged commit 6c3170c into master Dec 26, 2022

javeme deleted the zy_dev branch December 26, 2022 14:41

		boolean supportsPersistence = this.backendStoreFeatures().supportsPersistence();
		this.features = new HugeFeatures(this, supportsPersistence);

Conversation

zyxxoo commented Dec 18, 2022 • edited by javeme Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Dec 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

imbajin commented Dec 19, 2022

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

zyxxoo commented Dec 18, 2022 •

edited by javeme

Loading

codecov bot commented Dec 18, 2022 •

edited

Loading