Repository: impala Updated Branches: refs/heads/master 1d72c7584 -> 8cbec20ea
http://git-wip-us.apache.org/repos/asf/impala/blob/8cbec20e/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 aa67453..5abb80b 100644 --- a/testdata/workloads/functional-query/queries/QueryTest/explain-level2.test +++ b/testdata/workloads/functional-query/queries/QueryTest/explain-level2.test @@ -9,39 +9,39 @@ 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 thread-reservation=1' +row_regex:.*| Per-Host Resources: mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=1 'PLAN-ROOT SINK' -'| mem-estimate=0B mem-reservation=0B thread-reservation=0' +row_regex:.*| mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=0 '|' '04:EXCHANGE [UNPARTITIONED]' -'| mem-estimate=0B mem-reservation=0B thread-reservation=0' +row_regex:.*| mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=0 '| tuple-ids=0,1 row-size=454B cardinality=5757710' '| in pipelines: 00(GETNEXT)' '|' 'F00:PLAN FRAGMENT [RANDOM] hosts=3 instances=3' -row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* +row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B 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 thread-reservation=0.* +row_regex:.*| mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B spill-buffer=[0-9.]*MB thread-reservation=0.* '| tuple-ids=0,1 row-size=454B cardinality=5757710' '| in pipelines: 00(GETNEXT), 01(OPEN)' '|' '|--03:EXCHANGE [BROADCAST]' -'| | mem-estimate=0B mem-reservation=0B thread-reservation=0' +row_regex:.*| | mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=0 '| | tuple-ids=1 row-size=191B cardinality=1500000' '| | in pipelines: 01(GETNEXT)' '| |' '| F01:PLAN FRAGMENT [RANDOM] hosts=2 instances=2' -row_regex:.*| Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* +row_regex:.*| Per-Host Resources: mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B 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 thread-reservation=1.* +row_regex:.*| mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=1.* '| tuple-ids=1 row-size=191B cardinality=1500000' '| in pipelines: 01(GETNEXT)' '|' @@ -52,7 +52,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 thread-reservation=1.* +row_regex:.* mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=1.* ' tuple-ids=0 row-size=263B cardinality=6001215' ' in pipelines: 00(GETNEXT)' ==== http://git-wip-us.apache.org/repos/asf/impala/blob/8cbec20e/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 f199f4e..9ac5698 100644 --- a/testdata/workloads/functional-query/queries/QueryTest/explain-level3.test +++ b/testdata/workloads/functional-query/queries/QueryTest/explain-level3.test @@ -9,29 +9,29 @@ 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 thread-reservation=1' +row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=1 ' PLAN-ROOT SINK' -' | mem-estimate=0B mem-reservation=0B thread-reservation=0' +row_regex:.* | mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=0 ' |' ' 04:EXCHANGE [UNPARTITIONED]' -' mem-estimate=0B mem-reservation=0B thread-reservation=0' +row_regex:.* mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=0 ' tuple-ids=0,1 row-size=454B cardinality=5757710' ' in pipelines: 00(GETNEXT)' '' 'F00:PLAN FRAGMENT [RANDOM] hosts=3 instances=3' -row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* +row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=.* ' DATASTREAM SINK [FRAGMENT=F02, EXCHANGE=04, UNPARTITIONED]' -' | mem-estimate=0B mem-reservation=0B thread-reservation=0' +row_regex:.* | mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B 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 thread-reservation=.* +row_regex:.* | mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B spill-buffer=[0-9.]*MB thread-reservation=.* ' | tuple-ids=0,1 row-size=454B cardinality=5757710' ' | in pipelines: 00(GETNEXT), 01(OPEN)' ' |' ' |--03:EXCHANGE [BROADCAST]' -' | mem-estimate=0B mem-reservation=0B thread-reservation=0' +row_regex:.* | mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=0 ' | tuple-ids=1 row-size=191B cardinality=1500000' ' | in pipelines: 01(GETNEXT)' ' |' @@ -42,21 +42,21 @@ 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 thread-reservation=1.* +row_regex:.* mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=1.* ' tuple-ids=0 row-size=263B cardinality=6001215' ' in pipelines: 00(GETNEXT)' '' 'F01:PLAN FRAGMENT [RANDOM] hosts=2 instances=2' -row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*MB mem-reservation=[0-9.]*MB thread-reservation=.* +row_regex:.*Per-Host Resources: mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=.* ' DATASTREAM SINK [FRAGMENT=F00, EXCHANGE=03, BROADCAST]' -' | mem-estimate=0B mem-reservation=0B thread-reservation=0' +row_regex:.* | mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B 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 thread-reservation=.* +row_regex:.* mem-estimate=[0-9.]*[A-Z]*B mem-reservation=[0-9.]*[A-Z]*B thread-reservation=.* ' tuple-ids=1 row-size=191B cardinality=1500000' ' in pipelines: 01(GETNEXT)' ====
