http://git-wip-us.apache.org/repos/asf/impala/blob/e12ee485/testdata/workloads/functional-query/queries/QueryTest/explain-level2.test ---------------------------------------------------------------------- diff --git a/testdata/workloads/functional-query/queries/QueryTest/explain-level2.test b/testdata/workloads/functional-query/queries/QueryTest/explain-level2.test index 10ddf0a..1706654 100644 --- a/testdata/workloads/functional-query/queries/QueryTest/explain-level2.test +++ b/testdata/workloads/functional-query/queries/QueryTest/explain-level2.test @@ -5,40 +5,40 @@ explain select * from tpch.lineitem join tpch.orders on l_orderkey = o_orderkey; ---- RESULTS: VERIFY_IS_EQUAL -row_regex:.*Max Per-Host Resource Reservation: Memory=[0-9.]*MB.* +row_regex:.*Max Per-Host Resource Reservation: Memory=[0-9.]*MB Threads=[0-9]*.* row_regex:.*Per-Host Resource Estimates: Memory=[0-9.]*MB.* '' 'F02:PLAN FRAGMENT [UNPARTITIONED] hosts=1 instances=1' -'| Per-Host Resources: mem-estimate=0B mem-reservation=0B' +'| Per-Host Resources: mem-estimate=0B mem-reservation=0B thread-reservation=1' 'PLAN-ROOT SINK' -'| mem-estimate=0B mem-reservation=0B' +'| mem-estimate=0B mem-reservation=0B thread-reservation=0' '|' '04:EXCHANGE [UNPARTITIONED]' -'| mem-estimate=0B mem-reservation=0B' +'| mem-estimate=0B mem-reservation=0B thread-reservation=0' '| tuple-ids=0,1 row-size=454B cardinality=5757710' '|' 'F00:PLAN FRAGMENT [RANDOM] hosts=3 instances=3' -row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB.* +row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* '02:HASH JOIN [INNER JOIN, BROADCAST]' '| hash predicates: l_orderkey = o_orderkey' '| fk/pk conjuncts: l_orderkey = o_orderkey' '| runtime filters: RF000[bloom] <- o_orderkey' -row_regex:.*| mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB spill-buffer=[0-9.]*MB.* +row_regex:.*| mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB spill-buffer=[0-9.]*MB thread-reservation=0.* '| tuple-ids=0,1 row-size=454B cardinality=5757710' '|' '|--03:EXCHANGE [BROADCAST]' -'| | mem-estimate=0B mem-reservation=0B' +'| | mem-estimate=0B mem-reservation=0B thread-reservation=0' '| | tuple-ids=1 row-size=191B cardinality=1500000' '| |' '| F01:PLAN FRAGMENT [RANDOM] hosts=2 instances=2' -row_regex:.*| Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB.* +row_regex:.*| Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* '| 01:SCAN HDFS [tpch.orders, RANDOM]' row_regex:.*partitions=1/1 files=1 size=.* '| stored statistics:' row_regex:.*table: rows=1500000 size=.* '| columns: all' row_regex:.*| extrapolated-rows=disabled max-scan-range-rows=[0-9]*.* -row_regex:.*| mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB.* +row_regex:.*| mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=1.* '| tuple-ids=1 row-size=191B cardinality=1500000' '|' '00:SCAN HDFS [tpch.lineitem, RANDOM]' @@ -48,7 +48,7 @@ row_regex:.*partitions=1/1 files=1 size=.* row_regex:.*table: rows=6001215 size=.* ' columns: all' row_regex:.* extrapolated-rows=disabled max-scan-range-rows=[0-9]*.* -row_regex:.* mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB.* +row_regex:.* mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=1.* ' tuple-ids=0 row-size=263B cardinality=6001215' ==== ---- QUERY
http://git-wip-us.apache.org/repos/asf/impala/blob/e12ee485/testdata/workloads/functional-query/queries/QueryTest/explain-level3.test ---------------------------------------------------------------------- diff --git a/testdata/workloads/functional-query/queries/QueryTest/explain-level3.test b/testdata/workloads/functional-query/queries/QueryTest/explain-level3.test index 3b2058e..22c7bed 100644 --- a/testdata/workloads/functional-query/queries/QueryTest/explain-level3.test +++ b/testdata/workloads/functional-query/queries/QueryTest/explain-level3.test @@ -5,31 +5,31 @@ explain select * from tpch.lineitem join tpch.orders on l_orderkey = o_orderkey; ---- RESULTS: VERIFY_IS_EQUAL -row_regex:.*Max Per-Host Resource Reservation: Memory=[0-9.]*MB.* +row_regex:.*Max Per-Host Resource Reservation: Memory=[0-9.]*MB Threads=[0-9]*.* row_regex:.*Per-Host Resource Estimates: Memory=[0-9.]*MB.* '' 'F02:PLAN FRAGMENT [UNPARTITIONED] hosts=1 instances=1' -'Per-Host Resources: mem-estimate=0B mem-reservation=0B' +'Per-Host Resources: mem-estimate=0B mem-reservation=0B thread-reservation=1' ' PLAN-ROOT SINK' -' | mem-estimate=0B mem-reservation=0B' +' | mem-estimate=0B mem-reservation=0B thread-reservation=0' ' |' ' 04:EXCHANGE [UNPARTITIONED]' -' mem-estimate=0B mem-reservation=0B' +' mem-estimate=0B mem-reservation=0B thread-reservation=0' ' tuple-ids=0,1 row-size=454B cardinality=5757710' '' 'F00:PLAN FRAGMENT [RANDOM] hosts=3 instances=3' -row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB.* +row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* ' DATASTREAM SINK [FRAGMENT=F02, EXCHANGE=04, UNPARTITIONED]' -' | mem-estimate=0B mem-reservation=0B' +' | mem-estimate=0B mem-reservation=0B thread-reservation=0' ' 02:HASH JOIN [INNER JOIN, BROADCAST]' ' | hash predicates: l_orderkey = o_orderkey' ' | fk/pk conjuncts: l_orderkey = o_orderkey' ' | runtime filters: RF000[bloom] <- o_orderkey' -row_regex:.* | mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB spill-buffer=[0-9.]*MB.* +row_regex:.* | mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB spill-buffer=[0-9.]*MB thread-reservation=.* ' | tuple-ids=0,1 row-size=454B cardinality=5757710' ' |' ' |--03:EXCHANGE [BROADCAST]' -' | mem-estimate=0B mem-reservation=0B' +' | mem-estimate=0B mem-reservation=0B thread-reservation=0' ' | tuple-ids=1 row-size=191B cardinality=1500000' ' |' ' 00:SCAN HDFS [tpch.lineitem, RANDOM]' @@ -39,20 +39,20 @@ row_regex:.*partitions=1/1 files=1 size=.* row_regex:.*table: rows=6001215 size=.* ' columns: all' row_regex:.*| extrapolated-rows=disabled max-scan-range-rows=[0-9]*.* -row_regex:.* mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB.* +row_regex:.* mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=1.* ' tuple-ids=0 row-size=263B cardinality=6001215' '' 'F01:PLAN FRAGMENT [RANDOM] hosts=2 instances=2' -row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB.* +row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* ' DATASTREAM SINK [FRAGMENT=F00, EXCHANGE=03, BROADCAST]' -' | mem-estimate=0B mem-reservation=0B' +' | mem-estimate=0B mem-reservation=0B thread-reservation=0' ' 01:SCAN HDFS [tpch.orders, RANDOM]' row_regex:.*partitions=1/1 files=1 size=.* ' stored statistics:' row_regex:.*table: rows=1500000 size=.* ' columns: all' row_regex:.* extrapolated-rows=disabled max-scan-range-rows=[0-9]*.* -row_regex:.* mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB.* +row_regex:.* mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* ' tuple-ids=1 row-size=191B cardinality=1500000' ==== ---- QUERY
