diff --git a/hugegraph-api/pom.xml b/hugegraph-api/pom.xml
index 74ac2d4195..7082c4ad44 100644
--- a/hugegraph-api/pom.xml
+++ b/hugegraph-api/pom.xml
@@ -5,7 +5,7 @@
hugegraph
com.baidu.hugegraph
- 0.9.1
+ 0.9.2
4.0.0
@@ -86,7 +86,7 @@
- 0.34.0.0
+ 0.35.0.0
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java
index 75ed3a4761..ba54eba04d 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java
@@ -222,17 +222,20 @@ public String list(@Context GraphManager manager,
LOG.debug("Graph [{}] query edges by vertex: {}, direction: {}, " +
"label: {}, properties: {}, offset: {}, page: {}, limit: {}",
vertexId, direction, label, properties, offset, page, limit);
+
+ Map props = parseProperties(properties);
if (page != null) {
E.checkArgument(vertexId == null && direction == null &&
- label == null && properties == null && offset == 0,
- "Not support quering edges based on paging and " +
- "[vertex, direction, label, properties, offset] " +
- "together");
+ offset == 0,
+ "Not support querying edges based on paging " +
+ "and [vertex, direction, offset] together");
+ E.checkArgument(props.size() <= 1,
+ "Not support querying edges based on paging " +
+ "and more than one property");
}
Id vertex = VertexAPI.checkAndParseVertexId(vertexId);
Direction dir = parseDirection(direction);
- Map props = parseProperties(properties);
HugeGraph g = graph(manager, graph);
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java
index 8479f46712..ee0823c01e 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java
@@ -173,13 +173,16 @@ public String list(@Context GraphManager manager,
LOG.debug("Graph [{}] query vertices by label: {}, properties: {}, " +
"offset: {}, page: {}, limit: {}",
graph, label, properties, offset, page, limit);
- if (page != null) {
- E.checkArgument(label == null && properties == null && offset == 0,
- "Not support quering vertices based on paging " +
- "and [label, properties, offset] together");
- }
Map props = parseProperties(properties);
+ if (page != null) {
+ E.checkArgument(offset == 0,
+ "Not support querying vertices based on paging " +
+ "and offset together");
+ E.checkArgument(props.size() <= 1,
+ "Not support querying vertices based on paging " +
+ "and more than one property");
+ }
HugeGraph g = graph(manager, graph);
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/GremlinAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/GremlinAPI.java
index 5f76c7f7e3..46c3988cd5 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/GremlinAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/GremlinAPI.java
@@ -59,8 +59,7 @@
import com.codahale.metrics.Histogram;
import com.codahale.metrics.annotation.Timed;
import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jersey.repackaged.com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
@Path("graphs/{graph}/jobs/gremlin")
@Singleton
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java
index 9ef7222e22..9a627212a3 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java
@@ -78,10 +78,11 @@ public final class ApiVersion {
* [0.32] Issue-250: Keep depth and degree consistent for traverser api
* [0.33] Issue-305: Implement customized paths and crosspoints RESTful API
* [0.34] Issue-307: Let VertexAPI use simplified property serializer
+ * [0.35] Issue-287: Support pagination when do index query
*/
// The second parameter of Version.of() is for IDE running without JAR
- public static final Version VERSION = Version.of(ApiVersion.class, "0.34");
+ public static final Version VERSION = Version.of(ApiVersion.class, "0.35");
public static final void check() {
// Check version of hugegraph-core. Firstly do check from version 0.3
diff --git a/hugegraph-cassandra/pom.xml b/hugegraph-cassandra/pom.xml
index 5f98a01252..fa8352fe2b 100644
--- a/hugegraph-cassandra/pom.xml
+++ b/hugegraph-cassandra/pom.xml
@@ -5,7 +5,7 @@
hugegraph
com.baidu.hugegraph
- 0.9.1
+ 0.9.2
4.0.0
diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java
index ae8c80b974..41b45df32e 100644
--- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java
+++ b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java
@@ -127,25 +127,6 @@ protected List