Skip to content

Add unit tests for sequence number #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdblue merged 8 commits into from
Jun 2, 2020
Merged

Add unit tests for sequence number #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
10c8c8c
Always assign sequence number for adding manifest
chenjunjiedada Apr 27, 2020
760157b
revert changes for adding sequence number
chenjunjiedada May 6, 2020
3f6fae3
Use wrapper for adding entries from added manifests
chenjunjiedada May 6, 2020
20d55de
address comments
chenjunjiedada May 13, 2020
ba27dd2
fix unit test
chenjunjiedada May 14, 2020
9d848c4
remove duplicate unit test
chenjunjiedada May 26, 2020
1710148
address comments
chenjunjiedada May 27, 2020
798d95d
rebase to master
chenjunjiedada Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/java/org/apache/iceberg/BaseRewriteManifests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ public RewriteManifests addManifest(ManifestFile manifest) {
Preconditions.checkArgument(
manifest.snapshotId() == null || manifest.snapshotId() == -1,
"Snapshot id must be assigned during commit");
Preconditions.checkArgument(manifest.sequenceNumber() == -1,
"Sequence must be assigned during commit");

if (snapshotIdInheritanceEnabled && manifest.snapshotId() == null) {
addedManifests.add(manifest);
Expand Down Expand Up @@ -174,7 +176,6 @@ public List<ManifestFile> apply(TableMetadata base) {

validateFilesCounts();

// TODO: add sequence numbers here
Iterable<ManifestFile> newManifestsWithMetadata = Iterables.transform(
Iterables.concat(newManifests, addedManifests, rewrittenAddedManifests),
manifest -> GenericManifestFile.copyOf(manifest).withSnapshotId(snapshotId()).build());
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/apache/iceberg/FastAppend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ public FastAppend appendManifest(ManifestFile manifest) {
Preconditions.checkArgument(
manifest.snapshotId() == null || manifest.snapshotId() == -1,
"Snapshot id must be assigned during commit");
Preconditions.checkArgument(manifest.sequenceNumber() == -1,
"Sequence number must be assigned during commit");

if (snapshotIdInheritanceEnabled && manifest.snapshotId() == null) {
summaryBuilder.addedManifest(manifest);
Expand Down Expand Up @@ -131,7 +133,6 @@ public List<ManifestFile> apply(TableMetadata base) {
throw new RuntimeIOException(e, "Failed to write manifest");
}

// TODO: add sequence numbers here
Iterable<ManifestFile> appendManifestsWithMetadata = Iterables.transform(
Iterables.concat(appendManifests, rewrittenAppendManifests),
manifest -> GenericManifestFile.copyOf(manifest).withSnapshotId(snapshotId()).build());
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/iceberg/MergeAppend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ public AppendFiles appendManifest(ManifestFile manifest) {
Preconditions.checkArgument(
manifest.snapshotId() == null || manifest.snapshotId() == -1,
"Snapshot id must be assigned during commit");
Preconditions.checkArgument(manifest.sequenceNumber() == -1,
"Sequence must be assigned during commit");
add(manifest);
return this;
}
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/org/apache/iceberg/MergingSnapshotProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ public List<ManifestFile> apply(TableMetadata base) {
newManifests = Iterables.concat(appendManifests, rewrittenAppendManifests);
}

// TODO: add sequence numbers here
Iterable<ManifestFile> newManifestsWithMetadata = Iterables.transform(
newManifests,
manifest -> GenericManifestFile.copyOf(manifest).withSnapshotId(snapshotId()).build());
Expand Down Expand Up @@ -676,11 +675,11 @@ private ManifestFile createManifest(int specId, List<ManifestFile> bin) throws I
// suppress deletes from previous snapshots. only files deleted by this snapshot
// should be added to the new manifest
if (entry.snapshotId() == snapshotId()) {
writer.addEntry(entry);
writer.delete(entry);
}
} else if (entry.status() == Status.ADDED && entry.snapshotId() == snapshotId()) {
// adds from this snapshot are still adds, otherwise they should be existing
writer.addEntry(entry);
writer.add(entry);
} else {
// add all files from the old manifest as existing files
writer.existing(entry);
Expand Down
Loading