Merge branch 'main' into xxchan/self

ci/scripts/build-other.sh

@@ -13,6 +13,6 @@ cd ..
 
 echo "--- Upload Java artifacts"
 cp java/connector-node/assembly/target/risingwave-connector-1.0.0.tar.gz ./risingwave-connector.tar.gz
-cp java/udf/target/risingwave-udf-example.jar ./risingwave-udf-example.jar
+cp java/udf-example/target/risingwave-udf-example.jar ./risingwave-udf-example.jar
 buildkite-agent artifact upload ./risingwave-connector.tar.gz
 buildkite-agent artifact upload ./risingwave-udf-example.jar

ci/scripts/release.sh

@@ -40,7 +40,7 @@ curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip
 unzip -q awscliv2.zip && ./aws/install && mv /usr/local/bin/aws /bin/aws
 
 echo "--- Check risingwave release version"
-if [[ -n "${BUILDKITE_TAG+x}" ]]; then
+if [[ -n "${BUILDKITE_TAG}" ]]; then
   CARGO_PKG_VERSION="$(toml get --toml-path Cargo.toml workspace.package.version)"
   if [[ "${CARGO_PKG_VERSION}" != "${BUILDKITE_TAG#*v}" ]]; then
     echo "CARGO_PKG_VERSION: ${CARGO_PKG_VERSION}"
@@ -64,7 +64,7 @@ elif [[ -n "${BINARY_NAME+x}" ]]; then
     aws s3 cp risingwave-${BINARY_NAME}-x86_64-unknown-linux.tar.gz s3://risingwave-nightly-pre-built-binary
 fi
 
-if [[ -n "${BUILDKITE_TAG+x}" ]]; then
+if [[ -n "${BUILDKITE_TAG}" ]]; then
   echo "--- Install gh cli"
   yum install -y dnf
   dnf install -y 'dnf-command(config-manager)'

ci/workflows/main.yml

@@ -111,7 +111,7 @@ steps:
           files: "*-junit.xml"
           format: "junit"
       - ./ci/plugins/upload-failure-logs
-    timeout_in_minutes: 10
+    timeout_in_minutes: 15
 
   - label: "end-to-end test (parallel) (release mode)"
     command: "ci/scripts/e2e-test-parallel.sh -p ci-release"

e2e_test/batch/basic/range.slt.part

@@ -113,3 +113,19 @@ SELECT * FROM range(0.1::numeric, 2.1::numeric, 0.5::numeric)
 0.6
 1.1
 1.6
+
+# test table function with aliases
+query I
+SELECT alias from range(1,2) alias;
+----
+1
+
+query I
+SELECT alias.alias from range(1,2) alias;
+----
+1
+
+query I
+SELECT alias.col from range(1,2) alias(col);
+----
+1

e2e_test/udf/udf.slt

@@ -1,7 +1,7 @@
 # Before running this test:
 #   python3 e2e_test/udf/test.py
 # or:
-#   cd src/udf/java && mvn package && java -jar target/risingwave-udf-example.jar
+#   cd java/udf-example && mvn package && java -jar target/risingwave-udf-example.jar
 
 # Create a function.
 statement ok

java/pom.xml

@@ -9,6 +9,7 @@
     <modules>
         <module>proto</module>
         <module>udf</module>
+        <module>udf-example</module>
         <module>java-binding</module>
         <module>common-utils</module>
         <module>java-binding-integration-test</module>

java/udf-example/README.md

@@ -0,0 +1,8 @@
+## RisingWave Java UDF Example
+
+Make sure you have installed Java 11 and Maven 3 or later.
+
+```sh
+mvn package
+java -jar target/risingwave-udf-example.jar
+```

java/udf-example/pom.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>udf-example</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>udf-example</name>
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.risingwave.java</groupId>
+      <artifactId>risingwave-udf</artifactId>
+      <version>0.0.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M6</version>
+        <configuration>
+          <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+        </configuration>
+      </plugin>
+      <!-- generate an executable for examples -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.4.2</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>com.example.UdfExample</mainClass>
+            </manifest>
+          </archive>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <finalName>risingwave-udf-example</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+        <executions>
+          <execution>
+            <id>udf-example</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

java/udf/src/main/java/com/risingwave/functions/example/UdfExample.java → java/udf-example/src/main/java/com/example/UdfExample.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.risingwave.functions.example;
+package com.example;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -35,7 +35,6 @@ public static void main(String[] args) throws IOException {
             server.addFunction("int_42", new Int42());
             server.addFunction("gcd", new Gcd());
             server.addFunction("gcd3", new Gcd3());
-            server.addFunction("to_string", new ToString());
             server.addFunction("extract_tcp_info", new ExtractTcpInfo());
             server.addFunction("hex_to_dec", new HexToDec());
             server.addFunction("array_access", new ArrayAccess());
@@ -77,12 +76,6 @@ public int eval(int a, int b, int c) {
         }
     }
 
-    public static class ToString implements ScalarFunction {
-        public String eval(String s) {
-            return s;
-        }
-    }
-
     public static class ExtractTcpInfo implements ScalarFunction {
         public static class TcpPacketInfo {
             public String srcAddr;