aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorTimothy Farkas <timothyfarkas@apache.org>2018-06-25 13:50:37 -0700
committerBen-Zvi <bben-zvi@mapr.com>2018-07-18 19:15:02 -0700
commit2c92ea22d9aa098cf3aaaf7893bd2fc33a08af31 (patch)
treeaa01c1a98ec7ea91ca01be155d2e68fbba18ccb0 /contrib
parent6bb0879ea22c31acc42632147ac3a1af9ec66fce (diff)
DRILL-6496: Added print methods for debugging tests, and fixed missing log statement in VectorUtils.
closes #1336
Diffstat (limited to 'contrib')
-rw-r--r--contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java6
-rw-r--r--contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java8
-rw-r--r--contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java2
-rw-r--r--contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java2
-rw-r--r--contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java8
-rw-r--r--contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java10
6 files changed, 18 insertions, 18 deletions
diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java
index ee32aa18e..550fb73b3 100644
--- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java
+++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java
@@ -55,11 +55,11 @@ public class BaseJsonTest extends BaseTestQuery {
protected void runSQLAndVerifyCount(String sql, int expectedRowCount) throws Exception{
List<QueryDataBatch> results = runHBaseSQLlWithResults(sql);
- printResultAndVerifyRowCount(results, expectedRowCount);
+ logResultAndVerifyRowCount(results, expectedRowCount);
}
- private void printResultAndVerifyRowCount(List<QueryDataBatch> results, int expectedRowCount) throws SchemaChangeException {
- int rowCount = printResult(results);
+ private void logResultAndVerifyRowCount(List<QueryDataBatch> results, int expectedRowCount) throws SchemaChangeException {
+ int rowCount = logResult(results);
if (expectedRowCount != -1) {
Assert.assertEquals(expectedRowCount, rowCount);
}
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
index dd7ce674e..ab75eda1e 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
@@ -79,7 +79,7 @@ public class BaseHBaseTest extends BaseTestQuery {
protected void runHBasePhysicalVerifyCount(String planFile, String tableName, int expectedRowCount) throws Exception{
String physicalPlan = getPlanText(planFile, tableName);
List<QueryDataBatch> results = testPhysicalWithResults(physicalPlan);
- printResultAndVerifyRowCount(results, expectedRowCount);
+ logResultAndVerifyRowCount(results, expectedRowCount);
}
protected List<QueryDataBatch> runHBaseSQLlWithResults(String sql) throws Exception {
@@ -89,11 +89,11 @@ public class BaseHBaseTest extends BaseTestQuery {
protected void runHBaseSQLVerifyCount(String sql, int expectedRowCount) throws Exception{
List<QueryDataBatch> results = runHBaseSQLlWithResults(sql);
- printResultAndVerifyRowCount(results, expectedRowCount);
+ logResultAndVerifyRowCount(results, expectedRowCount);
}
- private void printResultAndVerifyRowCount(List<QueryDataBatch> results, int expectedRowCount) throws SchemaChangeException {
- int rowCount = printResult(results);
+ private void logResultAndVerifyRowCount(List<QueryDataBatch> results, int expectedRowCount) throws SchemaChangeException {
+ int rowCount = logResult(results);
if (expectedRowCount != -1) {
Assert.assertEquals(expectedRowCount, rowCount);
}
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java
index 592dda073..50cda8fb2 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java
@@ -55,7 +55,7 @@ public class TestHBaseCFAsJSONString extends BaseHBaseTest {
public void testColumnFamiliesAsJSONString() throws Exception {
setColumnWidths(new int[] {112, 12});
List<QueryDataBatch> resultList = runHBaseSQLlWithResults("SELECT f, f2 FROM hbase.`[TABLE_NAME]` tableName LIMIT 1");
- printResult(resultList);
+ logResult(resultList);
}
}
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
index abd76a7e6..27882b59e 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
@@ -96,7 +96,7 @@ public class TestHBaseQueries extends BaseHBaseTest {
List<QueryDataBatch> resultList = runHBaseSQLlWithResults("SELECT row_key,\n"
+ " CAST(t.f.c1 as INT) c1, CAST(t.f.c2 as BIGINT) c2, CAST(t.f.c3 as INT) c3,\n"
+ " CAST(t.f.c4 as INT) c4 FROM hbase.TestTableNullStr t where row_key='a1'");
- printResult(resultList);
+ logResult(resultList);
}
finally {
test("alter system reset `drill.exec.functions.cast_empty_string_to_null`;");
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 e30f3e650..83da934e9 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
@@ -66,12 +66,12 @@ public class KafkaTestBase extends PlanTestBase {
public void runKafkaSQLVerifyCount(String sql, int expectedRowCount) throws Exception {
List<QueryDataBatch> results = runKafkaSQLWithResults(sql);
- printResultAndVerifyRowCount(results, expectedRowCount);
+ logResultAndVerifyRowCount(results, expectedRowCount);
}
- public void printResultAndVerifyRowCount(List<QueryDataBatch> results, int expectedRowCount)
+ public void logResultAndVerifyRowCount(List<QueryDataBatch> results, int expectedRowCount)
throws SchemaChangeException {
- int rowCount = printResult(results);
+ int rowCount = logResult(results);
if (expectedRowCount != -1) {
Assert.assertEquals(expectedRowCount, rowCount);
}
@@ -89,4 +89,4 @@ public class KafkaTestBase extends PlanTestBase {
TestKafkaSuit.tearDownCluster();
}
-} \ No newline at end of file
+}
diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java
index 923c648ca..4b4412f8d 100644
--- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java
+++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java
@@ -64,12 +64,12 @@ public class MongoTestBase extends PlanTestBase implements MongoTestConstants {
public void runMongoSQLVerifyCount(String sql, int expectedRowCount)
throws Exception {
List<QueryDataBatch> results = runMongoSQLWithResults(sql);
- printResultAndVerifyRowCount(results, expectedRowCount);
+ logResultAndVerifyRowCount(results, expectedRowCount);
}
- public void printResultAndVerifyRowCount(List<QueryDataBatch> results,
- int expectedRowCount) throws SchemaChangeException {
- int rowCount = printResult(results);
+ public void logResultAndVerifyRowCount(List<QueryDataBatch> results,
+ int expectedRowCount) throws SchemaChangeException {
+ int rowCount = logResult(results);
if (expectedRowCount != -1) {
Assert.assertEquals(expectedRowCount, rowCount);
}
@@ -92,4 +92,4 @@ public class MongoTestBase extends PlanTestBase implements MongoTestConstants {
storagePlugin = null;
}
-} \ No newline at end of file
+}