From ca33d8bf2e131801318b0c170b7e312669443026 Mon Sep 17 00:00:00 2001 From: rishabh singh Date: Thu, 14 Mar 2024 16:49:41 +0530 Subject: [PATCH 1/3] Fix build --- .../org/apache/druid/sql/calcite/CalciteArraysQueryTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteArraysQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteArraysQueryTest.java index 141baa5e5308..2c165ffe3c3b 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteArraysQueryTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteArraysQueryTest.java @@ -1160,7 +1160,7 @@ public void testArrayContainsArrayStringColumns() "SELECT ARRAY_CONTAINS(arrayStringNulls, ARRAY['a', 'b']), ARRAY_CONTAINS(arrayStringNulls, arrayString) FROM druid.arrays LIMIT 5", ImmutableList.of( newScanQueryBuilder() - .dataSource(DATA_SOURCE_ARRAYS) + .dataSource(CalciteTests.ARRAYS_DATASOURCE) .intervals(querySegmentSpec(Filtration.eternity())) .columns("v0", "v1") .virtualColumns( From 4fdf232b56e8061dc054039eab7eb5cca78ad168 Mon Sep 17 00:00:00 2001 From: rishabh singh Date: Tue, 25 Jun 2024 22:46:52 +0530 Subject: [PATCH 2/3] Increase query cancellation timeout in router --- .../org/apache/druid/server/AsyncQueryForwardingServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java b/services/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java index 5134a8109b8a..d41a253034b8 100644 --- a/services/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java +++ b/services/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java @@ -104,7 +104,7 @@ public class AsyncQueryForwardingServlet extends AsyncProxyServlet implements Qu private static final String PROPERTY_SQL_ENABLE = "druid.router.sql.enable"; private static final String PROPERTY_SQL_ENABLE_DEFAULT = "false"; - private static final int CANCELLATION_TIMEOUT_MILLIS = 500; + private static final int CANCELLATION_TIMEOUT_MILLIS = 1000; private final AtomicLong successfulQueryCount = new AtomicLong(); private final AtomicLong failedQueryCount = new AtomicLong(); From ddee2ab288213564c461a89887e3464abfda7f42 Mon Sep 17 00:00:00 2001 From: rishabh singh Date: Wed, 17 Jul 2024 12:28:23 +0530 Subject: [PATCH 3/3] Increase cancellation timeout to 5 seconds --- .../org/apache/druid/server/AsyncQueryForwardingServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java b/services/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java index d41a253034b8..1fc1a6dfd068 100644 --- a/services/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java +++ b/services/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java @@ -104,7 +104,7 @@ public class AsyncQueryForwardingServlet extends AsyncProxyServlet implements Qu private static final String PROPERTY_SQL_ENABLE = "druid.router.sql.enable"; private static final String PROPERTY_SQL_ENABLE_DEFAULT = "false"; - private static final int CANCELLATION_TIMEOUT_MILLIS = 1000; + private static final long CANCELLATION_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5); private final AtomicLong successfulQueryCount = new AtomicLong(); private final AtomicLong failedQueryCount = new AtomicLong();