Skip to content

Skip default timeout at query level #214

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

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Skip default timeout at query level #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
917b47e
Skip default timeout at query level
suresh-prakash Oct 10, 2024
aeea285
Upgrade Mongo driver version
suresh-prakash Oct 12, 2024
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
2 changes: 1 addition & 1 deletion ...egrationTest/java/org/hypertrace/core/documentstore/ArrayFiltersQueryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private static void initializeAndConnectToPostgres() {

private static void initializeAndConnectToMongo() {
mongo =
new GenericContainer<>(DockerImageName.parse("mongo:7.0.14"))
new GenericContainer<>(DockerImageName.parse("mongo:8.0.1"))
.withExposedPorts(27017)
.waitingFor(Wait.forListeningPort());
mongo.start();
Expand Down
2 changes: 1 addition & 1 deletion ...store/src/integrationTest/java/org/hypertrace/core/documentstore/DocStoreQueryV1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public class DocStoreQueryV1Test {
public static void init() throws IOException {
datastoreMap = Maps.newHashMap();
mongo =
new GenericContainer<>(DockerImageName.parse("mongo:7.0.14"))
new GenericContainer<>(DockerImageName.parse("mongo:8.0.1"))
.withExposedPorts(27017)
.waitingFor(Wait.forListeningPort());
mongo.start();
Expand Down
2 changes: 1 addition & 1 deletion document-store/src/integrationTest/java/org/hypertrace/core/documentstore/DocStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class DocStoreTest {
public static void init() {
datastoreMap = Maps.newHashMap();
mongo =
new GenericContainer<>(DockerImageName.parse("mongo:7.0.14"))
new GenericContainer<>(DockerImageName.parse("mongo:8.0.1"))
.withExposedPorts(27017)
.waitingFor(Wait.forListeningPort());
mongo.start();
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/integrationTest/java/org/hypertrace/core/documentstore/mongo/MongoDocStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public class MongoDocStoreTest {
@BeforeAll
public static void init() {
mongo =
new GenericContainer<>(DockerImageName.parse("mongo:7.0.14"))
new GenericContainer<>(DockerImageName.parse("mongo:8.0.1"))
.withExposedPorts(27017)
.waitingFor(Wait.forListeningPort());
mongo.start();
Expand Down
3 changes: 2 additions & 1 deletion ...ent-store/src/main/java/org/hypertrace/core/documentstore/model/options/QueryOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.hypertrace.core.documentstore.model.options;

import java.time.Duration;
import javax.annotation.Nullable;
import lombok.Builder;
import lombok.Builder.Default;
import lombok.Value;
Expand All @@ -13,5 +14,5 @@ public class QueryOptions {
public static final QueryOptions DEFAULT_QUERY_OPTIONS = QueryOptions.builder().build();

@Default DataFreshness dataFreshness = DataFreshness.SYSTEM_DEFAULT;
@Default Duration queryTimeout = Duration.ofMinutes(1);
@Default @Nullable Duration queryTimeout = null;
}
13 changes: 0 additions & 13 deletions ...t-store/src/test/java/org/hypertrace/core/documentstore/mongo/MongoQueryExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,19 +752,6 @@ void testConnectionLevelQueryTimeout() {
validate(duration);
}

@Test
void testConnectionLevelQueryTimeoutWithNullValue() {
final Query query =
Query.builder()
.addSelection(AggregateExpression.of(COUNT, ConstantExpression.of(1)), "total")
.build();

when(connectionConfig.queryTimeout()).thenReturn(null);
executor.aggregate(query, QueryOptions.DEFAULT_QUERY_OPTIONS);

validate(Duration.ofMinutes(1));
}

@Test
void testConnectionAndQueryLevelQueryTimeout() {
final Query query =
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ org-junit-jupiter-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter",
org-mockito-mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito" }
org-mockito-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "org-mockito" }
org-mockito-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "org-mockito" }
org-mongodb-mongodb-driver-sync = { module = "org.mongodb:mongodb-driver-sync", version = "5.1.4" }
org-mongodb-mongodb-driver-sync = { module = "org.mongodb:mongodb-driver-sync", version = "5.2.0" }
org-postgresql = { module = "org.postgresql:postgresql", version = "42.5.5" }
org-projectlombok-lombok = { module = "org.projectlombok:lombok", version = "1.18.30" }
org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.36" }
Expand Down
Loading