From 903a0d140e0d691bcd8e1fd32de7de2067869cab Mon Sep 17 00:00:00 2001 From: Ivan Yurochko Date: Fri, 1 Mar 2024 15:33:25 +0100 Subject: [PATCH 1/4] ignore materialized and alias cols during instantiation of the batch insert we construct all the columns, there is no need to do it for materialized and alias columns as they are non insertable --- conn_http_batch.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/conn_http_batch.go b/conn_http_batch.go index d64faeb374..4c1c98ff00 100644 --- a/conn_http_batch.go +++ b/conn_http_batch.go @@ -21,13 +21,14 @@ import ( "context" "errors" "fmt" - "github.com/ClickHouse/clickhouse-go/v2/lib/column" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" "io" "io/ioutil" "regexp" "strings" + + "github.com/ClickHouse/clickhouse-go/v2/lib/column" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) // \x60 represents a backtick @@ -63,14 +64,19 @@ func (h *httpConnect) prepareBatch(ctx context.Context, query string, opts drive var colNames []string for r.Next() { var ( - colName string - colType string - ignore string + colName string + colType string + default_type string + ignore string ) - if err = r.Scan(&colName, &colType, &ignore, &ignore, &ignore, &ignore, &ignore); err != nil { + if err = r.Scan(&colName, &colType, &default_type, &ignore, &ignore, &ignore, &ignore); err != nil { return nil, err } + // // these column types cannot be specified in INSERT queries + // if default_type == "MATERIALIZED" || default_type == "ALIAS" { + // continue + // } colNames = append(colNames, colName) columns[colName] = colType } From ffc756bbd39eb85e44faba2022c066b797aabfac Mon Sep 17 00:00:00 2001 From: Ivan Yurochko Date: Fri, 1 Mar 2024 17:48:58 +0100 Subject: [PATCH 2/4] fix indent --- conn_http_batch.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conn_http_batch.go b/conn_http_batch.go index 4c1594cb1a..72c0e75ad7 100644 --- a/conn_http_batch.go +++ b/conn_http_batch.go @@ -73,8 +73,7 @@ func (h *httpConnect) prepareBatch(ctx context.Context, query string, opts drive return nil, err } // these column types cannot be specified in INSERT queries - - if default_type == "MATERIALIZED" || default_type == "ALIAS" { + if default_type == "MATERIALIZED" || default_type == "ALIAS" { continue } colNames = append(colNames, colName) From acca78487005263e9aa41775da56c96c470eacdf Mon Sep 17 00:00:00 2001 From: Ivan Yurochko Date: Sun, 10 Mar 2024 13:17:26 +0100 Subject: [PATCH 3/4] add test case --- conn_http_batch.go | 4 +- tests/std/mat_cols_test.go | 77 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 tests/std/mat_cols_test.go diff --git a/conn_http_batch.go b/conn_http_batch.go index 72c0e75ad7..6fbf3f1100 100644 --- a/conn_http_batch.go +++ b/conn_http_batch.go @@ -73,8 +73,8 @@ func (h *httpConnect) prepareBatch(ctx context.Context, query string, opts drive return nil, err } // these column types cannot be specified in INSERT queries - if default_type == "MATERIALIZED" || default_type == "ALIAS" { - continue + if default_type == "MATERIALIZED" || default_type == "ALIAS" { + continue } colNames = append(colNames, colName) columns[colName] = colType diff --git a/tests/std/mat_cols_test.go b/tests/std/mat_cols_test.go new file mode 100644 index 0000000000..baae734c88 --- /dev/null +++ b/tests/std/mat_cols_test.go @@ -0,0 +1,77 @@ +// Licensed to ClickHouse, Inc. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. ClickHouse, Inc. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package std + +import ( + "fmt" + "math/big" + "strconv" + "testing" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestMatColInsert(t *testing.T) { + dsns := map[string]clickhouse.Protocol{"Native": clickhouse.Native, "Http": clickhouse.HTTP} + useSSL, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_SSL", "false")) + require.NoError(t, err) + for name, protocol := range dsns { + t.Run(fmt.Sprintf("%s Protocol", name), func(t *testing.T) { + if conn, err := GetStdDSNConnection(protocol, useSSL, nil); assert.NoError(t, err) { + if !CheckMinServerVersion(conn, 21, 12, 0) { + t.Skip(fmt.Errorf("unsupported clickhouse version")) + return + } + const ddl = ` + CREATE TABLE test_mat_cols ( + Col1 Int128 + , Col2 MATERIALIZED Col1 * 2 + ) Engine MergeTree() ORDER BY tuple() + ` + defer func() { + conn.Exec("DROP TABLE test_mat_cols") + }() + _, err := conn.Exec(ddl) + require.NoError(t, err) + scope, err := conn.Begin() + require.NoError(t, err) + batch, err := scope.Prepare("INSERT INTO test_mat_cols") + require.NoError(t, err) + var ( + col1Data = big.NewInt(128) + col2Data = big.NewInt(128 * 2) + ) + _, err = batch.Exec(col1Data) + require.NoError(t, err) + require.NoError(t, scope.Commit()) + var ( + col1 big.Int + col2 big.Int + ) + require.NoError(t, conn.QueryRow("SELECT * FROM test_mat_cols").Scan(&col1)) + assert.Equal(t, *col1Data, col1) + require.NoError(t, conn.QueryRow("SELECT Col1, Col2 from test_mat_cols").Scan(&col1, &col2)) + assert.Equal(t, *col1Data, col1) + assert.Equal(t, *col2Data, col2) + } + }) + } +} From 8322114d9a11a3849c048dd0004dbfbb7e4d1480 Mon Sep 17 00:00:00 2001 From: Kuba Kaflik Date: Mon, 11 Mar 2024 08:16:24 +0100 Subject: [PATCH 4/4] Update and rename mat_cols_test.go to materialized_column_test.go --- tests/std/{mat_cols_test.go => materialized_column_test.go} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename tests/std/{mat_cols_test.go => materialized_column_test.go} (98%) diff --git a/tests/std/mat_cols_test.go b/tests/std/materialized_column_test.go similarity index 98% rename from tests/std/mat_cols_test.go rename to tests/std/materialized_column_test.go index baae734c88..1ba1575345 100644 --- a/tests/std/mat_cols_test.go +++ b/tests/std/materialized_column_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestMatColInsert(t *testing.T) { +func TestMaterializedColumnInsert(t *testing.T) { dsns := map[string]clickhouse.Protocol{"Native": clickhouse.Native, "Http": clickhouse.HTTP} useSSL, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_SSL", "false")) require.NoError(t, err)