You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/08/26 20:38:24 UTC
[3/3] hive git commit: HIVE-11656 : LLAP: merge master into branch
(Sergey Shelukhin)
HIVE-11656 : LLAP: merge master into branch (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2b02e935
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2b02e935
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2b02e935
Branch: refs/heads/llap
Commit: 2b02e93572e511400822b1874b36558f0bbda603
Parents: 0249d64 bb7153f
Author: Sergey Shelukhin <se...@apache.org>
Authored: Wed Aug 26 11:37:12 2015 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Wed Aug 26 11:37:12 2015 -0700
----------------------------------------------------------------------
.../hive/ql/io/orc/TreeReaderFactory.java | 18 ++++------
.../hadoop/hive/ql/plan/ExprNodeDesc.java | 15 ++++----
.../apache/hadoop/hive/shims/Hadoop23Shims.java | 38 ++++++++++++++++++++
.../apache/hadoop/hive/shims/HadoopShims.java | 22 ++++++++++++
.../hadoop/hive/shims/HadoopShimsSecure.java | 32 +++++++++++++++++
5 files changed, 107 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/2b02e935/ql/src/java/org/apache/hadoop/hive/ql/io/orc/TreeReaderFactory.java
----------------------------------------------------------------------
diff --cc ql/src/java/org/apache/hadoop/hive/ql/io/orc/TreeReaderFactory.java
index 328e4e2,6d47532..4bcc621
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/TreeReaderFactory.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/TreeReaderFactory.java
@@@ -1488,8 -1486,9 +1490,9 @@@ public class TreeReaderFactory
* A reader for string columns that are direct encoded in the current
* stripe.
*/
- protected static class StringDirectTreeReader extends TreeReader {
+ public static class StringDirectTreeReader extends TreeReader {
protected InStream stream;
+ protected TextReaderShim data;
protected IntegerReader lengths;
private final LongColumnVector scratchlcv;
http://git-wip-us.apache.org/repos/asf/hive/blob/2b02e935/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
----------------------------------------------------------------------