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

support composite primary keys bq resync #1273

Merged
merged 1 commit into from
Feb 13, 2024
Merged

support composite primary keys bq resync #1273

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
37 changes: 33 additions & 4 deletions flow/connectors/bigquery/bigquery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,14 @@ func (c *BigQueryConnector) RenameTables(ctx context.Context, req *protos.Rename
activity.RecordHeartbeat(ctx, fmt.Sprintf("renaming table '%s' to '%s'...", srcDatasetTable.string(),
dstDatasetTable.string()))

// if source table does not exist, log and continue.
dataset := c.client.DatasetInProject(c.projectID, srcDatasetTable.dataset)
_, err := dataset.Table(srcDatasetTable.table).Metadata(ctx)
if err != nil {
c.logger.Info(fmt.Sprintf("table '%s' does not exist, skipping rename", srcDatasetTable.string()))
continue
}

columnNames := make([]string, 0, len(renameRequest.TableSchema.Columns))
for _, col := range renameRequest.TableSchema.Columns {
columnNames = append(columnNames, col.Name)
Expand All @@ -834,16 +842,37 @@ func (c *BigQueryConnector) RenameTables(ctx context.Context, req *protos.Rename
allColsWithoutAlias := strings.Join(columnNames, ",")
allColsWithAlias := allColsBuilder.String()

pkeyCols := strings.Join(renameRequest.TableSchema.PrimaryKeyColumns, ",")
pkeyCols := renameRequest.TableSchema.PrimaryKeyColumns

c.logger.Info(fmt.Sprintf("handling soft-deletes for table '%s'...", dstDatasetTable.string()))

activity.RecordHeartbeat(ctx, fmt.Sprintf("handling soft-deletes for table '%s'...", dstDatasetTable.string()))

q := fmt.Sprintf("INSERT INTO %s(%s) SELECT %s,true AS %s FROM %s _pt WHERE (%s) NOT IN (SELECT %s FROM %s)",
pkeyOnClauseBuilder := strings.Builder{}
ljWhereClauseBuilder := strings.Builder{}
for idx, col := range pkeyCols {
pkeyOnClauseBuilder.WriteString("_pt.")
pkeyOnClauseBuilder.WriteString(col)
pkeyOnClauseBuilder.WriteString(" = _resync.")
pkeyOnClauseBuilder.WriteString(col)

ljWhereClauseBuilder.WriteString("_resync.")
ljWhereClauseBuilder.WriteString(col)
ljWhereClauseBuilder.WriteString(" IS NULL")

if idx < len(pkeyCols)-1 {
pkeyOnClauseBuilder.WriteString(" AND ")
ljWhereClauseBuilder.WriteString(" AND ")
}
}

leftJoin := fmt.Sprintf("LEFT JOIN %s _resync ON %s WHERE %s", srcDatasetTable.string(),
pkeyOnClauseBuilder.String(), ljWhereClauseBuilder.String())

q := fmt.Sprintf("INSERT INTO %s(%s) SELECT %s,true AS %s FROM %s _pt %s",
srcDatasetTable.string(), fmt.Sprintf("%s,%s", allColsWithoutAlias, *req.SoftDeleteColName),
allColsWithAlias, *req.SoftDeleteColName, dstDatasetTable.string(),
pkeyCols, pkeyCols, srcDatasetTable.string())
leftJoin)

c.logger.Info(q)
query := c.client.Query(q)
Expand Down Expand Up @@ -884,7 +913,7 @@ func (c *BigQueryConnector) RenameTables(ctx context.Context, req *protos.Rename
dstDatasetTable.string()))
dropQuery.DefaultProjectID = c.projectID
dropQuery.DefaultDatasetID = c.datasetID
_, err := dropQuery.Read(ctx)
_, err = dropQuery.Read(ctx)
if err != nil {
return nil, fmt.Errorf("unable to drop table %s: %w", dstDatasetTable.string(), err)
}
Expand Down
Loading