Impala Public Jenkins has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/21777 )
Change subject: IMPALA-13334: Fix test_sort.py DCHECK hit when max_sort_run_size>0 ...................................................................... IMPALA-13334: Fix test_sort.py DCHECK hit when max_sort_run_size>0 test_sort.py declared 'max_sort_run_size' query option, but it silently did not exercise it. Fixing the query option declaration in IMPALA-13349 using helper function add_exec_option_dimension() revealed a DCHECK failure in sorter.cc. In some cases the length of an in-memory run could exceed 'max_sort_run_size' by 1 page. This patch fixed the DCHECK failure by strictly enforcing the 'max_sort_run_size' limit. Memory limits were also adjusted in test_sort.py according to the memory usage of the different sort run sizes. Additionally, the 'MAX_SORT_RUN_SIZE' query option's valid range was relaxed. Instead of throwing an error, negative values also disable the run size limitation, just as the default: '0'. Testing: - E2E tests in sort.py - set test Change-Id: I943d8edcc87df168448a174d6c9c6b46fe960eae Reviewed-on: http://gerrit.cloudera.org:8080/21777 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- M be/src/runtime/sorter-internal.h M be/src/runtime/sorter.cc M be/src/service/query-options-test.cc M be/src/service/query-options.cc M common/thrift/ImpalaService.thrift M testdata/workloads/functional-query/queries/QueryTest/set.test M testdata/workloads/tpch/queries/sort-reservation-usage-single-node.test M tests/query_test/test_sort.py 8 files changed, 91 insertions(+), 38 deletions(-) Approvals: Impala Public Jenkins: Looks good to me, approved; Verified -- To view, visit http://gerrit.cloudera.org:8080/21777 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: Impala-ASF Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I943d8edcc87df168448a174d6c9c6b46fe960eae Gerrit-Change-Number: 21777 Gerrit-PatchSet: 10 Gerrit-Owner: Noemi Pap-Takacs <[email protected]> Gerrit-Reviewer: Csaba Ringhofer <[email protected]> Gerrit-Reviewer: Daniel Becker <[email protected]> Gerrit-Reviewer: Impala Public Jenkins <[email protected]> Gerrit-Reviewer: Noemi Pap-Takacs <[email protected]> Gerrit-Reviewer: Riza Suminto <[email protected]> Gerrit-Reviewer: Zoltan Borok-Nagy <[email protected]>
