[ https://issues.apache.org/jira/browse/DRILL-6473?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16650664#comment-16650664 ]
ASF GitHub Bot commented on DRILL-6473: --------------------------------------- amansinha100 closed pull request #1307: DRILL-6473: Update MapR Hive URL: https://github.com/apache/drill/pull/1307 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveAbstractReader.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveAbstractReader.java index ba1cd30b50a..5ed6c3bb7ee 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveAbstractReader.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveAbstractReader.java @@ -25,6 +25,7 @@ import java.util.Properties; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListenableFuture; import io.netty.buffer.DrillBuf; @@ -203,20 +204,10 @@ private void init() throws ExecutionSetupException { } } } - ColumnProjectionUtils.appendReadColumns(job, columnIds); - - // TODO: Use below overloaded method instead of above simpler version of it, once Hive client dependencies - // (from all profiles) will be updated to 2.3 version or above -// ColumnProjectionUtils.appendReadColumns(job, columnIds, selectedColumnNames, -// Lists.newArrayList(Iterables.transform(getColumns(), new Function<SchemaPath, String>() -// { -// @Nullable -// @Override -// public String apply(@Nullable SchemaPath path) -// { -// return path.getRootSegmentPath(); -// } -// }))); + List<String> paths = getColumns().stream() + .map(SchemaPath::getRootSegmentPath) + .collect(Collectors.toList()); + ColumnProjectionUtils.appendReadColumns(job, columnIds, selectedColumnNames, paths); for (String columnName : selectedColumnNames) { StructField fieldRef = finalOI.getStructFieldRef(columnName); diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml index 3ef1839a905..b857758480b 100644 --- a/contrib/storage-hive/hive-exec-shade/pom.xml +++ b/contrib/storage-hive/hive-exec-shade/pom.xml @@ -139,6 +139,9 @@ <filter> <artifact>org.apache.hive:hive-exec</artifact> <excludes> + <!-- This exclusion can be removed once hive-exec uses parquet-hadoop-bundle 1.8.2 or higher. + It can be so, for example, after upgrading Hive to 3.0. To check if it's safe to remove the exclusion + you can use TestHiveStorage.readFromAlteredPartitionedTableWithEmptyGroupType() test case. --> <exclude>org/apache/parquet/schema/*</exclude> </excludes> </filter> diff --git a/pom.xml b/pom.xml index 5d00ee6f544..3a2d21ef806 100644 --- a/pom.xml +++ b/pom.xml @@ -2439,9 +2439,9 @@ <properties> <alt-hadoop>mapr</alt-hadoop> <rat.excludeSubprojects>true</rat.excludeSubprojects> - <hive.version>2.1.1-mapr-1710</hive.version> + <hive.version>2.3.3-mapr-1808</hive.version> <hbase.version>1.1.1-mapr-1602-m7-5.2.0</hbase.version> - <hadoop.version>2.7.0-mapr-1707</hadoop.version> + <hadoop.version>2.7.0-mapr-1808</hadoop.version> <zookeeper.version>3.4.11-mapr-1808</zookeeper.version> </properties> <dependencyManagement> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Update MapR Hive > ---------------- > > Key: DRILL-6473 > URL: https://issues.apache.org/jira/browse/DRILL-6473 > Project: Apache Drill > Issue Type: Task > Reporter: Bohdan Kazydub > Assignee: Bohdan Kazydub > Priority: Major > Labels: ready-to-commit > Fix For: 1.15.0 > > > Update version of Hive to 2.3.3-mapr-1808 for mapr profile. -- This message was sent by Atlassian JIRA (v7.6.3#76005)