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

prototype: push clickhouse cdc to raw table with batch insert instead of cdc #2131

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

prototype: push clickhouse cdc to raw table with batch insert instead of cdc #2131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 26 additions & 9 deletions flow/connectors/clickhouse/cdc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (c *ClickHouseConnector) avroSyncMethod(flowJobName string) *ClickHouseAvro
return NewClickHouseAvroSyncMethod(qrepConfig, c)
}

func (c *ClickHouseConnector) syncRecordsViaAvro(
func (c *ClickHouseConnector) syncRecords(
ctx context.Context,
req *model.SyncRecordsRequest[model.RecordItems],
syncBatchID int64,
Expand All @@ -87,14 +87,32 @@ func (c *ClickHouseConnector) syncRecordsViaAvro(
return nil, fmt.Errorf("failed to convert records to raw table stream: %w", err)
}

avroSyncer := c.avroSyncMethod(req.FlowJobName)
numRecords, err := avroSyncer.SyncRecords(ctx, stream, req.FlowJobName, syncBatchID)
batch, err := c.database.PrepareBatch(ctx, "INSERT INTO "+c.getRawTableName(req.FlowJobName))
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to begin inserting batch: %w", err)
}
numRecords := 0
row := make([]any, 0, 8)
for record := range stream.Records {
row = row[:0]
for _, qv := range record {
switch val := qv.(type) {
case qvalue.QValueString:
row = append(row, val.Val)
case qvalue.QValueInt64:
row = append(row, val.Val)
}
}
if err := batch.Append(row...); err != nil {
return nil, fmt.Errorf("failed to append to batch: %w", err)
}
numRecords += 1
}
if err := batch.Send(); err != nil {
return nil, fmt.Errorf("failed to send batch: %w", err)
}

err = c.ReplayTableSchemaDeltas(ctx, req.FlowJobName, req.Records.SchemaDeltas)
if err != nil {
if err := c.ReplayTableSchemaDeltas(ctx, req.FlowJobName, req.Records.SchemaDeltas); err != nil {
return nil, fmt.Errorf("failed to sync schema changes: %w", err)
}

Expand All @@ -108,13 +126,12 @@ func (c *ClickHouseConnector) syncRecordsViaAvro(
}

func (c *ClickHouseConnector) SyncRecords(ctx context.Context, req *model.SyncRecordsRequest[model.RecordItems]) (*model.SyncResponse, error) {
res, err := c.syncRecordsViaAvro(ctx, req, req.SyncBatchID)
res, err := c.syncRecords(ctx, req, req.SyncBatchID)
if err != nil {
return nil, err
}

err = c.FinishBatch(ctx, req.FlowJobName, req.SyncBatchID, res.LastSyncedCheckpointID)
if err != nil {
if err := c.FinishBatch(ctx, req.FlowJobName, req.SyncBatchID, res.LastSyncedCheckpointID); err != nil {
c.logger.Error("failed to increment id", slog.Any("error", err))
return nil, err
}
Expand Down
Loading