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

Minor clean up #934

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Minor clean up #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d50ee30
Clean up.
Tang8330 Sep 27, 2024
09d8b3b
Minor clean up.
Tang8330 Sep 27, 2024
a37d050
Merge branch 'master' into minor-cleanup
Tang8330 Sep 27, 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
12 changes: 5 additions & 7 deletions clients/mssql/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/artie-labs/transfer/lib/kafkalib"
"github.com/artie-labs/transfer/lib/optimization"
"github.com/artie-labs/transfer/lib/sql"
"github.com/artie-labs/transfer/lib/typing"
)

type Store struct {
Expand All @@ -32,6 +31,10 @@ func getSchema(schema string) string {
}

func (s *Store) Dialect() sql.Dialect {
return s.dialect()
}

func (s *Store) dialect() dialect.MSSQLDialect {
return dialect.MSSQLDialect{}
}

Expand Down Expand Up @@ -59,12 +62,7 @@ func (s *Store) Sweep() error {
return err
}

mssqlDialect, err := typing.AssertType[dialect.MSSQLDialect](s.Dialect())
if err != nil {
return err
}

return shared.Sweep(s, tcs, mssqlDialect.BuildSweepQuery)
return shared.Sweep(s, tcs, s.dialect().BuildSweepQuery)
}

func (s *Store) Dedupe(_ sql.TableIdentifier, _ []string, _ bool) error {
Expand Down
7 changes: 1 addition & 6 deletions lib/cdc/format/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ import (
"github.com/artie-labs/transfer/lib/logger"
)

var (
r relational.Debezium
m mongo.Debezium
)

func GetFormatParser(label, topic string) cdc.Format {
for _, validFormat := range []cdc.Format{&r, &m} {
for _, validFormat := range []cdc.Format{relational.Debezium{}, mongo.Debezium{}} {
for _, fmtLabel := range validFormat.Labels() {
if fmtLabel == label {
slog.Info("Loaded CDC Format parser...",
Expand Down
23 changes: 20 additions & 3 deletions lib/cdc/format/format_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,30 @@ import (

"github.com/stretchr/testify/assert"

"github.com/artie-labs/transfer/lib/cdc/mongo"
"github.com/artie-labs/transfer/lib/cdc/relational"
"github.com/artie-labs/transfer/lib/config/constants"
"github.com/artie-labs/transfer/lib/typing"
)

func TestGetFormatParser(t *testing.T) {
validFormats := []string{constants.DBZPostgresAltFormat, constants.DBZPostgresFormat, constants.DBZMongoFormat}
for _, validFormat := range validFormats {
assert.NotNil(t, GetFormatParser(validFormat, "topicA"))
{
// Relational
for _, format := range []string{constants.DBZPostgresAltFormat, constants.DBZPostgresFormat} {
formatParser := GetFormatParser(format, "topicA")
assert.NotNil(t, formatParser)

_, err := typing.AssertType[relational.Debezium](formatParser)
assert.NoError(t, err)
}
}
{
// Mongo
formatParser := GetFormatParser(constants.DBZMongoFormat, "topicA")
assert.NotNil(t, formatParser)

_, err := typing.AssertType[mongo.Debezium](formatParser)
assert.NoError(t, err)
}
}

Expand Down
8 changes: 4 additions & 4 deletions lib/cdc/mongo/debezium.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"go.mongodb.org/mongo-driver/bson"
)

type Debezium string
type Debezium struct{}

func (d *Debezium) GetEventFromBytes(bytes []byte) (cdc.Event, error) {
func (Debezium) GetEventFromBytes(bytes []byte) (cdc.Event, error) {
var schemaEventPayload SchemaEventPayload
if len(bytes) == 0 {
return nil, fmt.Errorf("empty message")
Expand Down Expand Up @@ -70,11 +70,11 @@ func (d *Debezium) GetEventFromBytes(bytes []byte) (cdc.Event, error) {
return &schemaEventPayload, nil
}

func (d *Debezium) Labels() []string {
func (Debezium) Labels() []string {
return []string{constants.DBZMongoFormat}
}

func (d *Debezium) GetPrimaryKey(key []byte, tc kafkalib.TopicConfig) (map[string]any, error) {
func (Debezium) GetPrimaryKey(key []byte, tc kafkalib.TopicConfig) (map[string]any, error) {
kvMap, err := debezium.ParsePartitionKey(key, tc.CDCKeyFormat)
if err != nil {
return nil, err
Expand Down
8 changes: 4 additions & 4 deletions lib/cdc/relational/debezium.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/artie-labs/transfer/lib/kafkalib"
)

type Debezium string
type Debezium struct{}

func (d *Debezium) GetEventFromBytes(bytes []byte) (cdc.Event, error) {
func (Debezium) GetEventFromBytes(bytes []byte) (cdc.Event, error) {
var event util.SchemaEventPayload
if len(bytes) == 0 {
return nil, fmt.Errorf("empty message")
Expand All @@ -26,7 +26,7 @@ func (d *Debezium) GetEventFromBytes(bytes []byte) (cdc.Event, error) {
return &event, nil
}

func (d *Debezium) Labels() []string {
func (Debezium) Labels() []string {
return []string{
constants.DBZPostgresFormat,
constants.DBZPostgresAltFormat,
Expand All @@ -35,6 +35,6 @@ func (d *Debezium) Labels() []string {
}
}

func (d *Debezium) GetPrimaryKey(key []byte, tc kafkalib.TopicConfig) (map[string]any, error) {
func (Debezium) GetPrimaryKey(key []byte, tc kafkalib.TopicConfig) (map[string]any, error) {
return debezium.ParsePartitionKey(key, tc.CDCKeyFormat)
}
Loading