aokolnychyi commented on code in PR #4744: URL: https://github.com/apache/iceberg/pull/4744#discussion_r883995287
########## core/src/main/java/org/apache/iceberg/BaseIncrementalAppendScan.java: ########## @@ -0,0 +1,179 @@ +/* + * 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 java.util.Set; +import org.apache.iceberg.events.IncrementalScanEvent; +import org.apache.iceberg.events.Listeners; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.FluentIterable; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.util.SnapshotUtil; +import org.apache.iceberg.util.TableScanUtil; + +class BaseIncrementalAppendScan extends BaseScan<IncrementalAppendScan> implements IncrementalAppendScan { + + BaseIncrementalAppendScan(TableOperations ops, Table table) { + this(ops, table, table.schema(), new TableScanContext()); + } + + BaseIncrementalAppendScan(TableOperations ops, Table table, Schema schema, TableScanContext context) { + super(ops, table, schema, context); + } + + @Override + protected IncrementalAppendScan newRefinedScan( + TableOperations newOps, Table newTable, Schema newSchema, TableScanContext newContext) { + return new BaseIncrementalAppendScan(newOps, newTable, newSchema, newContext); + } + + @Override + public IncrementalAppendScan fromSnapshotInclusive(long fromSnapshotId) { + Preconditions.checkArgument(table().snapshot(fromSnapshotId) != null, + "Cannot find the starting snapshot: %d", fromSnapshotId); + return newRefinedScan(tableOps(), table(), schema(), context().fromSnapshotIdInclusive(fromSnapshotId)); + } + + @Override + public IncrementalAppendScan fromSnapshotExclusive(long fromSnapshotId) { + // for exclusive behavior, table().snapshot(fromSnapshotId) check can't be applied. + // as fromSnapshotId could be matched to a parent snapshot that is already expired + return newRefinedScan(tableOps(), table(), schema(), context().fromSnapshotId(fromSnapshotId)); + } + + @Override + public IncrementalAppendScan toSnapshot(long toSnapshotId) { + Preconditions.checkArgument(table().snapshot(toSnapshotId) != null, + "Cannot find end snapshot: %d", toSnapshotId); + return newRefinedScan(tableOps(), table(), schema(), context().toSnapshotId(toSnapshotId)); + } + + @Override + public CloseableIterable<FileScanTask> planFiles() { + long toSnapshotIdInclusive; + if (context().toSnapshotId() != null) { + toSnapshotIdInclusive = context().toSnapshotId(); + } else if (table().currentSnapshot() != null) { + toSnapshotIdInclusive = table().currentSnapshot().snapshotId(); + } else if (context().fromSnapshotId() != null) { + throw new IllegalArgumentException( + "Invalid config: end snapshot is not set, start snapshot is set, and table has no current snapshot"); + } else { + // It is an empty table (no current snapshot). Both from and to snapshots aren't set either. + // In this case, listener notification is also skipped + return CloseableIterable.empty(); + } + + // fromSnapshotIdExclusive can be null. appendsBetween handles null fromSnapshotIdExclusive properly + // by finding the oldest ancestor of end snapshot. + Long fromSnapshotIdExclusive = context().fromSnapshotId(); + if (context().fromSnapshotId() != null) { + if (context().fromSnapshotInclusive()) { + // validate the fromSnapshotId is an ancestor of toSnapshotId + Preconditions.checkArgument( + SnapshotUtil.isAncestorOf(table(), toSnapshotIdInclusive, context().fromSnapshotId()), + "Starting snapshot (inclusive) %s is not an ancestor of end snapshot %s", + context().fromSnapshotId(), toSnapshotIdInclusive); + // for inclusive behavior fromSnapshotIdExclusive is set to the parent snapshot id, which can be null. + fromSnapshotIdExclusive = table().snapshot(context().fromSnapshotId()).parentId(); + } else { + // validate the parent snapshot id an ancestor of toSnapshotId + Preconditions.checkArgument( + SnapshotUtil.isParentAncestorOf(table(), toSnapshotIdInclusive, context().fromSnapshotId()), + "Starting snapshot (exclusive) %s is not a parent ancestor of end snapshot %s", + context().fromSnapshotId(), toSnapshotIdInclusive); + } + } + + if (fromSnapshotIdExclusive != null) { + Listeners.notifyAll(new IncrementalScanEvent(table().name(), fromSnapshotIdExclusive, Review Comment: I mentioned separate methods as we usually prefer a named method to give some meaning to a boolean flag but I agree there are quite some args in this case so such it is questionable. Builder sounds good but this point is minor. Up to you. I think we can leave as-is and don't worry about it. -- 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]
