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

Jump to bottom

Allow overriding external_table_storage for duckdb #5723

Merged
merged 5 commits into from
Sep 19, 2024
+23 −20
Merged

Allow overriding external_table_storage for duckdb #5723

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9675ac0
external_table_storage should not be a preset
k-anshul Sep 18, 2024
444dfad
external_table_storage should not be a preset
k-anshul Sep 18, 2024
4a5292d
Merge remote-tracking branch 'origin/main' into external_table_storag…
k-anshul Sep 18, 2024
65ddd1e
fix unit test
k-anshul Sep 18, 2024
0fe5deb
web tests fix
k-anshul Sep 19, 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
7 changes: 3 additions & 4 deletions admin/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ func (s *Service) createDeployment(ctx context.Context, opts *createDeploymentOp
Type: "duckdb",
// duckdb DSN will automatically be computed based on these parameters
Config: map[string]string{
"cpu": strconv.Itoa(alloc.CPU),
"memory_limit_gb": strconv.Itoa(alloc.MemoryGB),
"storage_limit_bytes": strconv.FormatInt(alloc.StorageBytes, 10),
"external_table_storage": strconv.FormatBool(true),
"cpu": strconv.Itoa(alloc.CPU),
"memory_limit_gb": strconv.Itoa(alloc.MemoryGB),
"storage_limit_bytes": strconv.FormatInt(alloc.StorageBytes, 10),
},
})

Expand Down
5 changes: 4 additions & 1 deletion runtime/drivers/duckdb/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ type config struct {
}

func newConfig(cfgMap map[string]any) (*config, error) {
cfg := &config{}
cfg := &config{
ExtTableStorage: true,
}
err := mapstructure.WeakDecode(cfgMap, cfg)
if err != nil {
return nil, fmt.Errorf("could not decode config: %w", err)
Expand All @@ -64,6 +66,7 @@ func newConfig(cfgMap map[string]any) (*config, error) {
if strings.HasPrefix(cfg.DSN, ":memory:") {
inMemory = true
cfg.DSN = strings.Replace(cfg.DSN, ":memory:", "", 1)
cfg.ExtTableStorage = false
}

// Parse DSN as URL
Expand Down
5 changes: 3 additions & 2 deletions runtime/drivers/duckdb/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ func TestConfig(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "?custom_user_agent=rill&max_memory=1GB&threads=2", cfg.DSN)
require.Equal(t, 2, cfg.PoolSize)
require.Equal(t, true, cfg.ExtTableStorage)

cfg, err = newConfig(map[string]any{"data_dir": "path/to"})
require.NoError(t, err)
Expand Down Expand Up @@ -92,7 +93,7 @@ func Test_specialCharInPath(t *testing.T) {
require.NoError(t, err)

dbFile := filepath.Join(path, "st@g3's.db")
conn, err := Driver{}.Open("default", map[string]any{"path": dbFile, "memory_limit_gb": "4", "cpu": "1"}, activity.NewNoopClient(), zap.NewNop())
conn, err := Driver{}.Open("default", map[string]any{"path": dbFile, "memory_limit_gb": "4", "cpu": "1", "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)
config := conn.(*connection).config
require.Equal(t, filepath.Join(path, "st@g3's.db?custom_user_agent=rill&max_memory=4GB&threads=1"), config.DSN)
Expand All @@ -108,7 +109,7 @@ func Test_specialCharInPath(t *testing.T) {
}

func TestOverrides(t *testing.T) {
cfgMap := map[string]any{"path": "duck.db", "memory_limit_gb": "4", "cpu": "2", "max_memory_gb_override": "2", "threads_override": "10"}
cfgMap := map[string]any{"path": "duck.db", "memory_limit_gb": "4", "cpu": "2", "max_memory_gb_override": "2", "threads_override": "10", "external_table_storage": false}
handle, err := Driver{}.Open("default", cfgMap, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)

Expand Down
6 changes: 3 additions & 3 deletions runtime/drivers/duckdb/duckdb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestOpenDrop(t *testing.T) {
walpath := path + ".wal"
dsn := path

handle, err := Driver{}.Open("default", map[string]any{"path": dsn, "pool_size": 2}, activity.NewNoopClient(), zap.NewNop())
handle, err := Driver{}.Open("default", map[string]any{"path": dsn, "pool_size": 2, "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)

olap, ok := handle.AsOLAP("")
Expand All @@ -43,7 +43,7 @@ func TestNoFatalErr(t *testing.T) {

dsn := filepath.Join(t.TempDir(), "tmp.db")

handle, err := Driver{}.Open("default", map[string]any{"path": dsn, "pool_size": 2}, activity.NewNoopClient(), zap.NewNop())
handle, err := Driver{}.Open("default", map[string]any{"path": dsn, "pool_size": 2, "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)

olap, ok := handle.AsOLAP("")
Expand Down Expand Up @@ -105,7 +105,7 @@ func TestNoFatalErrConcurrent(t *testing.T) {

dsn := filepath.Join(t.TempDir(), "tmp.db")

handle, err := Driver{}.Open("default", map[string]any{"path": dsn, "pool_size": 3}, activity.NewNoopClient(), zap.NewNop())
handle, err := Driver{}.Open("default", map[string]any{"path": dsn, "pool_size": 3, "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)

olap, ok := handle.AsOLAP("")
Expand Down
6 changes: 3 additions & 3 deletions runtime/drivers/duckdb/olap_crud_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func Test_connection_CreateTableAsSelect(t *testing.T) {
temp := t.TempDir()
require.NoError(t, os.Mkdir(filepath.Join(temp, "default"), fs.ModePerm))
dbPath := filepath.Join(temp, "default", "normal.db")
handle, err := Driver{}.Open("default", map[string]any{"path": dbPath}, activity.NewNoopClient(), zap.NewNop())
handle, err := Driver{}.Open("default", map[string]any{"path": dbPath, "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)
normalConn := handle.(*connection)
normalConn.AsOLAP("default")
Expand Down Expand Up @@ -287,7 +287,7 @@ func Test_connection_AddTableColumn(t *testing.T) {
}

func Test_connection_RenameToExistingTableOld(t *testing.T) {
handle, err := Driver{}.Open("default", map[string]any{"dsn": ":memory:"}, activity.NewNoopClient(), zap.NewNop())
handle, err := Driver{}.Open("default", map[string]any{"dsn": ":memory:", "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)
c := handle.(*connection)
require.NoError(t, c.Migrate(context.Background()))
Expand Down Expand Up @@ -361,7 +361,7 @@ func Test_connection_CreateTableAsSelectWithComments(t *testing.T) {
temp := t.TempDir()
require.NoError(t, os.Mkdir(filepath.Join(temp, "default"), fs.ModePerm))
dbPath := filepath.Join(temp, "default", "normal.db")
handle, err := Driver{}.Open("default", map[string]any{"path": dbPath}, activity.NewNoopClient(), zap.NewNop())
handle, err := Driver{}.Open("default", map[string]any{"path": dbPath, "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)
normalConn := handle.(*connection)
normalConn.AsOLAP("default")
Expand Down
6 changes: 3 additions & 3 deletions runtime/drivers/duckdb/olap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func TestClose(t *testing.T) {
}

func prepareConn(t *testing.T) drivers.Handle {
conn, err := Driver{}.Open("default", map[string]any{"dsn": ":memory:?access_mode=read_write", "pool_size": 4}, activity.NewNoopClient(), zap.NewNop())
conn, err := Driver{}.Open("default", map[string]any{"dsn": ":memory:?access_mode=read_write", "pool_size": 4, "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)

olap, ok := conn.AsOLAP("")
Expand Down Expand Up @@ -248,11 +248,11 @@ func Test_safeSQLString(t *testing.T) {
require.NoError(t, err)

dbFile := filepath.Join(path, "st@g3's.db")
conn, err := Driver{}.Open("default", map[string]any{"path": dbFile}, activity.NewNoopClient(), zap.NewNop())
conn, err := Driver{}.Open("default", map[string]any{"path": dbFile, "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)
require.NoError(t, conn.Close())

conn, err = Driver{}.Open("default", map[string]any{}, activity.NewNoopClient(), zap.NewNop())
conn, err = Driver{}.Open("default", map[string]any{"external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)

olap, ok := conn.AsOLAP("")
Expand Down
4 changes: 2 additions & 2 deletions runtime/drivers/duckdb/transporter_duckDB_to_duckDB_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

func TestDuckDBToDuckDBTransfer(t *testing.T) {
tempDir := t.TempDir()
conn, err := Driver{}.Open("default", map[string]any{"path": fmt.Sprintf("%s.db", filepath.Join(tempDir, "tranfser"))}, activity.NewNoopClient(), zap.NewNop())
conn, err := Driver{}.Open("default", map[string]any{"path": fmt.Sprintf("%s.db", filepath.Join(tempDir, "tranfser")), "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)

olap, ok := conn.AsOLAP("")
Expand All @@ -31,7 +31,7 @@ func TestDuckDBToDuckDBTransfer(t *testing.T) {
require.NoError(t, err)
require.NoError(t, conn.Close())

to, err := Driver{}.Open("default", map[string]any{"path": filepath.Join(tempDir, "main.db")}, activity.NewNoopClient(), zap.NewNop())
to, err := Driver{}.Open("default", map[string]any{"path": filepath.Join(tempDir, "main.db"), "external_table_storage": false}, activity.NewNoopClient(), zap.NewNop())
require.NoError(t, err)

olap, _ = to.AsOLAP("")
Expand Down
Loading