switch to javascript udf

Signed-off-by: Runji Wang <[email protected]>
risingwavelabs · Feb 8, 2024 · 667f68e · 667f68e
1 parent d8c2c38
commit 667f68e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 19 deletions.
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -29,7 +29,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-mo
 ENV PATH /root/.cargo/bin/:$PATH
 
 RUN rustup show
-RUN rustup default `rustup show active-toolchain | awk '{print $1}'`
 
 RUN curl -sSL "https://github.com/bufbuild/buf/releases/download/v1.4.0/buf-$(uname -s)-$(uname -m).tar.gz" | \
     tar -xvzf - -C /usr/local --strip-components 1

diff --git a/ci/build-ci-image.sh b/ci/build-ci-image.sh
@@ -10,7 +10,7 @@ cat ../rust-toolchain
 # shellcheck disable=SC2155
 
 # REMEMBER TO ALSO UPDATE ci/docker-compose.yml
-export BUILD_ENV_VERSION=v20240208
+export BUILD_ENV_VERSION=v20240204
 
 export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"
 

diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       retries: 5
 
   source-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240208
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240204
     depends_on:
       - mysql
       - db
@@ -81,7 +81,7 @@ services:
       - ..:/risingwave
 
   sink-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240208
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240204
     depends_on:
       - mysql
       - db
@@ -93,12 +93,12 @@ services:
       - ..:/risingwave
 
   rw-build-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240208
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240204
     volumes:
       - ..:/risingwave
 
   ci-flamegraph-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240208
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240204
     # NOTE(kwannoel): This is used in order to permit
     # syscalls for `nperf` (perf_event_open),
     # so it can do CPU profiling.
@@ -109,7 +109,7 @@ services:
       - ..:/risingwave
 
   regress-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240208
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240204
     depends_on:
       db:
         condition: service_healthy

diff --git a/ci/scripts/sql/nexmark/q14.sql b/ci/scripts/sql/nexmark/q14.sql
@@ -1,10 +1,14 @@
 -- noinspection SqlNoDataSourceInspectionForFile
 -- noinspection SqlResolveForFile
 
-CREATE FUNCTION count_char(s varchar, c varchar) RETURNS int LANGUAGE rust AS $$
-  fn count_char(s: &str, c: &str) -> i32 {
-      s.matches(c).count() as i32
-  }
+CREATE FUNCTION count_char(s varchar, c varchar) RETURNS int LANGUAGE javascript AS $$
+    var count = 0;
+    for (var cc of s) {
+        if (cc === c) {
+            count++;
+        }
+    }
+    return count;
 $$;
 
 CREATE SINK nexmark_q14 AS

diff --git a/e2e_test/streaming/nexmark/sinks/q14.slt.part b/e2e_test/streaming/nexmark/sinks/q14.slt.part
@@ -1,8 +1,12 @@
 statement ok
-CREATE FUNCTION count_char(s varchar, c varchar) RETURNS int LANGUAGE rust AS $$
-  fn count_char(s: &str, c: &str) -> i32 {
-      s.matches(c).count() as i32
-  }
+CREATE FUNCTION count_char(s varchar, c varchar) RETURNS int LANGUAGE javascript AS $$
+    var count = 0;
+    for (var cc of s) {
+        if (cc === c) {
+            count++;
+        }
+    }
+    return count;
 $$;
 
 statement ok

diff --git a/e2e_test/streaming/nexmark/views/q14.slt.part b/e2e_test/streaming/nexmark/views/q14.slt.part
@@ -1,8 +1,12 @@
 statement ok
-CREATE FUNCTION count_char(s varchar, c varchar) RETURNS int LANGUAGE rust AS $$
-  fn count_char(s: &str, c: &str) -> i32 {
-      s.matches(c).count() as i32
-  }
+CREATE FUNCTION count_char(s varchar, c varchar) RETURNS int LANGUAGE javascript AS $$
+    var count = 0;
+    for (var cc of s) {
+        if (cc === c) {
+            count++;
+        }
+    }
+    return count;
 $$;
 
 statement ok