-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
Kafka Connect: Add delta writer support #12070
Draft
ismailsimsek
wants to merge
12
commits into
apache:main
Choose a base branch
from
ismailsimsek:kafka-delete-classes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
289575e
support row deltas
bryanck 17c95c2
cdc integration test
bryanck 65038e9
add comment
bryanck 7bd9538
add upsert mode
bryanck f788d3e
license
bryanck 796f0f4
Write only key fields to delete files (#60)
bryanck 49cb85d
Fix delta writer when relying on ID col config (#136)
bryanck dffad4d
Relocate classes and fix package name
ismailsimsek 50c3cb0
Revert extra changes
ismailsimsek 2deedbc
Relocate fix package name
ismailsimsek 7f36b22
Use Delta writer classes
ismailsimsek bf1b168
Fix DeltaWriter tests
ismailsimsek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
...nect/kafka-connect/src/main/java/org/apache/iceberg/connect/data/BaseDeltaTaskWriter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
/* | ||
* 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.connect.data; | ||
|
||
import java.io.IOException; | ||
import java.util.Set; | ||
import org.apache.iceberg.FileFormat; | ||
import org.apache.iceberg.PartitionKey; | ||
import org.apache.iceberg.PartitionSpec; | ||
import org.apache.iceberg.Schema; | ||
import org.apache.iceberg.StructLike; | ||
import org.apache.iceberg.data.InternalRecordWrapper; | ||
import org.apache.iceberg.data.Record; | ||
import org.apache.iceberg.io.BaseTaskWriter; | ||
import org.apache.iceberg.io.FileAppenderFactory; | ||
import org.apache.iceberg.io.FileIO; | ||
import org.apache.iceberg.io.OutputFileFactory; | ||
import org.apache.iceberg.relocated.com.google.common.collect.Sets; | ||
import org.apache.iceberg.types.TypeUtil; | ||
|
||
abstract class BaseDeltaTaskWriter extends BaseTaskWriter<Record> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @bryanck should we add this and other using example refactored version: |
||
|
||
private final Schema schema; | ||
private final Schema deleteSchema; | ||
private final InternalRecordWrapper wrapper; | ||
private final InternalRecordWrapper keyWrapper; | ||
private final RecordProjection keyProjection; | ||
private final boolean upsertMode; | ||
|
||
BaseDeltaTaskWriter( | ||
PartitionSpec spec, | ||
FileFormat format, | ||
FileAppenderFactory<Record> appenderFactory, | ||
OutputFileFactory fileFactory, | ||
FileIO io, | ||
long targetFileSize, | ||
Schema schema, | ||
Set<Integer> identifierFieldIds, | ||
boolean upsertMode) { | ||
super(spec, format, appenderFactory, fileFactory, io, targetFileSize); | ||
this.schema = schema; | ||
this.deleteSchema = TypeUtil.select(schema, Sets.newHashSet(identifierFieldIds)); | ||
this.wrapper = new InternalRecordWrapper(schema.asStruct()); | ||
this.keyWrapper = new InternalRecordWrapper(deleteSchema.asStruct()); | ||
this.keyProjection = RecordProjection.create(schema, deleteSchema); | ||
this.upsertMode = upsertMode; | ||
} | ||
|
||
abstract RowDataDeltaWriter route(Record row); | ||
|
||
InternalRecordWrapper wrapper() { | ||
return wrapper; | ||
} | ||
|
||
@Override | ||
public void write(Record row) throws IOException { | ||
Operation op = | ||
row instanceof RecordWrapper | ||
? ((RecordWrapper) row).op() | ||
: upsertMode ? Operation.UPDATE : Operation.INSERT; | ||
RowDataDeltaWriter writer = route(row); | ||
if (op == Operation.UPDATE || op == Operation.DELETE) { | ||
writer.deleteKey(keyProjection.wrap(row)); | ||
} | ||
if (op == Operation.UPDATE || op == Operation.INSERT) { | ||
writer.write(row); | ||
} | ||
} | ||
|
||
class RowDataDeltaWriter extends BaseEqualityDeltaWriter { | ||
|
||
RowDataDeltaWriter(PartitionKey partition) { | ||
super(partition, schema, deleteSchema); | ||
} | ||
|
||
@Override | ||
protected StructLike asStructLike(Record data) { | ||
return wrapper.wrap(data); | ||
} | ||
|
||
@Override | ||
protected StructLike asStructLikeKey(Record data) { | ||
return keyWrapper.wrap(data); | ||
} | ||
} | ||
} |
25 changes: 25 additions & 0 deletions
25
kafka-connect/kafka-connect/src/main/java/org/apache/iceberg/connect/data/Operation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
/* | ||
* 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.connect.data; | ||
|
||
public enum Operation { | ||
INSERT, | ||
UPDATE, | ||
DELETE | ||
} |
93 changes: 93 additions & 0 deletions
93
...t/kafka-connect/src/main/java/org/apache/iceberg/connect/data/PartitionedDeltaWriter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
/* | ||
* 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.connect.data; | ||
|
||
import java.io.IOException; | ||
import java.io.UncheckedIOException; | ||
import java.util.Map; | ||
import java.util.Set; | ||
import org.apache.iceberg.FileFormat; | ||
import org.apache.iceberg.PartitionKey; | ||
import org.apache.iceberg.PartitionSpec; | ||
import org.apache.iceberg.Schema; | ||
import org.apache.iceberg.data.Record; | ||
import org.apache.iceberg.io.FileAppenderFactory; | ||
import org.apache.iceberg.io.FileIO; | ||
import org.apache.iceberg.io.OutputFileFactory; | ||
import org.apache.iceberg.relocated.com.google.common.collect.Maps; | ||
import org.apache.iceberg.util.Tasks; | ||
|
||
public class PartitionedDeltaWriter extends BaseDeltaTaskWriter { | ||
private final PartitionKey partitionKey; | ||
|
||
private final Map<PartitionKey, RowDataDeltaWriter> writers = Maps.newHashMap(); | ||
|
||
PartitionedDeltaWriter( | ||
PartitionSpec spec, | ||
FileFormat format, | ||
FileAppenderFactory<Record> appenderFactory, | ||
OutputFileFactory fileFactory, | ||
FileIO io, | ||
long targetFileSize, | ||
Schema schema, | ||
Set<Integer> identifierFieldIds, | ||
boolean upsertMode) { | ||
super( | ||
spec, | ||
format, | ||
appenderFactory, | ||
fileFactory, | ||
io, | ||
targetFileSize, | ||
schema, | ||
identifierFieldIds, | ||
upsertMode); | ||
this.partitionKey = new PartitionKey(spec, schema); | ||
} | ||
|
||
@Override | ||
RowDataDeltaWriter route(Record row) { | ||
partitionKey.partition(wrapper().wrap(row)); | ||
|
||
RowDataDeltaWriter writer = writers.get(partitionKey); | ||
if (writer == null) { | ||
// NOTICE: we need to copy a new partition key here, in case of messing up the keys in | ||
// writers. | ||
PartitionKey copiedKey = partitionKey.copy(); | ||
writer = new RowDataDeltaWriter(copiedKey); | ||
writers.put(copiedKey, writer); | ||
} | ||
|
||
return writer; | ||
} | ||
|
||
@Override | ||
public void close() { | ||
try { | ||
Tasks.foreach(writers.values()) | ||
.throwFailureWhenFinished() | ||
.noRetry() | ||
.run(RowDataDeltaWriter::close, IOException.class); | ||
|
||
writers.clear(); | ||
} catch (IOException e) { | ||
throw new UncheckedIOException("Failed to close equality delta writer", e); | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i believe naming should change to
dash-case-naming
? examplecdc-field
?