You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pa...@apache.org on 2015/06/30 07:15:26 UTC
drill git commit: DRILL-3422: Multiple unit test failures on Windows
with current master
Repository: drill
Updated Branches:
refs/heads/master 19c0225dc -> e2e59a01b
DRILL-3422: Multiple unit test failures on Windows with current master
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e2e59a01
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e2e59a01
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e2e59a01
Branch: refs/heads/master
Commit: e2e59a01b6efc8041b3d274433f2fd067de3b08a
Parents: 19c0225
Author: Aditya Kishore <ad...@apache.org>
Authored: Mon Jun 29 11:14:37 2015 -0700
Committer: Parth Chandra <pa...@apache.org>
Committed: Mon Jun 29 17:49:42 2015 -0700
----------------------------------------------------------------------
.../drill/exec/impersonation/hive/BaseTestHiveImpersonation.java | 2 +-
.../org/apache/drill/exec/store/hive/HiveTestDataGenerator.java | 2 +-
.../main/java/org/apache/drill/exec/store/dfs/FileSelection.java | 4 +++-
.../org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java | 2 +-
.../apache/drill/exec/store/parquet/ParquetScanBatchCreator.java | 2 +-
.../java/org/apache/drill/TestPlanVerificationUtilities.java | 2 +-
6 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/e2e59a01/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java
index 8004155..ed772e4 100644
--- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java
+++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java
@@ -62,7 +62,7 @@ public class BaseTestHiveImpersonation extends BaseTestImpersonation {
final String dbUrl = String.format("jdbc:derby:;databaseName=%s;create=true", getTempDir("metastore_db"));
hiveConf.set(ConfVars.METASTORECONNECTURLKEY.varname, dbUrl);
- hiveConf.set(ConfVars.SCRATCHDIR.varname, getTempDir("scratch_dir"));
+ hiveConf.set(ConfVars.SCRATCHDIR.varname, "file:///" + getTempDir("scratch_dir"));
hiveConf.set(ConfVars.LOCALSCRATCHDIR.varname, getTempDir("local_scratch_dir"));
// Set MiniDFS conf in HiveConf
http://git-wip-us.apache.org/repos/asf/drill/blob/e2e59a01/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java
index 965a863..21d4f7b 100644
--- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java
+++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java
@@ -147,7 +147,7 @@ public class HiveTestDataGenerator {
"STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat' " +
"OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat' " +
"TBLPROPERTIES ('avro.schema.url'='file:///%s')",
- BaseTestQuery.getPhysicalFileFromResource("avro_test_schema.json"));
+ BaseTestQuery.getPhysicalFileFromResource("avro_test_schema.json").replace('\\', '/'));
executeQuery(hiveDriver, avroCreateQuery);
executeQuery(hiveDriver, "INSERT INTO TABLE db1.avro SELECT * FROM default.kv");
http://git-wip-us.apache.org/repos/asf/drill/blob/e2e59a01/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java
index e7f7b28..91f5a95 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java
@@ -161,7 +161,9 @@ public class FileSelection {
return null;
}
if (status.length == 1) {
- return new FileSelection(Collections.singletonList(status[0]), p.toUri().getPath());
+ URI oneURI = status[0].getPath().toUri();
+ String selectionRoot = new Path(oneURI.getScheme(), oneURI.getAuthority(), p.toUri().getPath()).toString();
+ return new FileSelection(Collections.singletonList(status[0]), selectionRoot);
}
return new FileSelection(Lists.newArrayList(status), commonPath(status));
}
http://git-wip-us.apache.org/repos/asf/drill/blob/e2e59a01/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java
index 82a4fba..3c2b806 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java
@@ -172,7 +172,7 @@ public abstract class EasyFormatPlugin<T extends FormatPluginConfig> implements
for(FileWork work : scan.getWorkUnits()){
readers.add(getRecordReader(context, dfs, work, scan.getColumns()));
if (scan.getSelectionRoot() != null) {
- String[] r = scan.getSelectionRoot().split("/");
+ String[] r = Path.getPathWithoutSchemeAndAuthority(new Path(scan.getSelectionRoot())).toString().split("/");
String[] p = Path.getPathWithoutSchemeAndAuthority(new Path(work.getPath())).toString().split("/");
if (p.length > r.length) {
String[] q = ArrayUtils.subarray(p, r.length, p.length - 1);
http://git-wip-us.apache.org/repos/asf/drill/blob/e2e59a01/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java
index 1f71c54..441a707 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java
@@ -139,7 +139,7 @@ public class ParquetScanBatchCreator implements BatchCreator<ParquetRowGroupScan
readers.add(new DrillParquetReader(context, footer, e, newColumns, fs));
}
if (rowGroupScan.getSelectionRoot() != null) {
- String[] r = rowGroupScan.getSelectionRoot().split("/");
+ String[] r = Path.getPathWithoutSchemeAndAuthority(new Path(rowGroupScan.getSelectionRoot())).toString().split("/");
String[] p = Path.getPathWithoutSchemeAndAuthority(new Path(e.getPath())).toString().split("/");
if (p.length > r.length) {
String[] q = ArrayUtils.subarray(p, r.length, p.length - 1);
http://git-wip-us.apache.org/repos/asf/drill/blob/e2e59a01/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java b/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java
index 6ccda12..1d8ebc7 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java
@@ -26,7 +26,7 @@ public class TestPlanVerificationUtilities extends PlanTestBase {
@Test
public void testPlanVerifier() throws Exception {
String query = "select * from cp.`tpch/lineitem.parquet`";
- String expectedPattern = "selectionRoot=/tpch/lineitem.parquet, numFiles=[1-9]+, ";
+ String expectedPattern = "selectionRoot=classpath:/tpch/lineitem.parquet, numFiles=[1-9]+, ";
String excludedPattern = "part.parquet";
testPlanMatchingPatterns(query,
new String[] {expectedPattern}, new String[] {excludedPattern});