DRILL-887: TestQueriesOnLargeFile.testMergingReceiver fails on Windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/37a47765 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/37a47765 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/37a47765 Branch: refs/heads/master Commit: 37a47765542047d04690f88854b0353cffe067fc Parents: 1c53c2d Author: Aditya Kishore <[email protected]> Authored: Mon Jun 2 13:58:11 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Sun Jun 8 19:13:04 2014 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/drill/test/DrillTest.java | 15 ++++++++++++++- .../apache/drill/exec/TestQueriesOnLargeFile.java | 2 +- .../largefiles/merging_receiver_large_data.json | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/37a47765/common/src/test/java/org/apache/drill/test/DrillTest.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/drill/test/DrillTest.java b/common/src/test/java/org/apache/drill/test/DrillTest.java index 6e9af83..6716f83 100644 --- a/common/src/test/java/org/apache/drill/test/DrillTest.java +++ b/common/src/test/java/org/apache/drill/test/DrillTest.java @@ -31,11 +31,16 @@ import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.slf4j.Logger; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + public class DrillTest { static final Logger logger = org.slf4j.LoggerFactory.getLogger(DrillTest.class); + protected static final ObjectMapper objectMapper = new ObjectMapper(); + static final SystemManager manager = new SystemManager(); - + static final Logger testReporter = org.slf4j.LoggerFactory.getLogger("org.apache.drill.TestReporter"); static final TestLogReporter LOG_OUTCOME = new TestLogReporter(); @@ -122,6 +127,14 @@ public class DrillTest { } + public static String escapeJsonString(String original) { + try { + return objectMapper.writeValueAsString(original); + } catch (JsonProcessingException e) { + return original; + } + } + public static String readable(long bytes) { int unit = 1024; long absBytes = Math.abs(bytes); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/37a47765/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java index 879dc3c..09aa6c4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java @@ -94,7 +94,7 @@ public class TestQueriesOnLargeFile extends BaseTestQuery { @Test public void testMergingReceiver() throws Exception { String plan = Files.toString(FileUtils.getResourceAsFile("/largefiles/merging_receiver_large_data.json"), - Charsets.UTF_8).replace("#{TEST_FILE}", dataFile.getPath()); + Charsets.UTF_8).replace("#{TEST_FILE}", escapeJsonString(dataFile.getPath())); List<QueryResultBatch> results = testPhysicalWithResults(plan); int recordsInOutput = 0; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/37a47765/exec/java-exec/src/test/resources/largefiles/merging_receiver_large_data.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/largefiles/merging_receiver_large_data.json b/exec/java-exec/src/test/resources/largefiles/merging_receiver_large_data.json index 3ce5526..902a59e 100644 --- a/exec/java-exec/src/test/resources/largefiles/merging_receiver_large_data.json +++ b/exec/java-exec/src/test/resources/largefiles/merging_receiver_large_data.json @@ -9,7 +9,7 @@ "graph" : [ { "pop" : "fs-scan", "@id" : 1, - "files" : [ "#{TEST_FILE}" ], + "files" : [ #{TEST_FILE} ], "storage" : { "type" : "file", "connection" : "file:///", @@ -53,7 +53,7 @@ "type" : "json" }, "columns" : [ "`id`", "`summary`" ], - "selectionRoot" : "#{TEST_FILE}" + "selectionRoot" : #{TEST_FILE} }, { "pop" : "project", "@id" : 2,
