Skip to content

feat(duckdb): Update to SDK V2 (Arrow) #10275

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

Merged
kodiakhq merged 13 commits into from
Apr 25, 2023
Merged

feat(duckdb): Update to SDK V2 (Arrow) #10275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2ee59d9
feat(duckdb): Update to SDK V2 (Arrow)
yevgenypats Apr 24, 2023
4f23cc3
wip
yevgenypats Apr 24, 2023
8bee22e
tests passing
yevgenypats Apr 24, 2023
f75a67a
fix duckdb
yevgenypats Apr 24, 2023
875b040
fix
yevgenypats Apr 24, 2023
25a42ae
Merge branch 'main' into feat/duckdb_arrow
yevgenypats Apr 24, 2023
4819d65
Use managed writer
hermanschaaf Apr 25, 2023
7ca3f14
Update plugins/destination/duckdb/json/writer.go
yevgenypats Apr 25, 2023
e864baf
fix review
yevgenypats Apr 25, 2023
980beb7
fix review
yevgenypats Apr 25, 2023
52ced15
fix review
yevgenypats Apr 25, 2023
74465ee
fix review
yevgenypats Apr 25, 2023
0f6c59e
Merge branch 'main' into feat/duckdb_arrow
kodiakhq[bot] Apr 25, 2023
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
29 changes: 17 additions & 12 deletions plugins/destination/duckdb/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,28 @@ package client
import (
"context"
"database/sql"
"database/sql/driver"
"fmt"

"github.com/cloudquery/plugin-sdk/plugins/destination"
"github.com/cloudquery/plugin-sdk/specs"
"github.com/cloudquery/plugin-sdk/v2/plugins/destination"
"github.com/cloudquery/plugin-sdk/v2/specs"
"github.com/rs/zerolog"

// import duckdb driver
_ "github.com/marcboeker/go-duckdb"
"github.com/marcboeker/go-duckdb"
)

type Client struct {
destination.UnimplementedManagedWriter
destination.DefaultReverseTransformer
db *sql.DB
logger zerolog.Logger
spec specs.Destination
metrics destination.Metrics
destination.UnimplementedUnmanagedWriter
db *sql.DB
connector driver.Connector
logger zerolog.Logger
spec specs.Destination
metrics destination.Metrics
}

func New(ctx context.Context, logger zerolog.Logger, spec specs.Destination) (destination.Client, error) {
var err error
c := &Client{
logger: logger.With().Str("module", "duckdb-dest").Logger(),
}
Expand All @@ -32,13 +34,16 @@ func New(ctx context.Context, logger zerolog.Logger, spec specs.Destination) (de
if err := spec.UnmarshalSpec(&duckdbSpec); err != nil {
return nil, fmt.Errorf("failed to unmarshal duckdb spec: %w", err)
}
duckdbSpec.SetDefaults()

db, err := sql.Open("duckdb", duckdbSpec.ConnectionString)
c.connector, err = duckdb.NewConnector(duckdbSpec.ConnectionString, nil)
db := sql.OpenDB(c.connector)
if err != nil {
return nil, err
}
c.db = db
_, err = c.db.Exec("INSTALL 'json'; LOAD 'json';")
if err != nil {
return nil, err
}
return c, nil
}

Expand Down
6 changes: 3 additions & 3 deletions plugins/destination/duckdb/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package client
import (
"testing"

"github.com/cloudquery/plugin-sdk/plugins/destination"
"github.com/cloudquery/plugin-sdk/specs"
"github.com/cloudquery/plugin-sdk/v2/plugins/destination"
"github.com/cloudquery/plugin-sdk/v2/specs"
)

var migrateStrategy = destination.MigrateStrategy{
Expand All @@ -18,7 +18,7 @@ var migrateStrategy = destination.MigrateStrategy{
func TestPlugin(t *testing.T) {
destination.PluginTestSuiteRunner(t,
func() *destination.Plugin {
return destination.NewPlugin("duckdb", "development", New)
return destination.NewPlugin("duckdb", "development", New, destination.WithManagedWriter())
},
specs.Destination{
Spec: &Spec{
Expand Down
9 changes: 5 additions & 4 deletions plugins/destination/duckdb/client/deletestale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import (
"strings"
"time"

"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/v2/schema"
)

func (c *Client) DeleteStale(ctx context.Context, tables schema.Tables, source string, syncTime time.Time) error {
for _, table := range tables.FlattenTables() {
func (c *Client) DeleteStale(ctx context.Context, tables schema.Schemas, source string, syncTime time.Time) error {
for _, table := range tables {
var sb strings.Builder
tableName := schema.TableName(table)
sb.WriteString("delete from ")
sb.WriteString(`"` + table.Name + `"`)
sb.WriteString(`"` + tableName + `"`)
sb.WriteString(" where ")
sb.WriteString(`"` + schema.CqSourceNameColumn.Name + `"`)
sb.WriteString(" = $1 and ")
Expand Down
2 changes: 1 addition & 1 deletion plugins/destination/duckdb/client/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/cloudquery/plugin-sdk/plugins/destination"
"github.com/cloudquery/plugin-sdk/v2/plugins/destination"
)

func (c *Client) Metrics() destination.Metrics {
Expand Down
Loading