Skip to content

Commit da16c0f

Browse files
mattdeekaymattdeekay
committed
Fix connector_test.go and gofmt lint
Signed-off-by: Matthew Kim <11141331+mattdeekay@users.noreply.github.com>
1 parent 4be8ace commit da16c0f

3 files changed

Lines changed: 99 additions & 76 deletions

File tree

‎connector_test.go‎

Lines changed: 61 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,33 @@ func TestNewConnector(t *testing.T) {
3636
WithSessionParams(sessionParams),
3737
WithRetries(10, 3*time.Second, 60*time.Second),
3838
WithTransport(roundTripper),
39+
WithCloudFetch(true),
40+
WithMaxDownloadThreads(15),
3941
)
42+
expectedCloudFetchConfig := config.CloudFetchConfig{
43+
UseCloudFetch: true,
44+
MaxDownloadThreads: 15,
45+
MaxFilesInMemory: 10,
46+
MinTimeToExpiry: 0 * time.Second,
47+
}
4048
expectedUserConfig := config.UserConfig{
41-
Host: host,
42-
Port: port,
43-
Protocol: "https",
44-
AccessToken: accessToken,
45-
Authenticator: &pat.PATAuth{AccessToken: accessToken},
46-
HTTPPath: "/" + httpPath,
47-
MaxRows: maxRows,
48-
QueryTimeout: timeout,
49-
Catalog: catalog,
50-
Schema: schema,
51-
UserAgentEntry: userAgentEntry,
52-
SessionParams: sessionParams,
53-
RetryMax: 10,
54-
RetryWaitMin: 3 * time.Second,
55-
RetryWaitMax: 60 * time.Second,
56-
Transport: roundTripper,
49+
Host: host,
50+
Port: port,
51+
Protocol: "https",
52+
AccessToken: accessToken,
53+
Authenticator: &pat.PATAuth{AccessToken: accessToken},
54+
HTTPPath: "/" + httpPath,
55+
MaxRows: maxRows,
56+
QueryTimeout: timeout,
57+
Catalog: catalog,
58+
Schema: schema,
59+
UserAgentEntry: userAgentEntry,
60+
SessionParams: sessionParams,
61+
RetryMax: 10,
62+
RetryWaitMin: 3 * time.Second,
63+
RetryWaitMax: 60 * time.Second,
64+
Transport: roundTripper,
65+
CloudFetchConfig: expectedCloudFetchConfig,
5766
}
5867
expectedCfg := config.WithDefaults()
5968
expectedCfg.DriverVersion = DriverVersion
@@ -75,18 +84,25 @@ func TestNewConnector(t *testing.T) {
7584
WithAccessToken(accessToken),
7685
WithHTTPPath(httpPath),
7786
)
87+
expectedCloudFetchConfig := config.CloudFetchConfig{
88+
UseCloudFetch: false,
89+
MaxDownloadThreads: 10,
90+
MaxFilesInMemory: 10,
91+
MinTimeToExpiry: 0 * time.Second,
92+
}
7893
expectedUserConfig := config.UserConfig{
79-
Host: host,
80-
Port: port,
81-
Protocol: "https",
82-
AccessToken: accessToken,
83-
Authenticator: &pat.PATAuth{AccessToken: accessToken},
84-
HTTPPath: "/" + httpPath,
85-
MaxRows: maxRows,
86-
SessionParams: sessionParams,
87-
RetryMax: 4,
88-
RetryWaitMin: 1 * time.Second,
89-
RetryWaitMax: 30 * time.Second,
94+
Host: host,
95+
Port: port,
96+
Protocol: "https",
97+
AccessToken: accessToken,
98+
Authenticator: &pat.PATAuth{AccessToken: accessToken},
99+
HTTPPath: "/" + httpPath,
100+
MaxRows: maxRows,
101+
SessionParams: sessionParams,
102+
RetryMax: 4,
103+
RetryWaitMin: 1 * time.Second,
104+
RetryWaitMax: 30 * time.Second,
105+
CloudFetchConfig: expectedCloudFetchConfig,
90106
}
91107
expectedCfg := config.WithDefaults()
92108
expectedCfg.UserConfig = expectedUserConfig
@@ -109,18 +125,25 @@ func TestNewConnector(t *testing.T) {
109125
WithHTTPPath(httpPath),
110126
WithRetries(-1, 0, 0),
111127
)
128+
expectedCloudFetchConfig := config.CloudFetchConfig{
129+
UseCloudFetch: false,
130+
MaxDownloadThreads: 10,
131+
MaxFilesInMemory: 10,
132+
MinTimeToExpiry: 0 * time.Second,
133+
}
112134
expectedUserConfig := config.UserConfig{
113-
Host: host,
114-
Port: port,
115-
Protocol: "https",
116-
AccessToken: accessToken,
117-
Authenticator: &pat.PATAuth{AccessToken: accessToken},
118-
HTTPPath: "/" + httpPath,
119-
MaxRows: maxRows,
120-
SessionParams: sessionParams,
121-
RetryMax: -1,
122-
RetryWaitMin: 0,
123-
RetryWaitMax: 0,
135+
Host: host,
136+
Port: port,
137+
Protocol: "https",
138+
AccessToken: accessToken,
139+
Authenticator: &pat.PATAuth{AccessToken: accessToken},
140+
HTTPPath: "/" + httpPath,
141+
MaxRows: maxRows,
142+
SessionParams: sessionParams,
143+
RetryMax: -1,
144+
RetryWaitMin: 0,
145+
RetryWaitMax: 0,
146+
CloudFetchConfig: expectedCloudFetchConfig,
124147
}
125148
expectedCfg := config.WithDefaults()
126149
expectedCfg.DriverVersion = DriverVersion

‎internal/config/config.go‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,23 @@ func (c *Config) DeepCopy() *Config {
8282

8383
// UserConfig is the set of configurations exposed to users
8484
type UserConfig struct {
85-
Protocol string
86-
Host string // from databricks UI
87-
Port int // from databricks UI
88-
HTTPPath string // from databricks UI
89-
Catalog string
90-
Schema string
91-
Authenticator auth.Authenticator
92-
AccessToken string // from databricks UI
93-
MaxRows int // max rows per page
94-
QueryTimeout time.Duration // Timeout passed to server for query processing
95-
UserAgentEntry string
96-
Location *time.Location
97-
SessionParams map[string]string
98-
RetryWaitMin time.Duration
99-
RetryWaitMax time.Duration
100-
RetryMax int
101-
Transport http.RoundTripper
85+
Protocol string
86+
Host string // from databricks UI
87+
Port int // from databricks UI
88+
HTTPPath string // from databricks UI
89+
Catalog string
90+
Schema string
91+
Authenticator auth.Authenticator
92+
AccessToken string // from databricks UI
93+
MaxRows int // max rows per page
94+
QueryTimeout time.Duration // Timeout passed to server for query processing
95+
UserAgentEntry string
96+
Location *time.Location
97+
SessionParams map[string]string
98+
RetryWaitMin time.Duration
99+
RetryWaitMax time.Duration
100+
RetryMax int
101+
Transport http.RoundTripper
102102
UseLz4Compression bool
103103
CloudFetchConfig
104104
}
@@ -123,23 +123,23 @@ func (ucfg UserConfig) DeepCopy() UserConfig {
123123
}
124124

125125
return UserConfig{
126-
Protocol: ucfg.Protocol,
127-
Host: ucfg.Host,
128-
Port: ucfg.Port,
129-
HTTPPath: ucfg.HTTPPath,
130-
Catalog: ucfg.Catalog,
131-
Schema: ucfg.Schema,
132-
Authenticator: ucfg.Authenticator,
133-
AccessToken: ucfg.AccessToken,
134-
MaxRows: ucfg.MaxRows,
135-
QueryTimeout: ucfg.QueryTimeout,
136-
UserAgentEntry: ucfg.UserAgentEntry,
137-
Location: loccp,
138-
SessionParams: sessionParams,
139-
RetryWaitMin: ucfg.RetryWaitMin,
140-
RetryWaitMax: ucfg.RetryWaitMax,
141-
RetryMax: ucfg.RetryMax,
142-
Transport: ucfg.Transport,
126+
Protocol: ucfg.Protocol,
127+
Host: ucfg.Host,
128+
Port: ucfg.Port,
129+
HTTPPath: ucfg.HTTPPath,
130+
Catalog: ucfg.Catalog,
131+
Schema: ucfg.Schema,
132+
Authenticator: ucfg.Authenticator,
133+
AccessToken: ucfg.AccessToken,
134+
MaxRows: ucfg.MaxRows,
135+
QueryTimeout: ucfg.QueryTimeout,
136+
UserAgentEntry: ucfg.UserAgentEntry,
137+
Location: loccp,
138+
SessionParams: sessionParams,
139+
RetryWaitMin: ucfg.RetryWaitMin,
140+
RetryWaitMax: ucfg.RetryWaitMax,
141+
RetryMax: ucfg.RetryMax,
142+
Transport: ucfg.Transport,
143143
UseLz4Compression: ucfg.UseLz4Compression,
144144
CloudFetchConfig: ucfg.CloudFetchConfig,
145145
}

‎internal/rows/arrowbased/batchloader_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"bytes"
55
"context"
66
"fmt"
7-
"github.com/apache/arrow/go/v11/arrow"
8-
"github.com/apache/arrow/go/v11/arrow/array"
9-
"github.com/apache/arrow/go/v11/arrow/ipc"
10-
"github.com/apache/arrow/go/v11/arrow/memory"
7+
"github.com/apache/arrow/go/v12/arrow"
8+
"github.com/apache/arrow/go/v12/arrow/array"
9+
"github.com/apache/arrow/go/v12/arrow/ipc"
10+
"github.com/apache/arrow/go/v12/arrow/memory"
1111
"github.com/databricks/databricks-sql-go/internal/cli_service"
1212
"github.com/databricks/databricks-sql-go/internal/config"
1313
dbsqlerrint "github.com/databricks/databricks-sql-go/internal/errors"

0 commit comments

Comments
 (0)