szehon-ho commented on a change in pull request #4243: URL: https://github.com/apache/iceberg/pull/4243#discussion_r820014398
########## File path: core/src/main/java/org/apache/iceberg/DeleteFilesTable.java ########## @@ -0,0 +1,126 @@ +/* + * 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 java.util.Map; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.expressions.ResidualEvaluator; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; + +/** + * A {@link Table} implementation that exposes a table's delete files as rows. + */ +public class DeleteFilesTable extends BaseFilesTable { + + DeleteFilesTable(TableOperations ops, Table table) { + this(ops, table, table.name() + ".delete_files"); + } + + DeleteFilesTable(TableOperations ops, Table table, String name) { + super(ops, table, name); + } + + @Override + public TableScan newScan() { + return new DeleteFilesTableScan(operations(), table(), schema()); + } + + @Override + MetadataTableType metadataTableType() { + return MetadataTableType.DELETE_FILES; + } + + public static class DeleteFilesTableScan extends BaseFilesTableScan { + private final Schema fileSchema; Review comment: Good point, done. ########## File path: core/src/main/java/org/apache/iceberg/BaseFilesTable.java ########## @@ -0,0 +1,99 @@ +/* + * 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 java.util.List; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.ManifestEvaluator; +import org.apache.iceberg.expressions.Projections; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.types.TypeUtil; +import org.apache.iceberg.types.Types.StructType; + +/** + * Base class logic for files metadata tables + */ +abstract class BaseFilesTable extends BaseMetadataTable { + + BaseFilesTable(TableOperations ops, Table table, String name) { + super(ops, table, name); + } + + @Override + public Schema schema() { + StructType partitionType = Partitioning.partitionType(table()); + Schema schema = new Schema(DataFile.getType(partitionType).fields()); + if (partitionType.fields().size() < 1) { + // avoid returning an empty struct, which is not always supported. instead, drop the partition field + return TypeUtil.selectNot(schema, Sets.newHashSet(DataFile.PARTITION_ID)); + } else { + return schema; + } + } + + abstract static class BaseFilesTableScan extends BaseMetadataTableScan { + private final Schema fileSchema; + private final MetadataTableType type; + + protected BaseFilesTableScan(TableOperations ops, Table table, Schema fileSchema, MetadataTableType type) { + super(ops, table, fileSchema); + this.fileSchema = fileSchema; + this.type = type; + } + + protected BaseFilesTableScan(TableOperations ops, Table table, Schema schema, Schema fileSchema, + TableScanContext context, MetadataTableType type) { Review comment: Done ########## File path: core/src/main/java/org/apache/iceberg/BaseFilesTable.java ########## @@ -0,0 +1,99 @@ +/* + * 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 java.util.List; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.ManifestEvaluator; +import org.apache.iceberg.expressions.Projections; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.types.TypeUtil; +import org.apache.iceberg.types.Types.StructType; + +/** + * Base class logic for files metadata tables + */ +abstract class BaseFilesTable extends BaseMetadataTable { + + BaseFilesTable(TableOperations ops, Table table, String name) { + super(ops, table, name); + } + + @Override + public Schema schema() { + StructType partitionType = Partitioning.partitionType(table()); + Schema schema = new Schema(DataFile.getType(partitionType).fields()); + if (partitionType.fields().size() < 1) { + // avoid returning an empty struct, which is not always supported. instead, drop the partition field + return TypeUtil.selectNot(schema, Sets.newHashSet(DataFile.PARTITION_ID)); + } else { + return schema; + } + } + + abstract static class BaseFilesTableScan extends BaseMetadataTableScan { + private final Schema fileSchema; Review comment: Good point, done ########## File path: core/src/main/java/org/apache/iceberg/DataFilesTable.java ########## @@ -47,78 +42,44 @@ @Override public TableScan newScan() { - return new FilesTableScan(operations(), table(), schema()); - } - - @Override - public Schema schema() { - StructType partitionType = Partitioning.partitionType(table()); - Schema schema = new Schema(DataFile.getType(partitionType).fields()); - if (partitionType.fields().size() < 1) { - // avoid returning an empty struct, which is not always supported. instead, drop the partition field - return TypeUtil.selectNot(schema, Sets.newHashSet(DataFile.PARTITION_ID)); - } else { - return schema; - } + return new DataFilesTableScan(operations(), table(), schema()); } @Override MetadataTableType metadataTableType() { return MetadataTableType.FILES; } - public static class FilesTableScan extends BaseMetadataTableScan { + public static class DataFilesTableScan extends BaseFilesTableScan { private final Schema fileSchema; - FilesTableScan(TableOperations ops, Table table, Schema fileSchema) { - super(ops, table, fileSchema); + DataFilesTableScan(TableOperations ops, Table table, Schema fileSchema) { + super(ops, table, fileSchema, MetadataTableType.FILES); this.fileSchema = fileSchema; } - private FilesTableScan(TableOperations ops, Table table, Schema schema, Schema fileSchema, + DataFilesTableScan(TableOperations ops, Table table, Schema schema, Schema fileSchema, Review comment: Fixed ########## File path: core/src/main/java/org/apache/iceberg/DeleteFilesTable.java ########## @@ -0,0 +1,126 @@ +/* + * 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 java.util.Map; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.expressions.ResidualEvaluator; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; + +/** + * A {@link Table} implementation that exposes a table's delete files as rows. + */ +public class DeleteFilesTable extends BaseFilesTable { + + DeleteFilesTable(TableOperations ops, Table table) { + this(ops, table, table.name() + ".delete_files"); + } + + DeleteFilesTable(TableOperations ops, Table table, String name) { + super(ops, table, name); + } + + @Override + public TableScan newScan() { + return new DeleteFilesTableScan(operations(), table(), schema()); + } + + @Override + MetadataTableType metadataTableType() { + return MetadataTableType.DELETE_FILES; + } + + public static class DeleteFilesTableScan extends BaseFilesTableScan { + private final Schema fileSchema; Review comment: Done ########## File path: core/src/main/java/org/apache/iceberg/DeleteFilesTable.java ########## @@ -0,0 +1,126 @@ +/* + * 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 java.util.Map; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.expressions.ResidualEvaluator; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; + +/** + * A {@link Table} implementation that exposes a table's delete files as rows. + */ +public class DeleteFilesTable extends BaseFilesTable { + + DeleteFilesTable(TableOperations ops, Table table) { + this(ops, table, table.name() + ".delete_files"); + } + + DeleteFilesTable(TableOperations ops, Table table, String name) { + super(ops, table, name); + } + + @Override + public TableScan newScan() { + return new DeleteFilesTableScan(operations(), table(), schema()); + } + + @Override + MetadataTableType metadataTableType() { + return MetadataTableType.DELETE_FILES; + } + + public static class DeleteFilesTableScan extends BaseFilesTableScan { + private final Schema fileSchema; + + DeleteFilesTableScan(TableOperations ops, Table table, Schema fileSchema) { + super(ops, table, fileSchema, MetadataTableType.DELETE_FILES); + this.fileSchema = fileSchema; + } + + private DeleteFilesTableScan(TableOperations ops, Table table, Schema schema, Schema fileSchema, + TableScanContext context) { Review comment: Done -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
