Skip to content
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

fix: check uncommit due to gremlin partition test silently fails #2065

Merged
merged 2 commits into from
Jan 4, 2023
Merged

fix: check uncommit due to gremlin partition test silently fails #2065

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abf7c6e
fix: check uncommit due gremlin partition test silently fails
javeme Jan 2, 2023
4463c5d
Merge branch 'master' into partition-test-check
javeme Jan 4, 2023
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
9 changes: 8 additions & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,12 +542,19 @@ public QueryResults<BackendEntry> query(Query query) {

@Override
public Number queryNumber(Query query) {
boolean isConditionQuery = query instanceof ConditionQuery;
boolean hasUpdate = this.hasUpdate();
Aggregate aggregate = query.aggregateNotNull();

// TODO: we can concat index-query results and tx uncommitted records.
if (hasUpdate) {
E.checkArgument(!isConditionQuery,
"It's not allowed to query by index when " +
"there are uncommitted records.");
}

QueryList<Number> queries = this.optimizeQueries(query, q -> {
boolean isIndexQuery = q instanceof IdQuery;
boolean isConditionQuery = query instanceof ConditionQuery;
assert isIndexQuery || isConditionQuery || q == query;
// Need to fallback if there are uncommitted records
boolean fallback = hasUpdate;
Expand Down