Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore forwarding CQL requests for Insights Client #139

Merged
merged 1 commit into from
Feb 28, 2025
Merged

Ignore forwarding CQL requests for Insights Client #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG/CHANGELOG-2.3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ When cutting a new release, update the `unreleased` heading to the tag being gen

## Unreleased

* [#139](https://github.com/datastax/zdm-proxy/pull/139): Ignore forwarding CQL requests for DSE Insights Client to target cluster

---

## v2.3.1 - 2024-11-08

### New Features
Expand Down
8 changes: 8 additions & 0 deletions antlr/SimplifiedCql.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ cqlStatement
| batchStatement EOS?
| selectStatement EOS?
| useStatement EOS?
| callStatement EOS?
| unrecognizedStatement EOS?
;

Expand Down Expand Up @@ -119,6 +120,12 @@ useStatement
: K_USE keyspaceName
;

// CALL

callStatement
: K_CALL identifier '.' identifier '(' terms? ')'
;

// CLAUSES

// ORDER BY, GROUP BY, LIMIT
Expand Down Expand Up @@ -463,6 +470,7 @@ K_BIGINT: B I G I N T;
K_BLOB: B L O B;
K_BOOLEAN: B O O L E A N;
K_BY: B Y;
K_CALL: C A L L;
K_CAST: C A S T;
K_CLUSTERING: C L U S T E R I N G;
K_CONTAINS: C O N T A I N S;
Expand Down
5 changes: 4 additions & 1 deletion antlr/SimplifiedCql.interp
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading