ice: Add support for partition by and sort columns in create table and insert. #22
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| services: | ||
| spark-iceberg: | ||
| image: tabulario/spark-iceberg | ||
| container_name: spark-iceberg | ||
| network_mode: host | ||
| volumes: | ||
| - ./warehouse:/home/iceberg/warehouse | ||
| - ./notebooks:/home/iceberg/notebooks/notebooks | ||
| environment: | ||
| - AWS_ACCESS_KEY_ID=miniouser | ||
| - AWS_SECRET_ACCESS_KEY=miniopassword | ||
| - AWS_REGION=minio | ||
| ports: | ||
| - 8888:8888 | ||
| - 8080:8080 | ||
| - 10000:10000 | ||
| - 10001:10001 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,8 +18,12 @@ | |
| import com.altinity.ice.cli.internal.config.Config; | ||
| import com.altinity.ice.internal.picocli.VersionProvider; | ||
| import com.altinity.ice.internal.strings.Strings; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.databind.DeserializationFeature; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Scanner; | ||
|
|
@@ -114,6 +118,14 @@ void describe( | |
| } | ||
| } | ||
|
|
||
| public record IceSortOrder( | ||
| @JsonProperty("column") String column, | ||
| @JsonProperty("desc") boolean desc, | ||
| @JsonProperty("nullFirst") boolean nullFirst) {} | ||
|
|
||
| public record IcePartition( | ||
| @JsonProperty("column") String column, @JsonProperty("transform") String transform) {} | ||
|
|
||
| @CommandLine.Command(name = "create-table", description = "Create table.") | ||
| void createTable( | ||
| @CommandLine.Parameters( | ||
|
|
@@ -138,16 +150,46 @@ void createTable( | |
| required = true, | ||
| names = "--schema-from-parquet", | ||
| description = "/path/to/file.parquet") | ||
| String schemaFile, | ||
| @CommandLine.Option( | ||
| names = {"--partition"}, | ||
| description = | ||
| "JSON array of partition specifications: [{\"column\":\"date\",\"transform\":\"year\"}]," | ||
| + "Supported transforms: hour, day, month, year, identity(default)") | ||
| String partitionJson, | ||
| @CommandLine.Option( | ||
| names = {"--sort-order"}, | ||
| description = | ||
| "JSON array of sort orders: [{\"column\":\"name\",\"desc\":true,\"nullFirst\":true}]") | ||
| String sortOrderJson) | ||
| throws IOException { | ||
| try (RESTCatalog catalog = loadCatalog(this.configFile())) { | ||
| List<IceSortOrder> sortOrders = new ArrayList<>(); | ||
| List<IcePartition> partitions = new ArrayList<>(); | ||
|
|
||
| if (sortOrderJson != null && !sortOrderJson.isEmpty()) { | ||
| ObjectMapper mapper = new ObjectMapper(); | ||
|
Collaborator
There was a problem hiding this comment. it's best to set https://github.com/Altinity/ice/blob/master/ice/src/main/java/com/altinity/ice/internal/config/Config.java#L37, otherwise any typos are silently ignored |
||
| mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true); | ||
| IceSortOrder[] orders = mapper.readValue(sortOrderJson, IceSortOrder[].class); | ||
| sortOrders = Arrays.asList(orders); | ||
| } | ||
|
|
||
| if (partitionJson != null && !partitionJson.isEmpty()) { | ||
| ObjectMapper mapper = new ObjectMapper(); | ||
| mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true); | ||
| IcePartition[] parts = mapper.readValue(partitionJson, IcePartition[].class); | ||
| partitions = Arrays.asList(parts); | ||
| } | ||
|
|
||
| CreateTable.run( | ||
| catalog, | ||
| TableIdentifier.parse(name), | ||
| schemaFile, | ||
| location, | ||
| createTableIfNotExists, | ||
| s3NoSignRequest, | ||
| partitions, | ||
| sortOrders); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -206,6 +248,17 @@ void insert( | |
| "/path/to/file where to save list of files to retry" | ||
| + " (useful for retrying partially failed insert using `cat ice.retry | ice insert - --retry-list=ice.retry`)") | ||
| String retryList, | ||
| @CommandLine.Option( | ||
| names = {"--partition"}, | ||
| description = | ||
| "JSON array of partition specifications: [{\"column\":\"date\",\"transform\":\"year\"}]," | ||
| + "Supported transforms: hour, day, month, year, identity(default)") | ||
| String partitionJson, | ||
| @CommandLine.Option( | ||
| names = {"--sort-order"}, | ||
| description = | ||
| "JSON array of sort orders: [{\"column\":\"name\",\"desc\":true,\"nullFirst\":true}]") | ||
| String sortOrderJson, | ||
| @CommandLine.Option( | ||
| names = {"--thread-count"}, | ||
| description = "Number of threads to use for inserting data", | ||
|
|
@@ -224,11 +277,35 @@ void insert( | |
| return; | ||
| } | ||
| } | ||
|
|
||
| List<IceSortOrder> sortOrders = new ArrayList<>(); | ||
| List<IcePartition> partitions = new ArrayList<>(); | ||
|
|
||
| if (sortOrderJson != null && !sortOrderJson.isEmpty()) { | ||
| ObjectMapper mapper = new ObjectMapper(); | ||
| mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true); | ||
| IceSortOrder[] orders = mapper.readValue(sortOrderJson, IceSortOrder[].class); | ||
| sortOrders = Arrays.asList(orders); | ||
| } | ||
|
|
||
| if (partitionJson != null && !partitionJson.isEmpty()) { | ||
| ObjectMapper mapper = new ObjectMapper(); | ||
| mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true); | ||
| IcePartition[] parts = mapper.readValue(partitionJson, IcePartition[].class); | ||
| partitions = Arrays.asList(parts); | ||
| } | ||
|
|
||
| TableIdentifier tableId = TableIdentifier.parse(name); | ||
| if (createTableIfNotExists) { | ||
| CreateTable.run( | ||
| catalog, | ||
| tableId, | ||
| dataFiles[0], | ||
| null, | ||
| createTableIfNotExists, | ||
| s3NoSignRequest, | ||
| partitions, | ||
| sortOrders); | ||
| } | ||
| Insert.run( | ||
| catalog, | ||
|
|
@@ -243,6 +320,8 @@ void insert( | |
| s3NoSignRequest, | ||
| s3CopyObject, | ||
| retryList, | ||
| partitions, | ||
| sortOrders, | ||
| threadCount < 1 ? Runtime.getRuntime().availableProcessors() : threadCount); | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing instructions on how to actually use any of this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added