Revert IMPALA-4835 and dependent changes

Revert "IMPALA-6585: increase test_low_mem_limit_q21 limit"

This reverts commit 25bcb258df.

Revert "IMPALA-6588: don't add empty list of ranges in text scan"

This reverts commit d57fbec6f6.

Revert "IMPALA-4835: Part 3: switch I/O buffers to buffer pool"

This reverts commit 24b4ed0b29.

Revert "IMPALA-4835: Part 2: Allocate scan range buffers upfront"

This reverts commit 5699b59d0c.

Revert "IMPALA-4835: Part 1: simplify I/O mgr mem mgmt and cancellation"

This reverts commit 65680dc421.

Change-Id: Ie5ca451cd96602886b0a8ecaa846957df0269cbb
Reviewed-on: http://gerrit.cloudera.org:8080/9480
Reviewed-by: Dan Hecht <dhecht@cloudera.com>
Tested-by: Impala Public Jenkins
This commit is contained in:
Tim Armstrong
2018-03-02 16:09:25 -08:00
committed by Impala Public Jenkins
parent a2c9a7c86b
commit 161cbe30ff
88 changed files with 2778 additions and 4542 deletions

View File

@@ -68,23 +68,14 @@ class TestQueryFullSort(ImpalaTestSuite):
order by o_orderdate"""
exec_option = copy(vector.get_value('exec_option'))
table_format = vector.get_value('table_format')
exec_option['default_spillable_buffer_size'] = '8M'
# Minimum memory for different parts of the plan.
sort_reservation_mb = 48
if table_format.file_format == 'parquet':
scan_reservation_mb = 24
else:
scan_reservation_mb = 8
total_reservation_mb = sort_reservation_mb + scan_reservation_mb
# The below memory value assume 8M pages.
# Test with unlimited and minimum memory for all file formats.
buffer_pool_limit_values = ['-1', '{0}M'.format(total_reservation_mb)]
exec_option['default_spillable_buffer_size'] = '8M'
buffer_pool_limit_values = ['-1', '48M'] # Unlimited and minimum memory.
if self.exploration_strategy() == 'exhaustive' and \
table_format.file_format == 'parquet':
# Test some intermediate values for parquet on exhaustive.
buffer_pool_limit_values += ['128M', '256M']
buffer_pool_limit_values += ['64M', '128M', '256M']
for buffer_pool_limit in buffer_pool_limit_values:
exec_option['buffer_pool_limit'] = buffer_pool_limit
result = transpose_results(self.execute_query(
@@ -93,6 +84,7 @@ class TestQueryFullSort(ImpalaTestSuite):
def test_sort_join(self, vector):
"""With 200m memory limit this should be a 2-phase sort"""
query = """select o1.o_orderdate, o2.o_custkey, o1.o_comment from orders o1 join
orders o2 on (o1.o_orderkey = o2.o_orderkey) order by o1.o_orderdate limit 100000"""