jun-he commented on a change in pull request #922: URL: https://github.com/apache/iceberg/pull/922#discussion_r437173927
########## File path: api/src/main/java/org/apache/iceberg/UpdatePartitionSpec.java ########## @@ -0,0 +1,268 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.transforms.Transform; + +/** + * API for partition spec evolution. + * <p> + * When committing, these changes will be applied to the current table metadata. Commit conflicts + * will not be resolved and will result in a {@link CommitFailedException}. + */ +public interface UpdatePartitionSpec extends PendingUpdate<PartitionSpec> { + + /** + * Clear all partition fields in the current partition spec. + * <p> + * This will create a new partition spec without any partition field. + * Partition field IDs is automatically assigned and will be updated during the commit. + * Table schema should be obtained from the current table metadata + * + * @return this for method chaining + */ + UpdatePartitionSpec clear(); + + /** + * Add a new partition field with identity transform to the partition spec. + * <p> + * The partition field id is automatically assigned and will be updated during the commit. + * + * @param sourceName the field name of the source field in the {@link PartitionSpec spec's} table schema + * @param targetName the name of this partition field + * @return this for method chaining + */ + UpdatePartitionSpec addIdentityField(String sourceName, String targetName); + + /** + * Add a new partition field with identity transform to the partition spec. + * <p> + * The partition field name is automatically assigned set. + * The partition field id is automatically assigned and will be updated during the commit. + * + * @param sourceName the field name of the source field in the {@link PartitionSpec spec's} table schema + * @return this for method chaining + */ + UpdatePartitionSpec addIdentityField(String sourceName); + + /** + * Add a new partition field with year transform to the partition spec. + * <p> + * The partition field id is automatically assigned and will be updated during the commit. + * + * @param sourceName the field name of the source field in the {@link PartitionSpec spec's} table schema + * @param targetName the name of this partition field + * @return this for method chaining + */ + UpdatePartitionSpec addYearField(String sourceName, String targetName); + + /** + * Add a new partition field with year transform to the partition spec. + * <p> + * The partition field name is automatically assigned set. + * The partition field id is automatically assigned and will be updated during the commit. Review comment: 👌 ########## File path: api/src/main/java/org/apache/iceberg/UpdatePartitionSpec.java ########## @@ -0,0 +1,268 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.transforms.Transform; + +/** + * API for partition spec evolution. + * <p> + * When committing, these changes will be applied to the current table metadata. Commit conflicts + * will not be resolved and will result in a {@link CommitFailedException}. + */ +public interface UpdatePartitionSpec extends PendingUpdate<PartitionSpec> { + + /** + * Clear all partition fields in the current partition spec. + * <p> + * This will create a new partition spec without any partition field. Review comment: 👌 ########## File path: api/src/main/java/org/apache/iceberg/UpdatePartitionSpec.java ########## @@ -0,0 +1,268 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.transforms.Transform; + +/** + * API for partition spec evolution. + * <p> + * When committing, these changes will be applied to the current table metadata. Commit conflicts + * will not be resolved and will result in a {@link CommitFailedException}. + */ +public interface UpdatePartitionSpec extends PendingUpdate<PartitionSpec> { + + /** + * Clear all partition fields in the current partition spec. + * <p> + * This will create a new partition spec without any partition field. + * Partition field IDs is automatically assigned and will be updated during the commit. + * Table schema should be obtained from the current table metadata Review comment: 👌 ########## File path: api/src/main/java/org/apache/iceberg/UpdatePartitionSpec.java ########## @@ -0,0 +1,268 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.transforms.Transform; + +/** + * API for partition spec evolution. + * <p> + * When committing, these changes will be applied to the current table metadata. Commit conflicts + * will not be resolved and will result in a {@link CommitFailedException}. + */ +public interface UpdatePartitionSpec extends PendingUpdate<PartitionSpec> { + + /** + * Clear all partition fields in the current partition spec. + * <p> + * This will create a new partition spec without any partition field. + * Partition field IDs is automatically assigned and will be updated during the commit. + * Table schema should be obtained from the current table metadata + * + * @return this for method chaining + */ + UpdatePartitionSpec clear(); + + /** + * Add a new partition field with identity transform to the partition spec. + * <p> + * The partition field id is automatically assigned and will be updated during the commit. + * + * @param sourceName the field name of the source field in the {@link PartitionSpec spec's} table schema + * @param targetName the name of this partition field + * @return this for method chaining + */ + UpdatePartitionSpec addIdentityField(String sourceName, String targetName); + + /** + * Add a new partition field with identity transform to the partition spec. + * <p> + * The partition field name is automatically assigned set. Review comment: 👌 ########## File path: core/src/main/java/org/apache/iceberg/PartitionSpecUpdate.java ########## @@ -0,0 +1,214 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import java.util.Map; +import org.apache.iceberg.transforms.Transform; + +/** + * PartitionSpec evolution API implementation. + */ +class PartitionSpecUpdate implements UpdatePartitionSpec { + + private final TableMetadata base; + private final TableOperations ops; + private PartitionSpec.Builder newSpecBuilder; + + PartitionSpecUpdate(TableOperations ops) { + this.ops = ops; + this.base = ops.current(); + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + for (PartitionField field : base.spec().fields()) { + this.newSpecBuilder.add(field.sourceId(), field.fieldId(), field.name(), field.transform().toString()); + } + } + + @Override + public PartitionSpec apply() { + Preconditions.checkNotNull(newSpecBuilder, "new partition spec is not set"); + return newSpecBuilder.build(); + } + + @Override + public UpdatePartitionSpec clear() { + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName, String targetName) { + newSpecBuilder.identity(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName) { + newSpecBuilder.identity(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName, String targetName) { + newSpecBuilder.year(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName) { + newSpecBuilder.year(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName, String targetName) { + newSpecBuilder.month(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName) { + newSpecBuilder.month(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName, String targetName) { + newSpecBuilder.day(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName) { + newSpecBuilder.day(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName, String targetName) { + newSpecBuilder.hour(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName) { + newSpecBuilder.hour(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets, String targetName) { + newSpecBuilder.bucket(sourceName, numBuckets, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets) { + newSpecBuilder.bucket(sourceName, numBuckets); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width, String targetName) { + newSpecBuilder.truncate(sourceName, width, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width) { + newSpecBuilder.truncate(sourceName, width); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, String transform) { + newSpecBuilder.add(sourceId, name, transform); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, Transform<?, ?> transform) { + return addField(sourceId, name, transform.toString()); + } + + @Override + public UpdatePartitionSpec renameField(String name, String newName) { + newSpecBuilder.rename(name, newName); + return this; + } + + @Override + public UpdatePartitionSpec removeField(String name) { + newSpecBuilder.remove(name, base.formatVersion() == 1); + return this; + } + + @Override + public UpdatePartitionSpec replaceField(String name, String transform) { + int sourceId = newSpecBuilder.remove(name, base.formatVersion() == 1); + return addField(sourceId, name, transform); + } + + @Override + public UpdatePartitionSpec replaceField(String name, Transform<?, ?> transform) { Review comment: Thanks for the comments. Will do. ########## File path: core/src/main/java/org/apache/iceberg/PartitionSpecUpdate.java ########## @@ -0,0 +1,214 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import java.util.Map; +import org.apache.iceberg.transforms.Transform; + +/** + * PartitionSpec evolution API implementation. + */ +class PartitionSpecUpdate implements UpdatePartitionSpec { + + private final TableMetadata base; + private final TableOperations ops; + private PartitionSpec.Builder newSpecBuilder; + + PartitionSpecUpdate(TableOperations ops) { + this.ops = ops; + this.base = ops.current(); + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + for (PartitionField field : base.spec().fields()) { + this.newSpecBuilder.add(field.sourceId(), field.fieldId(), field.name(), field.transform().toString()); + } + } + + @Override + public PartitionSpec apply() { + Preconditions.checkNotNull(newSpecBuilder, "new partition spec is not set"); + return newSpecBuilder.build(); + } + + @Override + public UpdatePartitionSpec clear() { + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName, String targetName) { + newSpecBuilder.identity(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName) { + newSpecBuilder.identity(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName, String targetName) { + newSpecBuilder.year(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName) { + newSpecBuilder.year(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName, String targetName) { + newSpecBuilder.month(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName) { + newSpecBuilder.month(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName, String targetName) { + newSpecBuilder.day(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName) { + newSpecBuilder.day(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName, String targetName) { + newSpecBuilder.hour(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName) { + newSpecBuilder.hour(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets, String targetName) { + newSpecBuilder.bucket(sourceName, numBuckets, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets) { + newSpecBuilder.bucket(sourceName, numBuckets); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width, String targetName) { + newSpecBuilder.truncate(sourceName, width, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width) { + newSpecBuilder.truncate(sourceName, width); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, String transform) { + newSpecBuilder.add(sourceId, name, transform); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, Transform<?, ?> transform) { + return addField(sourceId, name, transform.toString()); + } + + @Override + public UpdatePartitionSpec renameField(String name, String newName) { + newSpecBuilder.rename(name, newName); + return this; + } + + @Override + public UpdatePartitionSpec removeField(String name) { + newSpecBuilder.remove(name, base.formatVersion() == 1); + return this; + } + + @Override + public UpdatePartitionSpec replaceField(String name, String transform) { + int sourceId = newSpecBuilder.remove(name, base.formatVersion() == 1); + return addField(sourceId, name, transform); + } + + @Override + public UpdatePartitionSpec replaceField(String name, Transform<?, ?> transform) { + return replaceField(name, transform.toString()); + } + + @Override + public void commit() { + TableMetadata update = base.updatePartitionSpec(freshSpecFieldIds(apply())); + ops.commit(base, update); + } + + private PartitionSpec freshSpecFieldIds(PartitionSpec partitionSpec) { Review comment: @rdblue Yes, that will also work. Current implementation lazily reassign the partition field ids if needed during commit. Both ways have the similar complexity. I feel the lazy way is slightly simpler as it does not track the states. For example, if users add and remove the same field before commit, ``` table.updateSpec() .addBucketField("data", 8) .removeField("data_bucket") .commit(); ``` then, there is no need to assign IDs. ########## File path: core/src/main/java/org/apache/iceberg/PartitionSpecUpdate.java ########## @@ -0,0 +1,214 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import java.util.Map; +import org.apache.iceberg.transforms.Transform; + +/** + * PartitionSpec evolution API implementation. + */ +class PartitionSpecUpdate implements UpdatePartitionSpec { + + private final TableMetadata base; + private final TableOperations ops; + private PartitionSpec.Builder newSpecBuilder; + + PartitionSpecUpdate(TableOperations ops) { + this.ops = ops; + this.base = ops.current(); + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + for (PartitionField field : base.spec().fields()) { + this.newSpecBuilder.add(field.sourceId(), field.fieldId(), field.name(), field.transform().toString()); + } + } + + @Override + public PartitionSpec apply() { + Preconditions.checkNotNull(newSpecBuilder, "new partition spec is not set"); + return newSpecBuilder.build(); + } + + @Override + public UpdatePartitionSpec clear() { + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName, String targetName) { + newSpecBuilder.identity(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName) { + newSpecBuilder.identity(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName, String targetName) { + newSpecBuilder.year(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName) { + newSpecBuilder.year(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName, String targetName) { + newSpecBuilder.month(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName) { + newSpecBuilder.month(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName, String targetName) { + newSpecBuilder.day(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName) { + newSpecBuilder.day(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName, String targetName) { + newSpecBuilder.hour(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName) { + newSpecBuilder.hour(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets, String targetName) { + newSpecBuilder.bucket(sourceName, numBuckets, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets) { + newSpecBuilder.bucket(sourceName, numBuckets); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width, String targetName) { + newSpecBuilder.truncate(sourceName, width, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width) { + newSpecBuilder.truncate(sourceName, width); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, String transform) { + newSpecBuilder.add(sourceId, name, transform); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, Transform<?, ?> transform) { + return addField(sourceId, name, transform.toString()); + } + + @Override + public UpdatePartitionSpec renameField(String name, String newName) { + newSpecBuilder.rename(name, newName); + return this; + } + + @Override + public UpdatePartitionSpec removeField(String name) { + newSpecBuilder.remove(name, base.formatVersion() == 1); + return this; + } + + @Override + public UpdatePartitionSpec replaceField(String name, String transform) { + int sourceId = newSpecBuilder.remove(name, base.formatVersion() == 1); + return addField(sourceId, name, transform); + } + + @Override + public UpdatePartitionSpec replaceField(String name, Transform<?, ?> transform) { + return replaceField(name, transform.toString()); + } + + @Override + public void commit() { + TableMetadata update = base.updatePartitionSpec(freshSpecFieldIds(apply())); Review comment: `lastAssignedPartitionId` is kept inside each partition spec. metadata's `lastAssignedPartitionId ` is only used here before committing. So we can lazily compute it while looping over the partition spec history. So it is unnecessary to add an extra field into Table metadata. ########## File path: core/src/main/java/org/apache/iceberg/PartitionSpecUpdate.java ########## @@ -0,0 +1,214 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import java.util.Map; +import org.apache.iceberg.transforms.Transform; + +/** + * PartitionSpec evolution API implementation. + */ +class PartitionSpecUpdate implements UpdatePartitionSpec { + + private final TableMetadata base; + private final TableOperations ops; + private PartitionSpec.Builder newSpecBuilder; + + PartitionSpecUpdate(TableOperations ops) { + this.ops = ops; + this.base = ops.current(); + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); Review comment: @rdblue thanks for the comments. Let me check if this will introduce some duplicate code (same logic in partition spec builder and here). ########## File path: core/src/main/java/org/apache/iceberg/PartitionSpecUpdate.java ########## @@ -0,0 +1,214 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import java.util.Map; +import org.apache.iceberg.transforms.Transform; + +/** + * PartitionSpec evolution API implementation. + */ +class PartitionSpecUpdate implements UpdatePartitionSpec { + + private final TableMetadata base; + private final TableOperations ops; + private PartitionSpec.Builder newSpecBuilder; + + PartitionSpecUpdate(TableOperations ops) { + this.ops = ops; + this.base = ops.current(); + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + for (PartitionField field : base.spec().fields()) { + this.newSpecBuilder.add(field.sourceId(), field.fieldId(), field.name(), field.transform().toString()); + } + } + + @Override + public PartitionSpec apply() { + Preconditions.checkNotNull(newSpecBuilder, "new partition spec is not set"); + return newSpecBuilder.build(); + } + + @Override + public UpdatePartitionSpec clear() { + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName, String targetName) { + newSpecBuilder.identity(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName) { + newSpecBuilder.identity(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName, String targetName) { + newSpecBuilder.year(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName) { + newSpecBuilder.year(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName, String targetName) { + newSpecBuilder.month(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName) { + newSpecBuilder.month(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName, String targetName) { + newSpecBuilder.day(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName) { + newSpecBuilder.day(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName, String targetName) { + newSpecBuilder.hour(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName) { + newSpecBuilder.hour(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets, String targetName) { + newSpecBuilder.bucket(sourceName, numBuckets, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets) { + newSpecBuilder.bucket(sourceName, numBuckets); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width, String targetName) { + newSpecBuilder.truncate(sourceName, width, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width) { + newSpecBuilder.truncate(sourceName, width); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, String transform) { + newSpecBuilder.add(sourceId, name, transform); Review comment: 👌 ########## File path: core/src/main/java/org/apache/iceberg/PartitionSpecUpdate.java ########## @@ -0,0 +1,214 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import java.util.Map; +import org.apache.iceberg.transforms.Transform; + +/** + * PartitionSpec evolution API implementation. + */ +class PartitionSpecUpdate implements UpdatePartitionSpec { + + private final TableMetadata base; + private final TableOperations ops; + private PartitionSpec.Builder newSpecBuilder; + + PartitionSpecUpdate(TableOperations ops) { + this.ops = ops; + this.base = ops.current(); + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + for (PartitionField field : base.spec().fields()) { + this.newSpecBuilder.add(field.sourceId(), field.fieldId(), field.name(), field.transform().toString()); + } + } + + @Override + public PartitionSpec apply() { + Preconditions.checkNotNull(newSpecBuilder, "new partition spec is not set"); + return newSpecBuilder.build(); + } + + @Override + public UpdatePartitionSpec clear() { + this.newSpecBuilder = PartitionSpec.builderFor(base.schema()); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName, String targetName) { + newSpecBuilder.identity(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addIdentityField(String sourceName) { + newSpecBuilder.identity(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName, String targetName) { + newSpecBuilder.year(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addYearField(String sourceName) { + newSpecBuilder.year(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName, String targetName) { + newSpecBuilder.month(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addMonthField(String sourceName) { + newSpecBuilder.month(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName, String targetName) { + newSpecBuilder.day(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addDayField(String sourceName) { + newSpecBuilder.day(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName, String targetName) { + newSpecBuilder.hour(sourceName, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addHourField(String sourceName) { + newSpecBuilder.hour(sourceName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets, String targetName) { + newSpecBuilder.bucket(sourceName, numBuckets, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addBucketField(String sourceName, int numBuckets) { + newSpecBuilder.bucket(sourceName, numBuckets); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width, String targetName) { + newSpecBuilder.truncate(sourceName, width, targetName); + return this; + } + + @Override + public UpdatePartitionSpec addTruncateField(String sourceName, int width) { + newSpecBuilder.truncate(sourceName, width); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, String transform) { + newSpecBuilder.add(sourceId, name, transform); + return this; + } + + @Override + public UpdatePartitionSpec addField(int sourceId, String name, Transform<?, ?> transform) { + return addField(sourceId, name, transform.toString()); + } + + @Override + public UpdatePartitionSpec renameField(String name, String newName) { + newSpecBuilder.rename(name, newName); + return this; + } + + @Override + public UpdatePartitionSpec removeField(String name) { + newSpecBuilder.remove(name, base.formatVersion() == 1); + return this; + } + + @Override + public UpdatePartitionSpec replaceField(String name, String transform) { + int sourceId = newSpecBuilder.remove(name, base.formatVersion() == 1); + return addField(sourceId, name, transform); + } + + @Override + public UpdatePartitionSpec replaceField(String name, Transform<?, ?> transform) { + return replaceField(name, transform.toString()); + } + + @Override + public void commit() { + TableMetadata update = base.updatePartitionSpec(freshSpecFieldIds(apply())); + ops.commit(base, update); + } + + private PartitionSpec freshSpecFieldIds(PartitionSpec partitionSpec) { Review comment: @rdblue Yes, that will also work. Current implementation lazily reassign the partition field ids if needed during commit. Both ways have the similar complexity. I feel the lazy way is slightly simpler as it does not track the states. I will check if this is still true if we keep track a list of PartitionField instead of using partition spec builder. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
