nastra commented on code in PR #6706: URL: https://github.com/apache/iceberg/pull/6706#discussion_r1092274484
########## core/src/main/java/org/apache/iceberg/SnapshotOperations.java: ########## @@ -0,0 +1,190 @@ +/* + * 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.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; + +class SnapshotOperations implements Serializable { + + private List<Snapshot> snapshots; + private Supplier<List<Snapshot>> snapshotSupplier; + private Map<Long, Snapshot> snapshotsById; + private Map<String, SnapshotRef> refs; + + SnapshotOperations() { + snapshots = Lists.newArrayList(); + snapshotsById = Maps.newHashMap(); + refs = Maps.newHashMap(); + } + + SnapshotOperations(List<Snapshot> snapshots, Map<String, SnapshotRef> refs) { + this(snapshots, null, refs); + } + + SnapshotOperations(SnapshotOperations snapshotOperations) { + this( + snapshotOperations.snapshots, snapshotOperations.snapshotSupplier, snapshotOperations.refs); + } + + SnapshotOperations( + List<Snapshot> snapshots, + Supplier<List<Snapshot>> snapshotSupplier, + Map<String, SnapshotRef> refs) { + this.snapshots = Lists.newArrayList(snapshots); + this.snapshotSupplier = snapshotSupplier; + this.refs = Maps.newHashMap(refs); + + indexSnapshots(); + } + + List<Snapshot> snapshots() { + ensureLoaded(); + + return Collections.unmodifiableList(snapshots); + } + + Snapshot snapshot(long id) { + if (!snapshotsById.containsKey(id)) { Review Comment: I'm not sure this is correct. `ensureLoaded()` doesn't populate anything to `snapshotsById` ########## core/src/main/java/org/apache/iceberg/SnapshotOperations.java: ########## @@ -0,0 +1,190 @@ +/* + * 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.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; + +class SnapshotOperations implements Serializable { + + private List<Snapshot> snapshots; + private Supplier<List<Snapshot>> snapshotSupplier; + private Map<Long, Snapshot> snapshotsById; + private Map<String, SnapshotRef> refs; + + SnapshotOperations() { + snapshots = Lists.newArrayList(); + snapshotsById = Maps.newHashMap(); + refs = Maps.newHashMap(); + } + + SnapshotOperations(List<Snapshot> snapshots, Map<String, SnapshotRef> refs) { + this(snapshots, null, refs); + } + + SnapshotOperations(SnapshotOperations snapshotOperations) { + this( + snapshotOperations.snapshots, snapshotOperations.snapshotSupplier, snapshotOperations.refs); + } + + SnapshotOperations( + List<Snapshot> snapshots, + Supplier<List<Snapshot>> snapshotSupplier, + Map<String, SnapshotRef> refs) { + this.snapshots = Lists.newArrayList(snapshots); + this.snapshotSupplier = snapshotSupplier; + this.refs = Maps.newHashMap(refs); + + indexSnapshots(); + } + + List<Snapshot> snapshots() { + ensureLoaded(); + + return Collections.unmodifiableList(snapshots); + } + + Snapshot snapshot(long id) { + if (!snapshotsById.containsKey(id)) { + ensureLoaded(); + } + + return snapshotsById.get(id); + } + + boolean contains(long id) { + return snapshotsById.containsKey(id); + } + + void add(Snapshot snapshot) { + ValidationException.check( + !contains(snapshot.snapshotId()), + "Snapshot already exists for id: %s", + snapshot.snapshotId()); + + snapshots.add(snapshot); + snapshotsById.put(snapshot.snapshotId(), snapshot); + } + + List<Snapshot> remove(Collection<Long> idsToRemove) { + List<Snapshot> retainedSnapshots = + Lists.newArrayListWithExpectedSize(snapshots.size() - idsToRemove.size()); + List<Snapshot> removedSnapshots = Lists.newArrayListWithExpectedSize(idsToRemove.size()); + + for (Snapshot snapshot : snapshots) { + long snapshotId = snapshot.snapshotId(); + if (idsToRemove.contains(snapshotId)) { + Snapshot removed = snapshotsById.remove(snapshotId); + removedSnapshots.add(removed); + } else { + retainedSnapshots.add(snapshot); + } + } + + this.snapshots = retainedSnapshots; + + // remove any refs that are no longer valid + Set<String> danglingRefs = Sets.newHashSet(); + for (Map.Entry<String, SnapshotRef> refEntry : refs.entrySet()) { + if (!snapshotsById.containsKey(refEntry.getValue().snapshotId())) { + danglingRefs.add(refEntry.getKey()); + } + } + + danglingRefs.forEach(this::removeRef); + + return removedSnapshots; + } + + Map<String, SnapshotRef> refs() { + return Collections.unmodifiableMap(refs); + } + + SnapshotRef ref(String name) { + return refs.get(name); + } + + void addRef(String name, SnapshotRef ref) { + refs.put(name, ref); + } + + SnapshotRef removeRef(String name) { + return refs.remove(name); + } + + void indexSnapshots() { + this.snapshotsById = + snapshots.stream().collect(Collectors.toMap(Snapshot::snapshotId, Function.identity())); + } + + void ensureLoaded() { + if (snapshotSupplier != null) { Review Comment: should we rather use `Suppliers.memoize(..)` to make sure stuff is loaded exactly once (rather than having this logic)? ########## core/src/main/java/org/apache/iceberg/SnapshotOperations.java: ########## @@ -0,0 +1,190 @@ +/* + * 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.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; + +class SnapshotOperations implements Serializable { + + private List<Snapshot> snapshots; + private Supplier<List<Snapshot>> snapshotSupplier; + private Map<Long, Snapshot> snapshotsById; + private Map<String, SnapshotRef> refs; + + SnapshotOperations() { + snapshots = Lists.newArrayList(); + snapshotsById = Maps.newHashMap(); + refs = Maps.newHashMap(); + } + + SnapshotOperations(List<Snapshot> snapshots, Map<String, SnapshotRef> refs) { + this(snapshots, null, refs); + } + + SnapshotOperations(SnapshotOperations snapshotOperations) { + this( + snapshotOperations.snapshots, snapshotOperations.snapshotSupplier, snapshotOperations.refs); + } + + SnapshotOperations( + List<Snapshot> snapshots, + Supplier<List<Snapshot>> snapshotSupplier, + Map<String, SnapshotRef> refs) { + this.snapshots = Lists.newArrayList(snapshots); + this.snapshotSupplier = snapshotSupplier; + this.refs = Maps.newHashMap(refs); + + indexSnapshots(); + } + + List<Snapshot> snapshots() { + ensureLoaded(); + + return Collections.unmodifiableList(snapshots); + } + + Snapshot snapshot(long id) { + if (!snapshotsById.containsKey(id)) { + ensureLoaded(); + } + + return snapshotsById.get(id); + } + + boolean contains(long id) { + return snapshotsById.containsKey(id); + } + + void add(Snapshot snapshot) { + ValidationException.check( + !contains(snapshot.snapshotId()), + "Snapshot already exists for id: %s", + snapshot.snapshotId()); + + snapshots.add(snapshot); + snapshotsById.put(snapshot.snapshotId(), snapshot); + } + + List<Snapshot> remove(Collection<Long> idsToRemove) { + List<Snapshot> retainedSnapshots = + Lists.newArrayListWithExpectedSize(snapshots.size() - idsToRemove.size()); + List<Snapshot> removedSnapshots = Lists.newArrayListWithExpectedSize(idsToRemove.size()); + + for (Snapshot snapshot : snapshots) { + long snapshotId = snapshot.snapshotId(); + if (idsToRemove.contains(snapshotId)) { + Snapshot removed = snapshotsById.remove(snapshotId); + removedSnapshots.add(removed); + } else { + retainedSnapshots.add(snapshot); + } + } + + this.snapshots = retainedSnapshots; + + // remove any refs that are no longer valid + Set<String> danglingRefs = Sets.newHashSet(); + for (Map.Entry<String, SnapshotRef> refEntry : refs.entrySet()) { + if (!snapshotsById.containsKey(refEntry.getValue().snapshotId())) { + danglingRefs.add(refEntry.getKey()); + } + } + + danglingRefs.forEach(this::removeRef); + + return removedSnapshots; + } + + Map<String, SnapshotRef> refs() { + return Collections.unmodifiableMap(refs); + } + + SnapshotRef ref(String name) { + return refs.get(name); + } + + void addRef(String name, SnapshotRef ref) { + refs.put(name, ref); + } + + SnapshotRef removeRef(String name) { + return refs.remove(name); + } + + void indexSnapshots() { + this.snapshotsById = + snapshots.stream().collect(Collectors.toMap(Snapshot::snapshotId, Function.identity())); + } + + void ensureLoaded() { + if (snapshotSupplier != null) { + snapshots.addAll(snapshotSupplier.get()); Review Comment: I'm curious whether we'd actually have a use case where someone would provide a list of snapshots and also the supplier that loads additional snapshots to that initial list. If we don't have such a use case, maybe we just try and simplify the API to either only provide the list of snapshots or the supplier ########## core/src/main/java/org/apache/iceberg/SnapshotOperations.java: ########## @@ -0,0 +1,190 @@ +/* + * 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.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; + +class SnapshotOperations implements Serializable { + + private List<Snapshot> snapshots; + private Supplier<List<Snapshot>> snapshotSupplier; + private Map<Long, Snapshot> snapshotsById; + private Map<String, SnapshotRef> refs; + + SnapshotOperations() { + snapshots = Lists.newArrayList(); + snapshotsById = Maps.newHashMap(); + refs = Maps.newHashMap(); + } + + SnapshotOperations(List<Snapshot> snapshots, Map<String, SnapshotRef> refs) { + this(snapshots, null, refs); + } + + SnapshotOperations(SnapshotOperations snapshotOperations) { + this( + snapshotOperations.snapshots, snapshotOperations.snapshotSupplier, snapshotOperations.refs); + } + + SnapshotOperations( + List<Snapshot> snapshots, + Supplier<List<Snapshot>> snapshotSupplier, + Map<String, SnapshotRef> refs) { + this.snapshots = Lists.newArrayList(snapshots); + this.snapshotSupplier = snapshotSupplier; + this.refs = Maps.newHashMap(refs); + + indexSnapshots(); + } + + List<Snapshot> snapshots() { + ensureLoaded(); + + return Collections.unmodifiableList(snapshots); + } + + Snapshot snapshot(long id) { + if (!snapshotsById.containsKey(id)) { + ensureLoaded(); + } + + return snapshotsById.get(id); + } + + boolean contains(long id) { + return snapshotsById.containsKey(id); + } + + void add(Snapshot snapshot) { + ValidationException.check( + !contains(snapshot.snapshotId()), + "Snapshot already exists for id: %s", + snapshot.snapshotId()); + + snapshots.add(snapshot); + snapshotsById.put(snapshot.snapshotId(), snapshot); + } + + List<Snapshot> remove(Collection<Long> idsToRemove) { + List<Snapshot> retainedSnapshots = + Lists.newArrayListWithExpectedSize(snapshots.size() - idsToRemove.size()); + List<Snapshot> removedSnapshots = Lists.newArrayListWithExpectedSize(idsToRemove.size()); + + for (Snapshot snapshot : snapshots) { + long snapshotId = snapshot.snapshotId(); + if (idsToRemove.contains(snapshotId)) { + Snapshot removed = snapshotsById.remove(snapshotId); + removedSnapshots.add(removed); + } else { + retainedSnapshots.add(snapshot); + } + } + + this.snapshots = retainedSnapshots; + + // remove any refs that are no longer valid + Set<String> danglingRefs = Sets.newHashSet(); + for (Map.Entry<String, SnapshotRef> refEntry : refs.entrySet()) { + if (!snapshotsById.containsKey(refEntry.getValue().snapshotId())) { + danglingRefs.add(refEntry.getKey()); + } + } + + danglingRefs.forEach(this::removeRef); + + return removedSnapshots; + } + + Map<String, SnapshotRef> refs() { + return Collections.unmodifiableMap(refs); + } + + SnapshotRef ref(String name) { + return refs.get(name); + } + + void addRef(String name, SnapshotRef ref) { + refs.put(name, ref); + } + + SnapshotRef removeRef(String name) { + return refs.remove(name); + } + + void indexSnapshots() { + this.snapshotsById = + snapshots.stream().collect(Collectors.toMap(Snapshot::snapshotId, Function.identity())); + } + + void ensureLoaded() { + if (snapshotSupplier != null) { + snapshots.addAll(snapshotSupplier.get()); + snapshotSupplier = null; + } + } + + void validate(long currentSnapshotId, long lastSequenceNumber) { + validateSnapshots(lastSequenceNumber); + validateRefs(currentSnapshotId); + } + + void validateSnapshots(long lastSequenceNumber) { + for (Snapshot snap : snapshots) { + ValidationException.check( + snap.sequenceNumber() <= lastSequenceNumber, + "Invalid snapshot with sequence number %s greater than last sequence number %s", + snap.sequenceNumber(), + lastSequenceNumber); + } + } + + void validateRefs(long currentSnapshotId) { Review Comment: can be `private` ########## core/src/main/java/org/apache/iceberg/SnapshotOperations.java: ########## @@ -0,0 +1,190 @@ +/* + * 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.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; + +class SnapshotOperations implements Serializable { + + private List<Snapshot> snapshots; + private Supplier<List<Snapshot>> snapshotSupplier; + private Map<Long, Snapshot> snapshotsById; + private Map<String, SnapshotRef> refs; + + SnapshotOperations() { + snapshots = Lists.newArrayList(); + snapshotsById = Maps.newHashMap(); + refs = Maps.newHashMap(); + } + + SnapshotOperations(List<Snapshot> snapshots, Map<String, SnapshotRef> refs) { + this(snapshots, null, refs); + } + + SnapshotOperations(SnapshotOperations snapshotOperations) { + this( + snapshotOperations.snapshots, snapshotOperations.snapshotSupplier, snapshotOperations.refs); + } + + SnapshotOperations( + List<Snapshot> snapshots, + Supplier<List<Snapshot>> snapshotSupplier, + Map<String, SnapshotRef> refs) { + this.snapshots = Lists.newArrayList(snapshots); + this.snapshotSupplier = snapshotSupplier; + this.refs = Maps.newHashMap(refs); + + indexSnapshots(); + } + + List<Snapshot> snapshots() { + ensureLoaded(); + + return Collections.unmodifiableList(snapshots); + } + + Snapshot snapshot(long id) { + if (!snapshotsById.containsKey(id)) { + ensureLoaded(); + } + + return snapshotsById.get(id); + } + + boolean contains(long id) { + return snapshotsById.containsKey(id); + } + + void add(Snapshot snapshot) { + ValidationException.check( + !contains(snapshot.snapshotId()), + "Snapshot already exists for id: %s", + snapshot.snapshotId()); + + snapshots.add(snapshot); + snapshotsById.put(snapshot.snapshotId(), snapshot); + } + + List<Snapshot> remove(Collection<Long> idsToRemove) { + List<Snapshot> retainedSnapshots = + Lists.newArrayListWithExpectedSize(snapshots.size() - idsToRemove.size()); + List<Snapshot> removedSnapshots = Lists.newArrayListWithExpectedSize(idsToRemove.size()); + + for (Snapshot snapshot : snapshots) { + long snapshotId = snapshot.snapshotId(); + if (idsToRemove.contains(snapshotId)) { + Snapshot removed = snapshotsById.remove(snapshotId); + removedSnapshots.add(removed); + } else { + retainedSnapshots.add(snapshot); + } + } + + this.snapshots = retainedSnapshots; + + // remove any refs that are no longer valid + Set<String> danglingRefs = Sets.newHashSet(); + for (Map.Entry<String, SnapshotRef> refEntry : refs.entrySet()) { + if (!snapshotsById.containsKey(refEntry.getValue().snapshotId())) { + danglingRefs.add(refEntry.getKey()); + } + } + + danglingRefs.forEach(this::removeRef); + + return removedSnapshots; + } + + Map<String, SnapshotRef> refs() { + return Collections.unmodifiableMap(refs); + } + + SnapshotRef ref(String name) { + return refs.get(name); + } + + void addRef(String name, SnapshotRef ref) { + refs.put(name, ref); + } + + SnapshotRef removeRef(String name) { + return refs.remove(name); + } + + void indexSnapshots() { Review Comment: can be `private` ########## core/src/main/java/org/apache/iceberg/SnapshotOperations.java: ########## @@ -0,0 +1,190 @@ +/* + * 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.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; + +class SnapshotOperations implements Serializable { + + private List<Snapshot> snapshots; + private Supplier<List<Snapshot>> snapshotSupplier; + private Map<Long, Snapshot> snapshotsById; + private Map<String, SnapshotRef> refs; + + SnapshotOperations() { + snapshots = Lists.newArrayList(); + snapshotsById = Maps.newHashMap(); + refs = Maps.newHashMap(); + } + + SnapshotOperations(List<Snapshot> snapshots, Map<String, SnapshotRef> refs) { + this(snapshots, null, refs); + } + + SnapshotOperations(SnapshotOperations snapshotOperations) { + this( + snapshotOperations.snapshots, snapshotOperations.snapshotSupplier, snapshotOperations.refs); + } + + SnapshotOperations( + List<Snapshot> snapshots, + Supplier<List<Snapshot>> snapshotSupplier, + Map<String, SnapshotRef> refs) { + this.snapshots = Lists.newArrayList(snapshots); + this.snapshotSupplier = snapshotSupplier; + this.refs = Maps.newHashMap(refs); + + indexSnapshots(); + } + + List<Snapshot> snapshots() { + ensureLoaded(); + + return Collections.unmodifiableList(snapshots); + } + + Snapshot snapshot(long id) { + if (!snapshotsById.containsKey(id)) { + ensureLoaded(); + } + + return snapshotsById.get(id); + } + + boolean contains(long id) { + return snapshotsById.containsKey(id); + } + + void add(Snapshot snapshot) { + ValidationException.check( + !contains(snapshot.snapshotId()), + "Snapshot already exists for id: %s", + snapshot.snapshotId()); + + snapshots.add(snapshot); + snapshotsById.put(snapshot.snapshotId(), snapshot); + } + + List<Snapshot> remove(Collection<Long> idsToRemove) { + List<Snapshot> retainedSnapshots = + Lists.newArrayListWithExpectedSize(snapshots.size() - idsToRemove.size()); + List<Snapshot> removedSnapshots = Lists.newArrayListWithExpectedSize(idsToRemove.size()); + + for (Snapshot snapshot : snapshots) { + long snapshotId = snapshot.snapshotId(); + if (idsToRemove.contains(snapshotId)) { + Snapshot removed = snapshotsById.remove(snapshotId); + removedSnapshots.add(removed); + } else { + retainedSnapshots.add(snapshot); + } + } + + this.snapshots = retainedSnapshots; + + // remove any refs that are no longer valid + Set<String> danglingRefs = Sets.newHashSet(); + for (Map.Entry<String, SnapshotRef> refEntry : refs.entrySet()) { + if (!snapshotsById.containsKey(refEntry.getValue().snapshotId())) { + danglingRefs.add(refEntry.getKey()); + } + } + + danglingRefs.forEach(this::removeRef); + + return removedSnapshots; + } + + Map<String, SnapshotRef> refs() { + return Collections.unmodifiableMap(refs); + } + + SnapshotRef ref(String name) { + return refs.get(name); + } + + void addRef(String name, SnapshotRef ref) { + refs.put(name, ref); + } + + SnapshotRef removeRef(String name) { + return refs.remove(name); + } + + void indexSnapshots() { + this.snapshotsById = + snapshots.stream().collect(Collectors.toMap(Snapshot::snapshotId, Function.identity())); + } + + void ensureLoaded() { + if (snapshotSupplier != null) { + snapshots.addAll(snapshotSupplier.get()); + snapshotSupplier = null; + } + } + + void validate(long currentSnapshotId, long lastSequenceNumber) { + validateSnapshots(lastSequenceNumber); + validateRefs(currentSnapshotId); + } + + void validateSnapshots(long lastSequenceNumber) { Review Comment: can be `private` -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
