Skip to content

Commit 029b2d8

Browse files
Merge pull request #1497 from pablomatiasgomez/reduce-memory-usage-compressor
change container provider, verify close conn error in tests
2 parents 88b9368 + f6fa3c1 commit 029b2d8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

conn.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ func (c *connect) close() error {
223223
}
224224

225225
c.buffer = nil
226+
c.compressor = nil
226227

227228
c.readerMutex.Lock()
228229
c.reader = nil

tests/conn_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,7 @@ func TestConnectionExpiresIdleConnection(t *testing.T) {
358358
defer wg.Done()
359359
r, err := conn.Query(ctx, "SELECT 1")
360360
require.NoError(t, err)
361-
362-
r.Close()
361+
require.NoError(t, r.Close())
363362
}()
364363
}
365364
wg.Wait()
@@ -390,8 +389,8 @@ func TestConnectionCloseIdle(t *testing.T) {
390389
conn, err := TestClientWithDefaultSettings(testEnv)
391390
require.NoError(t, err)
392391
err = conn.Ping(ctx)
393-
conn.Close()
394392
require.NoError(t, err)
393+
require.NoError(t, conn.Close())
395394
}
396395
time.Sleep(100 * time.Millisecond) // wait for all connections closed
397396
finalGoroutine := runtime.NumGoroutine()

tests/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func CreateClickHouseTestEnvironment(testSet string) (ClickHouseTestEnvironment,
127127
// create a ClickHouse Container
128128
ctx := context.Background()
129129
// attempt use docker for CI
130-
provider, err := testcontainers.ProviderDocker.GetProvider()
130+
provider, err := testcontainers.ProviderDefault.GetProvider()
131131
if err != nil {
132132
fmt.Printf("Docker is not running and no clickhouse connections details were provided. Skipping tests: %s\n", err)
133133
os.Exit(0)

0 commit comments

Comments
 (0)