This is an automated email from the ASF dual-hosted git repository.
cgivre 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 3bbfb7e DRILL-7901: Bump junit from 4.12 to 4.13.2 (#2200)
3bbfb7e is described below
commit 3bbfb7e8a5315b22ac8c7148e2c85dcb5f5fec27
Author: Charles S. Givre <[email protected]>
AuthorDate: Wed May 19 12:53:57 2021 -0400
DRILL-7901: Bump junit from 4.12 to 4.13.2 (#2200)
* Initial Commit
* Updated Kafka Library
* Still not working...
* WIP
* Kafka tests working
* Bump version to 4.13.2
* Added Fix Order
* Removed unnecessary dependencies
* Fixed spacing on KafkaFilterPushdownTest
---
.../exec/store/kafka/KafkaFilterPushdownTest.java | 222 ++++++++++-----------
.../drill/exec/store/kafka/KafkaQueriesTest.java | 7 +-
.../drill/exec/store/kafka/KafkaTestBase.java | 2 +-
pom.xml | 2 +-
4 files changed, 118 insertions(+), 115 deletions(-)
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 757f6e3..c9277f9 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
@@ -38,7 +38,7 @@ public class KafkaFilterPushdownTest extends KafkaTestBase {
public static void setup() throws Exception {
TestKafkaSuit.createTopicHelper(TestQueryConstants.JSON_PUSHDOWN_TOPIC,
NUM_PARTITIONS);
KafkaMessageGenerator generator = new
KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(),
- StringSerializer.class);
+ StringSerializer.class);
generator.populateJsonMsgWithTimestamps(TestQueryConstants.JSON_PUSHDOWN_TOPIC,
NUM_JSON_MSG);
String query = String.format(TestQueryConstants.MSG_SELECT_QUERY,
TestQueryConstants.JSON_PUSHDOWN_TOPIC);
//Ensure messages are present
@@ -55,14 +55,14 @@ public class KafkaFilterPushdownTest extends KafkaTestBase {
final int expectedRowCount = 5; //1 * NUM_PARTITIONS
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_AND,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
runKafkaSQLVerifyCount(queryString, expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -74,14 +74,14 @@ public class KafkaFilterPushdownTest extends KafkaTestBase {
final int expectedRowCount = NUM_JSON_MSG;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
runKafkaSQLVerifyCount(queryString, expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -93,14 +93,14 @@ public class KafkaFilterPushdownTest extends KafkaTestBase {
final int expectedRowCount = 20;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -113,14 +113,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 5;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowInPlan))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowInPlan))
+ .match();
}
/**
@@ -132,14 +132,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 0;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -151,14 +151,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 0;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -171,14 +171,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 0;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_AND,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -191,69 +191,69 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
//"equal" such that value = endOffset
String queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset = 10");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset = 10");
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
//"equal" such that value < startOffset
queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset = -1");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset = -1");
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
//"greater_than" such that value = endOffset-1
queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset > 9");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset > 9");
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
//"greater_than_or_equal" such that value = endOffset
queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset >= 10");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset >= 10");
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
//"less_than" such that value = startOffset
queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset < 0");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset < 0");
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
//"less_than_or_equal" such that value < startOffset
queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset <= -1");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset <= -1");
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -266,36 +266,36 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
//"equal" such that value = endOffset-1
String queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset = 9");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset = 9");
runKafkaSQLVerifyCount(queryString, expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
//"greater_than" such that value = endOffset-2
queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset > 8");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset > 8");
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
//"greater_than_or_equal" such that value = endOffset-1
queryString = String.format(TestQueryConstants.QUERY_TEMPLATE_BASIC,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset >= 9");
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, "kafkaMsgOffset >= 9");
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -309,14 +309,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 26;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_OR,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -330,14 +330,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 10;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_OR,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowInPlan))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowInPlan))
+ .match();
}
/**
@@ -351,14 +351,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 8;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_AND_OR_PATTERN_1,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2,
predicate3);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2,
predicate3);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCount))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCount))
+ .match();
}
/**
@@ -374,14 +374,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 4;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_AND_OR_PATTERN_3,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2,
predicate3, predicate4);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2,
predicate3, predicate4);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCountInPlan))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCountInPlan))
+ .match();
}
/**
@@ -396,14 +396,14 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 10;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_AND,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCountInPlan))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCountInPlan))
+ .match();
}
/**
@@ -419,13 +419,13 @@ public class KafkaFilterPushdownTest extends
KafkaTestBase {
final int expectedRowCount = 30;
final String queryString =
String.format(TestQueryConstants.QUERY_TEMPLATE_AND_OR_PATTERN_2,
- TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2,
predicate3);
+ TestQueryConstants.JSON_PUSHDOWN_TOPIC, predicate1, predicate2,
predicate3);
runKafkaSQLVerifyCount(queryString,expectedRowCount);
queryBuilder()
- .sql(queryString)
- .jsonPlanMatcher()
- .include(String.format(EXPECTED_PATTERN, expectedRowCountInPlan))
- .match();
+ .sql(queryString)
+ .jsonPlanMatcher()
+ .include(String.format(EXPECTED_PATTERN, expectedRowCountInPlan))
+ .match();
}
}
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 cc7649f..9e89171 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
@@ -28,8 +28,10 @@ import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
import org.junit.Assert;
+import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
import java.util.Collections;
import java.util.HashMap;
@@ -39,6 +41,7 @@ import java.util.Set;
import static
org.apache.drill.exec.store.kafka.TestKafkaSuit.embeddedKafkaCluster;
import static org.junit.Assert.fail;
+@FixMethodOrder(MethodSorters.JVM)
@Category({KafkaStorageTest.class, SlowTest.class})
public class KafkaQueriesTest extends KafkaTestBase {
@@ -100,7 +103,7 @@ public class KafkaQueriesTest extends KafkaTestBase {
private Map<TopicPartition, Long> fetchOffsets(int flag) {
Consumer<byte[], byte[]> kafkaConsumer = null;
try {
- kafkaConsumer = new
KafkaConsumer<>(storagePluginConfig.getKafkaConsumerProps(),
+ kafkaConsumer = new
KafkaConsumer<>(storagePluginConfig.getKafkaConsumerProps(),
new ByteArrayDeserializer(), new ByteArrayDeserializer());
Map<TopicPartition, Long> offsetsMap = new HashMap<>();
@@ -245,4 +248,4 @@ public class KafkaQueriesTest extends KafkaTestBase {
client.resetSession(ExecConstants.KAFKA_READER_ESCAPE_ANY_CHAR);
}
}
-}
+}
\ No newline at end of file
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 56e8138..c233b1f 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
@@ -76,4 +76,4 @@ public class KafkaTestBase extends ClusterTest {
TestKafkaSuit.tearDownCluster();
}
}
-}
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8959bc1..299c666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path>
<proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>
- <junit.version>4.12</junit.version>
+ <junit.version>4.13.2</junit.version>
<slf4j.version>1.7.26</slf4j.version>
<shaded.guava.version>28.2-jre</shaded.guava.version>
<guava.version>19.0</guava.version>
