This is an automated email from the ASF dual-hosted git repository.
jasonmfehr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit 6a971095517806ee0cd2f0b9f4c5ec390038ff41
Author: Daniel Vanko <dva...@cloudera.com>
AuthorDate: Wed Jul 16 16:02:58 2025 +0200
IMPALA-12520: Create all Iceberg test tables under /test-warehouse
This patch modifies the creation of Iceberg tables in 5 testfiles.
Previously these tables were created outside of /test-warehouse which
could lead to issues, because we only clear the /test-warehouse
directory in bin/jenkins/release_cloud_resources.sh. This means tables
subsequent executions might see data from earlier runs.
Change-Id: I97ce512db052b6e7499187079a184c1525692592
Reviewed-on: http://gerrit.cloudera.org:8080/23188
Tested-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
Reviewed-by: Zoltan Borok-Nagy <borokna...@cloudera.com>
---
.../queries/QueryTest/iceberg-alter-default.test | 2 +-
.../queries/QueryTest/iceberg-alter-v1.test | 2 +-
.../queries/QueryTest/iceberg-alter-v2.test | 2 +-
.../functional-query/queries/QueryTest/iceberg-create.test | 14 +++++++-------
.../queries/QueryTest/iceberg-negative.test | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-default.test
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-default.test
index c1ef2185e..7b51dd6e4 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-default.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-default.test
@@ -74,7 +74,7 @@ CREATE TABLE iceberg_hadoop_catalog(
)
STORED AS ICEBERG
TBLPROPERTIES('iceberg.catalog'='hadoop.catalog',
-'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE/hadoop_catalog_test');
+'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE/hadoop_catalog_test');
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(event_time TIMESTAMP,
register_time DATE);
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(message STRING, price
DECIMAL(8,1));
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(map_test MAP <STRING, array
<STRING>>, struct_test STRUCT <f1: BIGINT, f2: BIGINT>);
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-v1.test
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-v1.test
index 2310f669f..9aa74288a 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-v1.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-v1.test
@@ -74,7 +74,7 @@ CREATE TABLE iceberg_hadoop_catalog(
)
STORED AS ICEBERG
TBLPROPERTIES('format-version'='1', 'iceberg.catalog'='hadoop.catalog',
-'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE/hadoop_catalog_test');
+'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE/hadoop_catalog_test');
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(event_time TIMESTAMP,
register_time DATE);
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(message STRING, price
DECIMAL(8,1));
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(map_test MAP <STRING, array
<STRING>>, struct_test STRUCT <f1: BIGINT, f2: BIGINT>);
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-v2.test
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-v2.test
index e99c4a5ae..5e512f970 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-v2.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-alter-v2.test
@@ -74,7 +74,7 @@ CREATE TABLE iceberg_hadoop_catalog(
)
STORED AS ICEBERG
TBLPROPERTIES('format-version'='2', 'iceberg.catalog'='hadoop.catalog',
-'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE/hadoop_catalog_test');
+'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE/hadoop_catalog_test');
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(event_time TIMESTAMP,
register_time DATE);
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(message STRING, price
DECIMAL(8,1));
ALTER TABLE iceberg_hadoop_catalog ADD COLUMNS(map_test MAP <STRING, array
<STRING>>, struct_test STRUCT <f1: BIGINT, f2: BIGINT>);
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-create.test
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-create.test
index 23b834407..451c81771 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/iceberg-create.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/iceberg-create.test
@@ -70,13 +70,13 @@ PARTITIONED BY SPEC
TRUNCATE(15, level)
)
STORED AS ICEBERG
-LOCATION
'$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE.iceberg_test_with_location'
+LOCATION
'$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE.iceberg_test_with_location'
TBLPROPERTIES('iceberg.catalog'='hadoop.tables');
CREATE EXTERNAL TABLE iceberg_hadoop_tbls_external(
level STRING
)
STORED AS ICEBERG
-LOCATION
'$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE.iceberg_test_with_location'
+LOCATION
'$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE.iceberg_test_with_location'
TBLPROPERTIES('iceberg.catalog'='hadoop.tables');
---- RESULTS
'Table has been created.'
@@ -97,7 +97,7 @@ STRING,BIGINT,BIGINT
---- QUERY
CREATE EXTERNAL TABLE iceberg_hadoop_tbls_external_empty_col
STORED AS ICEBERG
-LOCATION
'$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE.iceberg_test_with_location'
+LOCATION
'$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE.iceberg_test_with_location'
TBLPROPERTIES('iceberg.catalog'='hadoop.tables');
---- RESULTS
'Table has been created.'
@@ -137,7 +137,7 @@ PARTITIONED BY SPEC
)
STORED AS ICEBERG
TBLPROPERTIES('iceberg.catalog'='hadoop.catalog',
-'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE/hadoop_catalog_test');
+'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE/hadoop_catalog_test');
---- RESULTS
'Table has been created.'
====
@@ -171,13 +171,13 @@ PARTITIONED BY SPEC
)
STORED AS ICEBERG
TBLPROPERTIES('iceberg.catalog'='hadoop.catalog',
-'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE/hadoop_catalog_test');
+'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE/hadoop_catalog_test');
CREATE EXTERNAL TABLE iceberg_hadoop_cat_external(
level STRING
)
STORED AS ICEBERG
TBLPROPERTIES('iceberg.catalog'='hadoop.catalog',
-'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE/hadoop_catalog_test',
'iceberg.table_identifier'='$DATABASE.iceberg_hadoop_catalog');
+'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE/hadoop_catalog_test',
'iceberg.table_identifier'='$DATABASE.iceberg_hadoop_catalog');
---- RESULTS
'Table has been created.'
====
@@ -476,7 +476,7 @@ create table ice_part_hadoop_catalog (
col_identity
) stored as iceberg TBLPROPERTIES(
'iceberg.catalog' = 'hadoop.catalog',
- 'iceberg.catalog_location' =
'$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE/hadoop_catalog_test'
+ 'iceberg.catalog_location' =
'$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE/hadoop_catalog_test'
);
---- RESULTS
'Table has been created.'
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-negative.test
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-negative.test
index effb641fc..2474901ca 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/iceberg-negative.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/iceberg-negative.test
@@ -266,7 +266,7 @@ CREATE TABLE iceberg_table_hadoop_catalog(
)
STORED AS ICEBERG
TBLPROPERTIES('iceberg.catalog'='hadoop.catalog',
-'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/other/$DATABASE/hadoop_catalog_test');
+'iceberg.catalog_location'='$WAREHOUSE_LOCATION_PREFIX/test_warehouse/$DATABASE/hadoop_catalog_test');
ALTER TABLE iceberg_table_hadoop_catalog RENAME TO
iceberg_table_hadoop_catalog_new;
---- CATCH
UnsupportedOperationException: Cannot rename Iceberg tables that use
'hadoop.catalog' as catalog.
