-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Core: Add TableUtil to provide access to a table's format version
- Loading branch information
Showing
5 changed files
with
188 additions
and
7 deletions.
There are no files selected for viewing
This file contains 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 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,59 @@ | ||
| /* | ||
| * 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.relocated.com.google.common.base.Preconditions; | ||
|
|
||
| public class TableUtil { | ||
| private TableUtil() {} | ||
|
|
||
| /** | ||
| * Returns the format version of the given table. Note that subclasses of {@link | ||
| * BaseMetadataTable} do not have a format version. The only exception to this is {@link | ||
| * PositionDeletesTable}, where the format version is fetched from the underlying table. | ||
| */ | ||
| public static int formatVersion(Table table) { | ||
| Preconditions.checkArgument(null != table, "Invalid table: null"); | ||
|
|
||
| // being able to read the format version from the PositionDeletesTable is mainly needed in | ||
| // SparkPositionDeletesRewrite when determining whether to rewrite V2 position deletes to DVs | ||
| if (table instanceof BaseMetadataTable) { | ||
| Preconditions.checkArgument( | ||
| table instanceof PositionDeletesTable, | ||
| "%s table does not have a format version", | ||
| ((BaseMetadataTable) table).metadataTableType()); | ||
|
|
||
| return ((PositionDeletesTable) table).table().operations().current().formatVersion(); | ||
| } else if (table instanceof SerializableTable.SerializableMetadataTable) { | ||
| SerializableTable.SerializableMetadataTable metadataTable = | ||
| (SerializableTable.SerializableMetadataTable) table; | ||
| Preconditions.checkArgument( | ||
| metadataTable.type() == MetadataTableType.POSITION_DELETES, | ||
| "%s table does not have a format version", | ||
| metadataTable.type()); | ||
|
|
||
| return metadataTable.underlyingMetadataTable().table().operations().current().formatVersion(); | ||
| } else if (table instanceof HasTableOperations) { | ||
| return ((HasTableOperations) table).operations().current().formatVersion(); | ||
| } else { | ||
| throw new IllegalArgumentException( | ||
| String.format("%s does not have a format version", table.getClass().getSimpleName())); | ||
| } | ||
| } | ||
| } |
111 changes: 111 additions & 0 deletions
111
core/src/test/java/org/apache/iceberg/TestTableUtil.java
This file contains 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,111 @@ | ||
| /* | ||
| * 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 static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
|
|
||
| import java.io.File; | ||
| import java.util.Arrays; | ||
| import java.util.stream.Collectors; | ||
| import org.apache.iceberg.catalog.Namespace; | ||
| import org.apache.iceberg.catalog.TableIdentifier; | ||
| import org.apache.iceberg.inmemory.InMemoryCatalog; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; | ||
| import org.apache.iceberg.types.Types; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.io.TempDir; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.ValueSource; | ||
|
|
||
| public class TestTableUtil { | ||
| private static final Namespace NS = Namespace.of("ns"); | ||
| private static final TableIdentifier IDENTIFIER = TableIdentifier.of(NS, "test"); | ||
|
|
||
| @TempDir private File tmp; | ||
|
|
||
| private InMemoryCatalog catalog; | ||
|
|
||
| @BeforeEach | ||
| public void initCatalog() { | ||
| catalog = new InMemoryCatalog(); | ||
| catalog.initialize("catalog", ImmutableMap.of()); | ||
| catalog.createNamespace(NS); | ||
| } | ||
|
|
||
| @Test | ||
| public void nullTable() { | ||
| assertThatThrownBy(() -> TableUtil.formatVersion(null)) | ||
| .isInstanceOf(IllegalArgumentException.class) | ||
| .hasMessage("Invalid table: null"); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @ValueSource(ints = {1, 2, 3}) | ||
| public void formatVersionFromBaseTable(int formatVersion) { | ||
| Table table = | ||
| catalog.createTable( | ||
| IDENTIFIER, | ||
| new Schema(Types.NestedField.required(1, "id", Types.IntegerType.get())), | ||
| PartitionSpec.unpartitioned(), | ||
| ImmutableMap.of(TableProperties.FORMAT_VERSION, String.valueOf(formatVersion))); | ||
|
|
||
| assertThat(TableUtil.formatVersion(table)).isEqualTo(formatVersion); | ||
| assertThat(TableUtil.formatVersion(SerializableTable.copyOf(table))).isEqualTo(formatVersion); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @ValueSource(ints = {1, 2, 3}) | ||
| public void formatVersionFromPositionDeletesTable(int formatVersion) { | ||
| Table table = | ||
| catalog.createTable( | ||
| IDENTIFIER, | ||
| new Schema(Types.NestedField.required(1, "id", Types.IntegerType.get())), | ||
| PartitionSpec.unpartitioned(), | ||
| ImmutableMap.of(TableProperties.FORMAT_VERSION, String.valueOf(formatVersion))); | ||
|
|
||
| PositionDeletesTable positionDeletesTable = new PositionDeletesTable(table); | ||
| assertThat(TableUtil.formatVersion(positionDeletesTable)).isEqualTo(formatVersion); | ||
| assertThat(TableUtil.formatVersion(SerializableTable.copyOf(positionDeletesTable))) | ||
| .isEqualTo(formatVersion); | ||
| } | ||
|
|
||
| @Test | ||
| public void formatVersionForMetadataTables() { | ||
| Table table = | ||
| catalog.createTable( | ||
| IDENTIFIER, new Schema(Types.NestedField.required(1, "id", Types.IntegerType.get()))); | ||
|
|
||
| for (MetadataTableType type : | ||
| Arrays.stream(MetadataTableType.values()) | ||
| .filter(type -> type != MetadataTableType.POSITION_DELETES) | ||
| .collect(Collectors.toList())) { | ||
|
|
||
| Table metadataTable = MetadataTableUtils.createMetadataTableInstance(table, type); | ||
| assertThatThrownBy(() -> TableUtil.formatVersion(metadataTable)) | ||
| .isInstanceOf(IllegalArgumentException.class) | ||
| .hasMessage("%s table does not have a format version", type); | ||
|
|
||
| assertThatThrownBy(() -> TableUtil.formatVersion(SerializableTable.copyOf(metadataTable))) | ||
| .isInstanceOf(IllegalArgumentException.class) | ||
| .hasMessage("%s table does not have a format version", type); | ||
| } | ||
| } | ||
| } |
This file contains 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 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