Modification on hbase table

Change-Id: Ib52121bcda96002048c826012929863f204f8c12
apache · Mar 15, 2019 · 274d28e · 274d28e
1 parent 7a1ab1c
commit 274d28e
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/IdHolder.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/IdHolder.java
@@ -79,16 +79,15 @@ public boolean paging() {
 
     public PageIds fetchNext(String page, long pageSize) {
         if (this.exhausted) {
-            return null;
+            return PageIds.EMPTY;
         }
 
         this.query.page(page);
         this.query.limit(pageSize);
 
         PageIds result = this.idsFetcher.get();
-        if (result == null) {
-            return null;
-        }
+
+        assert result != null;
         this.ids = result.ids();
         if (this.ids.size() != this.query.limit() || result.page() == null) {
             this.exhausted = true;

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageIds.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageIds.java
@@ -22,9 +22,12 @@
 import java.util.Set;
 
 import com.baidu.hugegraph.backend.id.Id;
+import com.google.common.collect.ImmutableSet;
 
 public final class PageIds {
 
+    public static final PageIds EMPTY = new PageIds(ImmutableSet.of(), null);
+
     private final Set<Id> ids;
     private final String page;
 
@@ -40,4 +43,8 @@ public Set<Id> ids() {
     public String page() {
         return this.page;
     }
+
+    public boolean empty() {
+        return this.ids.isEmpty();
+    }
 }
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
@@ -225,7 +225,7 @@ public Iterator<BackendEntry> iterator() {
         public PageIterator iterator(int index, String page, long pageSize) {
             IdHolder holder = this.holders.get(index);
             PageIds pageIds = holder.fetchNext(page, pageSize);
-            if (pageIds == null) {
+            if (pageIds.empty()) {
                 return PageIterator.EMPTY;
             }
             IdQuery query = new IdQuery(parent.resultType(), pageIds.ids());

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinarySerializer.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinarySerializer.java
@@ -748,6 +748,10 @@ private Query writeRangeIndexQuery(ConditionQuery query) {
             newQuery = new IdPrefixQuery(query, start, keyMinEq, prefix);
         } else {
             Id max = formatIndexId(type, index, keyMax);
+            if (keyMaxEq) {
+                keyMaxEq = false;
+                increaseOne(max.asBytes());
+            }
             newQuery = new IdRangeQuery(query, start, keyMinEq, max, keyMaxEq);
         }
         newQuery.page(query.page());

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/AbstractTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/AbstractTransaction.java
@@ -78,10 +78,6 @@ public HugeGraph graph() {
         return this.graph;
     }
 
-    public HugeConfig config() {
-        return this.graph().configuration();
-    }
-
     public BackendStore store() {
         E.checkNotNull(this.graph, "store");
         return this.store;

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java
@@ -495,7 +495,7 @@ private IdHolder doIndexQueryInPage(IndexLabel indexLabel,
                 }
                 // If there is no data, the entries is not a Metadatable object
                 if (ids.isEmpty()) {
-                    return null;
+                    return PageIds.EMPTY;
                 }
 
                 E.checkState(entries instanceof Metadatable,

diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java
@@ -23,7 +23,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellScanner;
@@ -41,7 +40,6 @@
 import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry;
 import com.baidu.hugegraph.backend.serializer.BinaryEntryIterator;
 import com.baidu.hugegraph.backend.serializer.BinaryEntryIterator.PageState;
-import com.baidu.hugegraph.backend.serializer.BinarySerializer;
 import com.baidu.hugegraph.backend.store.BackendEntry;
 import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn;
 import com.baidu.hugegraph.backend.store.BackendEntryIterator;
@@ -195,11 +193,6 @@ protected RowIterator queryByPrefix(Session session, IdPrefixQuery query) {
     protected RowIterator queryByRange(Session session, IdRangeQuery query) {
         byte[] start = query.start().asBytes();
         byte[] end = query.end() == null ? null : query.end().asBytes();
-        if (query.inclusiveEnd() && end != null) {
-            BinarySerializer.increaseOne(end);
-            return session.scan(this.table(), start, query.inclusiveStart(),
-                                end, false);
-        }
         return session.scan(this.table(), start, query.inclusiveStart(),
                             end, query.inclusiveEnd());
     }

diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java
@@ -224,6 +224,7 @@ public void delete(Session session, BackendEntry entry) {
         protected BackendEntryIterator newEntryIterator(RowIterator rows,
                                                         Query query) {
             return new BinaryEntryIterator<>(rows, query, (entry, row) -> {
+                assert row.size() == 1;
                 BackendColumn col = BackendColumn.of(row.getRow(), row.value());
                 entry = new BinaryBackendEntry(query.resultType(), col.name);
                 entry.columns(col);