move udf crate to expr folder

Signed-off-by: Runji Wang <[email protected]>
risingwavelabs · Dec 11, 2023 · a6e981a · a6e981a
1 parent 40f5d95
commit a6e981a
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
   "src/expr/core",
   "src/expr/impl",
   "src/expr/macro",
+  "src/expr/udf",
   "src/frontend",
   "src/frontend/planner_test",
   "src/java_binding",
@@ -48,7 +49,6 @@ members = [
   "src/tests/simulation",
   "src/tests/sqlsmith",
   "src/tests/state_cleaning_test",
-  "src/udf",
   "src/utils/local_stats_alloc",
   "src/utils/pgwire",
   "src/utils/runtime",
@@ -170,7 +170,7 @@ risingwave_sqlsmith = { path = "./src/tests/sqlsmith" }
 risingwave_storage = { path = "./src/storage" }
 risingwave_stream = { path = "./src/stream" }
 risingwave_test_runner = { path = "./src/test_runner" }
-risingwave_udf = { path = "./src/udf" }
+risingwave_udf = { path = "./src/expr/udf" }
 risingwave_variables = { path = "./src/utils/variables" }
 risingwave_java_binding = { path = "./src/java_binding" }
 risingwave_jni_core = { path = "src/jni_core" }

diff --git a/ci/scripts/run-unit-test.sh b/ci/scripts/run-unit-test.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 REPO_ROOT=${PWD}
 
 echo "+++ Run python UDF SDK unit tests"
-cd ${REPO_ROOT}/src/udf/python
+cd ${REPO_ROOT}/src/expr/udf/python
 python3 -m pytest
 cd ${REPO_ROOT}
 

diff --git a/e2e_test/udf/test.py b/e2e_test/udf/test.py
@@ -19,7 +19,7 @@
 from typing import Iterator, List, Optional, Tuple, Any
 from decimal import Decimal
 
-sys.path.append("src/udf/python")  # noqa
+sys.path.append("src/expr/udf/python")  # noqa
 
 from risingwave.udf import udf, udtf, UdfServer
 

diff --git a/integration_tests/feature-store/server/udf.py b/integration_tests/feature-store/server/udf.py
@@ -2,22 +2,20 @@
 from typing import Iterator, List, Optional, Tuple, Any
 from decimal import Decimal
 
-sys.path.append("src/udf/python")  # noqa
+sys.path.append("src/expr/udf/python")  # noqa
 
 from risingwave.udf import udf, UdfServer
 
 
-
 @udf(input_types=["INT", "VARCHAR"], result_type="INT")
 def udf_sum(x: int, y: str) -> int:
-    if y=='mfa+':
+    if y == "mfa+":
         return x
     else:
         return -x
 
 
-
 if __name__ == "__main__":
     server = UdfServer(location="0.0.0.0:8815")
     server.add_function(udf_sum)
-    server.serve()
+    server.serve()
diff --git a/src/udf/Cargo.toml → src/expr/udf/Cargo.toml b/src/udf/Cargo.toml → src/expr/udf/Cargo.toml
diff --git a/src/udf/examples/client.rs → src/expr/udf/examples/client.rs b/src/udf/examples/client.rs → src/expr/udf/examples/client.rs
diff --git a/src/udf/python/.gitignore → src/expr/udf/python/.gitignore b/src/udf/python/.gitignore → src/expr/udf/python/.gitignore
diff --git a/src/udf/python/CHANGELOG.md → src/expr/udf/python/CHANGELOG.md b/src/udf/python/CHANGELOG.md → src/expr/udf/python/CHANGELOG.md
diff --git a/src/udf/python/README.md → src/expr/udf/python/README.md b/src/udf/python/README.md → src/expr/udf/python/README.md
diff --git a/src/udf/python/publish.md → src/expr/udf/python/publish.md b/src/udf/python/publish.md → src/expr/udf/python/publish.md
diff --git a/src/udf/python/pyproject.toml → src/expr/udf/python/pyproject.toml b/src/udf/python/pyproject.toml → src/expr/udf/python/pyproject.toml
diff --git a/src/udf/python/risingwave/__init__.py → src/expr/udf/python/risingwave/__init__.py b/src/udf/python/risingwave/__init__.py → src/expr/udf/python/risingwave/__init__.py
diff --git a/src/udf/python/risingwave/test_udf.py → src/expr/udf/python/risingwave/test_udf.py b/src/udf/python/risingwave/test_udf.py → src/expr/udf/python/risingwave/test_udf.py
diff --git a/src/udf/python/risingwave/udf.py → src/expr/udf/python/risingwave/udf.py b/src/udf/python/risingwave/udf.py → src/expr/udf/python/risingwave/udf.py
diff --git a/...udf/python/risingwave/udf/health_check.py → ...udf/python/risingwave/udf/health_check.py b/...udf/python/risingwave/udf/health_check.py → ...udf/python/risingwave/udf/health_check.py
diff --git a/src/udf/src/error.rs → src/expr/udf/src/error.rs b/src/udf/src/error.rs → src/expr/udf/src/error.rs
diff --git a/src/udf/src/external.rs → src/expr/udf/src/external.rs b/src/udf/src/external.rs → src/expr/udf/src/external.rs
diff --git a/src/udf/src/lib.rs → src/expr/udf/src/lib.rs b/src/udf/src/lib.rs → src/expr/udf/src/lib.rs