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

create external function issue fix #1271

Merged
merged 1 commit into from
Sep 28, 2024
Merged

create external function issue fix #1271

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
57 changes: 57 additions & 0 deletions .../zilla/specs/binding/risingwave/streams/effective/create.function.return.table/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#
# 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 "CREATE FUNCTION series(int)\n"
"RETURNS TABLE (x int)\n"
"AS series\n"
"LANGUAGE java\n"
"USING LINK 'http://localhost:8815';"
[0x00]

write flush

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

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

57 changes: 57 additions & 0 deletions .../zilla/specs/binding/risingwave/streams/effective/create.function.return.table/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#
# 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 "CREATE FUNCTION series(int)\n"
"RETURNS TABLE (x int)\n"
"AS series\n"
"LANGUAGE java\n"
"USING LINK 'http://localhost:8815';"
[0x00]

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

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

6 changes: 3 additions & 3 deletions ...s/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.function/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ write zilla:data.ext ${pgsql:dataEx()
.query()
.build()
.build()}
write "CREATE FUNCTION series(int)\n"
"RETURNS TABLE (x int)\n"
"AS series\n"
write "CREATE FUNCTION gcd(int , int)\n"
"RETURNS int\n"
"AS gcd\n"
"LANGUAGE java\n"
"USING LINK 'http://localhost:8815';"
[0x00]
Expand Down
6 changes: 3 additions & 3 deletions ...s/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.function/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ read zilla:data.ext ${pgsql:dataEx()
.query()
.build()
.build()}
read "CREATE FUNCTION series(int)\n"
"RETURNS TABLE (x int)\n"
"AS series\n"
read "CREATE FUNCTION gcd(int , int)\n"
"RETURNS int\n"
"AS gcd\n"
"LANGUAGE java\n"
"USING LINK 'http://localhost:8815';"
[0x00]
Expand Down
54 changes: 54 additions & 0 deletions ...vity/zilla/specs/binding/risingwave/streams/pgsql/create.function.return.table/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#
# 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/app0"
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 "CREATE FUNCTION series(int) RETURNS TABLE (x int) "
"AS series;"
[0x00]

write flush

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

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

55 changes: 55 additions & 0 deletions ...vity/zilla/specs/binding/risingwave/streams/pgsql/create.function.return.table/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#
# 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.
#

property serverAddress "zilla://streams/app0"

accept ${serverAddress}
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 "CREATE FUNCTION series(int) RETURNS TABLE (x int) "
"AS series;"
[0x00]

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

write advise zilla:flush ${pgsql:flushEx()
.typeId(zilla:id("pgsql"))
.ready()
.status("IDLE")
.build()
.build()}
4 changes: 2 additions & 2 deletions ...ripts/io/aklivity/zilla/specs/binding/risingwave/streams/pgsql/create.function/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ write zilla:data.ext ${pgsql:dataEx()
.query()
.build()
.build()}
write "CREATE FUNCTION series(int) RETURNS TABLE (x int) "
"AS series;"
write "CREATE FUNCTION gcd(int, int) RETURNS int "
"AS gcd;"
[0x00]

write flush
Expand Down
4 changes: 2 additions & 2 deletions ...ripts/io/aklivity/zilla/specs/binding/risingwave/streams/pgsql/create.function/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ read zilla:data.ext ${pgsql:dataEx()
.query()
.build()
.build()}
read "CREATE FUNCTION series(int) RETURNS TABLE (x int) "
"AS series;"
read "CREATE FUNCTION gcd(int, int) RETURNS int "
"AS gcd;"
[0x00]

write advise zilla:flush ${pgsql:flushEx()
Expand Down
10 changes: 10 additions & 0 deletions ...ve.spec/src/test/java/io/aklivity/zilla/specs/binding/risingwave/streams/EffectiveIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ public void shouldCreateFunction() throws Exception
k3po.finish();
}

@Test
@Specification({
"${app}/create.function.return.table/client",
"${app}/create.function.return.table/server"
})
public void shouldCreateFunctionReturnTable() throws Exception
{
k3po.finish();
}

@Test
@Specification({
"${app}/create.function.embedded/client",
Expand Down
10 changes: 10 additions & 0 deletions ...ngwave.spec/src/test/java/io/aklivity/zilla/specs/binding/risingwave/streams/PgsqlIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ public void shouldCreateFunction() throws Exception
k3po.finish();
}

@Test
@Specification({
"${app}/create.function.return.table/client",
"${app}/create.function.return.table/server"
})
public void shouldCreateFunctionReturnTable() throws Exception
{
k3po.finish();
}

@Test
@Specification({
"${app}/create.function.embedded/client",
Expand Down
2 changes: 1 addition & 1 deletion ...ivity/zilla/runtime/binding/risingwave/internal/statement/RisingwaveSqlCommandParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public final class RisingwaveSqlCommandParser
"CREATE\\s+FUNCTION[\\s\\S]+?\\$\\$[\\s\\S]+?\\$\\$";
private static final String SQL_COMMAND_PATTERN =
"(?i)\\b(CREATE FUNCTION)\\b.*?\\$\\$(.*?)\\$\\$\\s*;[\\x00\\n]*" +
"|\\b(CREATE FUNCTION)\\b.*?RETURNS TABLE.*?AS.*?;[\\x00\\n]*" +
"|\\b(CREATE FUNCTION)\\b.*?RETURNS .*?AS.*?;[\\x00\\n]*" +
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to support both RETURNS and RETURNS TABLE.

"|\\b(CREATE MATERIALIZED VIEW|CREATE SOURCE|CREATE SINK|CREATE INDEX" +
"|CREATE VIEW|SHOW TABLES|DESCRIBE|SHOW)\\b.*?;[\\x00\\n]*" +
"|\\b(SELECT|INSERT|UPDATE|DELETE|ALTER|DROP|CREATE TABLE|CREATE SCHEMA|CREATE DATABASE)\\b.*?;[\\x00\\n]*";
Expand Down
10 changes: 10 additions & 0 deletions ...e/src/test/java/io/aklivity/zilla/runtime/binding/risingwave/internal/stream/ProxyIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,16 @@ public void shouldCreateFunction() throws Exception
k3po.finish();
}

@Test
@Configuration("proxy.function.yaml")
@Specification({
"${pgsql}/create.function.return.table/client",
"${effective}/create.function.return.table/server" })
public void shouldCreateFunctionReturnTable() throws Exception
{
k3po.finish();
}

@Test
@Configuration("proxy.function.yaml")
@Specification({
Expand Down