fix: cli options

aasaam · Jun 16, 2023 · 413454d · 413454d
1 parent 74db692
commit 413454d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 36 deletions.
diff --git a/clickhouse.go b/clickhouse.go
@@ -21,21 +21,22 @@ var clickhouseSQLInsertRecords string
 var clickhouseSQLInsertClientErrors string
 
 type clickhouseConfig struct {
-	servers          string
-	database         string
-	username         string
-	password         string
-	rootCAPath       string
-	clientCertPath   string
-	clientKeyPath    string
-	maxExecutionTime int
-	dialTimeout      int
-	debug            bool
-	compressionLZ4   bool
-	maxIdleConns     int
-	maxOpenConns     int
-	connMaxLifetime  int
-	maxBlockSize     int
+	servers            string
+	database           string
+	username           string
+	password           string
+	rootCAPath         string
+	clientCertPath     string
+	clientKeyPath      string
+	maxExecutionTime   int
+	maxInsertBlockSize int
+	dialTimeout        int
+	debug              bool
+	compressionLZ4     bool
+	maxIdleConns       int
+	maxOpenConns       int
+	connMaxLifetime    int
+	maxBlockSize       int
 
 	progress func(p *clickhouse.Progress)
 	profile  func(p *clickhouse.ProfileInfo)
@@ -51,7 +52,9 @@ func clickhouseGetConnection(c *clickhouseConfig) (driver.Conn, context.Context,
 			Password: c.password,
 		},
 		Settings: clickhouse.Settings{
-			"max_execution_time": c.maxExecutionTime,
+			"max_execution_time":    c.maxExecutionTime,
+			"max_block_size":        c.maxBlockSize,
+			"max_insert_block_size": c.maxInsertBlockSize,
 		},
 		DialTimeout:     time.Duration(c.dialTimeout) * time.Second,
 		Debug:           c.debug,

diff --git a/http_types.go b/http_types.go
@@ -18,10 +18,6 @@ const (
 	mimetypeGIF  = "image/gif"
 )
 
-const (
-	metricsPath = "/metrics"
-)
-
 const (
 	recordQueryMode             = "m"
 	recordQueryPublicInstanceID = "i"

diff --git a/main.go b/main.go
@@ -116,10 +116,17 @@ func main() {
 				&cli.IntFlag{
 					Name:     "clickhouse-max-block-size",
 					Usage:    "Clickhouse max block size",
-					Value:    10,
+					Value:    131072,
 					Required: false,
 					EnvVars:  []string{"ASM_ANALYTICS_COLLECTOR_CLICKHOUSE_MAX_BLOCK_SIZE"},
 				},
+				&cli.IntFlag{
+					Name:     "clickhouse-max-insert-block-size",
+					Usage:    "Clickhouse max insert block size",
+					Value:    33554432,
+					Required: false,
+					EnvVars:  []string{"ASM_ANALYTICS_COLLECTOR_CLICKHOUSE_MAX_INSERT_BLOCK_SIZE"},
+				},
 				&cli.BoolFlag{
 					Name:     "clickhouse-compression-lz4",
 					Usage:    "Clickhouse compression LZ4",

diff --git a/main_consumer.go b/main_consumer.go
@@ -14,21 +14,22 @@ func mainStore(c *cli.Context) error {
 	)
 
 	clickhouseConfig := clickhouseConfig{
-		servers:          c.String("clickhouse-servers"),
-		database:         c.String("clickhouse-database"),
-		username:         c.String("clickhouse-username"),
-		password:         c.String("clickhouse-password"),
-		maxExecutionTime: c.Int("clickhouse-max-execution-time"),
-		dialTimeout:      c.Int("clickhouse-dial-timeout"),
-		debug:            c.Bool("test-mode"),
-		compressionLZ4:   c.Bool("clickhouse-compression-lz4"),
-		maxIdleConns:     c.Int("clickhouse-max-idle-conns"),
-		maxOpenConns:     c.Int("clickhouse-max-open-conns"),
-		connMaxLifetime:  c.Int("clickhouse-conn-max-lifetime"),
-		maxBlockSize:     c.Int("clickhouse-max-block-size"),
-		rootCAPath:       c.String("clickhouse-root-ca"),
-		clientCertPath:   c.String("clickhouse-client-cert"),
-		clientKeyPath:    c.String("clickhouse-client-key"),
+		servers:            c.String("clickhouse-servers"),
+		database:           c.String("clickhouse-database"),
+		username:           c.String("clickhouse-username"),
+		password:           c.String("clickhouse-password"),
+		maxExecutionTime:   c.Int("clickhouse-max-execution-time"),
+		dialTimeout:        c.Int("clickhouse-dial-timeout"),
+		debug:              c.Bool("test-mode"),
+		compressionLZ4:     c.Bool("clickhouse-compression-lz4"),
+		maxIdleConns:       c.Int("clickhouse-max-idle-conns"),
+		maxOpenConns:       c.Int("clickhouse-max-open-conns"),
+		connMaxLifetime:    c.Int("clickhouse-conn-max-lifetime"),
+		maxBlockSize:       c.Int("clickhouse-max-block-size"),
+		maxInsertBlockSize: c.Int("clickhouse-max-insert-block-size"),
+		rootCAPath:         c.String("clickhouse-root-ca"),
+		clientCertPath:     c.String("clickhouse-client-cert"),
+		clientKeyPath:      c.String("clickhouse-client-key"),
 	}
 
 	checkInterval := time.Duration(c.Int("check-interval")) * time.Second