Repository: kylin Updated Branches: refs/heads/KYLIN-2351 2ac1743fc -> 21bd92c7f
fix UT Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/21bd92c7 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/21bd92c7 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/21bd92c7 Branch: refs/heads/KYLIN-2351 Commit: 21bd92c7f11cef16a3761803e0bf93fcbca44ed2 Parents: 2ac1743 Author: Li Yang <liy...@apache.org> Authored: Thu Jan 5 11:54:04 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Jan 5 11:54:04 2017 +0800 ---------------------------------------------------------------------- .../kylin/engine/mr/SortedColumnReaderTest.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/21bd92c7/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java b/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java index 3c4195f..be440f6 100644 --- a/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java +++ b/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java @@ -48,10 +48,9 @@ public class SortedColumnReaderTest { @Test public void testReadStringMultiFile() throws Exception { String dirPath = "src/test/resources/multi_file_str"; - StringBytesConverter converter = new StringBytesConverter(); ArrayList<String> correctAnswer = readAllFiles(dirPath); Collections.sort(correctAnswer, new ByteComparator<String>(new StringBytesConverter())); - SortedColumnDFSFile column = new SortedColumnDFSFile(dirPath + "/", DataType.getType("varchar")); + SortedColumnDFSFile column = new SortedColumnDFSFile(qualify(dirPath + "/"), DataType.getType("varchar")); IDictionaryValueEnumerator e = new TableColumnValueEnumerator(column.getReader(), -1); ArrayList<String> output = new ArrayList<>(); while (e.moveNext()) { @@ -124,7 +123,7 @@ public class SortedColumnReaderTest { } } }); - SortedColumnDFSFile column = new SortedColumnDFSFile(dirPath + "/", DataType.getType("long")); + SortedColumnDFSFile column = new SortedColumnDFSFile(qualify(dirPath + "/"), DataType.getType("long")); IDictionaryValueEnumerator e = new TableColumnValueEnumerator(column.getReader(), -1); ArrayList<String> output = new ArrayList<>(); while (e.moveNext()) { @@ -142,7 +141,7 @@ public class SortedColumnReaderTest { public void testEmptyDir() throws Exception { String dirPath = "src/test/resources/empty_dir"; new File(dirPath).mkdirs(); - SortedColumnDFSFile column = new SortedColumnDFSFile(dirPath + "/", DataType.getType("varchar")); + SortedColumnDFSFile column = new SortedColumnDFSFile(qualify(dirPath + "/"), DataType.getType("varchar")); IDictionaryValueEnumerator e = new TableColumnValueEnumerator(column.getReader(), -1); ArrayList<String> output = new ArrayList<>(); while (e.moveNext()) { @@ -159,7 +158,7 @@ public class SortedColumnReaderTest { final BytesConverter<String> converter = new StringBytesConverter(); Collections.sort(correctAnswer, new ByteComparator<String>(new StringBytesConverter())); System.out.println("correct answer:" + correctAnswer); - SortedColumnDFSFile column = new SortedColumnDFSFile(dirPath + "/", DataType.getType("varchar")); + SortedColumnDFSFile column = new SortedColumnDFSFile(qualify(dirPath + "/"), DataType.getType("varchar")); IDictionaryValueEnumerator e = new TableColumnValueEnumerator(column.getReader(), -1); ArrayList<String> output = new ArrayList<>(); while (e.moveNext()) { @@ -230,7 +229,7 @@ public class SortedColumnReaderTest { } } }); - SortedColumnDFSFile column = new SortedColumnDFSFile(dirPath + "/", DataType.getType("double")); + SortedColumnDFSFile column = new SortedColumnDFSFile(qualify(dirPath + "/"), DataType.getType("double")); IDictionaryValueEnumerator e = new TableColumnValueEnumerator(column.getReader(), -1); ArrayList<String> output = new ArrayList<>(); while (e.moveNext()) { @@ -300,4 +299,13 @@ public class SortedColumnReaderTest { } return result; } + + private String qualify(String path) { + String absolutePath = new File(path).getAbsolutePath(); + if (absolutePath.startsWith("/")) + return "file://" + absolutePath; + else + return "file:///" + absolutePath; + } + }
