diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 83d09c0..e49d2d7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -64,6 +64,7 @@ import org.apache.hadoop.hive.ql.exec.ColumnInfo; import org.apache.hadoop.hive.ql.exec.FetchTask; import org.apache.hadoop.hive.ql.exec.FileSinkOperator; +import org.apache.hadoop.hive.ql.exec.FilterOperator; import org.apache.hadoop.hive.ql.exec.FunctionInfo; import org.apache.hadoop.hive.ql.exec.FunctionRegistry; import org.apache.hadoop.hive.ql.exec.GroupByOperator; @@ -2368,6 +2369,16 @@ private Operator genNotNullFilterForJoinSourcePlan(QB qb, Operator input, OpParseContext inputCtx = opParseCtx.get(input); RowResolver inputRR = inputCtx.getRowResolver(); + if (input instanceof FilterOperator) { + FilterOperator f = (FilterOperator) input; + List preds = new ArrayList(); + preds.add(f.getConf().getPredicate()); + preds.add(filterPred); + f.getConf().setPredicate(ExprNodeDescUtils.mergePredicates(preds)); + + return input; + } + Operator output = putOpInsertMap(OperatorFactory.getAndMakeChild( new FilterDesc(filterPred, false), new RowSchema(inputRR.getColumnInfos()), input), inputRR); diff --git ql/src/test/results/clientpositive/auto_join11.q.out ql/src/test/results/clientpositive/auto_join11.q.out index 1cb2cce..6798df6 100644 --- ql/src/test/results/clientpositive/auto_join11.q.out +++ ql/src/test/results/clientpositive/auto_join11.q.out @@ -53,12 +53,12 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: ((key < 100) and key is not null) (type: boolean) + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -69,11 +69,11 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) outputColumnNames: _col0, _col3 - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col3 - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: sum(hash(_col0,_col3)) mode: hash diff --git ql/src/test/results/clientpositive/auto_join12.q.out ql/src/test/results/clientpositive/auto_join12.q.out index 6c5208e..174ca0a 100644 --- ql/src/test/results/clientpositive/auto_join12.q.out +++ ql/src/test/results/clientpositive/auto_join12.q.out @@ -41,12 +41,12 @@ STAGE PLANS: alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 100) and key is not null) (type: boolean) - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 80) and key is not null) and (key < 100)) (type: boolean) + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator condition expressions: 0 @@ -61,12 +61,12 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 100) and key is not null) and (key < 80)) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator condition expressions: 0 @@ -84,12 +84,12 @@ STAGE PLANS: alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 80) and key is not null) (type: boolean) - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 100) and key is not null) and (key < 80)) (type: boolean) + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -103,11 +103,11 @@ STAGE PLANS: 1 _col0 (type: string) 2 _col0 (type: string) outputColumnNames: _col0, _col3 - Statistics: Num rows: 33 Data size: 6613 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 660 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col3 - Statistics: Num rows: 33 Data size: 6613 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 660 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: sum(hash(_col0,_col3)) mode: hash diff --git ql/src/test/results/clientpositive/auto_join13.q.out ql/src/test/results/clientpositive/auto_join13.q.out index 00ce62f..0634692 100644 --- ql/src/test/results/clientpositive/auto_join13.q.out +++ ql/src/test/results/clientpositive/auto_join13.q.out @@ -80,12 +80,12 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: ((key < 100) and key is not null) (type: boolean) + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -96,10 +96,10 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) outputColumnNames: _col0, _col2, _col3 - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (_col0 + _col2) is not null (type: boolean) - Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 601 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 diff --git ql/src/test/results/clientpositive/auto_join14.q.out ql/src/test/results/clientpositive/auto_join14.q.out index f5a110a..2ba47e9 100644 --- ql/src/test/results/clientpositive/auto_join14.q.out +++ ql/src/test/results/clientpositive/auto_join14.q.out @@ -53,8 +53,8 @@ STAGE PLANS: alias: srcpart Statistics: Num rows: 58 Data size: 11624 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE + predicate: ((key > 100) and key is not null) (type: boolean) + Statistics: Num rows: 10 Data size: 2004 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -65,14 +65,14 @@ STAGE PLANS: 0 key (type: string) 1 key (type: string) outputColumnNames: _col0, _col5 - Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(_col0) (type: int), _col5 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/auto_join16.q.out ql/src/test/results/clientpositive/auto_join16.q.out index 32965bf..890ab07 100644 --- ql/src/test/results/clientpositive/auto_join16.q.out +++ ql/src/test/results/clientpositive/auto_join16.q.out @@ -53,8 +53,8 @@ STAGE PLANS: alias: tab Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key is not null and value is not null) and (value < 200)) (type: boolean) - Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE + predicate: ((((key > 20) and key is not null) and value is not null) and (value < 200)) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -65,11 +65,11 @@ STAGE PLANS: 0 _col0 (type: string), _col1 (type: string) 1 key (type: string), value (type: string) outputColumnNames: _col0, _col3 - Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col3 - Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: sum(hash(_col0,_col3)) mode: hash diff --git ql/src/test/results/clientpositive/auto_join27.q.out ql/src/test/results/clientpositive/auto_join27.q.out index 27d8328..bf1f06f 100644 --- ql/src/test/results/clientpositive/auto_join27.q.out +++ ql/src/test/results/clientpositive/auto_join27.q.out @@ -37,32 +37,32 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: ((key < 200) and key is not null) (type: boolean) + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: key, value - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: key (type: string), value (type: string) mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Map-reduce partition columns: _col0 (type: string), _col1 (type: string) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 7 Data size: 1402 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string) outputColumnNames: _col0 - Statistics: Num rows: 7 Data size: 1402 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -101,7 +101,7 @@ STAGE PLANS: Map Operator Tree: TableScan Union - Statistics: Num rows: 36 Data size: 4308 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 12 Data size: 1402 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -111,9 +111,9 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - Statistics: Num rows: 39 Data size: 4738 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 13 Data size: 1542 Basic stats: COMPLETE Column stats: NONE Select Operator - Statistics: Num rows: 39 Data size: 4738 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 13 Data size: 1542 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(1) mode: hash @@ -129,14 +129,14 @@ STAGE PLANS: alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 29 Data size: 2906 Basic stats: COMPLETE Column stats: NONE + predicate: ((key < 200) and key is not null) (type: boolean) + Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 29 Data size: 2906 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Union - Statistics: Num rows: 36 Data size: 4308 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 12 Data size: 1402 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -146,9 +146,9 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - Statistics: Num rows: 39 Data size: 4738 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 13 Data size: 1542 Basic stats: COMPLETE Column stats: NONE Select Operator - Statistics: Num rows: 39 Data size: 4738 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 13 Data size: 1542 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(1) mode: hash diff --git ql/src/test/results/clientpositive/auto_join29.q.out ql/src/test/results/clientpositive/auto_join29.q.out index ec76217..e2e0dcd 100644 --- ql/src/test/results/clientpositive/auto_join29.q.out +++ ql/src/test/results/clientpositive/auto_join29.q.out @@ -3551,8 +3551,8 @@ STAGE PLANS: alias: src1 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and key is not null) (type: boolean) - Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key > 10) and key is not null) and (key < 10)) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator condition expressions: 0 {value} @@ -3567,8 +3567,8 @@ STAGE PLANS: alias: src2 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key > 10) and key is not null) (type: boolean) - Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 10) and key is not null) and (key > 10)) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator condition expressions: 0 {value} @@ -3586,8 +3586,8 @@ STAGE PLANS: alias: src3 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and key is not null) (type: boolean) - Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key > 10) and key is not null) and (key < 10)) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -3601,25 +3601,25 @@ STAGE PLANS: 1 key (type: string) 2 key (type: string) outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9 - Statistics: Num rows: 11 Data size: 2204 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 - Statistics: Num rows: 11 Data size: 2204 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string) sort order: ++++++ - Statistics: Num rows: 11 Data size: 2204 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE Local Work: Map Reduce Local Work Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), KEY.reducesinkkey2 (type: string), KEY.reducesinkkey3 (type: string), KEY.reducesinkkey4 (type: string), KEY.reducesinkkey5 (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 - Statistics: Num rows: 11 Data size: 2204 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 11 Data size: 2204 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/filter_join_breaktask.q.out ql/src/test/results/clientpositive/filter_join_breaktask.q.out index b379f86..d46e30a 100644 --- ql/src/test/results/clientpositive/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/filter_join_breaktask.q.out @@ -263,7 +263,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: value is not null (type: boolean) + predicate: ((value <> '') and value is not null) (type: boolean) Statistics: Num rows: 13 Data size: 109 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: value (type: string) diff --git ql/src/test/results/clientpositive/join11.q.out ql/src/test/results/clientpositive/join11.q.out index abdc863..1fed058 100644 --- ql/src/test/results/clientpositive/join11.q.out +++ ql/src/test/results/clientpositive/join11.q.out @@ -26,17 +26,17 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: ((key < 100) and key is not null) (type: boolean) + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 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: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src @@ -61,14 +61,14 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} 1 {VALUE._col0} outputColumnNames: _col0, _col3 - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/join12.q.out ql/src/test/results/clientpositive/join12.q.out index 0a3d642..5ef9a95 100644 --- ql/src/test/results/clientpositive/join12.q.out +++ ql/src/test/results/clientpositive/join12.q.out @@ -32,48 +32,48 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 100) and key is not null) and (key < 80)) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 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: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 100) and key is not null) (type: boolean) - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 80) and key is not null) and (key < 100)) (type: boolean) + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 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: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE TableScan alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 80) and key is not null) (type: boolean) - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 100) and key is not null) and (key < 80)) (type: boolean) + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 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: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Join Operator condition map: @@ -84,14 +84,14 @@ STAGE PLANS: 1 {VALUE._col0} 2 outputColumnNames: _col0, _col3 - Statistics: Num rows: 33 Data size: 6613 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 660 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 33 Data size: 6613 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 660 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 33 Data size: 6613 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 660 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/join13.q.out ql/src/test/results/clientpositive/join13.q.out index 432c1e6..de8c729 100644 --- ql/src/test/results/clientpositive/join13.q.out +++ ql/src/test/results/clientpositive/join13.q.out @@ -33,17 +33,17 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: ((key < 100) and key is not null) (type: boolean) + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 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: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src @@ -68,10 +68,10 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} 1 {KEY.reducesinkkey0} {VALUE._col0} outputColumnNames: _col0, _col2, _col3 - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (_col0 + _col2) is not null (type: boolean) - Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 601 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -87,7 +87,7 @@ STAGE PLANS: key expressions: (_col0 + _col2) (type: double) sort order: + Map-reduce partition columns: (_col0 + _col2) (type: double) - Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 601 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string), _col3 (type: string) TableScan alias: src diff --git ql/src/test/results/clientpositive/join14.q.out ql/src/test/results/clientpositive/join14.q.out index b37ae6b..3986123 100644 --- ql/src/test/results/clientpositive/join14.q.out +++ ql/src/test/results/clientpositive/join14.q.out @@ -30,13 +30,13 @@ STAGE PLANS: alias: srcpart Statistics: Num rows: 58 Data size: 11624 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE + predicate: ((key > 100) and key is not null) (type: boolean) + Statistics: Num rows: 10 Data size: 2004 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) sort order: + Map-reduce partition columns: key (type: string) - Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2004 Basic stats: COMPLETE Column stats: NONE value expressions: value (type: string) TableScan alias: src @@ -57,14 +57,14 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} 1 {VALUE._col0} outputColumnNames: _col0, _col5 - Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(_col0) (type: int), _col5 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/join16.q.out ql/src/test/results/clientpositive/join16.q.out index 725cd08..bf2a773 100644 --- ql/src/test/results/clientpositive/join16.q.out +++ ql/src/test/results/clientpositive/join16.q.out @@ -29,13 +29,13 @@ STAGE PLANS: alias: tab Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key is not null and value is not null) and (value < 200)) (type: boolean) - Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE + predicate: ((((key > 20) and key is not null) and value is not null) and (value < 200)) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string), value (type: string) sort order: ++ Map-reduce partition columns: key (type: string), value (type: string) - Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Join Operator condition map: @@ -44,14 +44,14 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} 1 {KEY.reducesinkkey1} outputColumnNames: _col0, _col3 - Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 440 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/join_alt_syntax.q.out ql/src/test/results/clientpositive/join_alt_syntax.q.out index 583343c..a42edd8 100644 --- ql/src/test/results/clientpositive/join_alt_syntax.q.out +++ ql/src/test/results/clientpositive/join_alt_syntax.q.out @@ -306,8 +306,8 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col11, _col12 Statistics: Num rows: 33 Data size: 3490 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col11 + _col0) = _col0) (type: boolean) - Statistics: Num rows: 16 Data size: 1692 Basic stats: COMPLETE Column stats: NONE + predicate: (((_col11 + _col0) = _col0) and _col12 is not null) (type: boolean) + Statistics: Num rows: 8 Data size: 846 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -334,7 +334,7 @@ STAGE PLANS: key expressions: _col12 (type: string) sort order: + Map-reduce partition columns: _col12 (type: string) - Statistics: Num rows: 16 Data size: 1692 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 8 Data size: 846 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: int), _col1 (type: string), _col11 (type: int) Reduce Operator Tree: Join Operator @@ -344,17 +344,17 @@ STAGE PLANS: 0 {VALUE._col0} {VALUE._col1} {VALUE._col11} {KEY.reducesinkkey0} 1 {KEY.reducesinkkey0} outputColumnNames: _col0, _col1, _col11, _col12, _col23 - Statistics: Num rows: 17 Data size: 1861 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 17 Data size: 1800 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((_col11 + _col0) = _col0) and (_col23 = _col12)) (type: boolean) - Statistics: Num rows: 4 Data size: 437 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 4 Data size: 423 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: string), _col12 (type: string), _col23 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 4 Data size: 437 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 4 Data size: 423 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 4 Data size: 437 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 4 Data size: 423 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out index 7892eb8..b55c102 100644 --- ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out +++ ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out @@ -240,8 +240,8 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19 Statistics: Num rows: 5 Data size: 3490 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col11 + _col0) = _col0) (type: boolean) - Statistics: Num rows: 2 Data size: 1396 Basic stats: COMPLETE Column stats: NONE + predicate: (((_col11 + _col0) = _col0) and _col12 is not null) (type: boolean) + Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -269,7 +269,7 @@ STAGE PLANS: key expressions: _col12 (type: string) sort order: + Map-reduce partition columns: _col12 (type: string) - Statistics: Num rows: 2 Data size: 1396 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string) Reduce Operator Tree: Join Operator diff --git ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out index 086d145..e31f3fb 100644 --- ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out +++ ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out @@ -252,8 +252,8 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19 Statistics: Num rows: 5 Data size: 3490 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col11 + _col0) = _col0) (type: boolean) - Statistics: Num rows: 2 Data size: 1396 Basic stats: COMPLETE Column stats: NONE + predicate: (((_col11 + _col0) = _col0) and _col12 is not null) (type: boolean) + Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -281,7 +281,7 @@ STAGE PLANS: key expressions: _col12 (type: string) sort order: + Map-reduce partition columns: _col12 (type: string) - Statistics: Num rows: 2 Data size: 1396 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string) Reduce Operator Tree: Join Operator diff --git ql/src/test/results/clientpositive/join_cond_pushdown_unqual1.q.out ql/src/test/results/clientpositive/join_cond_pushdown_unqual1.q.out index 8c0da3d..ea39263 100644 --- ql/src/test/results/clientpositive/join_cond_pushdown_unqual1.q.out +++ ql/src/test/results/clientpositive/join_cond_pushdown_unqual1.q.out @@ -294,8 +294,8 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19 Statistics: Num rows: 5 Data size: 3490 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col11 + _col0) = _col0) (type: boolean) - Statistics: Num rows: 2 Data size: 1396 Basic stats: COMPLETE Column stats: NONE + predicate: (((_col11 + _col0) = _col0) and _col12 is not null) (type: boolean) + Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -323,7 +323,7 @@ STAGE PLANS: key expressions: _col12 (type: string) sort order: + Map-reduce partition columns: _col12 (type: string) - Statistics: Num rows: 2 Data size: 1396 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string) Reduce Operator Tree: Join Operator @@ -333,14 +333,14 @@ STAGE PLANS: 0 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7} {VALUE._col8} {VALUE._col11} {KEY.reducesinkkey0} {VALUE._col12} {VALUE._col13} {VALUE._col14} {VALUE._col15} {VALUE._col16} {VALUE._col17} {VALUE._col18} 1 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7} outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30 - Statistics: Num rows: 2 Data size: 1535 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 767 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col12 (type: string), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string), _col22 (type: int), _col23 (type: string), _col24 (type: string), _col25 (type: string), _col26 (type: string), _col27 (type: int), _col28 (type: string), _col29 (type: double), _col30 (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26 - Statistics: Num rows: 2 Data size: 1535 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 767 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 1535 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 767 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/join_cond_pushdown_unqual3.q.out ql/src/test/results/clientpositive/join_cond_pushdown_unqual3.q.out index 82f5474..8155a31 100644 --- ql/src/test/results/clientpositive/join_cond_pushdown_unqual3.q.out +++ ql/src/test/results/clientpositive/join_cond_pushdown_unqual3.q.out @@ -306,8 +306,8 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19 Statistics: Num rows: 5 Data size: 3490 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col11 + _col0) = _col0) (type: boolean) - Statistics: Num rows: 2 Data size: 1396 Basic stats: COMPLETE Column stats: NONE + predicate: (((_col11 + _col0) = _col0) and _col12 is not null) (type: boolean) + Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -335,7 +335,7 @@ STAGE PLANS: key expressions: _col12 (type: string) sort order: + Map-reduce partition columns: _col12 (type: string) - Statistics: Num rows: 2 Data size: 1396 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string) Reduce Operator Tree: Join Operator @@ -345,7 +345,7 @@ STAGE PLANS: 0 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7} {VALUE._col8} {VALUE._col11} {KEY.reducesinkkey0} {VALUE._col12} {VALUE._col13} {VALUE._col14} {VALUE._col15} {VALUE._col16} {VALUE._col17} {VALUE._col18} 1 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7} outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30 - Statistics: Num rows: 2 Data size: 1535 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 767 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((_col11 + _col0) = _col0) and (_col23 = _col12)) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE diff --git ql/src/test/results/clientpositive/ppd_gby_join.q.out ql/src/test/results/clientpositive/ppd_gby_join.q.out index d00c591..94f497a 100644 --- ql/src/test/results/clientpositive/ppd_gby_join.q.out +++ ql/src/test/results/clientpositive/ppd_gby_join.q.out @@ -31,20 +31,20 @@ STAGE PLANS: alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key > '2') and key is not null) and (key <> '4')) and (key > '20')) (type: boolean) - Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE + predicate: (((((key > '2') and (key < '400')) and key is not null) and (key <> '4')) and (key > '20')) (type: boolean) + Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: _col0 is not null (type: boolean) - Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE Column stats: NONE + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE TableScan alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE @@ -56,7 +56,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator - predicate: (_col0 is not null and (_col0 < '400')) (type: boolean) + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) @@ -72,7 +72,7 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} {VALUE._col0} 1 {KEY.reducesinkkey0} outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 220 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: ((((_col0 > '20') and ((_col1 < 'val_50') or (_col0 > '2'))) and ((_col2 > '50') or (_col0 < '50'))) and (_col2 <> '4')) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE @@ -161,17 +161,17 @@ STAGE PLANS: alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key > '2') and key is not null) and (key <> '4')) and (key > '20')) (type: boolean) - Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE + predicate: (((((key > '2') and (key < '400')) and key is not null) and (key <> '4')) and (key > '20')) (type: boolean) + Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 100 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: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE TableScan alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE @@ -196,7 +196,7 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} {VALUE._col0} 1 {KEY.reducesinkkey0} outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 330 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 110 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((((_col0 > '20') and ((_col1 < 'val_50') or (_col0 > '2'))) and ((_col2 > '50') or (_col0 < '50'))) and (_col2 <> '4')) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE diff --git ql/src/test/results/clientpositive/ppd_join.q.out ql/src/test/results/clientpositive/ppd_join.q.out index 400de16..a67a974 100644 --- ql/src/test/results/clientpositive/ppd_join.q.out +++ ql/src/test/results/clientpositive/ppd_join.q.out @@ -28,20 +28,20 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key > '2') and key is not null) and (key <> '4')) and (key > '20')) (type: boolean) - Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE + predicate: (((((key > '2') and (key < '400')) and key is not null) and (key <> '4')) and (key > '20')) (type: boolean) + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator - predicate: _col0 is not null (type: boolean) - Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src @@ -54,7 +54,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator - predicate: (_col0 is not null and (_col0 < '400')) (type: boolean) + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) @@ -70,7 +70,7 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} {VALUE._col0} 1 {KEY.reducesinkkey0} {VALUE._col0} outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: ((((_col0 > '20') and ((_col1 < 'val_50') or (_col0 > '2'))) and ((_col2 > '50') or (_col0 < '50'))) and (_col2 <> '4')) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE @@ -560,17 +560,17 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key > '2') and key is not null) and (key <> '4')) and (key > '20')) (type: boolean) - Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE + predicate: (((((key > '2') and (key < '400')) and key is not null) and (key <> '4')) and (key > '20')) (type: boolean) + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src @@ -596,7 +596,7 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} {VALUE._col0} 1 {KEY.reducesinkkey0} {VALUE._col0} outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: ((((_col0 > '20') and ((_col1 < 'val_50') or (_col0 > '2'))) and ((_col2 > '50') or (_col0 < '50'))) and (_col2 <> '4')) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE diff --git ql/src/test/results/clientpositive/ppd_join2.q.out ql/src/test/results/clientpositive/ppd_join2.q.out index 88d4f22..d27f677 100644 --- ql/src/test/results/clientpositive/ppd_join2.q.out +++ ql/src/test/results/clientpositive/ppd_join2.q.out @@ -35,20 +35,20 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '305') and key is not null) and (key <> '14')) and (key <> '311')) (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: (((((key <> '305') and (key < '400')) and key is not null) and (key <> '14')) and (key <> '311')) (type: boolean) + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: _col0 is not null (type: boolean) - Statistics: Num rows: 8 Data size: 1603 Basic stats: COMPLETE Column stats: NONE + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) + Statistics: Num rows: 1 Data size: 200 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: 8 Data size: 1603 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src @@ -61,13 +61,13 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 4 Data size: 801 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (_col0 is not null and (_col0 < '400')) (type: boolean) - Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) + Statistics: Num rows: 1 Data size: 200 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: 0 Data size: 0 Basic stats: NONE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) Reduce Operator Tree: Join Operator @@ -77,10 +77,10 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} {VALUE._col0} 1 {KEY.reducesinkkey0} {VALUE._col0} outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: _col1 is not null (type: boolean) - Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -96,7 +96,7 @@ STAGE PLANS: key expressions: _col1 (type: string) sort order: + Map-reduce partition columns: _col1 (type: string) - Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string), _col2 (type: string), _col3 (type: string) TableScan alias: src @@ -1728,17 +1728,17 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '305') and key is not null) and (key <> '14')) and (key <> '311')) (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: (((((key <> '305') and (key < '400')) and key is not null) and (key <> '14')) and (key <> '311')) (type: boolean) + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 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: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src @@ -1764,7 +1764,7 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} {VALUE._col0} 1 {KEY.reducesinkkey0} {VALUE._col0} outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1102 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -1780,7 +1780,7 @@ STAGE PLANS: key expressions: _col1 (type: string) sort order: + Map-reduce partition columns: _col1 (type: string) - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1102 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string), _col2 (type: string), _col3 (type: string) TableScan alias: src @@ -1806,17 +1806,17 @@ STAGE PLANS: 0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2} 1 {VALUE._col0} outputColumnNames: _col0, _col1, _col2, _col3, _col4 - Statistics: Num rows: 17 Data size: 3636 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((((_col0 <> '311') and ((_col1 <> 'val_50') or (_col0 > '1'))) and ((_col2 <> '10') or (_col0 <> '10'))) and (_col2 <> '14')) and (sqrt(_col4) <> 13)) (type: boolean) - Statistics: Num rows: 17 Data size: 3636 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 17 Data size: 3636 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 17 Data size: 3636 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/ppd_join3.q.out ql/src/test/results/clientpositive/ppd_join3.q.out index a07cea4..af6a3db 100644 --- ql/src/test/results/clientpositive/ppd_join3.q.out +++ ql/src/test/results/clientpositive/ppd_join3.q.out @@ -34,20 +34,20 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '12') and key is not null) and (key <> '4')) and (key > '0')) and (key <> '1')) (type: boolean) - Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: ((((((key <> '12') and (key < '400')) and key is not null) and (key <> '4')) and (key > '0')) and (key <> '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: _col0 is not null (type: boolean) - Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src @@ -60,7 +60,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (_col0 is not null and (_col0 < '400')) (type: boolean) + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) @@ -72,20 +72,20 @@ STAGE PLANS: alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '13') and key is not null) and (key <> '1')) and (key > '0')) and (key <> '4')) (type: boolean) - Statistics: Num rows: 9 Data size: 901 Basic stats: COMPLETE Column stats: NONE + predicate: ((((((key <> '13') and (key < '400')) and key is not null) and (key <> '1')) and (key > '0')) and (key <> '4')) (type: boolean) + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 9 Data size: 901 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: _col0 is not null (type: boolean) - Statistics: Num rows: 5 Data size: 500 Basic stats: COMPLETE Column stats: NONE + predicate: ((_col0 < '400') and _col0 is not null) (type: boolean) + Statistics: Num rows: 1 Data size: 100 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: 5 Data size: 500 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Join Operator condition map: @@ -96,17 +96,17 @@ STAGE PLANS: 1 {KEY.reducesinkkey0} {VALUE._col0} 2 {KEY.reducesinkkey0} outputColumnNames: _col0, _col1, _col2, _col3, _col4 - Statistics: Num rows: 11 Data size: 1100 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 220 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((((_col0 > '0') and ((_col1 <> 'val_500') or (_col0 > '1'))) and ((_col2 > '10') or (_col0 <> '10'))) and (_col2 <> '4')) and (_col4 <> '1')) (type: boolean) - Statistics: Num rows: 5 Data size: 500 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 5 Data size: 500 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 500 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -1755,17 +1755,17 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '12') and key is not null) and (key <> '4')) and (key > '0')) and (key <> '1')) (type: boolean) - Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: ((((((key <> '12') and (key < '400')) and key is not null) and (key <> '4')) and (key > '0')) and (key <> '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 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: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src @@ -1787,17 +1787,17 @@ STAGE PLANS: alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '13') and key is not null) and (key <> '1')) and (key > '0')) and (key <> '4')) (type: boolean) - Statistics: Num rows: 9 Data size: 901 Basic stats: COMPLETE Column stats: NONE + predicate: ((((((key <> '13') and (key < '400')) and key is not null) and (key <> '1')) and (key > '0')) and (key <> '4')) (type: boolean) + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 9 Data size: 901 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 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: 9 Data size: 901 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Join Operator condition map: @@ -1808,17 +1808,17 @@ STAGE PLANS: 1 {KEY.reducesinkkey0} {VALUE._col0} 2 {KEY.reducesinkkey0} outputColumnNames: _col0, _col1, _col2, _col3, _col4 - Statistics: Num rows: 19 Data size: 1982 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 660 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((((_col0 > '0') and ((_col1 <> 'val_500') or (_col0 > '1'))) and ((_col2 > '10') or (_col0 <> '10'))) and (_col2 <> '4')) and (_col4 <> '1')) (type: boolean) - Statistics: Num rows: 10 Data size: 1043 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 220 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 10 Data size: 1043 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 220 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 10 Data size: 1043 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 220 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/ppd_join_filter.q.out ql/src/test/results/clientpositive/ppd_join_filter.q.out index 95855c9..aa3af74 100644 --- ql/src/test/results/clientpositive/ppd_join_filter.q.out +++ ql/src/test/results/clientpositive/ppd_join_filter.q.out @@ -216,7 +216,7 @@ STAGE PLANS: Statistics: Num rows: 14 Data size: 1402 Basic stats: COMPLETE Column stats: NONE Filter Operator isSamplingPred: false - predicate: (_col0 is not null and (_col2 < 5.0)) (type: boolean) + predicate: ((_col2 < 5.0) and _col0 is not null) (type: boolean) Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1032,7 +1032,7 @@ STAGE PLANS: Statistics: Num rows: 29 Data size: 2906 Basic stats: COMPLETE Column stats: NONE Filter Operator isSamplingPred: false - predicate: (_col0 is not null and (_col2 < 5.0)) (type: boolean) + predicate: ((_col2 < 5.0) and _col0 is not null) (type: boolean) Statistics: Num rows: 5 Data size: 501 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false diff --git ql/src/test/results/clientpositive/regex_col.q.out ql/src/test/results/clientpositive/regex_col.q.out index c1674ef..97393fc 100644 --- ql/src/test/results/clientpositive/regex_col.q.out +++ ql/src/test/results/clientpositive/regex_col.q.out @@ -181,13 +181,13 @@ STAGE PLANS: alias: b Statistics: Num rows: 232 Data size: 23248 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 116 Data size: 11624 Basic stats: COMPLETE Column stats: NONE + predicate: ((key = 103) and key is not null) (type: boolean) + Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string), hr (type: string), ds (type: string) sort order: +++ Map-reduce partition columns: key (type: string), hr (type: string), ds (type: string) - Statistics: Num rows: 116 Data size: 11624 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE TableScan alias: a Statistics: Num rows: 232 Data size: 23248 Basic stats: COMPLETE Column stats: NONE @@ -207,11 +207,11 @@ STAGE PLANS: 0 1 {KEY.reducesinkkey2} {KEY.reducesinkkey1} outputColumnNames: _col8, _col9 - Statistics: Num rows: 127 Data size: 12786 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col8 (type: string), _col9 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 127 Data size: 12786 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -226,15 +226,15 @@ STAGE PLANS: Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ - Statistics: Num rows: 127 Data size: 12786 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 127 Data size: 12786 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 127 Data size: 12786 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git ql/src/test/results/clientpositive/sample8.q.out ql/src/test/results/clientpositive/sample8.q.out index 62c7d93..ddd81c2 100644 --- ql/src/test/results/clientpositive/sample8.q.out +++ ql/src/test/results/clientpositive/sample8.q.out @@ -97,28 +97,28 @@ STAGE PLANS: Statistics: Num rows: 116 Data size: 23248 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator - isSamplingPred: false - predicate: (((((hash(key) & 2147483647) % 10) = 0) and key is not null) and value is not null) (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + isSamplingPred: true + predicate: ((((((hash(key) & 2147483647) % 1) = 0) and key is not null) and value is not null) and (((hash(key) & 2147483647) % 10) = 0)) (type: boolean) + Statistics: Num rows: 7 Data size: 1402 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string), value (type: string) sort order: ++ Map-reduce partition columns: key (type: string), value (type: string) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 1402 Basic stats: COMPLETE Column stats: NONE tag: 1 TableScan alias: s Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator - isSamplingPred: false - predicate: (((((hash(key) & 2147483647) % 1) = 0) and key is not null) and value is not null) (type: boolean) - Statistics: Num rows: 4 Data size: 801 Basic stats: COMPLETE Column stats: NONE + isSamplingPred: true + predicate: ((((((hash(key) & 2147483647) % 10) = 0) and key is not null) and value is not null) and (((hash(key) & 2147483647) % 1) = 0)) (type: boolean) + Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string), value (type: string) sort order: ++ Map-reduce partition columns: key (type: string), value (type: string) - Statistics: Num rows: 4 Data size: 801 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE tag: 0 value expressions: ds (type: string), hr (type: string) Path -> Alias: @@ -322,21 +322,21 @@ STAGE PLANS: 0 {KEY.reducesinkkey0} {KEY.reducesinkkey1} {VALUE._col0} {VALUE._col1} 1 {KEY.reducesinkkey0} {KEY.reducesinkkey1} outputColumnNames: _col0, _col1, _col2, _col3, _col6, _col7 - Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE Column stats: NONE Filter Operator isSamplingPred: false predicate: ((((_col6 = _col0) and (_col7 = _col1)) and (_col2 = '2008-04-08')) and (_col3 = '11')) (type: boolean) - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat diff --git ql/src/test/results/clientpositive/skewjoin.q.out ql/src/test/results/clientpositive/skewjoin.q.out index 596855d..20b681c 100644 --- ql/src/test/results/clientpositive/skewjoin.q.out +++ ql/src/test/results/clientpositive/skewjoin.q.out @@ -965,48 +965,48 @@ STAGE PLANS: alias: src Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 100) and key is not null) and (key < 80)) (type: boolean) + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 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: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) TableScan alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 100) and key is not null) (type: boolean) - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 80) and key is not null) and (key < 100)) (type: boolean) + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 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: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE TableScan alias: src Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 80) and key is not null) (type: boolean) - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + predicate: (((key < 100) and key is not null) and (key < 80)) (type: boolean) + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 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: 10 Data size: 1002 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Join Operator condition map: @@ -1018,11 +1018,11 @@ STAGE PLANS: 2 handleSkewJoin: true outputColumnNames: _col0, _col3 - Statistics: Num rows: 33 Data size: 6613 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 660 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col3 (type: string) outputColumnNames: _col0, _col3 - Statistics: Num rows: 33 Data size: 6613 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 660 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: sum(hash(_col0)), sum(hash(_col3)) mode: hash diff --git ql/src/test/results/clientpositive/table_access_keys_stats.q.out ql/src/test/results/clientpositive/table_access_keys_stats.q.out index 996edd3..ca39c7a 100644 --- ql/src/test/results/clientpositive/table_access_keys_stats.q.out +++ ql/src/test/results/clientpositive/table_access_keys_stats.q.out @@ -326,7 +326,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -Operator:JOIN_8 +Operator:JOIN_6 Table:default@t2 Keys:key Table:default@t1 diff --git ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out index 5e32403..494e1fb 100644 --- ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out @@ -215,7 +215,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: value is not null (type: boolean) + predicate: ((value <> '') and value is not null) (type: boolean) Statistics: Num rows: 13 Data size: 109 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: value (type: string)