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

chore: async remove left index shouldn't effect query #2199

Merged
merged 1 commit into from
Apr 19, 2023
Merged

chore: async remove left index shouldn't effect query #2199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions hugegraph-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,20 @@
<version>${revision}</version>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>1.47.0</version>
</dependency>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-rpc</artifactId>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
</exclusion>
Comment on lines +38 to +51
Copy link
Member

Choose a reason for hiding this comment

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

@z7658329 commons could refer it?

Copy link
Member

Choose a reason for hiding this comment

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

@z7658329 commons could refer it?
ok

<!-- conflict with jraft -->
<exclusion>
<groupId>com.alipay.sofa</groupId>
Expand Down
14 changes: 12 additions & 2 deletions 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 @@ -1725,7 +1725,12 @@ private boolean rightResultFromIndexQuery(Query query, HugeElement elem) {
* Both have correct and left index, wo should return true
* but also needs to cleaned up left index
*/
this.indexTx.asyncRemoveIndexLeft(cq, elem);
try {
this.indexTx.asyncRemoveIndexLeft(cq, elem);
} catch (Throwable e) {
LOG.warn("Failed to remove left index for query '{}', " +
"element '{}'", cq, elem, e);
}
}

/* Return true if:
Expand All @@ -1737,7 +1742,12 @@ private boolean rightResultFromIndexQuery(Query query, HugeElement elem) {
}

if (cq.optimized() == OptimizedType.INDEX) {
this.indexTx.asyncRemoveIndexLeft(cq, elem);
try {
this.indexTx.asyncRemoveIndexLeft(cq, elem);
} catch (Throwable e) {
LOG.warn("Failed to remove left index for query '{}', " +
"element '{}'", cq, elem, e);
}
}
return false;
}
Expand Down
13 changes: 7 additions & 6 deletions hugegraph-dist/scripts/dependency/known-dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ disruptor-3.3.7.jar
eclipse-collections-11.1.0.jar
eclipse-collections-api-11.1.0.jar
error_prone_annotations-2.1.3.jar
error_prone_annotations-2.10.0.jar
exp4j-0.4.8.jar
expressions-9.0-9.0.20190305.jar
fastparse_2.12-2.0.4.jar
Expand Down Expand Up @@ -78,11 +79,11 @@ groovy-jsr223-2.5.14-indy.jar
groovy-swing-2.5.14.jar
groovy-templates-2.5.14.jar
groovy-xml-2.5.14.jar
grpc-api-1.28.0.jar
grpc-context-1.28.0.jar
grpc-core-1.28.0.jar
grpc-netty-shaded-1.28.0.jar
gson-2.8.6.jar
grpc-api-1.47.0.jar
grpc-context-1.47.0.jar
grpc-core-1.47.0.jar
grpc-netty-shaded-1.47.0.jar
gson-2.9.0.jar
guava-25.1-jre.jar
hamcrest-2.2.jar
hamcrest-core-1.3.jar
Expand Down Expand Up @@ -219,7 +220,7 @@ osgi-resource-locator-1.0.3.jar
parboiled-core-1.2.0.jar
parboiled-scala_2.12-1.2.0.jar
parser-9.0-9.0.20190305.jar
perfmark-api-0.19.0.jar
perfmark-api-0.25.0.jar
picocli-4.3.2.jar
postgresql-42.4.1.jar
protobuf-java-3.21.7.jar
Expand Down