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

Jump to bottom

Support DROP TABLE, STREAM, and MATERIALIZED VIEW #1266

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Support DROP TABLE, STREAM, and MATERIALIZED VIEW #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3d9b8af
Specs for drop table;
akrambek Sep 23, 2024
dd5953d
Add specs for materialized view and table
akrambek Sep 23, 2024
c7e6e62
Fiix typo
akrambek Sep 24, 2024
8668073
WIP
akrambek Sep 24, 2024
d75c122
Merge branch 'develop' into feature/risingwave-drop
akrambek Oct 4, 2024
05ebe75
WIP
akrambek Oct 4, 2024
0b5e7e0
WIP
akrambek Oct 5, 2024
305c309
WIP Checkpoint
akrambek Oct 7, 2024
829da38
Merge branch 'develop' into feature/risingwave-drop
akrambek Oct 22, 2024
de756c4
WIP
akrambek Oct 22, 2024
fcae8fc
WIP
akrambek Oct 22, 2024
777a32a
WIP
akrambek Oct 22, 2024
1dac5e0
Checkpoint
akrambek Oct 22, 2024
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
2 changes: 1 addition & 1 deletion ...nding-pgsql/src/main/java/io/aklivity/zilla/runtime/binding/pgsql/parser/PgsqlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public PgsqlParser()
this.lexer = new PostgreSqlLexer(null);
this.tokens = new CommonTokenStream(lexer);
this.parser = new PostgreSqlParser(tokens);
this.commandListener = new SqlCommandListener();
this.commandListener = new SqlCommandListener(tokens);
this.createTableListener = new SqlCreateTableTopicListener(tokens);
this.createStreamListener = new SqlCreateStreamListener(tokens);
this.createFunctionListener = new SqlCreateFunctionListener(tokens);
Expand Down
12 changes: 11 additions & 1 deletion ...main/java/io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlCommandListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,23 @@
*/
package io.aklivity.zilla.runtime.binding.pgsql.parser.listener;

import org.antlr.v4.runtime.TokenStream;

import io.aklivity.zilla.runtime.binding.pgsql.parser.PostgreSqlParser;
import io.aklivity.zilla.runtime.binding.pgsql.parser.PostgreSqlParserBaseListener;

public class SqlCommandListener extends PostgreSqlParserBaseListener
{
private String command = "";

private final TokenStream tokens;

public SqlCommandListener(
TokenStream tokens)
{
this.tokens = tokens;
}

public String command()
{
return command;
Expand Down Expand Up @@ -70,6 +80,6 @@ public void enterCreatefunctionstmt(
public void enterDropstmt(
PostgreSqlParser.DropstmtContext ctx)
{
command = "DROP %s".formatted(ctx.object_type_any_name().getText());
command = "DROP %s".formatted(tokens.getText(ctx.object_type_any_name()));
}
}
1 change: 1 addition & 0 deletions ...ngwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/config/proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ bindings:
when:
- commands:
- "CREATE TOPIC"
- "DROP TOPIC"
exit: app1
2 changes: 1 addition & 1 deletion ...in/scripts/io/aklivity/zilla/specs/binding/risingwave/schema/risingwave.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"items":
{
"type": "string",
"enum": [ "CREATE TOPIC" ]
"enum": [ "CREATE TOPIC", "DROP TOPIC" ]
}
}
}
Expand Down
112 changes: 112 additions & 0 deletions ...livity/zilla/specs/binding/risingwave/streams/effective/drop.materialized.view/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
#
# Copyright 2021-2023 Aklivity Inc
#
# Licensed under the Aklivity Community License (the "License"); you may not use
# this file except in compliance with the License. You may obtain a copy of the
# License at
#
# https://www.aklivity.io/aklivity-community-license/
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
#

connect "zilla://streams/app1"
option zilla:window 8192
option zilla:transmission "duplex"

write zilla:begin.ext ${pgsql:beginEx()
.typeId(zilla:id("pgsql"))
.parameter("user", "root")
.parameter("database", "dev")
.parameter("application_name", "psql")
.parameter("client_encoding", "UTF8")
.build()}

connected

write zilla:data.ext ${pgsql:dataEx()
.typeId(zilla:id("pgsql"))
.query()
.build()
.build()}
write "DROP MATERIALIZED VIEW weather;"
[0x00]
write flush

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.completion()
.tag("DROP_MATERIALIZED_VIEW")
.build()
.build()}

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}

write zilla:data.ext ${pgsql:dataEx()
.typeId(zilla:id("pgsql"))
.query()
.build()
.build()}
write "DROP SINK weather_sink;"
[0x00]
write flush

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.completion()
.tag("DROP_SINK")
.build()
.build()}

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}

connect "zilla://streams/app2"
option zilla:window 8192
option zilla:transmission "duplex"

write zilla:begin.ext ${pgsql:beginEx()
.typeId(zilla:id("pgsql"))
.parameter("user", "root")
.parameter("database", "dev")
.parameter("application_name", "psql")
.parameter("client_encoding", "UTF8")
.build()}

connected

write zilla:data.ext ${pgsql:dataEx()
.typeId(zilla:id("pgsql"))
.query()
.build()
.build()}
write "DROP TOPIC weather;"
[0x00]
write flush

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.completion()
.tag("DROP_TOPIC")
.build()
.build()}

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}

114 changes: 114 additions & 0 deletions ...livity/zilla/specs/binding/risingwave/streams/effective/drop.materialized.view/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
#
# Copyright 2021-2023 Aklivity Inc
#
# Licensed under the Aklivity Community License (the "License"); you may not use
# this file except in compliance with the License. You may obtain a copy of the
# License at
#
# https://www.aklivity.io/aklivity-community-license/
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
#

accept "zilla://streams/app1"
option zilla:window 8192
option zilla:transmission "duplex"

accepted

read zilla:begin.ext ${pgsql:beginEx()
.typeId(zilla:id("pgsql"))
.parameter("user", "root")
.parameter("database", "dev")
.parameter("application_name", "psql")
.parameter("client_encoding", "UTF8")
.build()}

connected

read zilla:data.ext ${pgsql:dataEx()
.typeId(zilla:id("pgsql"))
.query()
.build()
.build()}
read "DROP MATERIALIZED VIEW weather;"
[0x00]

write advise zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.completion()
.tag("DROP_MATERIALIZED_VIEW")
.build()
.build()}

write advise zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}

read zilla:data.ext ${pgsql:dataEx()
.typeId(zilla:id("pgsql"))
.query()
.build()
.build()}
read "DROP SINK weather_sink;"
[0x00]

write advise zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.completion()
.tag("DROP_SINK")
.build()
.build()}

write advise zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}

accept "zilla://streams/app2"
option zilla:window 8192
option zilla:transmission "duplex"

accepted

read zilla:begin.ext ${pgsql:beginEx()
.typeId(zilla:id("pgsql"))
.parameter("user", "root")
.parameter("database", "dev")
.parameter("application_name", "psql")
.parameter("client_encoding", "UTF8")
.build()}

connected

read zilla:data.ext ${pgsql:dataEx()
.typeId(zilla:id("pgsql"))
.query()
.build()
.build()}
read "DROP TOPIC weather;"
[0x00]

write advise zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.completion()
.tag("DROP_TOPIC")
.build()
.build()}


write advise zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}

90 changes: 90 additions & 0 deletions ...ripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.stream/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
#
# Copyright 2021-2023 Aklivity Inc
#
# Licensed under the Aklivity Community License (the "License"); you may not use
# this file except in compliance with the License. You may obtain a copy of the
# License at
#
# https://www.aklivity.io/aklivity-community-license/
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
#

connect "zilla://streams/app1"
option zilla:window 8192
option zilla:transmission "duplex"

write zilla:begin.ext ${pgsql:beginEx()
.typeId(zilla:id("pgsql"))
.parameter("user", "root")
.parameter("database", "dev")
.parameter("application_name", "psql")
.parameter("client_encoding", "UTF8")
.build()}

connected

write zilla:data.ext ${pgsql:dataEx()
.typeId(zilla:id("pgsql"))
.query()
.build()
.build()}
write "DROP SOURCE weather;"
[0x00]
write flush

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.completion()
.tag("DROP_SOURCE")
.build()
.build()}

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}

connect "zilla://streams/app2"
option zilla:window 8192
option zilla:transmission "duplex"

write zilla:begin.ext ${pgsql:beginEx()
.typeId(zilla:id("pgsql"))
.parameter("user", "root")
.parameter("database", "dev")
.parameter("application_name", "psql")
.parameter("client_encoding", "UTF8")
.build()}

connected

write zilla:data.ext ${pgsql:dataEx()
.typeId(zilla:id("pgsql"))
.query()
.build()
.build()}
write "DROP TOPIC weather;"
[0x00]

write flush

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.completion()
.tag("DROP_TOPIC")
.build()
.build()}

read advised zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}

Loading