Skip to content

Throw exception if exceeds 80w without paging #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhoney wants to merge 4 commits into from
Closed

Throw exception if exceeds 80w without paging #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2db3e5
Throw exception if exceeds 80w without paging
zhoney Mar 28, 2019
ec462a2
tiny improve
zhoney Mar 28, 2019
a0641bd
set scan limit to empirical value 10w to ensure return in 3s
zhoney Mar 28, 2019
45f9a99
tiny improve
zhoney Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/api/API.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public class API {

private static final Logger LOG = Log.logger(RestServer.class);

// Empirical value of scan limit, with which results can be returned in 3s
protected static final long SCAN_PAGE_LIMIT = 100_000L;

public static final String CHARSET = "UTF-8";

public static final String APPLICATION_JSON = MediaType.APPLICATION_JSON;
Expand Down
7 changes: 4 additions & 3 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/EdgesAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress;
import com.baidu.hugegraph.backend.id.Id;
import com.baidu.hugegraph.backend.query.ConditionQuery;
import com.baidu.hugegraph.backend.query.Query;
import com.baidu.hugegraph.backend.store.Shard;
import com.baidu.hugegraph.core.GraphManager;
import com.baidu.hugegraph.server.RestServer;
Expand Down Expand Up @@ -111,10 +110,12 @@ public String scan(@Context GraphManager manager,

ConditionQuery query = new ConditionQuery(HugeType.EDGE_OUT);
query.scan(start, end);
query.limit(Query.DEFAULT_CAPACITY);
query.page(page);
if (query.paging()) {
query.limit(SCAN_PAGE_LIMIT);
Copy link
Copy Markdown
Contributor

@javeme javeme Apr 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add page_limit parameter and set default value as SCAN_PAGE_LIMIT
rename SCAN_PAGE_LIMIT to SCAN_DEFAULT_PAGE_LIMIT

}
Iterator<Edge> edges = g.edges(query);

return manager.serializer(g).writeEdges(edges, true);
return manager.serializer(g).writeEdges(edges, query.paging());
}
}
7 changes: 4 additions & 3 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/VerticesAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import com.baidu.hugegraph.api.graph.VertexAPI;
import com.baidu.hugegraph.backend.id.Id;
import com.baidu.hugegraph.backend.query.ConditionQuery;
import com.baidu.hugegraph.backend.query.Query;
import com.baidu.hugegraph.backend.store.Shard;
import com.baidu.hugegraph.core.GraphManager;
import com.baidu.hugegraph.server.RestServer;
Expand Down Expand Up @@ -111,10 +110,12 @@ public String scan(@Context GraphManager manager,

ConditionQuery query = new ConditionQuery(HugeType.VERTEX);
query.scan(start, end);
query.limit(Query.DEFAULT_CAPACITY);
query.page(page);
if (query.paging()) {
query.limit(SCAN_PAGE_LIMIT);
}
Iterator<Vertex> vertices = g.vertices(query);

return manager.serializer(g).writeVertices(vertices, true);
return manager.serializer(g).writeVertices(vertices, query.paging());
}
}