diff --git a/ice-rest-catalog/src/test/java/com/altinity/ice/rest/catalog/internal/etcd/EtcdCatalogIT.java b/ice-rest-catalog/src/test/java/com/altinity/ice/rest/catalog/internal/etcd/EtcdCatalogIT.java index 7140310..2b23b10 100644 --- a/ice-rest-catalog/src/test/java/com/altinity/ice/rest/catalog/internal/etcd/EtcdCatalogIT.java +++ b/ice-rest-catalog/src/test/java/com/altinity/ice/rest/catalog/internal/etcd/EtcdCatalogIT.java @@ -49,7 +49,7 @@ public class EtcdCatalogIT { @SuppressWarnings("rawtypes") private final GenericContainer etcd = - new GenericContainer("bitnami/etcd:3.5.21") + new GenericContainer("milvusdb/etcd:3.5.21-r2") .withExposedPorts(2379, 2380) .withEnv("ALLOW_NONE_AUTHENTICATION", "yes"); diff --git a/ice/src/main/java/com/altinity/ice/cli/internal/iceberg/Sorting.java b/ice/src/main/java/com/altinity/ice/cli/internal/iceberg/Sorting.java index c972752..8471c78 100644 --- a/ice/src/main/java/com/altinity/ice/cli/internal/iceberg/Sorting.java +++ b/ice/src/main/java/com/altinity/ice/cli/internal/iceberg/Sorting.java @@ -25,7 +25,6 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.CloseableIterator; import org.apache.iceberg.io.InputFile; -import org.apache.iceberg.mapping.NameMapping; import org.apache.iceberg.parquet.Parquet; import org.apache.iceberg.types.Types; @@ -100,16 +99,14 @@ public String toUnsortedDiffString() { } } - public static boolean isSorted( - InputFile inputFile, Schema tableSchema, SortOrder sortOrder) + public static boolean isSorted(InputFile inputFile, Schema tableSchema, SortOrder sortOrder) throws IOException { return checkSorted(inputFile, tableSchema, sortOrder).ok; } // TODO: check metadata first to avoid full scan when unsorted public static SortCheckResult checkSorted( - InputFile inputFile, Schema tableSchema, SortOrder sortOrder) - throws IOException { + InputFile inputFile, Schema tableSchema, SortOrder sortOrder) throws IOException { if (sortOrder.isUnsorted()) { return new SortCheckResult(false); } @@ -140,7 +137,7 @@ public static SortCheckResult checkSorted( try (CloseableIterable records = Parquet.read(inputFile) - .createReaderFunc(s -> GenericParquetReaders.buildReader(tableSchema, s)) + .createReaderFunc(s -> GenericParquetReaders.buildReader(projectedSchema, s)) .project(projectedSchema) .build()) {