simplify (#3623)

Author: jgao54

flow/connectors/clickhouse/normalize.go

@@ -264,7 +264,7 @@ func (c *ClickHouseConnector) generateCreateTableSQLForNormalizedTable(
 		}
 
 		if allowNullableKey {
-			stmtBuilder.WriteString(NewCHSettingsString(chVersion, CHSettingEntry{SettingAllowNullableKey, "1"}))
+			stmtBuilder.WriteString(NewCHSettingsString(chVersion, SettingAllowNullableKey, "1"))
 		}
 
 		if c.Config.Cluster != "" {

flow/connectors/clickhouse/setting_util.go

@@ -48,11 +48,9 @@ func GetMinVersion(name CHSetting) (chproto.Version, bool) {
 }
 
 // NewCHSettingsString is a one-liner method to generate an immutable settings string
-func NewCHSettingsString(version *chproto.Version, settings ...CHSettingEntry) string {
+func NewCHSettingsString(version *chproto.Version, key CHSetting, val string) string {
 	sg := NewCHSettings(version)
-	for _, setting := range settings {
-		sg.Add(setting.key, setting.val)
-	}
+	sg.Add(key, val)
 	return sg.String()
 }
 

flow/connectors/clickhouse/setting_util_test.go

@@ -36,26 +36,23 @@ func TestCHSettingsVersionFiltering(t *testing.T) {
 	require.Equal(t, chproto.Version{Major: 25, Minor: 8, Patch: 0}, minVersion)
 	chSettings := NewCHSettings(&chproto.Version{Major: 25, Minor: 8, Patch: 0})
 	chSettings.Add(SettingJsonTypeEscapeDotsInKeys, "1")
-	result := chSettings.String()
-	require.Equal(t, " SETTINGS json_type_escape_dots_in_keys=1", result)
+	require.Equal(t, " SETTINGS json_type_escape_dots_in_keys=1", chSettings.String())
 
 	// setting not meeting minimum version should be filter out
 	chSettings = NewCHSettings(&chproto.Version{Major: 25, Minor: 7, Patch: 0})
 	chSettings.Add(SettingJsonTypeEscapeDotsInKeys, "1")
-	result = chSettings.String()
-	require.Empty(t, result)
+	require.Empty(t, chSettings.String())
 
 	// settings not having minimum version should be included
 	_, minVersionExist := GetMinVersion(SettingThrowOnMaxPartitionsPerInsertBlock)
 	require.False(t, minVersionExist)
-	result = NewCHSettingsString(&chproto.Version{Major: 25, Minor: 8, Patch: 0},
-		CHSettingEntry{SettingThrowOnMaxPartitionsPerInsertBlock, "0"})
-	require.Equal(t, " SETTINGS throw_on_max_partitions_per_insert_block=0", result)
+	require.Equal(t, " SETTINGS throw_on_max_partitions_per_insert_block=0",
+		NewCHSettingsString(&chproto.Version{Major: 25, Minor: 8, Patch: 0}, SettingThrowOnMaxPartitionsPerInsertBlock, "0"))
 
 	// setting should be included when ch version is not specified
-	result = NewCHSettingsString(nil,
-		CHSettingEntry{SettingJsonTypeEscapeDotsInKeys, "1"},
-		CHSettingEntry{SettingThrowOnMaxPartitionsPerInsertBlock, "0"},
-	)
-	require.Equal(t, " SETTINGS json_type_escape_dots_in_keys=1, throw_on_max_partitions_per_insert_block=0", result)
+	chSettings = NewCHSettings(nil)
+	chSettings.Add(SettingJsonTypeEscapeDotsInKeys, "1")
+	chSettings.Add(SettingThrowOnMaxPartitionsPerInsertBlock, "0")
+	require.Equal(t, " SETTINGS json_type_escape_dots_in_keys=1, throw_on_max_partitions_per_insert_block=0",
+		chSettings.String())
 }