fix bug traverseByLabel() not set page every loop #805

zhoney · 2019-12-30T13:22:19Z

Change-Id: I586032e221ebfdc3141fb9374bca23a4d5af229c

fixed: #802 Change-Id: I586032e221ebfdc3141fb9374bca23a4d5af229c

codecov · 2019-12-30T13:33:48Z

Codecov Report

Merging #805 into master will increase coverage by 0.62%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##             master     #805      +/-   ##
============================================
+ Coverage     71.13%   71.75%   +0.62%     
- Complexity     4331     4381      +50     
============================================
  Files           283      283              
  Lines         20957    20964       +7     
  Branches       2957     2958       +1     
============================================
+ Hits          14908    15043     +135     
+ Misses         4568     4443     -125     
+ Partials       1481     1478       -3

Impacted Files	Coverage Δ	Complexity Δ
...idu/hugegraph/job/schema/RebuildIndexCallable.java	`86.95% <ø> (-0.19%)`	`20 <0> (ø)`
...baidu/hugegraph/backend/store/BackendMutation.java	`85.71% <100%> (+0.27%)`	`32 <0> (ø)`	⬇️
...m/baidu/hugegraph/backend/tx/GraphTransaction.java	`82.77% <100%> (+1.09%)`	`235 <0> (+3)`	⬆️
.../java/com/baidu/hugegraph/backend/query/Query.java	`86.89% <0%> (-0.69%)`	`68% <0%> (ø)`
...du/hugegraph/backend/tx/GraphIndexTransaction.java	`81.1% <0%> (+0.26%)`	`180% <0%> (+2%)`	⬆️
...hugegraph/backend/serializer/BinarySerializer.java	`83.47% <0%> (+0.69%)`	`104% <0%> (+1%)`	⬆️
...a/com/baidu/hugegraph/backend/query/Condition.java	`78.83% <0%> (+0.82%)`	`31% <0%> (ø)`	⬇️
.../baidu/hugegraph/backend/query/ConditionQuery.java	`85.26% <0%> (+1.78%)`	`96% <0%> (+2%)`	⬆️
.../hugegraph/backend/store/rocksdb/RocksDBStore.java	`70.6% <0%> (+2.87%)`	`56% <0%> (+3%)`	⬆️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ef68289...349a919. Read the comment docs.

javeme · 2019-12-30T14:40:19Z

hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java

@@ -127,6 +127,7 @@ public GraphTransaction(HugeGraph graph, BackendStore store) {
                                CoreOptions.VERTEX_CHECK_CUSTOMIZED_ID_EXIST);
        this.verticesCapacity = conf.get(CoreOptions.VERTEX_TX_CAPACITY);
        this.edgesCapacity = conf.get(CoreOptions.EDGE_TX_CAPACITY);
+        this.traverseBatch = conf.get(CoreOptions.QUERY_TRAVERSE_BATCH);


prefer to use page_size

javeme · 2019-12-30T14:50:32Z

hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeLabelCoreTest.java

+        Assume.assumeFalse("Support query by label",
+                           storeFeatures().supportsQueryByLabel());
+
+        initDataWithoutLabelIndex();


add case graph().traversal().E().hasLabel(xx)

javeme · 2019-12-30T14:50:59Z

hugegraph-test/src/main/java/com/baidu/hugegraph/core/IndexLabelCoreTest.java

+        Assume.assumeFalse("Support query by label",
+                           storeFeatures().supportsQueryByLabel());
+
+        initDataWithoutLabelIndex();


add case graph().traversal().V().hasLabel(xx)

Change-Id: Ie88d6ad5633f477c87ae21878f93a0abf5727bc1

javeme · 2019-12-31T06:52:28Z

hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java

@@ -1538,10 +1539,14 @@ public void traverseEdgesByLabel(EdgeLabel label, Consumer<Edge> consumer,
                    SchemaLabel elemLabel = ((HugeElement) e).schemaLabel();
                    if (label.equals(elemLabel)) {
                        consumer.accept(e);
+                        if (deleting) {
+                            this.commit();
+                        }


call commitIf()

javeme · 2019-12-31T06:53:55Z

hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java

                    }
                }
                if (query.paging()) {
                    page = PageInfo.pageState(iter).toString();
+                    query.page(page);


this.commit();

javeme · 2019-12-31T06:54:24Z

hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java

@@ -127,6 +127,7 @@ public GraphTransaction(HugeGraph graph, BackendStore store) {
                                CoreOptions.VERTEX_CHECK_CUSTOMIZED_ID_EXIST);
        this.verticesCapacity = conf.get(CoreOptions.VERTEX_TX_CAPACITY);
        this.edgesCapacity = conf.get(CoreOptions.EDGE_TX_CAPACITY);
+        this.traverseBatch = conf.get(CoreOptions.QUERY_PAGE_SIZE);


rename this.traverseBatch to pageSize

Change-Id: I1406c003f1f52a691f6ef018f66c738c0102d921

Change-Id: I789db8f69f76895155be6db97a11f91ce6675971

zhoney · 2020-01-06T09:27:52Z

Also fixed #814

javeme · 2020-01-06T12:24:25Z

hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeLabelCoreTest.java

+            graph().traversal().E().hasLabel("read").toList();
+        }, e -> {
+            Assert.assertTrue(
+                   e.getMessage().startsWith("Don't accept query by label") &&


use assertContains() instead and rebase on apache/incubator-hugegraph-commons#43

javeme · 2020-01-06T12:25:43Z

hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeLabelCoreTest.java

+        }, e -> {
+            Assert.assertTrue(
+                   e.getMessage().startsWith("Don't accept query by label") &&
+                   e.getMessage().endsWith("it disables label index"));


use assertContains() instead and rebase on apache/incubator-hugegraph-commons#43

fix bug traverseByLabel() not set page every loop

f15fff1

fixed: #802 Change-Id: I586032e221ebfdc3141fb9374bca23a4d5af229c

javeme requested changes Dec 30, 2019

View reviewed changes

add query by label case and export TraverseUtil for gremlin

44e4efd

Change-Id: Ie88d6ad5633f477c87ae21878f93a0abf5727bc1

javeme reviewed Dec 31, 2019

View reviewed changes

zhoney added 2 commits December 31, 2019 15:35

improve

7de8dca

Change-Id: I1406c003f1f52a691f6ef018f66c738c0102d921

fix bug: calculate mutation size

349a919

Change-Id: I789db8f69f76895155be6db97a11f91ce6675971

javeme approved these changes Jan 6, 2020

View reviewed changes

Linary approved these changes Jan 7, 2020

View reviewed changes

Linary merged commit 455c8d9 into master Jan 7, 2020

Linary deleted the traverse-by-label branch January 7, 2020 03:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix bug traverseByLabel() not set page every loop #805

fix bug traverseByLabel() not set page every loop #805

zhoney commented Dec 30, 2019 •

edited by javeme

codecov bot commented Dec 30, 2019 •

edited

javeme Dec 30, 2019

javeme Dec 30, 2019

javeme Dec 30, 2019

javeme Dec 31, 2019

javeme Dec 31, 2019

javeme Dec 31, 2019

zhoney commented Jan 6, 2020

javeme Jan 6, 2020

javeme Jan 6, 2020

fix bug traverseByLabel() not set page every loop #805

fix bug traverseByLabel() not set page every loop #805

Conversation

zhoney commented Dec 30, 2019 • edited by javeme

codecov bot commented Dec 30, 2019 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhoney commented Jan 6, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhoney commented Dec 30, 2019 •

edited by javeme

codecov bot commented Dec 30, 2019 •

edited