Repository: incubator-impala Updated Branches: refs/heads/master 6098ac716 -> 9baf4f03a
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f83652c1/tests/query_test/test_kudu.py ---------------------------------------------------------------------- diff --git a/tests/query_test/test_kudu.py b/tests/query_test/test_kudu.py index 602b5f4..7b37385 100644 --- a/tests/query_test/test_kudu.py +++ b/tests/query_test/test_kudu.py @@ -83,8 +83,8 @@ class TestKuduOperations(KuduTestSuite): for nullable in nullability: impala_tbl_name = "test_column_options_%s" % str(indx) cursor.execute("""CREATE TABLE %s.%s (a INT PRIMARY KEY - %s %s %s %s, b INT %s %s %s %s %s) PARTITION BY HASH (a) INTO 3 - BUCKETS STORED AS KUDU""" % (unique_database, impala_tbl_name, + %s %s %s %s, b INT %s %s %s %s %s) PARTITION BY HASH (a) + PARTITIONS 3 STORED AS KUDU""" % (unique_database, impala_tbl_name, encoding, compression, default, blocksize, nullable, encoding, compression, default, blocksize)) indx = indx + 1 @@ -94,7 +94,7 @@ class TestKuduOperations(KuduTestSuite): def test_kudu_rename_table(self, cursor, kudu_client, unique_database): """Test Kudu table rename""" cursor.execute("""CREATE TABLE %s.foo (a INT PRIMARY KEY) PARTITION BY HASH(a) - INTO 3 BUCKETS STORED AS KUDU""" % unique_database) + PARTITIONS 3 STORED AS KUDU""" % unique_database) kudu_tbl_name = "impala::%s.foo" % unique_database assert kudu_client.table_exists(kudu_tbl_name) new_kudu_tbl_name = "blah" @@ -272,20 +272,20 @@ class TestShowCreateTable(KuduTestSuite): self.assert_show_create_equals(cursor, """ CREATE TABLE {table} (c INT PRIMARY KEY) - PARTITION BY HASH (c) INTO 3 BUCKETS STORED AS KUDU""", + PARTITION BY HASH (c) PARTITIONS 3 STORED AS KUDU""", """ CREATE TABLE {db}.{{table}} ( c INT NOT NULL ENCODING AUTO_ENCODING COMPRESSION DEFAULT_COMPRESSION, PRIMARY KEY (c) ) - PARTITION BY HASH (c) INTO 3 BUCKETS + PARTITION BY HASH (c) PARTITIONS 3 STORED AS KUDU TBLPROPERTIES ('kudu.master_addresses'='{kudu_addr}')""".format( db=cursor.conn.db_name, kudu_addr=KUDU_MASTER_HOSTS)) self.assert_show_create_equals(cursor, """ CREATE TABLE {table} (c INT PRIMARY KEY, d STRING NULL) - PARTITION BY HASH (c) INTO 3 BUCKETS, RANGE (c) + PARTITION BY HASH (c) PARTITIONS 3, RANGE (c) (PARTITION VALUES <= 1, PARTITION 1 < VALUES <= 2, PARTITION 2 < VALUES) STORED AS KUDU""", """ @@ -294,27 +294,27 @@ class TestShowCreateTable(KuduTestSuite): d STRING NULL ENCODING AUTO_ENCODING COMPRESSION DEFAULT_COMPRESSION, PRIMARY KEY (c) ) - PARTITION BY HASH (c) INTO 3 BUCKETS, RANGE (c) (...) + PARTITION BY HASH (c) PARTITIONS 3, RANGE (c) (...) STORED AS KUDU TBLPROPERTIES ('kudu.master_addresses'='{kudu_addr}')""".format( db=cursor.conn.db_name, kudu_addr=KUDU_MASTER_HOSTS)) self.assert_show_create_equals(cursor, """ CREATE TABLE {table} (c INT ENCODING PLAIN_ENCODING, PRIMARY KEY (c)) - PARTITION BY HASH (c) INTO 3 BUCKETS STORED AS KUDU""", + PARTITION BY HASH (c) PARTITIONS 3 STORED AS KUDU""", """ CREATE TABLE {db}.{{table}} ( c INT NOT NULL ENCODING PLAIN_ENCODING COMPRESSION DEFAULT_COMPRESSION, PRIMARY KEY (c) ) - PARTITION BY HASH (c) INTO 3 BUCKETS + PARTITION BY HASH (c) PARTITIONS 3 STORED AS KUDU TBLPROPERTIES ('kudu.master_addresses'='{kudu_addr}')""".format( db=cursor.conn.db_name, kudu_addr=KUDU_MASTER_HOSTS)) self.assert_show_create_equals(cursor, """ CREATE TABLE {table} (c INT COMPRESSION LZ4, d STRING, PRIMARY KEY(c, d)) - PARTITION BY HASH (c) INTO 3 BUCKETS, HASH (d) INTO 3 BUCKETS, + PARTITION BY HASH (c) PARTITIONS 3, HASH (d) PARTITIONS 3, RANGE (c, d) (PARTITION VALUE = (1, 'aaa'), PARTITION VALUE = (2, 'bbb')) STORED AS KUDU""", """ @@ -323,7 +323,7 @@ class TestShowCreateTable(KuduTestSuite): d STRING NOT NULL ENCODING AUTO_ENCODING COMPRESSION DEFAULT_COMPRESSION, PRIMARY KEY (c, d) ) - PARTITION BY HASH (c) INTO 3 BUCKETS, HASH (d) INTO 3 BUCKETS, RANGE (c, d) (...) + PARTITION BY HASH (c) PARTITIONS 3, HASH (d) PARTITIONS 3, RANGE (c, d) (...) STORED AS KUDU TBLPROPERTIES ('kudu.master_addresses'='{kudu_addr}')""".format( db=cursor.conn.db_name, kudu_addr=KUDU_MASTER_HOSTS)) @@ -352,7 +352,7 @@ class TestShowCreateTable(KuduTestSuite): self.assert_show_create_equals(cursor, """ CREATE TABLE {{table}} (c INT PRIMARY KEY) - PARTITION BY HASH (c) INTO 3 BUCKETS + PARTITION BY HASH (c) PARTITIONS 3 STORED AS KUDU TBLPROPERTIES ({props})""".format(props=props), """ @@ -360,7 +360,7 @@ class TestShowCreateTable(KuduTestSuite): c INT NOT NULL ENCODING AUTO_ENCODING COMPRESSION DEFAULT_COMPRESSION, PRIMARY KEY (c) ) - PARTITION BY HASH (c) INTO 3 BUCKETS + PARTITION BY HASH (c) PARTITIONS 3 STORED AS KUDU TBLPROPERTIES ('kudu.master_addresses'='{kudu_addr}', {props})""".format( db=cursor.conn.db_name, kudu_addr=KUDU_MASTER_HOSTS, props=props)) @@ -371,7 +371,7 @@ class TestShowCreateTable(KuduTestSuite): self.assert_show_create_equals(cursor, """ CREATE TABLE {{table}} (c INT PRIMARY KEY) - PARTITION BY HASH (c) INTO 3 BUCKETS + PARTITION BY HASH (c) PARTITIONS 3 STORED AS KUDU TBLPROPERTIES ({props})""".format(props=props), """ @@ -379,7 +379,7 @@ class TestShowCreateTable(KuduTestSuite): c INT NOT NULL ENCODING AUTO_ENCODING COMPRESSION DEFAULT_COMPRESSION, PRIMARY KEY (c) ) - PARTITION BY HASH (c) INTO 3 BUCKETS + PARTITION BY HASH (c) PARTITIONS 3 STORED AS KUDU TBLPROPERTIES ('kudu.master_addresses'='{kudu_addr}')""".format( db=cursor.conn.db_name, kudu_addr=KUDU_MASTER_HOSTS)) @@ -421,7 +421,7 @@ class TestDropDb(KuduTestSuite): # Create a managed Kudu table managed_table_name = self.random_table_name() unique_cursor.execute(""" - CREATE TABLE %s (a INT PRIMARY KEY) PARTITION BY HASH (a) INTO 3 BUCKETS + CREATE TABLE %s (a INT PRIMARY KEY) PARTITION BY HASH (a) PARTITIONS 3 STORED AS KUDU TBLPROPERTIES ('kudu.table_name' = '%s')""" % (managed_table_name, managed_table_name)) assert kudu_client.table_exists(managed_table_name) @@ -507,7 +507,7 @@ class TestImpalaKuduIntegration(KuduTestSuite): has been dropped externally.""" impala_tbl_name = "foo" cursor.execute("""CREATE TABLE %s.%s (a INT PRIMARY KEY) PARTITION BY HASH (a) - INTO 3 BUCKETS STORED AS KUDU""" % (unique_database, impala_tbl_name)) + PARTITIONS 3 STORED AS KUDU""" % (unique_database, impala_tbl_name)) kudu_tbl_name = "impala::%s.%s" % (unique_database, impala_tbl_name) assert kudu_client.table_exists(kudu_tbl_name) kudu_client.delete_table(kudu_tbl_name) @@ -545,7 +545,7 @@ class TestKuduMemLimits(KuduTestSuite): l_shipmode STRING, l_comment STRING, PRIMARY KEY (l_orderkey, l_linenumber)) - PARTITION BY HASH (l_orderkey, l_linenumber) INTO 3 BUCKETS + PARTITION BY HASH (l_orderkey, l_linenumber) PARTITIONS 3 STORED AS KUDU""" LOAD = """ http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f83652c1/tests/shell/test_shell_commandline.py ---------------------------------------------------------------------- diff --git a/tests/shell/test_shell_commandline.py b/tests/shell/test_shell_commandline.py index 88deed0..3d1f9e3 100644 --- a/tests/shell/test_shell_commandline.py +++ b/tests/shell/test_shell_commandline.py @@ -478,7 +478,7 @@ class TestImpalaShell(ImpalaTestSuite): def test_kudu_dml_reporting(self, unique_database): db = unique_database run_impala_shell_cmd('--query="create table %s.dml_test (id int primary key, '\ - 'age int null) partition by hash(id) into 2 buckets stored as kudu"' % db) + 'age int null) partition by hash(id) partitions 2 stored as kudu"' % db) self._validate_dml_stmt("insert into %s.dml_test (id) values (7), (7)" % db, 1, 1) self._validate_dml_stmt("insert into %s.dml_test (id) values (7)" % db, 0, 1)
