hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject [49/50] [abbrv] hive git commit: HIVE-10998 : LLAP: merge master into branch (Sergey Shelukhin)
Date Sat, 13 Jun 2015 01:28:47 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/test/results/clientpositive/tez/vector_outer_join3.q.out
----------------------------------------------------------------------
diff --cc ql/src/test/results/clientpositive/tez/vector_outer_join3.q.out
index 4351cda,b5619a0..5187a4d
--- a/ql/src/test/results/clientpositive/tez/vector_outer_join3.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_outer_join3.q.out
@@@ -118,11 -118,11 +118,11 @@@ STAGE PLANS
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 40 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cint (type: int), cstring1 (type: string)
                      outputColumnNames: _col0, _col1
-                     Statistics: Num rows: 40 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Map Join Operator
                        condition map:
                             Left Outer Join0 to 1
@@@ -132,7 -132,7 +132,7 @@@
                        outputColumnNames: _col1
                        input vertices:
                          1 Map 3
-                       Statistics: Num rows: 1150 Data size: 4603 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column
stats: NONE
                        HybridGraceHashJoin: true
                        Map Join Operator
                          condition map:
@@@ -142,7 -142,7 +142,7 @@@
                            1 _col0 (type: string)
                          input vertices:
                            1 Map 4
-                         Statistics: Num rows: 1265 Data size: 5063 Basic stats: COMPLETE
Column stats: NONE
 -                        Statistics: Num rows: 17 Data size: 4578 Basic stats: COMPLETE Column
stats: NONE
++                        Statistics: Num rows: 17 Data size: 4583 Basic stats: COMPLETE Column
stats: NONE
                          HybridGraceHashJoin: true
                          Group By Operator
                            aggregations: count()
@@@ -158,34 -158,33 +158,34 @@@
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cint (type: int)
                      outputColumnNames: _col0
-                     Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Reduce Output Operator
                        key expressions: _col0 (type: int)
                        sort order: +
                        Map-reduce partition columns: _col0 (type: int)
-                       Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
              Execution mode: vectorized
          Map 4 
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cstring1 (type: string)
                      outputColumnNames: _col0
-                     Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Reduce Output Operator
                        key expressions: _col0 (type: string)
                        sort order: +
                        Map-reduce partition columns: _col0 (type: string)
-                       Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
              Execution mode: vectorized
          Reducer 2 
 +            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -265,11 -265,11 +265,11 @@@ STAGE PLANS
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 20 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cstring1 (type: string), cstring2 (type: string)
                      outputColumnNames: _col0, _col1
-                     Statistics: Num rows: 20 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Map Join Operator
                        condition map:
                             Left Outer Join0 to 1
@@@ -279,7 -279,7 +279,7 @@@
                        outputColumnNames: _col0
                        input vertices:
                          1 Map 3
-                       Statistics: Num rows: 45 Data size: 4603 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column
stats: NONE
                        HybridGraceHashJoin: true
                        Map Join Operator
                          condition map:
@@@ -289,7 -289,7 +289,7 @@@
                            1 _col0 (type: string)
                          input vertices:
                            1 Map 4
-                         Statistics: Num rows: 49 Data size: 5063 Basic stats: COMPLETE Column
stats: NONE
 -                        Statistics: Num rows: 17 Data size: 4578 Basic stats: COMPLETE Column
stats: NONE
++                        Statistics: Num rows: 17 Data size: 4583 Basic stats: COMPLETE Column
stats: NONE
                          HybridGraceHashJoin: true
                          Group By Operator
                            aggregations: count()
@@@ -305,34 -305,33 +305,34 @@@
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cstring2 (type: string)
                      outputColumnNames: _col0
-                     Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Reduce Output Operator
                        key expressions: _col0 (type: string)
                        sort order: +
                        Map-reduce partition columns: _col0 (type: string)
-                       Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
              Execution mode: vectorized
          Map 4 
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cstring1 (type: string)
                      outputColumnNames: _col0
-                     Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Reduce Output Operator
                        key expressions: _col0 (type: string)
                        sort order: +
                        Map-reduce partition columns: _col0 (type: string)
-                       Statistics: Num rows: 41 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
              Execution mode: vectorized
          Reducer 2 
 +            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -412,11 -412,11 +412,11 @@@ STAGE PLANS
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 19 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cint (type: int), cbigint (type: bigint), cstring1 (type:
string), cstring2 (type: string)
                      outputColumnNames: _col0, _col1, _col2, _col3
-                     Statistics: Num rows: 19 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Map Join Operator
                        condition map:
                             Left Outer Join0 to 1
@@@ -426,7 -426,7 +426,7 @@@
                        outputColumnNames: _col0, _col2
                        input vertices:
                          1 Map 3
-                       Statistics: Num rows: 41 Data size: 4603 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column
stats: NONE
                        HybridGraceHashJoin: true
                        Map Join Operator
                          condition map:
@@@ -436,7 -436,7 +436,7 @@@
                            1 _col1 (type: string), _col0 (type: int)
                          input vertices:
                            1 Map 4
-                         Statistics: Num rows: 45 Data size: 5063 Basic stats: COMPLETE Column
stats: NONE
 -                        Statistics: Num rows: 17 Data size: 4578 Basic stats: COMPLETE Column
stats: NONE
++                        Statistics: Num rows: 17 Data size: 4583 Basic stats: COMPLETE Column
stats: NONE
                          HybridGraceHashJoin: true
                          Group By Operator
                            aggregations: count()
@@@ -452,34 -452,33 +452,34 @@@
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 38 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cbigint (type: bigint), cstring2 (type: string)
                      outputColumnNames: _col0, _col1
-                     Statistics: Num rows: 38 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Reduce Output Operator
                        key expressions: _col1 (type: string), _col0 (type: bigint)
                        sort order: ++
                        Map-reduce partition columns: _col1 (type: string), _col0 (type: bigint)
-                       Statistics: Num rows: 38 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
              Execution mode: vectorized
          Map 4 
              Map Operator Tree:
                  TableScan
                    alias: c
-                   Statistics: Num rows: 40 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                  Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                  Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                    Select Operator
                      expressions: cint (type: int), cstring1 (type: string)
                      outputColumnNames: _col0, _col1
-                     Statistics: Num rows: 40 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                    Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                    Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
                      Reduce Output Operator
                        key expressions: _col1 (type: string), _col0 (type: int)
                        sort order: ++
                        Map-reduce partition columns: _col1 (type: string), _col0 (type: int)
-                       Statistics: Num rows: 40 Data size: 4185 Basic stats: COMPLETE Column
stats: NONE
 -                      Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column
stats: NONE
++                      Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column
stats: NONE
              Execution mode: vectorized
          Reducer 2 
 +            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)

http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/test/results/clientpositive/tez/vector_outer_join4.q.out
----------------------------------------------------------------------
diff --cc ql/src/test/results/clientpositive/tez/vector_outer_join4.q.out
index 87367eb,2c9a9cd..5e49ef7
--- a/ql/src/test/results/clientpositive/tez/vector_outer_join4.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_outer_join4.q.out
@@@ -813,10 -813,9 +813,10 @@@ STAGE PLANS
                        key expressions: _col0 (type: tinyint)
                        sort order: +
                        Map-reduce partition columns: _col0 (type: tinyint)
-                       Statistics: Num rows: 996 Data size: 3987 Basic stats: COMPLETE Column
stats: NONE
+                       Statistics: Num rows: 30 Data size: 5922 Basic stats: COMPLETE Column
stats: NONE
              Execution mode: vectorized
          Reducer 2 
 +            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)

http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java
----------------------------------------------------------------------
diff --cc service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java
index e0a01b5,56af643..5f786d2
--- a/service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java
+++ b/service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java
@@@ -41,22 -39,11 +40,12 @@@ import org.apache.hive.service.cli.thri
   */
  public class HiveSessionImplwithUGI extends HiveSessionImpl {
    public static final String HS2TOKEN = "HiveServer2ImpersonationToken";
 +  static final Log LOG = LogFactory.getLog(HiveSessionImplwithUGI.class);
  
-   // Shared between threads.
    private UserGroupInformation sessionUgi = null;
    private String delegationTokenStr = null;
    private HiveSession proxySession = null;
 -  static final Log LOG = LogFactory.getLog(HiveSessionImplwithUGI.class);
 +
-   // Has to be private per thread due to thread safety issues.
-   private static class ThreadLocalState {
-     public Hive sessionHive;
-   }
- 
-   private final ThreadLocal<ThreadLocalState> threadLocalState =
-       new ThreadLocal<ThreadLocalState>() {
-         protected ThreadLocalState initialValue() { return new ThreadLocalState(); }
-       };
  
    public HiveSessionImplwithUGI(TProtocolVersion protocol, String username, String password,
        HiveConf hiveConf, String ipAddress, String delegationToken) throws HiveSQLException
{

http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
----------------------------------------------------------------------


Mime
View raw message