You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by mj...@apache.org on 2016/09/02 20:13:42 UTC
[2/5] incubator-impala git commit: IMPALA-4054: Remove serial test
workarounds for IMPALA-2479.
IMPALA-4054: Remove serial test workarounds for IMPALA-2479.
The underlying issue IMPALA-2479 has been fixed, so it
should be safe to execute these tests in parallel again:
- test_runtime_filters.py (all tests)
- test_scanners.py::TestParquet::test_multiple_blocks
- test_scanners.py::testParquet::test_multiple_blocks_one_row_group
Testing: Ran the tests locally in a loop. Did a private core/hdfs run.
Change-Id: I8f046e67eb1de1c6ff87980f906870ec9816f551
Reviewed-on: http://gerrit.cloudera.org:8080/4291
Reviewed-by: Tim Armstrong <ta...@cloudera.com>
Reviewed-by: Lars Volker <lv...@cloudera.com>
Tested-by: Internal Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/16f1c8d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/16f1c8d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/16f1c8d8
Branch: refs/heads/master
Commit: 16f1c8d8de0ad33e52524fd4761e7728852c27cc
Parents: ea7f158
Author: Alex Behm <al...@cloudera.com>
Authored: Wed Aug 31 18:53:32 2016 -0700
Committer: Internal Jenkins <cl...@gerrit.cloudera.org>
Committed: Fri Sep 2 02:19:52 2016 +0000
----------------------------------------------------------------------
.../queries/QueryTest/runtime_filters.test | 10 +++++-----
.../queries/QueryTest/runtime_row_filters.test | 8 ++++----
tests/query_test/test_runtime_filters.py | 2 --
tests/query_test/test_scanners.py | 5 -----
4 files changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/16f1c8d8/testdata/workloads/functional-query/queries/QueryTest/runtime_filters.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/functional-query/queries/QueryTest/runtime_filters.test b/testdata/workloads/functional-query/queries/QueryTest/runtime_filters.test
index 83637de..5798943 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/runtime_filters.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/runtime_filters.test
@@ -437,8 +437,8 @@ row_regex: .*Filter 0 \(8.00 KB\).*
set RUNTIME_FILTER_WAIT_TIME_MS=15000;
set RUNTIME_FILTER_MODE=GLOBAL;
select straight_join count(*)
-from functional.alltypes a join [BROADCAST] functional.alltypessmall c
- on a.month = c.month join [BROADCAST] functional.alltypesagg b
+from alltypes a join [BROADCAST] alltypessmall c
+ on a.month = c.month join [BROADCAST] alltypesagg b
on a.month = b.id where b.int_col < 0;
---- RESULTS
0
@@ -452,10 +452,10 @@ from functional.alltypes a join [BROADCAST] functional.alltypessmall c
set RUNTIME_FILTER_WAIT_TIME_MS=15000;
set RUNTIME_FILTER_MODE=GLOBAL;
select straight_join count(*)
-from (select month, year from functional.alltypes
+from (select month, year from alltypes
union all
- select month, year from functional.alltypes) a
- join functional.alltypessmall b on a.month = b.month
+ select month, year from alltypes) a
+ join alltypessmall b on a.month = b.month
where b.int_col = 1;
---- RESULTS
14400
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/16f1c8d8/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
----------------------------------------------------------------------
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 0b40e0a..d160d9d 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
@@ -279,8 +279,8 @@ row_regex: .*Filter 0 \(16.00 MB\).*
SET RUNTIME_FILTER_WAIT_TIME_MS=15000;
SET RUNTIME_FILTER_MODE=GLOBAL;
select straight_join count(*)
-from functional_parquet.alltypes a join [BROADCAST] functional_parquet.alltypessmall c
- on a.id = c.id join [BROADCAST] functional_parquet.alltypesagg b
+from alltypes a join [BROADCAST] alltypessmall c
+ on a.id = c.id join [BROADCAST] alltypesagg b
on a.id = b.id where b.int_col < 100;
---- RESULTS
108
@@ -295,8 +295,8 @@ from functional_parquet.alltypes a join [BROADCAST] functional_parquet.alltypess
SET RUNTIME_FILTER_WAIT_TIME_MS=15000;
SET RUNTIME_FILTER_MODE=GLOBAL;
select straight_join count(*)
-from functional_parquet.alltypes a join [SHUFFLE] functional_parquet.alltypessmall c
- on a.id = c.id join [SHUFFLE] functional_parquet.alltypesagg b
+from alltypes a join [SHUFFLE] alltypessmall c
+ on a.id = c.id join [SHUFFLE] alltypesagg b
on a.id = b.id where b.int_col < 100;
---- RESULTS
108
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/16f1c8d8/tests/query_test/test_runtime_filters.py
----------------------------------------------------------------------
diff --git a/tests/query_test/test_runtime_filters.py b/tests/query_test/test_runtime_filters.py
index 34f08f0..0330bf8 100644
--- a/tests/query_test/test_runtime_filters.py
+++ b/tests/query_test/test_runtime_filters.py
@@ -23,7 +23,6 @@ from tests.common.impala_test_suite import ImpalaTestSuite
from tests.common.skip import SkipIfLocal, SkipIfOldAggsJoins
@SkipIfLocal.multiple_impalad
-@pytest.mark.execute_serially # IMPALA-3367
class TestRuntimeFilters(ImpalaTestSuite):
@classmethod
def get_workload(cls):
@@ -50,7 +49,6 @@ class TestRuntimeFilters(ImpalaTestSuite):
@SkipIfLocal.multiple_impalad
-@pytest.mark.execute_serially # IMPALA-3367
class TestRuntimeRowFilters(ImpalaTestSuite):
@classmethod
def get_workload(cls):
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/16f1c8d8/tests/query_test/test_scanners.py
----------------------------------------------------------------------
diff --git a/tests/query_test/test_scanners.py b/tests/query_test/test_scanners.py
index e267f93..3de56f4 100644
--- a/tests/query_test/test_scanners.py
+++ b/tests/query_test/test_scanners.py
@@ -263,13 +263,9 @@ class TestParquet(ImpalaTestSuite):
@SkipIfS3.hdfs_block_size
@SkipIfIsilon.hdfs_block_size
@SkipIfLocal.multiple_impalad
- @pytest.mark.execute_serially
def test_multiple_blocks(self, vector):
# For IMPALA-1881. The table functional_parquet.lineitem_multiblock has 3 blocks, so
# each impalad should read 1 scan range.
- # It needs to execute serially because if there is at a time more, than one query
- # being scheduled, the simple scheduler round robins colocated impalads across
- # all running queries. See IMPALA-2479 for more details.
table_name = 'functional_parquet.lineitem_multiblock'
self._multiple_blocks_helper(table_name, 20000, ranges_per_node=1)
table_name = 'functional_parquet.lineitem_sixblocks'
@@ -280,7 +276,6 @@ class TestParquet(ImpalaTestSuite):
@SkipIfS3.hdfs_block_size
@SkipIfIsilon.hdfs_block_size
@SkipIfLocal.multiple_impalad
- @pytest.mark.execute_serially
def test_multiple_blocks_one_row_group(self, vector):
# For IMPALA-1881. The table functional_parquet.lineitem_multiblock_one_row_group has
# 3 blocks but only one row group across these blocks. We test to see that only one