[drill] branch master updated: DRILL-7654: Add support for JDK 14
This is an automated email from the ASF dual-hosted git repository.
arina pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 54399dc DRILL-7654: Add support for JDK 14
54399dc is described below
commit 54399dc268b46117174ea1af3e5f30aa72125674
Author: Volodymyr Vysotskyi
AuthorDate: Fri Mar 20 23:59:56 2020 +0200
DRILL-7654: Add support for JDK 14
---
.github/workflows/ci.yml | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9becd45..67fe40e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
strategy:
matrix:
# Java versions to run unit tests
-java: [ '1.8', '11', '13' ]
+java: [ '1.8', '11', '14' ]
steps:
- name: Checkout
uses: actions/checkout@v2
diff --git a/pom.xml b/pom.xml
index a4e8ab1..bacd6bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,14 +86,14 @@
2.2.2
1.0
2.3.28
-3.26.0-GA
+3.27.0-GA
0.6.6
0.9.10
1.9.1
4.0.2
9.3.25.v20180904
2.25.1
-7.2
+7.3.1
4096
4096
@@ -585,7 +585,7 @@
[{$lowestMavenVersion},4)
- [1.8,14)
+ [1.8,15)
[drill] branch master updated: DRILL-7651: Increase timeout for TestLargeFileCompilation to avoid GitHub Action failures and fix concurrent issue in TestTpchDistributedConcurrent
This is an automated email from the ASF dual-hosted git repository.
arina pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 0933f1b DRILL-7651: Increase timeout for TestLargeFileCompilation to
avoid GitHub Action failures and fix concurrent issue in
TestTpchDistributedConcurrent
0933f1b is described below
commit 0933f1bd6f496fe02f28e719c48839430add5977
Author: Volodymyr Vysotskyi
AuthorDate: Thu Mar 19 18:43:02 2020 +0200
DRILL-7651: Increase timeout for TestLargeFileCompilation to avoid GitHub
Action failures and fix concurrent issue in TestTpchDistributedConcurrent
---
.../drill/TestTpchDistributedConcurrent.java | 159 ++--
.../exec/compile/TestLargeFileCompilation.java | 163 -
2 files changed, 181 insertions(+), 141 deletions(-)
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java
b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java
index ba3bd44..c144c53 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java
@@ -26,18 +26,25 @@ import java.util.concurrent.Semaphore;
import org.apache.drill.categories.SlowTest;
import org.apache.drill.common.exceptions.UserException;
+import org.apache.drill.exec.ExecConstants;
+import org.apache.drill.test.BaseTestQuery.SilentListener;
+import org.apache.drill.test.ClusterFixture;
+import org.apache.drill.test.ClusterFixtureBuilder;
+import org.apache.drill.test.ClusterTest;
import org.apache.drill.test.TestTools;
import org.apache.drill.exec.proto.UserBitShared;
import org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState;
import org.apache.drill.exec.rpc.user.UserResultsListener;
-import org.apache.drill.test.BaseTestQuery;
import org.apache.drill.test.QueryTestUtil;
+import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestRule;
import org.apache.drill.shaded.guava.com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -49,17 +56,18 @@ import static org.junit.Assert.assertNull;
* any particular order of execution. We ignore the results.
*/
@Category({SlowTest.class})
-public class TestTpchDistributedConcurrent extends BaseTestQuery {
- private static final org.slf4j.Logger logger =
org.slf4j.LoggerFactory.getLogger(TestTpchDistributedConcurrent.class);
+public class TestTpchDistributedConcurrent extends ClusterTest {
+ private static final Logger logger =
LoggerFactory.getLogger(TestTpchDistributedConcurrent.class);
- @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(36); //
Longer timeout than usual.
+ @Rule
+ public final TestRule TIMEOUT = TestTools.getTimeoutRule(400_000); // 400
secs
/*
* Valid test names taken from TestTpchDistributed. Fuller path prefixes are
* used so that tests may also be taken from other locations -- more variety
* is better as far as this test goes.
*/
- private final static String queryFile[] = {
+ private static final String[] queryFile = {
"queries/tpch/01.sql",
"queries/tpch/03.sql",
"queries/tpch/04.sql",
@@ -80,45 +88,92 @@ public class TestTpchDistributedConcurrent extends
BaseTestQuery {
"queries/tpch/20.sql",
};
- private final static int TOTAL_QUERIES = 115;
- private final static int CONCURRENT_QUERIES = 15;
-
- private final static Random random = new Random(0xdeadbeef);
- private final static String alterSession = "alter session set
`planner.slice_target` = 10";
+ private static final int TOTAL_QUERIES = 115;
+ private static final int CONCURRENT_QUERIES = 15;
+ private static final Random random = new Random(0xdeadbeef);
private int remainingQueries = TOTAL_QUERIES - CONCURRENT_QUERIES;
private final Semaphore completionSemaphore = new Semaphore(0);
private final Semaphore submissionSemaphore = new Semaphore(0);
private final Set listeners = Sets.newIdentityHashSet();
+ private final List failedQueries = new LinkedList<>();
private Thread testThread = null; // used to interrupt semaphore wait in
case of error
- private static class FailedQuery {
-final String queryFile;
-final UserException userEx;
+ @BeforeClass
+ public static void setUp() throws Exception {
+ClusterFixtureBuilder builder = ClusterFixture.builder(dirTestWatcher)
+.configProperty(ExecConstants.USER_RPC_TIMEOUT, 5_000);
+startCluster(builder);
+ }
-public FailedQuery(final String queryFile, final UserException userEx) {
- this.queryFile = queryFile;
- this.userEx = userEx
[drill] branch master updated (e95f5a6 -> 129fa5b)
This is an automated email from the ASF dual-hosted git repository. arina pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/drill.git. from e95f5a6 DRILL-7650: Add option to enable Jetty's dump for troubleshooting add 129fa5b DRILL-7652: Add time_bucket() function for time series analysis No new revisions were added by this update. Summary of changes: contrib/udfs/README.md | 59 +- .../drill/exec/udfs/TimeBucketFunctions.java | 105 + .../drill/exec/udfs/TestTimeBucketFunction.java| 128 + 3 files changed, 289 insertions(+), 3 deletions(-) create mode 100644 contrib/udfs/src/main/java/org/apache/drill/exec/udfs/TimeBucketFunctions.java create mode 100644 contrib/udfs/src/test/java/org/apache/drill/exec/udfs/TestTimeBucketFunction.java
