diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaFilterPushdownTest.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaFilterPushdownTest.java
index c9277f90a5a..f1dd78b8767 100644
--- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaFilterPushdownTest.java
+++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaFilterPushdownTest.java
@@ -24,8 +24,8 @@
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.apache.drill.exec.store.kafka.TestKafkaSuit.NUM_JSON_MSG;
-import static org.apache.drill.exec.store.kafka.TestKafkaSuit.embeddedKafkaCluster;
+import static org.apache.drill.exec.store.kafka.TestKafkaSuite.NUM_JSON_MSG;
+import static org.apache.drill.exec.store.kafka.TestKafkaSuite.embeddedKafkaCluster;
import static org.junit.Assert.assertEquals;
@Category({KafkaStorageTest.class, SlowTest.class})
@@ -36,7 +36,7 @@ public class KafkaFilterPushdownTest extends KafkaTestBase {
@BeforeClass
public static void setup() throws Exception {
- TestKafkaSuit.createTopicHelper(TestQueryConstants.JSON_PUSHDOWN_TOPIC, NUM_PARTITIONS);
+ TestKafkaSuite.createTopicHelper(TestQueryConstants.JSON_PUSHDOWN_TOPIC, NUM_PARTITIONS);
KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(),
StringSerializer.class);
generator.populateJsonMsgWithTimestamps(TestQueryConstants.JSON_PUSHDOWN_TOPIC, NUM_JSON_MSG);
diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java
index e91303610f8..327962f99ca 100644
--- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java
+++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java
@@ -41,7 +41,7 @@
import java.util.Map;
import java.util.Set;
-import static org.apache.drill.exec.store.kafka.TestKafkaSuit.embeddedKafkaCluster;
+import static org.apache.drill.exec.store.kafka.TestKafkaSuite.embeddedKafkaCluster;
import static org.junit.Assert.fail;
@FixMethodOrder(MethodSorters.JVM)
@@ -76,7 +76,7 @@ public void testResultLimit() throws Exception {
@Test
public void testResultCount() {
String queryString = String.format(TestQueryConstants.MSG_SELECT_QUERY, TestQueryConstants.JSON_TOPIC);
- runKafkaSQLVerifyCount(queryString, TestKafkaSuit.NUM_JSON_MSG);
+ runKafkaSQLVerifyCount(queryString, TestKafkaSuite.NUM_JSON_MSG);
}
@Test
@@ -91,7 +91,7 @@ public void testAvroResultCount() {
KafkaAvroDeserializer.class.getName());
String queryString = String.format(TestQueryConstants.MSG_SELECT_QUERY, TestQueryConstants.AVRO_TOPIC);
- runKafkaSQLVerifyCount(queryString, TestKafkaSuit.NUM_JSON_MSG);
+ runKafkaSQLVerifyCount(queryString, TestKafkaSuite.NUM_JSON_MSG);
} finally {
client.resetSession(ExecConstants.KAFKA_RECORD_READER);
}
@@ -209,7 +209,7 @@ public void testPhysicalPlanSubmissionAvro() throws Exception {
@Test
public void testOneMessageTopic() throws Exception {
String topicName = "topicWithOneMessage";
- TestKafkaSuit.createTopicHelper(topicName, 1);
+ TestKafkaSuite.createTopicHelper(topicName, 1);
KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(), StringSerializer.class);
generator.populateMessages(topicName, "{\"index\": 1}");
@@ -224,7 +224,7 @@ public void testOneMessageTopic() throws Exception {
@Test
public void testMalformedRecords() throws Exception {
String topicName = "topicWithMalFormedMessages";
- TestKafkaSuit.createTopicHelper(topicName, 1);
+ TestKafkaSuite.createTopicHelper(topicName, 1);
try {
KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(), StringSerializer.class);
generator.populateMessages(topicName, "Test");
@@ -259,7 +259,7 @@ public void testMalformedRecords() throws Exception {
@Test
public void testNanInf() throws Exception {
String topicName = "topicWithNanInf";
- TestKafkaSuit.createTopicHelper(topicName, 1);
+ TestKafkaSuite.createTopicHelper(topicName, 1);
try {
KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(), StringSerializer.class);
generator.populateMessages(topicName, "{\"nan_col\":NaN, \"inf_col\":Infinity}");
@@ -287,7 +287,7 @@ public void testNanInf() throws Exception {
@Test
public void testEscapeAnyChar() throws Exception {
String topicName = "topicWithEscapeAnyChar";
- TestKafkaSuit.createTopicHelper(topicName, 1);
+ TestKafkaSuite.createTopicHelper(topicName, 1);
try {
KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(), StringSerializer.class);
generator.populateMessages(topicName, "{\"name\": \"AB\\\"\\C\"}");
diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java
index c426b061713..0af48213a41 100644
--- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java
+++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java
@@ -43,11 +43,11 @@ public class KafkaTestBase extends ClusterTest {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
// Make sure this test is only running as part of the suit
- Assume.assumeTrue(TestKafkaSuit.isRunningSuite());
+ Assume.assumeTrue(TestKafkaSuite.isRunningSuite());
ClusterFixtureBuilder builder = ClusterFixture.builder(dirTestWatcher);
startCluster(builder);
- TestKafkaSuit.initKafka();
- initKafkaStoragePlugin(TestKafkaSuit.embeddedKafkaCluster);
+ TestKafkaSuite.initKafka();
+ initKafkaStoragePlugin(TestKafkaSuite.embeddedKafkaCluster);
}
public static void initKafkaStoragePlugin(EmbeddedKafkaCluster embeddedKafkaCluster) throws Exception {
@@ -76,8 +76,8 @@ public static long testSql(String sql) {
@AfterClass
public static void tearDownKafkaTestBase() {
- if (TestKafkaSuit.isRunningSuite()) {
- TestKafkaSuit.tearDownCluster();
+ if (TestKafkaSuite.isRunningSuite()) {
+ TestKafkaSuite.tearDownCluster();
}
}
}
\ No newline at end of file
diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java
index 12db4c3de1e..ed5f1e6874c 100644
--- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java
+++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java
@@ -48,7 +48,7 @@ public void setUp() {
consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, ByteArrayDeserializer.class);
consumerProps.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, "4");
kafkaConsumer = new KafkaConsumer<>(consumerProps);
- subScanSpec = new KafkaPartitionScanSpec(TestQueryConstants.JSON_TOPIC, 0, 0, TestKafkaSuit.NUM_JSON_MSG);
+ subScanSpec = new KafkaPartitionScanSpec(TestQueryConstants.JSON_TOPIC, 0, 0, TestKafkaSuite.NUM_JSON_MSG);
}
@After
@@ -105,6 +105,6 @@ public void testShouldReturnMessage2() {
Assert.assertNotNull(consumerRecord);
++messageCount;
}
- Assert.assertEquals(TestKafkaSuit.NUM_JSON_MSG, messageCount);
+ Assert.assertEquals(TestKafkaSuite.NUM_JSON_MSG, messageCount);
}
}
diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuit.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuite.java
similarity index 98%
rename from contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuit.java
rename to contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuite.java
index 73384d28d89..23e6bc6ef07 100644
--- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuit.java
+++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuite.java
@@ -54,11 +54,11 @@
@Category({KafkaStorageTest.class, SlowTest.class})
@RunWith(Suite.class)
@SuiteClasses({KafkaQueriesTest.class, MessageIteratorTest.class, MessageReaderFactoryTest.class, KafkaFilterPushdownTest.class})
-public class TestKafkaSuit extends BaseTest {
+public class TestKafkaSuite extends BaseTest {
private static final Logger logger = LoggerFactory.getLogger(TestKafkaSuit.class);
- private static final String LOGIN_CONF_RESOURCE_PATHNAME = "login.conf";
+ private static final String LOGIN_CONF_RESOURCE_PATHNAME = "login.jaasconf";
public static EmbeddedKafkaCluster embeddedKafkaCluster;
diff --git a/contrib/storage-kafka/src/test/resources/login.conf b/contrib/storage-kafka/src/test/resources/login.jaasconf
similarity index 99%
rename from contrib/storage-kafka/src/test/resources/login.conf
rename to contrib/storage-kafka/src/test/resources/login.jaasconf
index 091612028f3..56a10c4fd41 100644
--- a/contrib/storage-kafka/src/test/resources/login.conf
+++ b/contrib/storage-kafka/src/test/resources/login.jaasconf
@@ -22,4 +22,4 @@
hadoop_simple {
org.apache.hadoop.security.login.GenericOSLoginModule required;
org.apache.hadoop.security.login.HadoopLoginModule required;
-};
\ No newline at end of file
+};
diff --git a/distribution/docker-compose/README b/distribution/docker-compose/README.txt
similarity index 100%
rename from distribution/docker-compose/README
rename to distribution/docker-compose/README.txt
diff --git a/exec/java-exec/src/main/codegen/templates/Parser.jj b/exec/java-exec/src/main/codegen/templates/Parser.jj
index f94c7d855a0..d9627fdb826 100644
--- a/exec/java-exec/src/main/codegen/templates/Parser.jj
+++ b/exec/java-exec/src/main/codegen/templates/Parser.jj
@@ -1,10 +1,11 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java b/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java
index 7256a6082df..c83ae5a41c6 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java
@@ -25,7 +25,7 @@
public class ZookeeperTestUtil {
- private static final String LOGIN_CONF_RESOURCE_PATHNAME = "login.conf";
+ private static final String LOGIN_CONF_RESOURCE_PATHNAME = "login.jaasconf";
/**
* Sets zookeeper server and client SASL test config properties.
diff --git a/exec/java-exec/src/test/resources/login.conf b/exec/java-exec/src/test/resources/login.jaasconf
similarity index 99%
rename from exec/java-exec/src/test/resources/login.conf
rename to exec/java-exec/src/test/resources/login.jaasconf
index 091612028f3..56a10c4fd41 100644
--- a/exec/java-exec/src/test/resources/login.conf
+++ b/exec/java-exec/src/test/resources/login.jaasconf
@@ -22,4 +22,4 @@
hadoop_simple {
org.apache.hadoop.security.login.GenericOSLoginModule required;
org.apache.hadoop.security.login.HadoopLoginModule required;
-};
\ No newline at end of file
+};
diff --git a/exec/java-exec/src/test/resources/vault/read-vault-secrets.hcl b/exec/java-exec/src/test/resources/vault/read-vault-secrets.hcl
index 62bbdd3b415..098bafba42a 100644
--- a/exec/java-exec/src/test/resources/vault/read-vault-secrets.hcl
+++ b/exec/java-exec/src/test/resources/vault/read-vault-secrets.hcl
@@ -1,3 +1,4 @@
+//
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
@@ -13,6 +14,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+//
path "secret/*"
{
diff --git a/pom.xml b/pom.xml
index 31fa23ecd91..c4e81ffcb44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -686,137 +686,138 @@
${maven.multiModuleProjectDirectory}/header
- **/clientlib/y2038/*.c
- **/clientlib/y2038/*.h
- **/resources/parquet/**/*
- **/.asf.yaml
- **/*.woff2
- **/*.ks
- **/*.pcap
- **/*.sas7bdat
- **/*.sav
- **/*.log1
- **/*.log2
- **/*.h5
- **/*.sqllog
- **/*.sqllog2
- **/*.syslog
- **/*.xls
- **/*.xlsx
- **/*.mdb
**/*.accdb
- **/*.syslog1
- **/*.ssdlog
- **/*.ltsv
- **/*.log
- **/*.css
- **/*.js
- **/*.map
- **/*.md
- **/*.eps
- **/*.json
- **/*.seq
- **/*.parquet
+ **/*.access_log
+ **/.asf.yaml
+ **/*.autotools
+ **/*.avi
**/*.avro
- **/*.sql
- **/git.properties
- **/*.csv
- **/*.csvh
- **/*.pdf
- **/*.csvh-test
- **/*.tsv
- **/*.txt
- **/*.ssv
**/.buildpath
- **/target/**
- **/*.iml
- **/.idea/**
- **/*.project
- **/TAGS
**/*.checkstyle
**/.classpath
- **/.settings/**
- **/*.patch
- **/*.pb.cc
- **/*.pb.h
**/client/*build*/**
+ **/clientlib/y2038/*.c
+ **/clientlib/y2038/*.h
**/client/tags
**/cmake_install.cmake
- **/ssl/*.csr
- **/ssl/*.pem
- **/ssl/*.p12
- **/*.tbl
- **/*.httpd
- **/*.autotools
+ **/control
**/*.cproject
+ **/.*.crc
+ **/*.css
+ **/*.csv
+ **/*.csvh
+ **/*.csvh-test
+ **/*.dbf
+
+ dependency-reduced-pom.xml
**/*.drill
- **/LICENSE
- **/NOTICE
- KEYS
- header
**/.drill.parquet_metadata
+ **/*.eps
+ **/git.properties
+ **/*.h5
+ header
+ **/*.httpd
+ **/.idea/**
+ **/*.iml
+ **/*.js
+ **/*.json
+ KEYS
+ **/*.ks
+ **/LICENSE
+ **/*.log1
+ **/*.log1
+ **/*.log2
+ **/*.log2
+ **/*.log
+ **/*.ltsv
+ **/*.ltsv
+ **/*.map
+ **/*.mdb
+ **/*.md
**/*.mov
**/*.mp4
- **/*.avi
- **/*.pcx
- **/*.webp
+ **/NOTICE
+ **/*.parquet
+ **/*.patch
+ **/*.pb.cc
+ **/*.pb.h
+ **/*.pcap
**/*.pcapng
- **/*.psd
**/*.pcx
- **/*.log1
- **/*.log2
- **/*.sqllog
- **/*.sqllog2
- **/*.ltsv
- **/*.wav
- **/control
-
- dependency-reduced-pom.xml
+ **/*.pcx
+ **/*.pdf
**/*.prj
+ **/*.project
+ **/*.psd
+ **/resources/parquet/**/*
+ **/*.sas7bdat
+ **/*.sav
+ **/*.seq
+ **/.settings/**
**/*.shp
- **/*.dbf
- **/*.access_log
+ **/*.sql
+ **/*.sqllog2
+ **/*.sqllog2
+ **/*.sqllog
+ **/*.sqllog
+ **/*.ssdlog
+ **/ssl/*.csr
+ **/ssl/*.p12
+ **/ssl/*.pem
+ **/*.ssv
+ **/*.syslog1
+ **/*.syslog
+ **/TAGS
+ **/target/**
+ **/*.tbl
+ **/*.tsv
+ **/*.txt
+ **/*.wav
+ **/*.webp
+ **/*.woff2
+ **/*.xls
+ **/*.xlsx
- SLASHSTAR_STYLE
+ SLASHSTAR_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
SLASHSTAR_STYLE
+ SLASHSTAR_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SCRIPT_STYLE
+ SLASHSTAR_STYLE
+ DOUBLESLASH_STYLE
SLASHSTAR_STYLE
SLASHSTAR_STYLE
SLASHSTAR_STYLE
- SLASHSTAR_STYLE
- SLASHSTAR_STYLE
- SLASHSTAR_STYLE
- SLASHSTAR_STYLE
+ SLASHSTAR_STYLE
+ SLASHSTAR_STYLE
+ SLASHSTAR_STYLE
SLASHSTAR_STYLE
- SLASHSTAR_STYLE
- SCRIPT_STYLE
- SLASHSTAR_STYLE
+ SLASHSTAR_STYLE
+ XML_STYLE
+ SCRIPT_STYLE
+ DOUBLESLASH_STYLE
+ SCRIPT_STYLE
SCRIPT_STYLE
SCRIPT_STYLE
- SCRIPT_STYLE
+ SLASHSTAR_STYLE
SCRIPT_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
+ SLASHSTAR_STYLE
SCRIPT_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
-
- SLASHSTAR_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
- DOUBLESLASH_STYLE
- SCRIPT_STYLE
SCRIPT_STYLE
- SLASHSTAR_STYLE
- XML_STYLE
- SLASHSTAR_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
- SCRIPT_STYLE
+ SLASHSTAR_STYLE