You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by cs...@apache.org on 2023/12/19 17:27:59 UTC

(impala) branch master updated: IMPALA-12593: Split test_drop_partition test table

This is an automated email from the ASF dual-hosted git repository.

csringhofer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c54c9684 IMPALA-12593: Split test_drop_partition test table
3c54c9684 is described below

commit 3c54c9684242c038d4b74807632a81d5ff4e8321
Author: Peter Rozsa <pr...@cloudera.com>
AuthorDate: Mon Dec 4 16:53:11 2023 +0100

    IMPALA-12593: Split test_drop_partition test table
    
    TestIcebergTable.test_drop_partition fails on the S3 builds because of
    too long file prefixes. This patch changes the test by creating
    multiple tables instead, and add more checkpointing to validate the
    drop operation.
    
    Change-Id: Ifc080c6bde091e17d20adc95da998e36c484f768
    Reviewed-on: http://gerrit.cloudera.org:8080/20746
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Reviewed-by: Csaba Ringhofer <cs...@cloudera.com>
    Tested-by: Csaba Ringhofer <cs...@cloudera.com>
---
 .../queries/QueryTest/iceberg-drop-partition.test  | 281 ++++++++++++++-------
 tests/query_test/test_iceberg.py                   |  22 --
 2 files changed, 192 insertions(+), 111 deletions(-)

diff --git a/testdata/workloads/functional-query/queries/QueryTest/iceberg-drop-partition.test b/testdata/workloads/functional-query/queries/QueryTest/iceberg-drop-partition.test
index 15d7c089f..a94732ea9 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/iceberg-drop-partition.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/iceberg-drop-partition.test
@@ -1,257 +1,360 @@
 ====
 ---- QUERY
+# Creating tables for each partition transform class
+CREATE TABLE iceberg_identity_partitions
+  (identity_boolean boolean, identity_int int, identity_bigint bigint,
+  identity_float float, identity_double double, identity_decimal decimal(20,10),
+  identity_date date, identity_timestamp timestamp, identity_string string)
+PARTITIONED BY SPEC
+  (identity(identity_boolean), identity(identity_int), identity(identity_bigint),
+  identity(identity_float), identity(identity_double), identity(identity_decimal),
+  identity(identity_date), identity(identity_string))
+STORED AS ICEBERG;
+CREATE TABLE iceberg_bucket_partitions
+  (bucket_int int, bucket_bigint bigint, bucket_decimal decimal(20,10),
+  bucket_date date, bucket_timestamp timestamp, bucket_string string)
+PARTITIONED BY SPEC
+  (bucket(5,bucket_int), bucket(5,bucket_bigint), bucket(5,bucket_decimal),
+  bucket(5,bucket_date), bucket(5,bucket_timestamp), bucket(5,bucket_string))
+STORED AS ICEBERG;
+CREATE TABLE iceberg_truncate_partitions
+  (truncate_int int, truncate_bigint bigint, truncate_decimal decimal(20,10),
+  truncate_string string)
+PARTITIONED BY SPEC
+  (truncate(5,truncate_int), truncate(5,truncate_bigint), truncate(5,truncate_decimal),
+  truncate(5,truncate_string))
+STORED AS ICEBERG;
+CREATE TABLE iceberg_time_partitions
+  (year_date date, year_timestamp timestamp, month_date date, month_timestamp timestamp,
+  day_date date, day_timestamp timestamp, hour_timestamp timestamp)
+PARTITIONED BY SPEC
+  (year(year_date), year(year_timestamp), month(month_date), month(month_timestamp),
+  day(day_date), day(day_timestamp),
+  hour(hour_timestamp))
+STORED AS ICEBERG;
+CREATE TABLE iceberg_mixed_partitions
+  (identity_int int, identity_string string, hour_timestamp timestamp)
+PARTITIONED BY SPEC
+  (identity(identity_int), identity(identity_string), hour(hour_timestamp))
+STORED AS ICEBERG;
+====
+---- QUERY
 # Failing implicit string to hour cast
-alter table iceberg_all_partitions drop partition (hour(hour_timestamp) = "2012-12-12");
+ALTER TABLE iceberg_time_partitions DROP PARTITION (hour(hour_timestamp) = "2012-12-12");
 ---- CATCH
 AnalysisException: operands of type INT and STRING are not comparable: HOUR(hour_timestamp) = '2012-12-12'
 ====
 ---- QUERY
 # Failing implicit string to day cast
-alter table iceberg_all_partitions drop partition (day(day_date) = "2012-12");
+ALTER TABLE iceberg_time_partitions DROP PARTITION (day(day_date) = "2012-12");
 ---- CATCH
 AnalysisException: operands of type INT and STRING are not comparable: DAY(day_date) = '2012-12'
 ====
 ---- QUERY
 # Failing implicit string to month cast
-alter table iceberg_all_partitions drop partition (month(month_date) = "2012");
+ALTER TABLE iceberg_time_partitions DROP PARTITION (month(month_date) = "2012");
 ---- CATCH
 AnalysisException: operands of type INT and STRING are not comparable: MONTH(month_date) = '2012'
 ====
 ---- QUERY
 # Failing implicit string to year cast
-alter table iceberg_all_partitions drop partition (year(year_date) = "2012-12-12-20");
+ALTER TABLE iceberg_time_partitions DROP PARTITION (year(year_date) = "2012-12-12-20");
 ---- CATCH
 AnalysisException: operands of type INT and STRING are not comparable: YEAR(year_date) = '2012-12-12-20'
 ====
 ---- QUERY
-INSERT INTO iceberg_all_partitions(identity_boolean) VALUES (true);
-INSERT INTO iceberg_all_partitions(identity_int) VALUES (1);
-INSERT INTO iceberg_all_partitions(identity_bigint) VALUES (1);
-INSERT INTO iceberg_all_partitions(identity_float) VALUES (1.0);
-INSERT INTO iceberg_all_partitions(identity_double) VALUES (1.0);
-INSERT INTO iceberg_all_partitions(identity_decimal) VALUES (1);
-INSERT INTO iceberg_all_partitions(identity_date) VALUES ('2000-12-12');
-INSERT INTO iceberg_all_partitions(identity_string) VALUES ("string-transform-omitted");
-INSERT INTO iceberg_all_partitions(identity_string) VALUES ("string-transform-set");
-INSERT INTO iceberg_all_partitions(identity_string) VALUES ("string"), ("another-string");
-INSERT INTO iceberg_all_partitions(identity_string) VALUES ("string"), ("another-string");
-INSERT INTO iceberg_all_partitions(bucket_int) VALUES (100), (200);
-INSERT INTO iceberg_all_partitions(bucket_bigint) VALUES (100);
-INSERT INTO iceberg_all_partitions(bucket_decimal) VALUES (10);
-INSERT INTO iceberg_all_partitions(bucket_date) VALUES ("1526-01-12");
-INSERT INTO iceberg_all_partitions(bucket_string) VALUES ("string");
-INSERT INTO iceberg_all_partitions(bucket_timestamp) VALUES ("1583-04-02 03:00:00");
-INSERT INTO iceberg_all_partitions(truncate_int) VALUES (131072);
-INSERT INTO iceberg_all_partitions(truncate_bigint) VALUES (68719476736);
-INSERT INTO iceberg_all_partitions(truncate_decimal) VALUES (100000.1234567891);
-INSERT INTO iceberg_all_partitions(truncate_string) VALUES ('thisisalongstring');
-INSERT INTO iceberg_all_partitions(year_date) VALUES ('2077-05-06');
-INSERT INTO iceberg_all_partitions(month_date) VALUES ('2023-12-01');
-INSERT INTO iceberg_all_partitions(day_date) VALUES ('2023-12-01');
-INSERT INTO iceberg_all_partitions(year_timestamp) VALUES ('2023-12-02 00:00:00');
-INSERT INTO iceberg_all_partitions(month_timestamp) VALUES ('2023-12-02 00:00:00');
-INSERT INTO iceberg_all_partitions(day_timestamp) VALUES ('2023-03-02 00:00:00');
-INSERT INTO iceberg_all_partitions(hour_timestamp) VALUES ('2023-06-02 00:00:00');
-INSERT INTO iceberg_all_partitions(identity_string, hour_timestamp) VALUES ('string-hour','2023-03-02 00:00:00');
-INSERT INTO iceberg_all_partitions(identity_string, hour_timestamp) VALUES ('another-string-hour', '2023-03-02 00:00:00');
-INSERT INTO iceberg_all_partitions(identity_string, hour_timestamp) VALUES ('another-string-hour', '2023-03-02 10:00:00');
-INSERT INTO iceberg_all_partitions(identity_string, hour_timestamp) VALUES ('string-hour', '2023-03-02 10:00:00');
-INSERT INTO iceberg_all_partitions(identity_string, identity_int) VALUES ('string-comma', 567);
-INSERT INTO iceberg_all_partitions(identity_string, identity_int) VALUES ('string-comma', 568);
-INSERT INTO iceberg_all_partitions(identity_int) VALUES (NULL);
-====
----- QUERY
-# Number of partitions before DROP PARTITION queries
-SELECT COUNT(1) FROM $DATABASE.iceberg_all_partitions.`partitions`;
----- RESULTS
-36
-====
----- QUERY
-ALTER TABLE iceberg_all_partitions DROP IF EXISTS PARTITION (identity_boolean = false)
+INSERT INTO iceberg_identity_partitions(identity_boolean) VALUES (true);
+INSERT INTO iceberg_identity_partitions(identity_int) VALUES (1);
+INSERT INTO iceberg_identity_partitions(identity_bigint) VALUES (1);
+INSERT INTO iceberg_identity_partitions(identity_float) VALUES (1.0);
+INSERT INTO iceberg_identity_partitions(identity_double) VALUES (1.0);
+INSERT INTO iceberg_identity_partitions(identity_decimal) VALUES (1);
+INSERT INTO iceberg_identity_partitions(identity_date) VALUES ('2000-12-12');
+INSERT INTO iceberg_identity_partitions(identity_string) VALUES ("string-transform-omitted");
+INSERT INTO iceberg_identity_partitions(identity_string) VALUES ("string-transform-set");
+INSERT INTO iceberg_identity_partitions(identity_string) VALUES ("string"), ("another-string");
+INSERT INTO iceberg_identity_partitions(identity_string) VALUES ("string"), ("another-string");
+INSERT INTO iceberg_bucket_partitions(bucket_int) VALUES (100), (200);
+INSERT INTO iceberg_bucket_partitions(bucket_bigint) VALUES (100);
+INSERT INTO iceberg_bucket_partitions(bucket_decimal) VALUES (10);
+INSERT INTO iceberg_bucket_partitions(bucket_date) VALUES ("1526-01-12");
+INSERT INTO iceberg_bucket_partitions(bucket_string) VALUES ("string");
+INSERT INTO iceberg_bucket_partitions(bucket_timestamp) VALUES ("1583-04-02 03:00:00");
+INSERT INTO iceberg_truncate_partitions(truncate_int) VALUES (131072);
+INSERT INTO iceberg_truncate_partitions(truncate_bigint) VALUES (68719476736);
+INSERT INTO iceberg_truncate_partitions(truncate_decimal) VALUES (100000.1234567891);
+INSERT INTO iceberg_truncate_partitions(truncate_string) VALUES ('thisisalongstring');
+INSERT INTO iceberg_time_partitions(year_date) VALUES ('2077-05-06');
+INSERT INTO iceberg_time_partitions(month_date) VALUES ('2023-12-01');
+INSERT INTO iceberg_time_partitions(day_date) VALUES ('2023-12-01');
+INSERT INTO iceberg_time_partitions(year_timestamp) VALUES ('2023-12-02 00:00:00');
+INSERT INTO iceberg_time_partitions(month_timestamp) VALUES ('2023-12-02 00:00:00');
+INSERT INTO iceberg_time_partitions(day_timestamp) VALUES ('2023-03-02 00:00:00');
+INSERT INTO iceberg_time_partitions(hour_timestamp) VALUES ('2023-06-02 00:00:00');
+INSERT INTO iceberg_mixed_partitions(identity_string, hour_timestamp) VALUES ('string-hour','2023-03-02 00:00:00');
+INSERT INTO iceberg_mixed_partitions(identity_string, hour_timestamp) VALUES ('another-string-hour', '2023-03-02 00:00:00');
+INSERT INTO iceberg_mixed_partitions(identity_string, hour_timestamp) VALUES ('another-string-hour', '2023-03-02 10:00:00');
+INSERT INTO iceberg_mixed_partitions(identity_string, hour_timestamp) VALUES ('string-hour', '2023-03-02 10:00:00');
+INSERT INTO iceberg_mixed_partitions(identity_string, identity_int) VALUES ('string-comma', 567);
+INSERT INTO iceberg_mixed_partitions(identity_string, identity_int) VALUES ('string-comma', 568);
+INSERT INTO iceberg_mixed_partitions(identity_int) VALUES (NULL);
+====
+---- QUERY
+# Number of partitions for iceberg_identity_partitions before DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_identity_partitions.`partitions`
+---- RESULTS
+11
+---- TYPES
+BIGINT
+====
+---- QUERY
+ALTER TABLE iceberg_identity_partitions DROP IF EXISTS PARTITION (identity_boolean = false)
 ---- RESULTS
 'Dropped 0 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_boolean = false)
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_boolean = false)
 ---- CATCH
 No matching partition(s) found
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_boolean = true)
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_boolean = true)
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_int = 1)
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_int = 1)
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_bigint = 1)
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_bigint = 1)
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_float < 3.0)
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_float < 3.0)
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_double > 0.0)
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_double > 0.0)
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_decimal < 3);
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_decimal < 3);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_date = '2000-12-12');
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_date = '2000-12-12');
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_string = "string-transform-omitted");
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity_string = "string-transform-omitted");
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity(identity_string) = "string-transform-set");
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity(identity_string) = "string-transform-set");
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity(identity_string) = "another-string");
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity(identity_string) = "another-string");
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity(identity_string) = "string");
+ALTER TABLE iceberg_identity_partitions DROP PARTITION (identity(identity_string) = "string");
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (bucket(5, bucket_int) in (1,2));
+# Number of partitions for iceberg_identity_partitions after DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_identity_partitions.`partitions`
+---- RESULTS
+0
+---- TYPES
+BIGINT
+====
+---- QUERY
+# Number of partitions for iceberg_bucket_partitions before DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_bucket_partitions.`partitions`
+---- RESULTS
+7
+---- TYPES
+BIGINT
+====
+---- QUERY
+ALTER TABLE iceberg_bucket_partitions DROP PARTITION (bucket(5, bucket_int) in (1,2));
 ---- RESULTS
 'Dropped 2 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (bucket(5, bucket_bigint) = 1);
+ALTER TABLE iceberg_bucket_partitions DROP PARTITION (bucket(5, bucket_bigint) = 1);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (bucket(5, bucket_decimal) = 3);
+ALTER TABLE iceberg_bucket_partitions DROP PARTITION (bucket(5, bucket_decimal) = 3);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (bucket(5, bucket_date) = 0);
+ALTER TABLE iceberg_bucket_partitions DROP PARTITION (bucket(5, bucket_date) = 0);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (bucket(5, bucket_timestamp) = 1);
+ALTER TABLE iceberg_bucket_partitions DROP PARTITION (bucket(5, bucket_timestamp) = 1);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (bucket(5, bucket_string) = 1);
+ALTER TABLE iceberg_bucket_partitions DROP PARTITION (bucket(5, bucket_string) = 1);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (truncate(5, truncate_int) = 131070);
+# Number of partitions for iceberg_bucket_partitions after DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_bucket_partitions.`partitions`
 ---- RESULTS
-'Dropped 1 partition(s)'
+0
+---- TYPES
+BIGINT
+====
+---- QUERY
+# Number of partitions for iceberg_truncate_partitions before DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_truncate_partitions.`partitions`
+---- RESULTS
+4
+---- TYPES
+BIGINT
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (truncate(5, truncate_bigint) = 68719476735);
+ALTER TABLE iceberg_truncate_partitions DROP PARTITION (truncate(5, truncate_int) = 131070);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (truncate(5, truncate_decimal) = 100000.1234567890);
+ALTER TABLE iceberg_truncate_partitions DROP PARTITION (truncate(5, truncate_bigint) = 68719476735);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (truncate(5, truncate_string) = 'thisi');
+ALTER TABLE iceberg_truncate_partitions DROP PARTITION (truncate(5, truncate_decimal) = 100000.1234567890);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (year(year_date) = '2077');
+ALTER TABLE iceberg_truncate_partitions DROP PARTITION (truncate(5, truncate_string) = 'thisi');
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-# Checkpoint for remaining partitions
-SELECT COUNT(1) FROM $DATABASE.iceberg_all_partitions.`partitions`;
+# Number of partitions for iceberg_truncate_partitions after DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_truncate_partitions.`partitions`
 ---- RESULTS
-13
+0
+---- TYPES
+BIGINT
+====
+---- QUERY
+# Number of partitions for iceberg_time_partitions before DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_time_partitions.`partitions`
+---- RESULTS
+7
+---- TYPES
+BIGINT
+====
+---- QUERY
+ALTER TABLE iceberg_time_partitions DROP PARTITION (year(year_date) = '2077');
+---- RESULTS
+'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (month(month_date) = '2023-12');
+ALTER TABLE iceberg_time_partitions DROP PARTITION (month(month_date) = '2023-12');
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (day(day_date) = '2023-12-01');
+ALTER TABLE iceberg_time_partitions DROP PARTITION (day(day_date) = '2023-12-01');
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (year(year_timestamp) = '2023');
+ALTER TABLE iceberg_time_partitions DROP PARTITION (year(year_timestamp) = '2023');
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (month(month_timestamp) = '2023-12');
+ALTER TABLE iceberg_time_partitions DROP PARTITION (month(month_timestamp) = '2023-12');
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (day(day_timestamp) = '2023-03-02');
+ALTER TABLE iceberg_time_partitions DROP PARTITION (day(day_timestamp) = '2023-03-02');
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (hour(hour_timestamp) = '2023-06-02-0');
+ALTER TABLE iceberg_time_partitions DROP PARTITION (hour(hour_timestamp) = '2023-06-02-0');
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_string in ('string-hour', 'another-string-hour') and hour(hour_timestamp) = '2023-03-02-10');
+# Number of partitions for iceberg_time_partitions after DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_time_partitions.`partitions`
+---- RESULTS
+0
+---- TYPES
+BIGINT
+====
+---- QUERY
+# Number of partitions for iceberg_mixed_partitions before DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_mixed_partitions.`partitions`
+---- RESULTS
+7
+---- TYPES
+BIGINT
+====
+---- QUERY
+ALTER TABLE iceberg_mixed_partitions DROP PARTITION (identity_string in ('string-hour', 'another-string-hour') and hour(hour_timestamp) = '2023-03-02-10');
 ---- RESULTS
 'Dropped 2 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (hour(hour_timestamp) < '2030-03-02-10');
+ALTER TABLE iceberg_mixed_partitions DROP PARTITION (hour(hour_timestamp) < '2030-03-02-10');
 ---- RESULTS
 'Dropped 2 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_string = "string-comma", identity_int in (567, 568));
+ALTER TABLE iceberg_mixed_partitions DROP PARTITION (identity_string = "string-comma", identity_int in (567, 568));
 ---- RESULTS
 'Dropped 2 partition(s)'
 ====
 ---- QUERY
-ALTER TABLE iceberg_all_partitions DROP PARTITION (identity_int IS NULL);
+ALTER TABLE iceberg_mixed_partitions DROP PARTITION (identity_int IS NULL);
 ---- RESULTS
 'Dropped 1 partition(s)'
 ====
 ---- QUERY
-# Number of partitions after DROP PARTITION queries
-SELECT count(1) FROM $DATABASE.iceberg_all_partitions.`partitions`;
+# Number of partitions for iceberg_mixed_partitions after DROP PARTITION queries
+SELECT COUNT(1) FROM $DATABASE.iceberg_mixed_partitions.`partitions`
 ---- RESULTS
 0
+---- TYPES
+BIGINT
 ====
 ---- QUERY
 # Partition evolution
-CREATE TABLE iceberg_drop_partition_evolution(identity_int int, unpartitioned_int_to_identity_int int, year_date_col_to_month_date_col date)
-PARTITIONED BY SPEC(identity(identity_int), year(year_date_col_to_month_date_col)) STORED AS ICEBERG;
+CREATE TABLE iceberg_drop_partition_evolution
+  (identity_int int, unpartitioned_int_to_identity_int int, year_date_col_to_month_date_col date)
+PARTITIONED BY SPEC
+  (identity(identity_int), year(year_date_col_to_month_date_col)) STORED AS ICEBERG;
 INSERT INTO iceberg_drop_partition_evolution VALUES (1, 2, "2023-10-11");
 ALTER TABLE iceberg_drop_partition_evolution SET PARTITION SPEC(identity(identity_int), identity(unpartitioned_int_to_identity_int), year(year_date_col_to_month_date_col));
 INSERT INTO iceberg_drop_partition_evolution VALUES (1, 2, "2023-01-11");
diff --git a/tests/query_test/test_iceberg.py b/tests/query_test/test_iceberg.py
index 670f4c6bd..acdee3946 100644
--- a/tests/query_test/test_iceberg.py
+++ b/tests/query_test/test_iceberg.py
@@ -1173,28 +1173,6 @@ class TestIcebergTable(IcebergTestSuite):
     assert data.data[0] == '1'
 
   def test_drop_partition(self, vector, unique_database):
-    create_table_stmt = """CREATE TABLE {}.iceberg_all_partitions
-        (identity_boolean boolean, identity_int int, identity_bigint bigint,
-        identity_float float, identity_double double, identity_decimal decimal(20,10),
-        identity_date date, identity_timestamp timestamp, identity_string string,
-        bucket_int int, bucket_bigint bigint, bucket_decimal decimal(20,10),
-        bucket_date date, bucket_timestamp timestamp, bucket_string string,
-        truncate_int int, truncate_bigint bigint, truncate_decimal decimal(20,10),
-        truncate_string string, year_date date, year_timestamp timestamp,
-        month_date date, month_timestamp timestamp, day_date date,
-        day_timestamp timestamp, hour_timestamp timestamp)
-      PARTITIONED BY SPEC
-        (identity(identity_boolean), identity(identity_int), identity(identity_bigint),
-        identity(identity_float), identity(identity_double), identity(identity_decimal),
-        identity(identity_date), identity(identity_string), bucket(5,bucket_int),
-        bucket(5,bucket_bigint), bucket(5,bucket_decimal), bucket(5,bucket_date),
-        bucket(5,bucket_timestamp), bucket(5,bucket_string), truncate(5,truncate_int),
-        truncate(5,truncate_bigint), truncate(5,truncate_decimal),
-        truncate(5,truncate_string), year(year_date), year(year_timestamp),
-        month(month_date), month(month_timestamp), day(day_date), day(day_timestamp),
-        hour(hour_timestamp))
-      STORED AS ICEBERG""".format(unique_database)
-    self.execute_query(create_table_stmt)
     self.run_test_case('QueryTest/iceberg-drop-partition', vector,
       use_db=unique_database)