rename index.page_size to query.page_size

Change-Id: I70a0ac73a1641bdb1a71d30b3ce366fe3c593178
apache · Mar 18, 2019 · 15d7395 · 15d7395
1 parent 274d28e
commit 15d7395
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/QueryList.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/QueryList.java
@@ -93,20 +93,20 @@ public Iterator<BackendEntry> fetch() {
         assert !queries.isEmpty();
         if (this.parent.paging()) {
             int pageSize = this.graph.configuration()
-                                     .get(CoreOptions.INDEX_PAGE_SIZE);
+                                     .get(CoreOptions.QUERY_PAGE_SIZE);
             return new PageEntryIterator(this, pageSize);
         } else {
             return this.fetchAll();
         }
     }
 
-    private Iterator<BackendEntry> fetchAll() {
+    protected Iterator<BackendEntry> fetchAll() {
         return new FlatMapperIterator<>(this.queries.iterator(), q -> {
             return q.iterator();
         });
     }
 
-    public PageIterator fetchNext(PageState pageState, long pageSize) {
+    protected PageIterator fetchNext(PageState pageState, long pageSize) {
         QueryHolder query = null;
         int offset = pageState.offset();
         int current = 0;

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/config/CoreOptions.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/config/CoreOptions.java
@@ -207,10 +207,10 @@ public static synchronized CoreOptions instance() {
                     (60 * 10)
             );
 
-    public static final ConfigOption<Integer> INDEX_PAGE_SIZE =
+    public static final ConfigOption<Integer> QUERY_PAGE_SIZE =
             new ConfigOption<>(
-                    "index.page_size",
-                    "The size of each page when query by index in paging.",
+                    "query.page_size",
+                    "The size of each page when query using paging.",
                     rangeInt(0, 10000),
                     500
             );

diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java
@@ -323,7 +323,7 @@ public void put(String table, byte[] family, byte[] rowkey,
         }
 
         /**
-         * Add a row record to a table(for index)
+         * Add a row record to a table(can be used when adding an index)
          */
         public void put(String table, byte[] family,
                         byte[] rowkey, byte[] qualifier, byte[] value) {

diff --git a/...graph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStoreProvider.java b/...graph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStoreProvider.java
@@ -52,7 +52,7 @@ public String version() {
          * [1.0] HugeGraph-1328: supports backend table version checking
          * [1.1] HugeGraph-1322: add support for full-text search
          * [1.2] #296: support range sortKey feature
-         * [1.3] #287: Support pagination when do index query
+         * [1.3] #287: support pagination when doing index query
          */
         return "1.3";
     }

diff --git a/hugegraph-test/src/main/resources/hugegraph.properties b/hugegraph-test/src/main/resources/hugegraph.properties
@@ -11,7 +11,7 @@ edge.tx_capacity=10000
 vertex.cache_expire=300
 edge.cache_expire=300
 
-index.page_size=10
+query.page_size=10
 
 # cassandra backend config
 cassandra.host=127.0.0.1