You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by to...@apache.org on 2018/08/15 06:21:12 UTC
[3/3] impala git commit: IMPALA-7445: separate skippable tables from
test_resource_limits
IMPALA-7445: separate skippable tables from test_resource_limits
Separate the Hbase and Kudu tables used in test_resource_limits to their
own files so they are skippable in environments where those services are
not used.
Change-Id: I02d9fd0b48817f755e1eee2ae4613e2089fa1973
Reviewed-on: http://gerrit.cloudera.org:8080/11221
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/cddb35be
Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/cddb35be
Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/cddb35be
Branch: refs/heads/master
Commit: cddb35be92b9b91e707aaf1781aed7999344a96a
Parents: 415300d
Author: Michael Brown <mi...@cloudera.com>
Authored: Tue Aug 14 14:50:02 2018 -0700
Committer: Impala Public Jenkins <im...@cloudera.com>
Committed: Wed Aug 15 04:15:46 2018 +0000
----------------------------------------------------------------------
.../QueryTest/query-resource-limits-hbase.test | 13 ++++++++++++
.../QueryTest/query-resource-limits-kudu.test | 10 ++++++++++
.../QueryTest/query-resource-limits.test | 21 --------------------
tests/query_test/test_resource_limits.py | 13 +++++++++++-
4 files changed, 35 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/impala/blob/cddb35be/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits-hbase.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits-hbase.test b/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits-hbase.test
new file mode 100644
index 0000000..e9ff0a3
--- /dev/null
+++ b/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits-hbase.test
@@ -0,0 +1,13 @@
+====
+---- QUERY
+# Bytes limit enforced for HBase.
+# Add a sleep to slow down query and avoid race with bytes check.
+set SCAN_BYTES_LIMIT="1k";
+select count(*)
+from (
+ select distinct *
+ from functional_hbase.alltypesagg
+ where sleep(100) = id) v
+---- CATCH
+row_regex:.*terminated due to scan bytes limit of 1.00 K.*
+====
http://git-wip-us.apache.org/repos/asf/impala/blob/cddb35be/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits-kudu.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits-kudu.test b/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits-kudu.test
new file mode 100644
index 0000000..df6a9e0
--- /dev/null
+++ b/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits-kudu.test
@@ -0,0 +1,10 @@
+====
+---- QUERY
+# Bytes limit not enforced for Kudu yet.
+set SCAN_BYTES_LIMIT="1k";
+select min(l_orderkey) from tpch_kudu.lineitem
+---- TYPES
+BIGINT
+---- RESULTS
+1
+====
http://git-wip-us.apache.org/repos/asf/impala/blob/cddb35be/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits.test b/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits.test
index e3cd401..daba679 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/query-resource-limits.test
@@ -52,24 +52,3 @@ select count(*) from tpch.lineitem l1,tpch.lineitem l2, tpch.lineitem l3 where
---- CATCH
row_regex:.*expired due to execution time limit of 2s000ms.*
====
----- QUERY
-# Bytes limit not enforced for Kudu yet.
-set SCAN_BYTES_LIMIT="1k";
-select min(l_orderkey) from tpch_kudu.lineitem
----- TYPES
-BIGINT
----- RESULTS
-1
-====
----- QUERY
-# Bytes limit enforced for HBase.
-# Add a sleep to slow down query and avoid race with bytes check.
-set SCAN_BYTES_LIMIT="1k";
-select count(*)
-from (
- select distinct *
- from functional_hbase.alltypesagg
- where sleep(100) = id) v
----- CATCH
-row_regex:.*terminated due to scan bytes limit of 1.00 K.*
-====
http://git-wip-us.apache.org/repos/asf/impala/blob/cddb35be/tests/query_test/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/tests/query_test/test_resource_limits.py b/tests/query_test/test_resource_limits.py
index be0895b..58ae4a5 100644
--- a/tests/query_test/test_resource_limits.py
+++ b/tests/query_test/test_resource_limits.py
@@ -16,9 +16,10 @@
# under the License.
from tests.common.impala_test_suite import ImpalaTestSuite
-from tests.common.skip import SkipIfEC, SkipIfLocal
+from tests.common.skip import SkipIfEC, SkipIfKudu, SkipIfLocal, SkipIfS3
from tests.common.test_dimensions import create_parquet_dimension
+
class TestResourceLimits(ImpalaTestSuite):
"""Test resource limit functionality."""
@@ -42,3 +43,13 @@ class TestResourceLimits(ImpalaTestSuite):
@SkipIfLocal.multiple_impalad
def test_resource_limits(self, vector):
self.run_test_case('QueryTest/query-resource-limits', vector)
+
+ @SkipIfS3.hbase
+ @SkipIfLocal.multiple_impalad
+ def test_resource_limits_hbase(self, vector):
+ self.run_test_case('QueryTest/query-resource-limits-hbase', vector)
+
+ @SkipIfKudu.unsupported_env
+ @SkipIfLocal.multiple_impalad
+ def test_resource_limits_kudu(self, vector):
+ self.run_test_case('QueryTest/query-resource-limits-kudu', vector)