Repository: drill Updated Branches: refs/heads/master 287f52db0 -> 1de6aed93
Update version for hadoop dependencies in mapr profile Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/1de6aed9 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/1de6aed9 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/1de6aed9 Branch: refs/heads/master Commit: 1de6aed93efce8a524964371d96673b8ef192d89 Parents: 287f52d Author: Steven Phillips <[email protected]> Authored: Fri May 15 18:23:46 2015 -0700 Committer: Steven Phillips <[email protected]> Committed: Thu Jun 4 17:15:35 2015 -0700 ---------------------------------------------------------------------- .../drill/exec/store/dfs/easy/EasyFormatPlugin.java | 3 ++- .../exec/store/parquet/ParquetScanBatchCreator.java | 2 +- exec/jdbc/pom.xml | 4 +--- pom.xml | 16 ++++++++-------- 4 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/1de6aed9/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 233c32b..8a18639 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 @@ -56,6 +56,7 @@ import org.apache.hadoop.conf.Configuration; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import org.apache.hadoop.fs.Path; public abstract class EasyFormatPlugin<T extends FormatPluginConfig> implements FormatPlugin { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(EasyFormatPlugin.class); @@ -171,7 +172,7 @@ public abstract class EasyFormatPlugin<T extends FormatPluginConfig> implements readers.add(getRecordReader(context, dfs, work, scan.getColumns())); if (scan.getSelectionRoot() != null) { String[] r = scan.getSelectionRoot().split("/"); - String[] p = work.getPath().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); partitionColumns.add(q); http://git-wip-us.apache.org/repos/asf/drill/blob/1de6aed9/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 4423fde..1f71c54 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 @@ -140,7 +140,7 @@ public class ParquetScanBatchCreator implements BatchCreator<ParquetRowGroupScan } if (rowGroupScan.getSelectionRoot() != null) { String[] r = rowGroupScan.getSelectionRoot().split("/"); - String[] p = e.getPath().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); partitionColumns.add(q); http://git-wip-us.apache.org/repos/asf/drill/blob/1de6aed9/exec/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml index 50b1695..3768a2b 100644 --- a/exec/jdbc/pom.xml +++ b/exec/jdbc/pom.xml @@ -129,8 +129,7 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>2.4.1-mapr-1408-SNAPSHOT</version> + <artifactId>hadoop-common</artifactId> <exclusions> <exclusion> <artifactId>commons-logging</artifactId> @@ -141,7 +140,6 @@ <artifactId>servlet-api-2.5</artifactId> </exclusion> </exclusions> - <scope>test</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/drill/blob/1de6aed9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9856ab4..4130051 100644 --- a/pom.xml +++ b/pom.xml @@ -1137,7 +1137,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>2.4.1-mapr-1408</version> + <version>2.5.1-mapr-1503</version> <exclusions> <exclusion> <artifactId>commons-logging</artifactId> @@ -1229,7 +1229,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>2.4.1-mapr-1408</version> + <version>2.5.1-mapr-1503</version> <exclusions> <exclusion> <artifactId>commons-logging</artifactId> @@ -1320,12 +1320,12 @@ <dependency> <groupId>com.mapr.fs</groupId> <artifactId>libprotodefs</artifactId> - <version>4.0.1-mapr</version> + <version>4.1.0-mapr</version> </dependency> <dependency> <groupId>com.mapr.fs</groupId> <artifactId>mapr-hbase</artifactId> - <version>4.0.1-mapr</version> + <version>4.1.0-mapr</version> <exclusions> <exclusion> <artifactId>slf4j-log4j12</artifactId> @@ -1356,7 +1356,7 @@ <dependency> <groupId>com.mapr.hadoop</groupId> <artifactId>maprfs</artifactId> - <version>4.0.1-mapr</version> + <version>4.1.0-mapr</version> </dependency> <dependency> <groupId>xerces</groupId> @@ -1377,7 +1377,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>2.4.1-mapr-1408</version> + <version>2.5.1-mapr-1503</version> <scope>test</scope> <exclusions> <exclusion> @@ -1393,7 +1393,7 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> - <version>0.98.7-mapr-1501-m7-4.0.1</version> + <version>0.98.9-mapr-1503-m7-4.1.0</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -1457,7 +1457,7 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-testing-util</artifactId> <classifier>tests</classifier> - <version>0.98.7-mapr-1501-m7-4.0.1</version> + <version>0.98.9-mapr-1503-m7-4.1.0</version> <scope>test</scope> <exclusions> <exclusion>
