Fix INDEX column spacing bug (#186)

---------

Signed-off-by: Sharad Gaur <[email protected]>

Author: sharadgaur

.github/workflows/ci.yaml

@@ -53,4 +53,4 @@ jobs:
       - name: Send coverage
         env:
           COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: goveralls -coverprofile=coverage.out -service=github
+        run: goveralls -coverprofile=coverage.out -service=github

parser/ast.go

@@ -1494,12 +1494,12 @@ func (a *TableIndex) String() string {
 	builder.WriteString("INDEX")
 	builder.WriteByte(' ')
 	builder.WriteString(a.Name.String())
-	// a.ColumnDef = *Name --- e.g. INDEX idx column TYPE ...
-	// a.ColumnDef = *ParamExprList --- e.g. INDEX idx(column) TYPE ...
-	if _, ok := a.ColumnExpr.Expr.(*Ident); ok {
+	// Add space only if column expression doesn't start with '('
+	columnExprStr := a.ColumnExpr.String()
+	if len(columnExprStr) > 0 && columnExprStr[0] != '(' {
 		builder.WriteByte(' ')
 	}
-	builder.WriteString(a.ColumnExpr.String())
+	builder.WriteString(columnExprStr)
 	builder.WriteByte(' ')
 	builder.WriteString("TYPE")
 	builder.WriteByte(' ')

parser/testdata/ddl/create_table_with_index.sql

@@ -1,10 +1,12 @@
 CREATE TABLE IF NOT EXISTS test_local
 (
+ `common.id` String CODEC(ZSTD(1)),
  `id` UInt64 CODEC(Delta, ZSTD(1)),
  `api_id` UInt64 CODEC(ZSTD(1)),
  `arr` Array(Int64),
  `content` String CODEC(ZSTD(1)),
  `output` String,
+ INDEX id_common_id_bloom_filter common.id TYPE bloom_filter(0.001) GRANULARITY 1,
  INDEX id_idx id TYPE minmax GRANULARITY 10,
  INDEX api_id_idx api_id TYPE set(100) GRANULARITY 2,
  INDEX arr_idx arr TYPE bloom_filter(0.01) GRANULARITY 3,

parser/testdata/ddl/format/create_table_with_index.sql

@@ -1,11 +1,13 @@
 -- Origin SQL:
 CREATE TABLE IF NOT EXISTS test_local
 (
+ `common.id` String CODEC(ZSTD(1)),
  `id` UInt64 CODEC(Delta, ZSTD(1)),
  `api_id` UInt64 CODEC(ZSTD(1)),
  `arr` Array(Int64),
  `content` String CODEC(ZSTD(1)),
  `output` String,
+ INDEX id_common_id_bloom_filter common.id TYPE bloom_filter(0.001) GRANULARITY 1,
  INDEX id_idx id TYPE minmax GRANULARITY 10,
  INDEX api_id_idx api_id TYPE set(100) GRANULARITY 2,
  INDEX arr_idx arr TYPE bloom_filter(0.01) GRANULARITY 3,
@@ -20,4 +22,4 @@ SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity
 
 
 -- Format SQL:
-CREATE TABLE IF NOT EXISTS test_local (`id` UInt64 CODEC(Delta, ZSTD(1)), `api_id` UInt64 CODEC(ZSTD(1)), `arr` Array(Int64), `content` String CODEC(ZSTD(1)), `output` String, INDEX id_idx id TYPE minmax GRANULARITY 10, INDEX api_id_idx api_id TYPE set(100) GRANULARITY 2, INDEX arr_idx arr TYPE bloom_filter(0.01) GRANULARITY 3, INDEX content_idx content TYPE tokenbf_v1(30720, 2, 0) GRANULARITY 1, INDEX output_idx output TYPE ngrambf_v1(3, 10000, 2, 1) GRANULARITY 2) ENGINE = ReplicatedMergeTree('/root/test_local', '{replica}') PARTITION BY toStartOfHour(`timestamp`) TTL toStartOfHour(`timestamp`) + INTERVAL 7 DAY, toStartOfHour(`timestamp`) + INTERVAL 2 DAY SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity=16384, max_bytes_to_merge_at_max_space_in_pool=64424509440, storage_policy='main', ttl_only_drop_parts=1 ORDER BY (toUnixTimestamp64Nano(`timestamp`), `api_id`);
+CREATE TABLE IF NOT EXISTS test_local (`common.id` String CODEC(ZSTD(1)), `id` UInt64 CODEC(Delta, ZSTD(1)), `api_id` UInt64 CODEC(ZSTD(1)), `arr` Array(Int64), `content` String CODEC(ZSTD(1)), `output` String, INDEX id_common_id_bloom_filter common.id TYPE bloom_filter(0.001) GRANULARITY 1, INDEX id_idx id TYPE minmax GRANULARITY 10, INDEX api_id_idx api_id TYPE set(100) GRANULARITY 2, INDEX arr_idx arr TYPE bloom_filter(0.01) GRANULARITY 3, INDEX content_idx content TYPE tokenbf_v1(30720, 2, 0) GRANULARITY 1, INDEX output_idx output TYPE ngrambf_v1(3, 10000, 2, 1) GRANULARITY 2) ENGINE = ReplicatedMergeTree('/root/test_local', '{replica}') PARTITION BY toStartOfHour(`timestamp`) TTL toStartOfHour(`timestamp`) + INTERVAL 7 DAY, toStartOfHour(`timestamp`) + INTERVAL 2 DAY SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity=16384, max_bytes_to_merge_at_max_space_in_pool=64424509440, storage_policy='main', ttl_only_drop_parts=1 ORDER BY (toUnixTimestamp64Nano(`timestamp`), `api_id`);