[impala] 05/06: IMPALA-6810: runtime_row_filters.test: omit pool name in pattern

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tarmstrong pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/impala.git

commit d0a6239be30b64f1193394236de0564bebe9f696
Author: Michael Brown <mi...@cloudera.com>
AuthorDate: Thu Jul 12 10:40:26 2018 -0700

    IMPALA-6810: runtime_row_filters.test: omit pool name in pattern
    
    Some downstream tests run this with a fair-scheduler.xml set that, while
    not changing admission control behavior, does change the name of the
    pool. Omit the pool name to permit that downstream test to succeed.
    
    Testing:
    - local with change in minicluster
    - downstream in environment as well
    
    Change-Id: I3fe6beb169dc6bfefabde9dc7a4632c1a5e63fa7
    Reviewed-on: http://gerrit.cloudera.org:8080/10942
    Reviewed-by: Michael Brown <mi...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 .../functional-query/queries/QueryTest/runtime_row_filters.test    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test b/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
index fe61741..ff13999 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
@@ -401,10 +401,9 @@ select STRAIGHT_JOIN * from alltypes a join [SHUFFLE] alltypes b
     on a.month = b.id and b.int_col = -3
 ---- RESULTS
 ---- CATCH
-row_regex:.*Rejected query from pool default-pool: minimum memory reservation on
- backend '.*' is greater than memory available to the query for buffer reservations\.
- Increase the buffer_pool_limit to 290.17 MB\. See the query profile for more information
- about the per-node memory requirements\.
+row_regex:.*minimum memory reservation on backend '.*' is greater than memory available to
+ the query for buffer reservations\. Increase the buffer_pool_limit to 290.17 MB\. See
+ the query profile for more information about the per-node memory requirements\.
 ====
 ---- QUERY
 # Confirm that with broadcast join, memory limit is not hit.