This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 4fcc01028d Reenable Iceberg unit tests
4fcc01028d is described below
commit 4fcc01028dbfe152ead5c5e784f11963ac4ee1d5
Author: hariuserx <[email protected]>
AuthorDate: Sun Jul 27 13:59:38 2025 -0700
Reenable Iceberg unit tests
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Iceberg version was upgraded to address a CVE which led to some test
failures and these tests were disabled
- The failures are due to a change in the default Iceberg table format
version. Explicitly add the format version to fix the tests and
re-enable them
Change-Id: Ibaf5498bbfaa720573cd97866b5209771790df1f
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20132
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Reviewed-by: Ian Maxon <[email protected]>
---
.../aws/AwsS3ExternalDatasetTest.java | 24 +++++++++++++---------
.../runtimets/testsuite_external_dataset_s3.xml | 2 --
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java
index e1da469dc0..8393e4b562 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java
@@ -266,7 +266,9 @@ public class AwsS3ExternalDatasetTest {
// create the table
Table table = tables.create(SCHEMA, PartitionSpec.unpartitioned(),
- ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
FileFormat.PARQUET.name()), ICEBERG_TABLE_PATH);
+ ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
FileFormat.PARQUET.name(),
+ TableProperties.FORMAT_VERSION, "1"),
+ ICEBERG_TABLE_PATH);
// load test data
try {
@@ -293,8 +295,9 @@ public class AwsS3ExternalDatasetTest {
}
// create a table with mix of parquet and avro data files
- Table mixedDataFormats = tables.create(SCHEMA,
PartitionSpec.unpartitioned(),
- ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
FileFormat.PARQUET.name()),
+ Table mixedDataFormats = tables.create(SCHEMA,
+ PartitionSpec.unpartitioned(),
ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
+ FileFormat.PARQUET.name(),
TableProperties.FORMAT_VERSION, "1"),
ICEBERG_TABLE_PATH_MIXED_DATA_FORMAT);
// load test data
@@ -310,14 +313,14 @@ public class AwsS3ExternalDatasetTest {
}
// empty table
- tables.create(SCHEMA, PartitionSpec.unpartitioned(),
- ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
FileFormat.PARQUET.name()),
- ICEBERG_TABLE_PATH_EMPTY);
+ tables.create(SCHEMA, PartitionSpec.unpartitioned(),
ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
+ FileFormat.PARQUET.name(), TableProperties.FORMAT_VERSION,
"1"), ICEBERG_TABLE_PATH_EMPTY);
// multiple data files
- Table multipleDataFiles = tables.create(SCHEMA,
PartitionSpec.unpartitioned(),
- ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
FileFormat.PARQUET.name()),
+ Table multipleDataFiles = tables.create(SCHEMA,
+ PartitionSpec.unpartitioned(),
ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
+ FileFormat.PARQUET.name(),
TableProperties.FORMAT_VERSION, "1"),
ICEBERG_TABLE_PATH_MULTIPLE_DATA_FILES);
// load test data
@@ -333,8 +336,9 @@ public class AwsS3ExternalDatasetTest {
}
// modify data
- Table modifiedData = tables.create(SCHEMA,
PartitionSpec.unpartitioned(),
- ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
FileFormat.PARQUET.name()),
+ Table modifiedData = tables.create(SCHEMA,
+ PartitionSpec.unpartitioned(),
ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT,
+ FileFormat.PARQUET.name(),
TableProperties.FORMAT_VERSION, "1"),
ICEBERG_TABLE_PATH_MODIFIED_DATA);
// load test data
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
index 810393f272..bb4cbb0a20 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
@@ -1388,7 +1388,6 @@
</test-case>
</test-group>
<!-- Iceberg Tests Start -->
- <!-- ASTERIXDB-3468: iceberg tests failing due to unsupported version
<test-group name="iceberg">
<test-case FilePath="external-dataset/s3">
<compilation-unit name="iceberg">
@@ -1435,7 +1434,6 @@
</compilation-unit>
</test-case>
</test-group>
- -->
<test-group name="copy-from">
<test-case FilePath="copy-from">
<compilation-unit name="copy-2">
