Modified: hive/branches/spark/ql/src/test/results/clientpositive/join_nullsafe.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join_nullsafe.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/join_nullsafe.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/join_nullsafe.q.out Sun Aug 3 20:48:35 2014 @@ -1519,9 +1519,8 @@ STAGE PLANS: predicate: value is null (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: value (type: int) + key expressions: null (type: void) sort order: + - Map-reduce partition columns: value (type: int) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE value expressions: key (type: int) TableScan @@ -1531,9 +1530,8 @@ STAGE PLANS: predicate: key is null (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: key (type: int) + key expressions: null (type: void) sort order: + - Map-reduce partition columns: key (type: int) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE value expressions: value (type: int) Reduce Operator Tree: @@ -1541,13 +1539,13 @@ STAGE PLANS: condition map: Inner Join 0 to 1 condition expressions: - 0 {KEY.reducesinkkey0} {VALUE._col0} - 1 {VALUE._col0} {KEY.reducesinkkey0} + 0 {VALUE._col0} + 1 {VALUE._col0} nullSafes: [true] - outputColumnNames: _col0, _col1, _col4, _col5 + outputColumnNames: _col1, _col4 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: _col0 (type: int), _col1 (type: int), _col4 (type: int), _col5 (type: int) + expressions: null (type: void), _col1 (type: int), _col4 (type: int), null (type: void) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE File Output Operator
Modified: hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== Files hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out Sun Aug 3 20:48:35 2014 differ Modified: hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== Files hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out Sun Aug 3 20:48:35 2014 differ Modified: hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== Files hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out Sun Aug 3 20:48:35 2014 differ Modified: hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== Files hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out Sun Aug 3 20:48:35 2014 differ Modified: hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== Files hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out Sun Aug 3 20:48:35 2014 differ Modified: hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out Sun Aug 3 20:48:35 2014 @@ -199,10 +199,14 @@ STAGE PLANS: Stats-Aggr Operator Stage: Stage-3 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-6 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out Sun Aug 3 20:48:35 2014 @@ -173,10 +173,14 @@ STAGE PLANS: Stats-Aggr Operator Stage: Stage-3 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-6 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/metadataonly1.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/metadataonly1.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== Files hive/branches/spark/ql/src/test/results/clientpositive/metadataonly1.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/metadataonly1.q.out Sun Aug 3 20:48:35 2014 differ Modified: hive/branches/spark/ql/src/test/results/clientpositive/orc_createas1.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/orc_createas1.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/orc_createas1.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/orc_createas1.q.out Sun Aug 3 20:48:35 2014 @@ -110,28 +110,14 @@ STAGE PLANS: Stats-Aggr Operator Stage: Stage-3 - Map Reduce - Map Operator Tree: - TableScan - File Output Operator - compressed: false - table: - input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat - output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat - serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde - name: default.orc_createas1b + Merge Work + merge level: stripe + input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat Stage: Stage-5 - Map Reduce - Map Operator Tree: - TableScan - File Output Operator - compressed: false - table: - input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat - output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat - serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde - name: default.orc_createas1b + Merge Work + merge level: stripe + input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat Stage: Stage-6 Move Operator @@ -280,28 +266,14 @@ STAGE PLANS: Stats-Aggr Operator Stage: Stage-3 - Map Reduce - Map Operator Tree: - TableScan - File Output Operator - compressed: false - table: - input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat - output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat - serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde - name: default.orc_createas1c + Merge Work + merge level: stripe + input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat Stage: Stage-5 - Map Reduce - Map Operator Tree: - TableScan - File Output Operator - compressed: false - table: - input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat - output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat - serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde - name: default.orc_createas1c + Merge Work + merge level: stripe + input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat Stage: Stage-6 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/rcfile_createas1.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/rcfile_createas1.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/rcfile_createas1.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/rcfile_createas1.q.out Sun Aug 3 20:48:35 2014 @@ -110,10 +110,14 @@ STAGE PLANS: Stats-Aggr Operator Stage: Stage-3 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-6 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge1.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge1.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge1.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge1.q.out Sun Aug 3 20:48:35 2014 @@ -495,10 +495,14 @@ STAGE PLANS: Stats-Aggr Operator Stage: Stage-3 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-6 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge2.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge2.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge2.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge2.q.out Sun Aug 3 20:48:35 2014 @@ -80,10 +80,14 @@ STAGE PLANS: Stats-Aggr Operator Stage: Stage-3 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-6 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge3.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge3.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge3.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/rcfile_merge3.q.out Sun Aug 3 20:48:35 2014 @@ -105,10 +105,14 @@ STAGE PLANS: Stats-Aggr Operator Stage: Stage-3 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-6 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out Sun Aug 3 20:48:35 2014 @@ -219,14 +219,13 @@ STAGE PLANS: condition map: Inner Join 0 to 1 condition expressions: - 0 {key} + 0 1 keys: - 0 key (type: int) - 1 key (type: int) - outputColumnNames: _col0 + 0 5 (type: int) + 1 5 (type: int) Select Operator - expressions: _col0 (type: int) + expressions: 5 (type: int) outputColumnNames: _col0 Reduce Output Operator key expressions: _col0 (type: int) @@ -242,14 +241,13 @@ STAGE PLANS: condition map: Inner Join 0 to 1 condition expressions: - 0 {key} + 0 1 keys: - 0 key (type: int) - 1 key (type: int) - outputColumnNames: _col0 + 0 5 (type: int) + 1 5 (type: int) Select Operator - expressions: _col0 (type: int) + expressions: 5 (type: int) outputColumnNames: _col0 Reduce Output Operator key expressions: _col0 (type: int) @@ -266,7 +264,7 @@ STAGE PLANS: Filter Operator predicate: (_col1 = 5) (type: boolean) Select Operator - expressions: _col0 (type: int), _col1 (type: int) + expressions: _col0 (type: int), 5 (type: int) outputColumnNames: _col0, _col1 File Output Operator compressed: false Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/metadataonly1.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/metadataonly1.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== Files hive/branches/spark/ql/src/test/results/clientpositive/tez/metadataonly1.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/tez/metadataonly1.q.out Sun Aug 3 20:48:35 2014 differ Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_10.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_10.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_10.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_10.q.out Sun Aug 3 20:48:35 2014 @@ -186,10 +186,14 @@ STAGE PLANS: name: default.outputtbl1 Stage: Stage-3 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-6 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_11.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_11.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_11.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_11.q.out Sun Aug 3 20:48:35 2014 @@ -183,10 +183,14 @@ STAGE PLANS: name: default.outputtbl1 Stage: Stage-2 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-4 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_12.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_12.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_12.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_12.q.out Sun Aug 3 20:48:35 2014 @@ -117,10 +117,14 @@ STAGE PLANS: name: default.outputtbl1 Stage: Stage-2 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-4 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_13.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_13.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_13.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_13.q.out Sun Aug 3 20:48:35 2014 @@ -140,10 +140,14 @@ STAGE PLANS: name: default.outputtbl1 Stage: Stage-2 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-4 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_14.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_14.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_14.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_14.q.out Sun Aug 3 20:48:35 2014 @@ -119,10 +119,14 @@ STAGE PLANS: name: default.outputtbl1 Stage: Stage-2 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-4 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_16.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_16.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_16.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_16.q.out Sun Aug 3 20:48:35 2014 @@ -137,10 +137,14 @@ STAGE PLANS: name: default.outputtbl1 Stage: Stage-2 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-4 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 Move Operator Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_9.q.out URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_9.q.out?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_9.q.out (original) +++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_9.q.out Sun Aug 3 20:48:35 2014 @@ -147,10 +147,14 @@ STAGE PLANS: name: default.outputtbl1 Stage: Stage-2 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-4 - Block level merge + Merge Work + merge level: block + input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat Stage: Stage-5 Move Operator Modified: hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableHiveDecimalObjectInspector.java URL: http://svn.apache.org/viewvc/hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableHiveDecimalObjectInspector.java?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableHiveDecimalObjectInspector.java (original) +++ hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableHiveDecimalObjectInspector.java Sun Aug 3 20:48:35 2014 @@ -35,11 +35,17 @@ implements SettableHiveDecimalObjectInsp @Override public HiveDecimalWritable getPrimitiveWritableObject(Object o) { + if (o == null) { + return null; + } return enforcePrecisionScale(((HiveDecimalWritable) o)); } @Override public HiveDecimal getPrimitiveJavaObject(Object o) { + if (o == null) { + return null; + } return enforcePrecisionScale(((HiveDecimalWritable)o).getHiveDecimal()); } Modified: hive/branches/spark/service/src/java/org/apache/hive/service/cli/CLIService.java URL: http://svn.apache.org/viewvc/hive/branches/spark/service/src/java/org/apache/hive/service/cli/CLIService.java?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/service/src/java/org/apache/hive/service/cli/CLIService.java (original) +++ hive/branches/spark/service/src/java/org/apache/hive/service/cli/CLIService.java Sun Aug 3 20:48:35 2014 @@ -46,6 +46,7 @@ import org.apache.hive.service.Composite import org.apache.hive.service.ServiceException; import org.apache.hive.service.auth.HiveAuthFactory; import org.apache.hive.service.cli.operation.Operation; +import org.apache.hive.service.cli.session.HiveSession; import org.apache.hive.service.cli.session.SessionManager; import org.apache.hive.service.cli.thrift.TProtocolVersion; @@ -149,17 +150,41 @@ public class CLIService extends Composit super.stop(); } + /** + * @deprecated Use {@link #openSession(TProtocolVersion, String, String, String, Map)} + */ + @Deprecated public SessionHandle openSession(TProtocolVersion protocol, String username, String password, Map<String, String> configuration) throws HiveSQLException { - SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, configuration, false, null); + SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, null, configuration, false, null); LOG.debug(sessionHandle + ": openSession()"); return sessionHandle; } + /** + * @deprecated Use {@link #openSessionWithImpersonation(TProtocolVersion, String, String, String, Map, String)} + */ + @Deprecated public SessionHandle openSessionWithImpersonation(TProtocolVersion protocol, String username, String password, Map<String, String> configuration, String delegationToken) throws HiveSQLException { - SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, configuration, + SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, null, configuration, + true, delegationToken); + LOG.debug(sessionHandle + ": openSession()"); + return sessionHandle; + } + + public SessionHandle openSession(TProtocolVersion protocol, String username, String password, String ipAddress, + Map<String, String> configuration) throws HiveSQLException { + SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, ipAddress, configuration, false, null); + LOG.debug(sessionHandle + ": openSession()"); + return sessionHandle; + } + + public SessionHandle openSessionWithImpersonation(TProtocolVersion protocol, String username, + String password, String ipAddress, Map<String, String> configuration, String delegationToken) + throws HiveSQLException { + SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, ipAddress, configuration, true, delegationToken); LOG.debug(sessionHandle + ": openSession()"); return sessionHandle; @@ -171,7 +196,7 @@ public class CLIService extends Composit @Override public SessionHandle openSession(String username, String password, Map<String, String> configuration) throws HiveSQLException { - SessionHandle sessionHandle = sessionManager.openSession(SERVER_VERSION, username, password, configuration, false, null); + SessionHandle sessionHandle = sessionManager.openSession(SERVER_VERSION, username, password, null, configuration, false, null); LOG.debug(sessionHandle + ": openSession()"); return sessionHandle; } @@ -182,7 +207,7 @@ public class CLIService extends Composit @Override public SessionHandle openSessionWithImpersonation(String username, String password, Map<String, String> configuration, String delegationToken) throws HiveSQLException { - SessionHandle sessionHandle = sessionManager.openSession(SERVER_VERSION, username, password, configuration, + SessionHandle sessionHandle = sessionManager.openSession(SERVER_VERSION, username, password, null, configuration, true, delegationToken); LOG.debug(sessionHandle + ": openSession()"); return sessionHandle; Modified: hive/branches/spark/service/src/java/org/apache/hive/service/cli/session/SessionManager.java URL: http://svn.apache.org/viewvc/hive/branches/spark/service/src/java/org/apache/hive/service/cli/session/SessionManager.java?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/service/src/java/org/apache/hive/service/cli/session/SessionManager.java (original) +++ hive/branches/spark/service/src/java/org/apache/hive/service/cli/session/SessionManager.java Sun Aug 3 20:48:35 2014 @@ -112,23 +112,22 @@ public class SessionManager extends Comp } } - public SessionHandle openSession(TProtocolVersion protocol, String username, String password, + public SessionHandle openSession(TProtocolVersion protocol, String username, String password, String ipAddress, Map<String, String> sessionConf) throws HiveSQLException { - return openSession(protocol, username, password, sessionConf, false, null); + return openSession(protocol, username, password, ipAddress, sessionConf, false, null); } - public SessionHandle openSession(TProtocolVersion protocol, String username, String password, + public SessionHandle openSession(TProtocolVersion protocol, String username, String password, String ipAddress, Map<String, String> sessionConf, boolean withImpersonation, String delegationToken) throws HiveSQLException { HiveSession session; if (withImpersonation) { HiveSessionImplwithUGI hiveSessionUgi = new HiveSessionImplwithUGI(protocol, username, password, - hiveConf, TSetIpAddressProcessor.getUserIpAddress(), delegationToken); + hiveConf, ipAddress, delegationToken); session = HiveSessionProxy.getProxy(hiveSessionUgi, hiveSessionUgi.getSessionUgi()); hiveSessionUgi.setProxySession(session); } else { - session = new HiveSessionImpl(protocol, username, password, hiveConf, - TSetIpAddressProcessor.getUserIpAddress()); + session = new HiveSessionImpl(protocol, username, password, hiveConf, ipAddress); } session.setSessionManager(this); session.setOperationManager(operationManager); Modified: hive/branches/spark/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java URL: http://svn.apache.org/viewvc/hive/branches/spark/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java?rev=1615452&r1=1615451&r2=1615452&view=diff ============================================================================== --- hive/branches/spark/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java (original) +++ hive/branches/spark/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java Sun Aug 3 20:48:35 2014 @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; +import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hive.service.AbstractService; import org.apache.hive.service.auth.HiveAuthFactory; import org.apache.hive.service.auth.TSetIpAddressProcessor; @@ -256,6 +257,7 @@ public abstract class ThriftCLIService e SessionHandle getSessionHandle(TOpenSessionReq req, TOpenSessionResp res) throws HiveSQLException, LoginException, IOException { String userName = getUserName(req); + String ipAddress = getIpAddress(); TProtocolVersion protocol = getMinVersion(CLIService.SERVER_VERSION, req.getClient_protocol()); SessionHandle sessionHandle; @@ -263,10 +265,10 @@ public abstract class ThriftCLIService e (userName != null)) { String delegationTokenStr = getDelegationToken(userName); sessionHandle = cliService.openSessionWithImpersonation(protocol, userName, - req.getPassword(), req.getConfiguration(), delegationTokenStr); + req.getPassword(), ipAddress, req.getConfiguration(), delegationTokenStr); } else { sessionHandle = cliService.openSession(protocol, userName, req.getPassword(), - req.getConfiguration()); + ipAddress, req.getConfiguration()); } res.setServerProtocolVersion(protocol); return sessionHandle;
