Skip to content

Commit 5bb1320

Browse files
committed
Fix should allow to assign parameters for the Null engine
1 parent 79044fb commit 5bb1320

File tree

4 files changed

+170
-4
lines changed

4 files changed

+170
-4
lines changed

parser/parser_table.go

-4
Original file line numberDiff line numberDiff line change
@@ -860,10 +860,6 @@ func (p *Parser) parseEngineExpr(pos Pos) (*EngineExpr, error) {
860860
engineExpr := &EngineExpr{EnginePos: pos}
861861
var engineEnd Pos
862862
switch {
863-
case p.matchKeyword(KeywordNull):
864-
engineExpr.Name = KeywordNull
865-
engineEnd = p.last().End
866-
_ = p.lexer.consumeToken()
867863
case p.matchTokenKind(TokenIdent):
868864
ident, err := p.parseIdent()
869865
if err != nil {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CREATE TABLE logs.t0 on cluster default
2+
(
3+
`trace_id` String CODEC(ZSTD(1)),
4+
INDEX trace_id_bloom_idx trace_id TYPE bloom_filter(0.01) GRANULARITY 64
5+
) ENGINE = Null();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- Origin SQL:
2+
CREATE TABLE logs.t0 on cluster default
3+
(
4+
`trace_id` String CODEC(ZSTD(1)),
5+
INDEX trace_id_bloom_idx trace_id TYPE bloom_filter(0.01) GRANULARITY 64
6+
) ENGINE = Null();
7+
8+
-- Format SQL:
9+
CREATE TABLE logs.t0 ON CLUSTER default (`trace_id` String CODEC(ZSTD(1)), INDEX trace_id_bloom_idx trace_id TYPE bloom_filter(0.01) GRANULARITY 64) ENGINE = Null();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
[
2+
{
3+
"CreatePos": 0,
4+
"StatementEnd": 172,
5+
"Name": {
6+
"Database": {
7+
"Name": "logs",
8+
"QuoteType": 1,
9+
"NamePos": 13,
10+
"NameEnd": 17
11+
},
12+
"Table": {
13+
"Name": "t0",
14+
"QuoteType": 1,
15+
"NamePos": 18,
16+
"NameEnd": 20
17+
}
18+
},
19+
"IfNotExists": false,
20+
"UUID": null,
21+
"OnCluster": {
22+
"OnPos": 21,
23+
"Expr": {
24+
"Name": "default",
25+
"QuoteType": 1,
26+
"NamePos": 32,
27+
"NameEnd": 39
28+
}
29+
},
30+
"TableSchema": {
31+
"SchemaPos": 40,
32+
"SchemaEnd": 157,
33+
"Columns": [
34+
{
35+
"NamePos": 47,
36+
"ColumnEnd": 78,
37+
"Name": {
38+
"Ident": {
39+
"Name": "trace_id",
40+
"QuoteType": 3,
41+
"NamePos": 47,
42+
"NameEnd": 55
43+
},
44+
"DotIdent": null
45+
},
46+
"Type": {
47+
"Name": {
48+
"Name": "String",
49+
"QuoteType": 1,
50+
"NamePos": 57,
51+
"NameEnd": 63
52+
}
53+
},
54+
"NotNull": null,
55+
"Nullable": null,
56+
"DefaultExpr": null,
57+
"MaterializedExpr": null,
58+
"AliasExpr": null,
59+
"Codec": {
60+
"CodecPos": 64,
61+
"RightParenPos": 78,
62+
"Type": null,
63+
"TypeLevel": null,
64+
"Name": {
65+
"Name": "ZSTD",
66+
"QuoteType": 1,
67+
"NamePos": 70,
68+
"NameEnd": 74
69+
},
70+
"Level": {
71+
"NumPos": 74,
72+
"NumEnd": 76,
73+
"Literal": "1",
74+
"Base": 10
75+
}
76+
},
77+
"TTL": null,
78+
"Comment": null,
79+
"CompressionCodec": null
80+
},
81+
{
82+
"IndexPos": 84,
83+
"Name": {
84+
"Ident": {
85+
"Name": "trace_id_bloom_idx",
86+
"QuoteType": 1,
87+
"NamePos": 90,
88+
"NameEnd": 108
89+
},
90+
"DotIdent": null
91+
},
92+
"ColumnExpr": {
93+
"Expr": {
94+
"Name": "trace_id",
95+
"QuoteType": 1,
96+
"NamePos": 109,
97+
"NameEnd": 117
98+
},
99+
"Alias": null
100+
},
101+
"ColumnType": {
102+
"LeftParenPos": 136,
103+
"RightParenPos": 140,
104+
"Name": {
105+
"Name": "bloom_filter",
106+
"QuoteType": 1,
107+
"NamePos": 123,
108+
"NameEnd": 135
109+
},
110+
"Params": [
111+
{
112+
"NumPos": 136,
113+
"NumEnd": 140,
114+
"Literal": "0.01",
115+
"Base": 10
116+
}
117+
]
118+
},
119+
"Granularity": {
120+
"NumPos": 154,
121+
"NumEnd": 156,
122+
"Literal": "64",
123+
"Base": 10
124+
}
125+
}
126+
],
127+
"AliasTable": null,
128+
"TableFunction": null
129+
},
130+
"Engine": {
131+
"EnginePos": 159,
132+
"EngineEnd": 172,
133+
"Name": "Null",
134+
"Params": {
135+
"LeftParenPos": 172,
136+
"RightParenPos": 173,
137+
"Items": {
138+
"ListPos": 173,
139+
"ListEnd": 173,
140+
"HasDistinct": false,
141+
"Items": []
142+
},
143+
"ColumnArgList": null
144+
},
145+
"PrimaryKey": null,
146+
"PartitionBy": null,
147+
"SampleBy": null,
148+
"TTL": null,
149+
"Settings": null,
150+
"OrderBy": null
151+
},
152+
"SubQuery": null,
153+
"HasTemporary": false,
154+
"Comment": null
155+
}
156+
]

0 commit comments

Comments
 (0)