[23/43] hive git commit: HIVE-11196 : Utilities.getPartitionDesc() should try to reuse TableDesc object (Hari Subramaniyan, reviewd by Jesus Camacho Rodriguez)
HIVE-11196 : Utilities.getPartitionDesc() should try to reuse TableDesc object (Hari Subramaniyan, reviewd by Jesus Camacho Rodriguez) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/8dcead4e Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/8dcead4e Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/8dcead4e Branch: refs/heads/spark Commit: 8dcead4ea1c1c6bb08eace1d8969694f8bff6ac7 Parents: c2dc452 Author: Hari Subramaniyan harisan...@apache.org Authored: Mon Jul 27 13:46:19 2015 -0700 Committer: Hari Subramaniyan harisan...@apache.org Committed: Mon Jul 27 13:46:19 2015 -0700 -- .../mapreduce/TestHCatMultiOutputFormat.java| 6 ++- .../apache/hadoop/hive/ql/exec/Utilities.java | 9 +++-- .../hive/ql/optimizer/GenMapRedUtils.java | 18 ++--- .../hive/ql/optimizer/SimpleFetchOptimizer.java | 5 ++- .../hadoop/hive/ql/plan/PartitionDesc.java | 39 5 files changed, 56 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hive/blob/8dcead4e/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java -- diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java index 049de54..8148faa 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java @@ -46,6 +46,7 @@ import org.apache.hadoop.hive.ql.metadata.Hive; import org.apache.hadoop.hive.ql.metadata.Partition; import org.apache.hadoop.hive.ql.plan.FetchWork; import org.apache.hadoop.hive.ql.plan.PartitionDesc; +import org.apache.hadoop.hive.ql.plan.TableDesc; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.LongWritable; @@ -379,11 +380,12 @@ public class TestHCatMultiOutputFormat { ListPartition partitions = hive.getPartitions(tbl); ListPartitionDesc partDesc = new ArrayListPartitionDesc(); ListPath partLocs = new ArrayListPath(); + TableDesc tableDesc = Utilities.getTableDesc(tbl); for (Partition part : partitions) { partLocs.add(part.getDataLocation()); -partDesc.add(Utilities.getPartitionDesc(part)); +partDesc.add(Utilities.getPartitionDescFromTableDesc(tableDesc, part, true)); } - work = new FetchWork(partLocs, partDesc, Utilities.getTableDesc(tbl)); + work = new FetchWork(partLocs, partDesc, tableDesc); work.setLimit(100); } else { work = new FetchWork(tbl.getDataLocation(), Utilities.getTableDesc(tbl)); http://git-wip-us.apache.org/repos/asf/hive/blob/8dcead4e/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index d8e463d..d578f11 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -18,6 +18,8 @@ package org.apache.hadoop.hive.ql.exec; +import static com.google.common.base.Preconditions.checkNotNull; + import java.beans.DefaultPersistenceDelegate; import java.beans.Encoder; import java.beans.ExceptionListener; @@ -80,6 +82,7 @@ import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; import org.antlr.runtime.CommonToken; +import org.apache.calcite.util.ChunkList; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.WordUtils; @@ -1230,9 +1233,9 @@ public final class Utilities { return (new PartitionDesc(part)); } - public static PartitionDesc getPartitionDescFromTableDesc(TableDesc tblDesc, Partition part) - throws HiveException { -return new PartitionDesc(part, tblDesc); + public static PartitionDesc getPartitionDescFromTableDesc(TableDesc tblDesc, Partition part, +boolean usePartSchemaProperties) throws HiveException { +return new PartitionDesc(part, tblDesc, usePartSchemaProperties); } private static String getOpTreeSkel_helper(Operator? op, String indent) { http://git-wip-us.apache.org/repos/asf/hive/blob/8dcead4e/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
hive git commit: HIVE-11196 : Utilities.getPartitionDesc() should try to reuse TableDesc object (Hari Subramaniyan, reviewd by Jesus Camacho Rodriguez)
Repository: hive Updated Branches: refs/heads/branch-1 56df57781 - 92e977206 HIVE-11196 : Utilities.getPartitionDesc() should try to reuse TableDesc object (Hari Subramaniyan, reviewd by Jesus Camacho Rodriguez) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/92e97720 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/92e97720 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/92e97720 Branch: refs/heads/branch-1 Commit: 92e9772068123ca1d2ed95435d28473b1ebb54fe Parents: 56df577 Author: Hari Subramaniyan harisan...@apache.org Authored: Mon Jul 27 13:46:19 2015 -0700 Committer: Hari Subramaniyan harisan...@apache.org Committed: Mon Jul 27 13:47:27 2015 -0700 -- .../mapreduce/TestHCatMultiOutputFormat.java| 6 ++- .../apache/hadoop/hive/ql/exec/Utilities.java | 9 +++-- .../hive/ql/optimizer/GenMapRedUtils.java | 18 ++--- .../hive/ql/optimizer/SimpleFetchOptimizer.java | 5 ++- .../hadoop/hive/ql/plan/PartitionDesc.java | 39 5 files changed, 56 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hive/blob/92e97720/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java -- diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java index 049de54..8148faa 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java @@ -46,6 +46,7 @@ import org.apache.hadoop.hive.ql.metadata.Hive; import org.apache.hadoop.hive.ql.metadata.Partition; import org.apache.hadoop.hive.ql.plan.FetchWork; import org.apache.hadoop.hive.ql.plan.PartitionDesc; +import org.apache.hadoop.hive.ql.plan.TableDesc; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.LongWritable; @@ -379,11 +380,12 @@ public class TestHCatMultiOutputFormat { ListPartition partitions = hive.getPartitions(tbl); ListPartitionDesc partDesc = new ArrayListPartitionDesc(); ListPath partLocs = new ArrayListPath(); + TableDesc tableDesc = Utilities.getTableDesc(tbl); for (Partition part : partitions) { partLocs.add(part.getDataLocation()); -partDesc.add(Utilities.getPartitionDesc(part)); +partDesc.add(Utilities.getPartitionDescFromTableDesc(tableDesc, part, true)); } - work = new FetchWork(partLocs, partDesc, Utilities.getTableDesc(tbl)); + work = new FetchWork(partLocs, partDesc, tableDesc); work.setLimit(100); } else { work = new FetchWork(tbl.getDataLocation(), Utilities.getTableDesc(tbl)); http://git-wip-us.apache.org/repos/asf/hive/blob/92e97720/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index b7c10fd..7280674 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -18,6 +18,8 @@ package org.apache.hadoop.hive.ql.exec; +import static com.google.common.base.Preconditions.checkNotNull; + import java.beans.DefaultPersistenceDelegate; import java.beans.Encoder; import java.beans.ExceptionListener; @@ -80,6 +82,7 @@ import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; import org.antlr.runtime.CommonToken; +import org.apache.calcite.util.ChunkList; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.WordUtils; @@ -1230,9 +1233,9 @@ public final class Utilities { return (new PartitionDesc(part)); } - public static PartitionDesc getPartitionDescFromTableDesc(TableDesc tblDesc, Partition part) - throws HiveException { -return new PartitionDesc(part, tblDesc); + public static PartitionDesc getPartitionDescFromTableDesc(TableDesc tblDesc, Partition part, +boolean usePartSchemaProperties) throws HiveException { +return new PartitionDesc(part, tblDesc, usePartSchemaProperties); } private static String getOpTreeSkel_helper(Operator? op, String indent) { http://git-wip-us.apache.org/repos/asf/hive/blob/92e97720/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java -- diff --git
hive git commit: HIVE-11196 : Utilities.getPartitionDesc() should try to reuse TableDesc object (Hari Subramaniyan, reviewd by Jesus Camacho Rodriguez)
Repository: hive Updated Branches: refs/heads/master c2dc452ec - 8dcead4ea HIVE-11196 : Utilities.getPartitionDesc() should try to reuse TableDesc object (Hari Subramaniyan, reviewd by Jesus Camacho Rodriguez) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/8dcead4e Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/8dcead4e Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/8dcead4e Branch: refs/heads/master Commit: 8dcead4ea1c1c6bb08eace1d8969694f8bff6ac7 Parents: c2dc452 Author: Hari Subramaniyan harisan...@apache.org Authored: Mon Jul 27 13:46:19 2015 -0700 Committer: Hari Subramaniyan harisan...@apache.org Committed: Mon Jul 27 13:46:19 2015 -0700 -- .../mapreduce/TestHCatMultiOutputFormat.java| 6 ++- .../apache/hadoop/hive/ql/exec/Utilities.java | 9 +++-- .../hive/ql/optimizer/GenMapRedUtils.java | 18 ++--- .../hive/ql/optimizer/SimpleFetchOptimizer.java | 5 ++- .../hadoop/hive/ql/plan/PartitionDesc.java | 39 5 files changed, 56 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hive/blob/8dcead4e/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java -- diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java index 049de54..8148faa 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java @@ -46,6 +46,7 @@ import org.apache.hadoop.hive.ql.metadata.Hive; import org.apache.hadoop.hive.ql.metadata.Partition; import org.apache.hadoop.hive.ql.plan.FetchWork; import org.apache.hadoop.hive.ql.plan.PartitionDesc; +import org.apache.hadoop.hive.ql.plan.TableDesc; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.LongWritable; @@ -379,11 +380,12 @@ public class TestHCatMultiOutputFormat { ListPartition partitions = hive.getPartitions(tbl); ListPartitionDesc partDesc = new ArrayListPartitionDesc(); ListPath partLocs = new ArrayListPath(); + TableDesc tableDesc = Utilities.getTableDesc(tbl); for (Partition part : partitions) { partLocs.add(part.getDataLocation()); -partDesc.add(Utilities.getPartitionDesc(part)); +partDesc.add(Utilities.getPartitionDescFromTableDesc(tableDesc, part, true)); } - work = new FetchWork(partLocs, partDesc, Utilities.getTableDesc(tbl)); + work = new FetchWork(partLocs, partDesc, tableDesc); work.setLimit(100); } else { work = new FetchWork(tbl.getDataLocation(), Utilities.getTableDesc(tbl)); http://git-wip-us.apache.org/repos/asf/hive/blob/8dcead4e/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index d8e463d..d578f11 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -18,6 +18,8 @@ package org.apache.hadoop.hive.ql.exec; +import static com.google.common.base.Preconditions.checkNotNull; + import java.beans.DefaultPersistenceDelegate; import java.beans.Encoder; import java.beans.ExceptionListener; @@ -80,6 +82,7 @@ import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; import org.antlr.runtime.CommonToken; +import org.apache.calcite.util.ChunkList; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.WordUtils; @@ -1230,9 +1233,9 @@ public final class Utilities { return (new PartitionDesc(part)); } - public static PartitionDesc getPartitionDescFromTableDesc(TableDesc tblDesc, Partition part) - throws HiveException { -return new PartitionDesc(part, tblDesc); + public static PartitionDesc getPartitionDescFromTableDesc(TableDesc tblDesc, Partition part, +boolean usePartSchemaProperties) throws HiveException { +return new PartitionDesc(part, tblDesc, usePartSchemaProperties); } private static String getOpTreeSkel_helper(Operator? op, String indent) { http://git-wip-us.apache.org/repos/asf/hive/blob/8dcead4e/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java -- diff --git