Skip to content

Commit 449aca8

Browse files
Ignore forwarding CQL requests for Insights Client
1 parent e6411a5 commit 449aca8

13 files changed

+2151
-1878
lines changed

CHANGELOG/CHANGELOG-2.3.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
66

77
## Unreleased
88

9+
* [#139](https://github.com/datastax/zdm-proxy/pull/139): Ignore forwarding CQL requests for DSE Insights Client to target cluster
10+
11+
---
12+
913
## v2.3.1 - 2024-11-08
1014

1115
### New Features

antlr/SimplifiedCql.g4

+8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ cqlStatement
99
| batchStatement EOS?
1010
| selectStatement EOS?
1111
| useStatement EOS?
12+
| callStatement EOS?
1213
| unrecognizedStatement EOS?
1314
;
1415

@@ -119,6 +120,12 @@ useStatement
119120
: K_USE keyspaceName
120121
;
121122

123+
// CALL
124+
125+
callStatement
126+
: K_CALL identifier '.' identifier '(' terms? ')'
127+
;
128+
122129
// CLAUSES
123130

124131
// ORDER BY, GROUP BY, LIMIT
@@ -463,6 +470,7 @@ K_BIGINT: B I G I N T;
463470
K_BLOB: B L O B;
464471
K_BOOLEAN: B O O L E A N;
465472
K_BY: B Y;
473+
K_CALL: C A L L;
466474
K_CAST: C A S T;
467475
K_CLUSTERING: C L U S T E R I N G;
468476
K_CONTAINS: C O N T A I N S;

antlr/SimplifiedCql.interp

+4-1
Large diffs are not rendered by default.

antlr/SimplifiedCql.tokens

+79-78
Original file line numberDiff line numberDiff line change
@@ -30,82 +30,83 @@ K_BIGINT=29
3030
K_BLOB=30
3131
K_BOOLEAN=31
3232
K_BY=32
33-
K_CAST=33
34-
K_CLUSTERING=34
35-
K_CONTAINS=35
36-
K_COUNTER=36
37-
K_COUNT=37
38-
K_DATE=38
39-
K_DECIMAL=39
40-
K_DELETE=40
41-
K_DESC=41
42-
K_DISTINCT=42
43-
K_DOUBLE=43
44-
K_DURATION=44
45-
K_EXISTS=45
46-
K_FILTERING=46
47-
K_FLOAT=47
48-
K_FROM=48
49-
K_FROZEN=49
50-
K_GROUP=50
51-
K_IF=51
52-
K_INET=52
53-
K_INFINITY=53
54-
K_INSERT=54
55-
K_INTO=55
56-
K_INT=56
57-
K_IN=57
58-
K_IS=58
59-
K_JSON=59
60-
K_KEY=60
61-
K_LIKE=61
62-
K_LIMIT=62
63-
K_LIST=63
64-
K_MAP=64
65-
K_NAN=65
66-
K_NOT=66
67-
K_NULL=67
68-
K_OR=68
69-
K_ORDER=69
70-
K_PARTITION=70
71-
K_PER=71
72-
K_SELECT=72
73-
K_SET=73
74-
K_SMALLINT=74
75-
K_TEXT=75
76-
K_TIMESTAMP=76
77-
K_TIMEUUID=77
78-
K_TIME=78
79-
K_TINYINT=79
80-
K_TOKEN=80
81-
K_TTL=81
82-
K_TUPLE=82
83-
K_TYPE=83
84-
K_UNLOGGED=84
85-
K_UPDATE=85
86-
K_USE=86
87-
K_USING=87
88-
K_UUID=88
89-
K_VALUES=89
90-
K_VARCHAR=90
91-
K_VARINT=91
92-
K_WHERE=92
93-
K_WRITETIME=93
94-
STRING_LITERAL=94
95-
QUOTED_IDENTIFIER=95
96-
INTEGER=96
97-
QMARK=97
98-
FLOAT=98
99-
BOOLEAN=99
100-
DURATION=100
101-
UNQUOTED_IDENTIFIER=101
102-
HEXNUMBER=102
103-
UUID=103
104-
WS=104
105-
COMMENT=105
106-
MULTILINE_COMMENT=106
107-
EOS=107
108-
OTHER=108
33+
K_CALL=33
34+
K_CAST=34
35+
K_CLUSTERING=35
36+
K_CONTAINS=36
37+
K_COUNTER=37
38+
K_COUNT=38
39+
K_DATE=39
40+
K_DECIMAL=40
41+
K_DELETE=41
42+
K_DESC=42
43+
K_DISTINCT=43
44+
K_DOUBLE=44
45+
K_DURATION=45
46+
K_EXISTS=46
47+
K_FILTERING=47
48+
K_FLOAT=48
49+
K_FROM=49
50+
K_FROZEN=50
51+
K_GROUP=51
52+
K_IF=52
53+
K_INET=53
54+
K_INFINITY=54
55+
K_INSERT=55
56+
K_INTO=56
57+
K_INT=57
58+
K_IN=58
59+
K_IS=59
60+
K_JSON=60
61+
K_KEY=61
62+
K_LIKE=62
63+
K_LIMIT=63
64+
K_LIST=64
65+
K_MAP=65
66+
K_NAN=66
67+
K_NOT=67
68+
K_NULL=68
69+
K_OR=69
70+
K_ORDER=70
71+
K_PARTITION=71
72+
K_PER=72
73+
K_SELECT=73
74+
K_SET=74
75+
K_SMALLINT=75
76+
K_TEXT=76
77+
K_TIMESTAMP=77
78+
K_TIMEUUID=78
79+
K_TIME=79
80+
K_TINYINT=80
81+
K_TOKEN=81
82+
K_TTL=82
83+
K_TUPLE=83
84+
K_TYPE=84
85+
K_UNLOGGED=85
86+
K_UPDATE=86
87+
K_USE=87
88+
K_USING=88
89+
K_UUID=89
90+
K_VALUES=90
91+
K_VARCHAR=91
92+
K_VARINT=92
93+
K_WHERE=93
94+
K_WRITETIME=94
95+
STRING_LITERAL=95
96+
QUOTED_IDENTIFIER=96
97+
INTEGER=97
98+
QMARK=98
99+
FLOAT=99
100+
BOOLEAN=100
101+
DURATION=101
102+
UNQUOTED_IDENTIFIER=102
103+
HEXNUMBER=103
104+
UUID=104
105+
WS=105
106+
COMMENT=106
107+
MULTILINE_COMMENT=107
108+
EOS=108
109+
OTHER=109
109110
'('=1
110111
')'=2
111112
','=3
@@ -126,5 +127,5 @@ OTHER=108
126127
':'=18
127128
'{'=19
128129
'}'=20
129-
'?'=97
130-
';'=107
130+
'?'=98
131+
';'=108

antlr/SimplifiedCqlLexer.interp

+4-1
Large diffs are not rendered by default.

antlr/SimplifiedCqlLexer.tokens

+79-78
Original file line numberDiff line numberDiff line change
@@ -30,82 +30,83 @@ K_BIGINT=29
3030
K_BLOB=30
3131
K_BOOLEAN=31
3232
K_BY=32
33-
K_CAST=33
34-
K_CLUSTERING=34
35-
K_CONTAINS=35
36-
K_COUNTER=36
37-
K_COUNT=37
38-
K_DATE=38
39-
K_DECIMAL=39
40-
K_DELETE=40
41-
K_DESC=41
42-
K_DISTINCT=42
43-
K_DOUBLE=43
44-
K_DURATION=44
45-
K_EXISTS=45
46-
K_FILTERING=46
47-
K_FLOAT=47
48-
K_FROM=48
49-
K_FROZEN=49
50-
K_GROUP=50
51-
K_IF=51
52-
K_INET=52
53-
K_INFINITY=53
54-
K_INSERT=54
55-
K_INTO=55
56-
K_INT=56
57-
K_IN=57
58-
K_IS=58
59-
K_JSON=59
60-
K_KEY=60
61-
K_LIKE=61
62-
K_LIMIT=62
63-
K_LIST=63
64-
K_MAP=64
65-
K_NAN=65
66-
K_NOT=66
67-
K_NULL=67
68-
K_OR=68
69-
K_ORDER=69
70-
K_PARTITION=70
71-
K_PER=71
72-
K_SELECT=72
73-
K_SET=73
74-
K_SMALLINT=74
75-
K_TEXT=75
76-
K_TIMESTAMP=76
77-
K_TIMEUUID=77
78-
K_TIME=78
79-
K_TINYINT=79
80-
K_TOKEN=80
81-
K_TTL=81
82-
K_TUPLE=82
83-
K_TYPE=83
84-
K_UNLOGGED=84
85-
K_UPDATE=85
86-
K_USE=86
87-
K_USING=87
88-
K_UUID=88
89-
K_VALUES=89
90-
K_VARCHAR=90
91-
K_VARINT=91
92-
K_WHERE=92
93-
K_WRITETIME=93
94-
STRING_LITERAL=94
95-
QUOTED_IDENTIFIER=95
96-
INTEGER=96
97-
QMARK=97
98-
FLOAT=98
99-
BOOLEAN=99
100-
DURATION=100
101-
UNQUOTED_IDENTIFIER=101
102-
HEXNUMBER=102
103-
UUID=103
104-
WS=104
105-
COMMENT=105
106-
MULTILINE_COMMENT=106
107-
EOS=107
108-
OTHER=108
33+
K_CALL=33
34+
K_CAST=34
35+
K_CLUSTERING=35
36+
K_CONTAINS=36
37+
K_COUNTER=37
38+
K_COUNT=38
39+
K_DATE=39
40+
K_DECIMAL=40
41+
K_DELETE=41
42+
K_DESC=42
43+
K_DISTINCT=43
44+
K_DOUBLE=44
45+
K_DURATION=45
46+
K_EXISTS=46
47+
K_FILTERING=47
48+
K_FLOAT=48
49+
K_FROM=49
50+
K_FROZEN=50
51+
K_GROUP=51
52+
K_IF=52
53+
K_INET=53
54+
K_INFINITY=54
55+
K_INSERT=55
56+
K_INTO=56
57+
K_INT=57
58+
K_IN=58
59+
K_IS=59
60+
K_JSON=60
61+
K_KEY=61
62+
K_LIKE=62
63+
K_LIMIT=63
64+
K_LIST=64
65+
K_MAP=65
66+
K_NAN=66
67+
K_NOT=67
68+
K_NULL=68
69+
K_OR=69
70+
K_ORDER=70
71+
K_PARTITION=71
72+
K_PER=72
73+
K_SELECT=73
74+
K_SET=74
75+
K_SMALLINT=75
76+
K_TEXT=76
77+
K_TIMESTAMP=77
78+
K_TIMEUUID=78
79+
K_TIME=79
80+
K_TINYINT=80
81+
K_TOKEN=81
82+
K_TTL=82
83+
K_TUPLE=83
84+
K_TYPE=84
85+
K_UNLOGGED=85
86+
K_UPDATE=86
87+
K_USE=87
88+
K_USING=88
89+
K_UUID=89
90+
K_VALUES=90
91+
K_VARCHAR=91
92+
K_VARINT=92
93+
K_WHERE=93
94+
K_WRITETIME=94
95+
STRING_LITERAL=95
96+
QUOTED_IDENTIFIER=96
97+
INTEGER=97
98+
QMARK=98
99+
FLOAT=99
100+
BOOLEAN=100
101+
DURATION=101
102+
UNQUOTED_IDENTIFIER=102
103+
HEXNUMBER=103
104+
UUID=104
105+
WS=105
106+
COMMENT=106
107+
MULTILINE_COMMENT=107
108+
EOS=108
109+
OTHER=109
109110
'('=1
110111
')'=2
111112
','=3
@@ -126,5 +127,5 @@ OTHER=108
126127
':'=18
127128
'{'=19
128129
'}'=20
129-
'?'=97
130-
';'=107
130+
'?'=98
131+
';'=108

antlr/simplifiedcql_base_listener.go

+7-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)