Skip to content
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

chore: use the generation id implementation #48579

Merged
merged 2 commits into from
Nov 20, 2024
Merged

chore: use the generation id implementation #48579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60a722a
chore: use the generation id implementation
subodh1810 Nov 20, 2024
551e78f
Merge branch 'remove-state-manager' into call-generation-id
subodh1810 Nov 20, 2024
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
20 changes: 15 additions & 5 deletions ...-v2/src/main/kotlin/io/airbyte/integrations/destination/iceberg/v2/IcebergStreamLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import io.airbyte.cdk.load.message.Batch
import io.airbyte.cdk.load.message.DestinationFile
import io.airbyte.cdk.load.message.DestinationRecord
import io.airbyte.cdk.load.message.SimpleBatch
import io.airbyte.cdk.load.state.StreamIncompleteResult
import io.airbyte.cdk.load.write.StreamLoader
import io.airbyte.integrations.destination.iceberg.v2.io.IcebergTableCleaner
import io.airbyte.integrations.destination.iceberg.v2.io.IcebergTableWriterFactory
import io.airbyte.integrations.destination.iceberg.v2.io.IcebergUtil
import io.airbyte.integrations.destination.iceberg.v2.io.IcebergUtil.constructGenerationIdSuffix
Expand Down Expand Up @@ -68,10 +70,18 @@ class IcebergStreamLoader(
throw NotImplementedError("Destination Iceberg does not support universal file transfer.")
}

override suspend fun processBatch(batch: Batch): Batch {
log.info { "Moving staged object from $stagingBranchName to $mainBranchName" }
table.manageSnapshots().fastForwardBranch(mainBranchName, stagingBranchName).commit()

return SimpleBatch(Batch.State.COMPLETE)
override suspend fun close(streamFailure: StreamIncompleteResult?) {
if (streamFailure == null) {
table.manageSnapshots().fastForwardBranch(mainBranchName, stagingBranchName).commit()
if (stream.minimumGenerationId > 0) {
val icebergTableCleaner = IcebergTableCleaner()
for (i in 0 until stream.minimumGenerationId) {
icebergTableCleaner.deleteGenerationId(
table,
constructGenerationIdSuffix(i),
)
}
}
}
}
}
10 changes: 7 additions & 3 deletions ...eberg-v2/src/main/kotlin/io/airbyte/integrations/destination/iceberg/v2/io/IcebergUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,16 @@ object IcebergUtil {
}

fun constructGenerationIdSuffix(stream: DestinationStream): String {
if (stream.generationId < 0) {
return constructGenerationIdSuffix(stream.generationId)
}

fun constructGenerationIdSuffix(generationId: Long): String {
if (generationId < 0) {
throw IllegalArgumentException(
"GenerationId must be non-negative. Provided: ${stream.generationId}",
"GenerationId must be non-negative. Provided: ${generationId}",
)
}
return "ab-generation-id-${stream.generationId}"
return "ab-generation-id-${generationId}"
}
/**
* Builds an Iceberg [Catalog].
Expand Down
Loading