diff --git hbase-handler/src/test/results/positive/external_table_ppd.q.out hbase-handler/src/test/results/positive/external_table_ppd.q.out index 2755525..d19a8e8 100644 --- hbase-handler/src/test/results/positive/external_table_ppd.q.out +++ hbase-handler/src/test/results/positive/external_table_ppd.q.out @@ -124,7 +124,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t_hbase - filterExpr: + filterExpr: (int_col > 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (int_col > 0) (type: boolean) diff --git hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out index 51acf28..e31d339 100644 --- hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out +++ hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out @@ -35,7 +35,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: (key > '90') (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (key > '90') (type: boolean) @@ -189,7 +189,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: (key >= UDFToString((40 + 50))) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (key >= UDFToString((40 + 50))) (type: boolean) @@ -242,7 +242,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: (key > '90') (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (value like '%9%') (type: boolean) @@ -296,7 +296,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: (key >= '90') (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: ((value like '%9%') and (key = UDFToInteger(value))) (type: boolean) @@ -347,7 +347,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: ((key < '80') and (key > '90')) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (value like '%90%') (type: boolean) @@ -505,7 +505,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: ((key > '281') and (key < '287')) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: ((key > '281') and (key < '287')) (type: boolean) diff --git hbase-handler/src/test/results/positive/hbase_pushdown.q.out hbase-handler/src/test/results/positive/hbase_pushdown.q.out index 14ae7ca..d7edbce 100644 --- hbase-handler/src/test/results/positive/hbase_pushdown.q.out +++ hbase-handler/src/test/results/positive/hbase_pushdown.q.out @@ -35,7 +35,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: (key = 90) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (key = 90) (type: boolean) @@ -83,7 +83,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: (key = 90) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (value like '%90%') (type: boolean) @@ -133,7 +133,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_pushdown - filterExpr: + filterExpr: (key = 90) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: ((value like '%90%') and (key = UDFToInteger(value))) (type: boolean) diff --git hbase-handler/src/test/results/positive/ppd_key_ranges.q.out hbase-handler/src/test/results/positive/ppd_key_ranges.q.out index 2186fd8..1d91845 100644 --- hbase-handler/src/test/results/positive/ppd_key_ranges.q.out +++ hbase-handler/src/test/results/positive/ppd_key_ranges.q.out @@ -33,7 +33,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_ppd_keyrange - filterExpr: + filterExpr: ((key > 8) and (key < 21)) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: ((key > 8) and (key < 21)) (type: boolean) @@ -85,7 +85,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_ppd_keyrange - filterExpr: + filterExpr: ((key > 8) and (key <= 17)) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: ((key > 8) and (key <= 17)) (type: boolean) @@ -134,7 +134,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: hbase_ppd_keyrange - filterExpr: + filterExpr: ((key > 8) and (key <= 17)) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (value like '%11%') (type: boolean) diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java index 9c35890..10bae4d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java @@ -96,6 +96,12 @@ public String getAlias() { } @Explain(displayName = "filterExpr") + public String getFilterExprString() { + StringBuffer sb = new StringBuffer(); + PlanUtils.addExprToStringBuffer(filterExpr, sb); + return sb.toString(); + } + public ExprNodeGenericFuncDesc getFilterExpr() { return filterExpr; } diff --git ql/src/test/results/clientpositive/index_auto.q.out ql/src/test/results/clientpositive/index_auto.q.out index 4958a60..717032a 100644 --- ql/src/test/results/clientpositive/index_auto.q.out +++ ql/src/test/results/clientpositive/index_auto.q.out @@ -161,7 +161,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) Select Operator @@ -194,7 +194,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) diff --git ql/src/test/results/clientpositive/index_auto_empty.q.out ql/src/test/results/clientpositive/index_auto_empty.q.out index c72b981..6f2d517 100644 --- ql/src/test/results/clientpositive/index_auto_empty.q.out +++ ql/src/test/results/clientpositive/index_auto_empty.q.out @@ -57,7 +57,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: temp - filterExpr: + filterExpr: (key = 86) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) diff --git ql/src/test/results/clientpositive/index_auto_file_format.q.out ql/src/test/results/clientpositive/index_auto_file_format.q.out index bd22334..71154a0 100644 --- ql/src/test/results/clientpositive/index_auto_file_format.q.out +++ ql/src/test/results/clientpositive/index_auto_file_format.q.out @@ -40,7 +40,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -73,7 +73,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: (key = 86) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -168,7 +168,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -201,7 +201,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: (key = 86) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) diff --git ql/src/test/results/clientpositive/index_auto_mult_tables.q.out ql/src/test/results/clientpositive/index_auto_mult_tables.q.out index e13c92a..5a21497 100644 --- ql/src/test/results/clientpositive/index_auto_mult_tables.q.out +++ ql/src/test/results/clientpositive/index_auto_mult_tables.q.out @@ -233,7 +233,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__srcpart_srcpart_index__ - filterExpr: + filterExpr: (((((key > 70) and (key < 90)) and (key > 80)) and (key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: (((((key > 70) and (key < 90)) and (key > 80)) and (key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Select Operator @@ -276,7 +276,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: + filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key < 100)) (type: boolean) Statistics: Num rows: 232 Data size: 23248 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((((key > 70) and (key < 90)) and (key > 80)) and (key < 100)) (type: boolean) @@ -288,7 +288,7 @@ STAGE PLANS: Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE Column stats: NONE TableScan alias: a - filterExpr: + filterExpr: ((((key > 80) and (key < 100)) and (key > 70)) and (key < 90)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((((key > 80) and (key < 100)) and (key > 70)) and (key < 90)) (type: boolean) @@ -344,7 +344,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: (((((key > 80) and (key < 100)) and (key > 70)) and (key < 90)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: (((((key > 80) and (key < 100)) and (key > 70)) and (key < 90)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Select Operator diff --git ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out index a1c0357..411953f 100644 --- ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out +++ ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out @@ -239,7 +239,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__srcpart_srcpart_index__ - filterExpr: + filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key < 100)) (type: boolean) Filter Operator predicate: ((((key > 70) and (key < 90)) and (key > 80)) and (key < 100)) (type: boolean) Select Operator @@ -272,7 +272,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: + filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key < 100)) (type: boolean) Statistics: Num rows: 232 Data size: 23248 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((((key > 70) and (key < 90)) and (key > 80)) and (key < 100)) (type: boolean) @@ -284,7 +284,7 @@ STAGE PLANS: Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE Column stats: NONE TableScan alias: a - filterExpr: + filterExpr: ((((key > 80) and (key < 100)) and (key > 70)) and (key < 90)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((((key > 80) and (key < 100)) and (key > 70)) and (key < 90)) (type: boolean) @@ -368,7 +368,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: ((((key > 80) and (key < 100)) and (key > 70)) and (key < 90)) (type: boolean) Filter Operator predicate: ((((key > 80) and (key < 100)) and (key > 70)) and (key < 90)) (type: boolean) Select Operator diff --git ql/src/test/results/clientpositive/index_auto_multiple.q.out ql/src/test/results/clientpositive/index_auto_multiple.q.out index d99dc74..3207d4a 100644 --- ql/src/test/results/clientpositive/index_auto_multiple.q.out +++ ql/src/test/results/clientpositive/index_auto_multiple.q.out @@ -64,7 +64,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_key_index__ - filterExpr: + filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -97,7 +97,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: (key = 86) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) diff --git ql/src/test/results/clientpositive/index_auto_partitioned.q.out ql/src/test/results/clientpositive/index_auto_partitioned.q.out index 1266679..11d25fc 100644 --- ql/src/test/results/clientpositive/index_auto_partitioned.q.out +++ ql/src/test/results/clientpositive/index_auto_partitioned.q.out @@ -54,7 +54,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__srcpart_src_part_index__ - filterExpr: + filterExpr: ((key = 86) and (ds = '2008-04-09')) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -87,7 +87,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: + filterExpr: ((key = 86) and (ds = '2008-04-09')) (type: boolean) Statistics: Num rows: 58 Data size: 11624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) diff --git ql/src/test/results/clientpositive/index_auto_self_join.q.out ql/src/test/results/clientpositive/index_auto_self_join.q.out index 6945949..ee748b9 100644 --- ql/src/test/results/clientpositive/index_auto_self_join.q.out +++ ql/src/test/results/clientpositive/index_auto_self_join.q.out @@ -143,7 +143,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: (((key > 70) and (key < 90)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: (((key > 70) and (key < 90)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Select Operator @@ -186,7 +186,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: + filterExpr: ((key > 70) and (key < 90)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key > 70) and (key < 90)) (type: boolean) @@ -199,7 +199,7 @@ STAGE PLANS: value expressions: key (type: string) TableScan alias: a - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) @@ -255,7 +255,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: (((key > 80) and (key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: (((key > 80) and (key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Select Operator diff --git ql/src/test/results/clientpositive/index_auto_unused.q.out ql/src/test/results/clientpositive/index_auto_unused.q.out index 2819241..ef6a0a1 100644 --- ql/src/test/results/clientpositive/index_auto_unused.q.out +++ ql/src/test/results/clientpositive/index_auto_unused.q.out @@ -37,7 +37,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) @@ -115,7 +115,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) @@ -193,7 +193,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: ((key < 10) or (key > 480)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key < 10) or (key > 480)) (type: boolean) @@ -316,7 +316,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) @@ -443,7 +443,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: + filterExpr: (((ds = '2008-04-09') and (hr = 12)) and (key < 10)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key < 10) (type: boolean) diff --git ql/src/test/results/clientpositive/index_auto_update.q.out ql/src/test/results/clientpositive/index_auto_update.q.out index ae3f902..5360b86 100644 --- ql/src/test/results/clientpositive/index_auto_update.q.out +++ ql/src/test/results/clientpositive/index_auto_update.q.out @@ -240,7 +240,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__temp_temp_index__ - filterExpr: + filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -273,7 +273,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: temp - filterExpr: + filterExpr: (key = 86) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) diff --git ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out index 3f1f70c..9b32022 100644 --- ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out +++ ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out @@ -51,7 +51,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__srcpart_src_part_index__ - filterExpr: + filterExpr: ((key = 86) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: ((key = 86) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Select Operator @@ -94,7 +94,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: + filterExpr: ((key = 86) and (ds = '2008-04-09')) (type: boolean) Statistics: Num rows: 58 Data size: 11624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) diff --git ql/src/test/results/clientpositive/index_bitmap_compression.q.out ql/src/test/results/clientpositive/index_bitmap_compression.q.out index f36326a..65bbc3f 100644 --- ql/src/test/results/clientpositive/index_bitmap_compression.q.out +++ ql/src/test/results/clientpositive/index_bitmap_compression.q.out @@ -37,7 +37,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: (((key > 80) and (key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: (((key > 80) and (key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Select Operator @@ -80,7 +80,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) diff --git ql/src/test/results/clientpositive/index_compression.q.out ql/src/test/results/clientpositive/index_compression.q.out index ff2fe96..dfb2045 100644 --- ql/src/test/results/clientpositive/index_compression.q.out +++ ql/src/test/results/clientpositive/index_compression.q.out @@ -40,7 +40,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_src_index__ - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) Select Operator @@ -73,7 +73,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: + filterExpr: ((key > 80) and (key < 100)) (type: boolean) Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key > 80) and (key < 100)) (type: boolean) diff --git ql/src/test/results/clientpositive/index_serde.q.out ql/src/test/results/clientpositive/index_serde.q.out index 0a796b9..75cca00 100644 --- ql/src/test/results/clientpositive/index_serde.q.out +++ ql/src/test/results/clientpositive/index_serde.q.out @@ -125,7 +125,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__doctors_doctors_index__ - filterExpr: + filterExpr: (number > 6) (type: boolean) Filter Operator predicate: (number > 6) (type: boolean) Select Operator @@ -158,7 +158,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: doctors - filterExpr: + filterExpr: (number > 6) (type: boolean) Statistics: Num rows: 2 Data size: 521 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (number > 6) (type: boolean) diff --git ql/src/test/results/clientpositive/index_stale.q.out ql/src/test/results/clientpositive/index_stale.q.out index 0a73a6a..169d3fa 100644 --- ql/src/test/results/clientpositive/index_stale.q.out +++ ql/src/test/results/clientpositive/index_stale.q.out @@ -79,7 +79,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: temp - filterExpr: + filterExpr: (key = 86) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) diff --git ql/src/test/results/clientpositive/index_stale_partitioned.q.out ql/src/test/results/clientpositive/index_stale_partitioned.q.out index 4c39086..5cff8a6 100644 --- ql/src/test/results/clientpositive/index_stale_partitioned.q.out +++ ql/src/test/results/clientpositive/index_stale_partitioned.q.out @@ -107,7 +107,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: temp - filterExpr: + filterExpr: ((key = 86) and (foo = 'bar')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) diff --git ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out index 0bcfce4..ef47c5e 100644 --- ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out +++ ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out @@ -494,7 +494,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: orc_pred - filterExpr: + filterExpr: ((t is not null and (t < 0)) and (t > (- 2))) (type: boolean) Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((t is not null and (t < 0)) and (t > (- 2))) (type: boolean) @@ -686,7 +686,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: orc_pred - filterExpr: + filterExpr: (((t = (- 1)) and s is not null) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((t = (- 1)) and s is not null) and (s like 'bob%')) (type: boolean) @@ -877,7 +877,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: orc_pred - filterExpr: + filterExpr: (((s is not null and (s like 'bob%')) and (not (t) IN ((- 1), (- 2), (- 3)))) and t BETWEEN 25 AND 30) (type: boolean) Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((s is not null and (s like 'bob%')) and (not (t) IN ((- 1), (- 2), (- 3)))) and t BETWEEN 25 AND 30) (type: boolean) @@ -1103,7 +1103,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: orc_pred - filterExpr: + filterExpr: (((((((d >= round(9.99)) and (d < 12.0)) and t is not null) and (s like '%son')) and (not (s like '%car%'))) and (t > 0)) and si BETWEEN 300 AND 400) (type: boolean) Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((((((d >= round(9.99)) and (d < 12.0)) and t is not null) and (s like '%son')) and (not (s like '%car%'))) and (t > 0)) and si BETWEEN 300 AND 400) (type: boolean) @@ -1368,7 +1368,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: orc_pred - filterExpr: + filterExpr: (((((((((t > 10) and (t <> 101)) and (d >= round(9.99))) and (d < 12.0)) and t is not null) and (s like '%son')) and (not (s like '%car%'))) and (t > 0)) and si BETWEEN 300 AND 400) (type: boolean) Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((((((((t > 10) and (t <> 101)) and (d >= round(9.99))) and (d < 12.0)) and t is not null) and (s like '%son')) and (not (s like '%car%'))) and (t > 0)) and si BETWEEN 300 AND 400) (type: boolean) diff --git ql/src/test/results/clientpositive/union_view.q.out ql/src/test/results/clientpositive/union_view.q.out index 09fbae5..3738702 100644 --- ql/src/test/results/clientpositive/union_view.q.out +++ ql/src/test/results/clientpositive/union_view.q.out @@ -40,7 +40,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_1_src_union_1_key_idx__ - filterExpr: + filterExpr: ((key = 86) and (ds = '1')) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -64,7 +64,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_1 - filterExpr: + filterExpr: ((key = 86) and (ds = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -97,7 +97,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_2_src_union_2_key_idx__ - filterExpr: + filterExpr: ((key = 86) and (ds = '2')) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -121,7 +121,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_2 - filterExpr: + filterExpr: ((key = 86) and (ds = '2')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -154,7 +154,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_3_src_union_3_key_idx__ - filterExpr: + filterExpr: ((key = 86) and (ds = '3')) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -178,7 +178,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_3 - filterExpr: + filterExpr: ((key = 86) and (ds = '3')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -216,7 +216,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_1_src_union_1_key_idx__ - filterExpr: + filterExpr: (ds = '1') (type: boolean) Select Operator expressions: _bucketname (type: string), _offsets (type: array) outputColumnNames: _col0, _col1 @@ -238,7 +238,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_1 - filterExpr: + filterExpr: (ds = '1') (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: COMPLETE @@ -285,7 +285,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_2_src_union_2_key_idx__ - filterExpr: + filterExpr: (ds = '2') (type: boolean) Select Operator expressions: _bucketname (type: string), _offsets (type: array) outputColumnNames: _col0, _col1 @@ -307,7 +307,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_2 - filterExpr: + filterExpr: (ds = '2') (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: COMPLETE @@ -354,7 +354,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_3_src_union_3_key_idx__ - filterExpr: + filterExpr: (ds = '3') (type: boolean) Select Operator expressions: _bucketname (type: string), _offsets (type: array) outputColumnNames: _col0, _col1 @@ -376,7 +376,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_3 - filterExpr: + filterExpr: (ds = '3') (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: COMPLETE @@ -426,7 +426,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_1_src_union_1_key_idx__ - filterExpr: + filterExpr: ((key = 86) and (ds = '1')) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -450,7 +450,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_1 - filterExpr: + filterExpr: ((key = 86) and (ds = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -489,7 +489,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_2_src_union_2_key_idx__ - filterExpr: + filterExpr: ((key = 86) and (ds = '2')) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -513,7 +513,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_2 - filterExpr: + filterExpr: ((key = 86) and (ds = '2')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -552,7 +552,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_3_src_union_3_key_idx__ - filterExpr: + filterExpr: ((key = 86) and (ds = '3')) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -576,7 +576,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_3 - filterExpr: + filterExpr: ((key = 86) and (ds = '3')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -619,7 +619,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_2_src_union_2_key_idx__ - filterExpr: + filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -643,7 +643,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_2 - filterExpr: + filterExpr: ((key = 86) and ds is not null) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -665,7 +665,7 @@ STAGE PLANS: value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string) TableScan alias: src_union_1 - filterExpr: + filterExpr: ((key = 86) and ds is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -687,7 +687,7 @@ STAGE PLANS: value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string) TableScan alias: src_union_3 - filterExpr: + filterExpr: ((key = 86) and ds is not null) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -723,7 +723,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_1_src_union_1_key_idx__ - filterExpr: + filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -747,7 +747,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_3_src_union_3_key_idx__ - filterExpr: + filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -792,7 +792,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_1_src_union_1_key_idx__ - filterExpr: + filterExpr: (ds = '1') (type: boolean) Select Operator expressions: _bucketname (type: string), _offsets (type: array) outputColumnNames: _col0, _col1 @@ -814,7 +814,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_1 - filterExpr: + filterExpr: (ds = '1') (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string), ds (type: string) @@ -867,7 +867,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_2_src_union_2_key_idx__ - filterExpr: + filterExpr: (ds = '2') (type: boolean) Select Operator expressions: _bucketname (type: string), _offsets (type: array) outputColumnNames: _col0, _col1 @@ -889,7 +889,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_2 - filterExpr: + filterExpr: (ds = '2') (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string), ds (type: string) @@ -942,7 +942,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_3_src_union_3_key_idx__ - filterExpr: + filterExpr: (ds = '3') (type: boolean) Select Operator expressions: _bucketname (type: string), _offsets (type: array) outputColumnNames: _col0, _col1 @@ -964,7 +964,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_3 - filterExpr: + filterExpr: (ds = '3') (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string), ds (type: string) @@ -1020,7 +1020,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_3_src_union_3_key_idx__ - filterExpr: + filterExpr: ((key = 86) and (ds = '4')) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) Select Operator @@ -1044,7 +1044,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_3 - filterExpr: + filterExpr: ((key = 86) and (ds = '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 86) (type: boolean) @@ -1084,7 +1084,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default__src_union_3_src_union_3_key_idx__ - filterExpr: + filterExpr: (ds = '4') (type: boolean) Select Operator expressions: _bucketname (type: string), _offsets (type: array) outputColumnNames: _col0, _col1 @@ -1106,7 +1106,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_union_3 - filterExpr: + filterExpr: (ds = '4') (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string), ds (type: string) diff --git ql/src/test/results/clientpositive/vectorization_pushdown.q.out ql/src/test/results/clientpositive/vectorization_pushdown.q.out index 4bbb467..df474d6 100644 --- ql/src/test/results/clientpositive/vectorization_pushdown.q.out +++ ql/src/test/results/clientpositive/vectorization_pushdown.q.out @@ -13,7 +13,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: + filterExpr: (cbigint < cdouble) (type: boolean) Statistics: Num rows: 23577 Data size: 377237 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (cbigint < cdouble) (type: boolean)