This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 4d66e977a9ed97277f4ee6418f04d28412ca5fbc
Author: Mryange <59914473+mrya...@users.noreply.github.com>
AuthorDate: Tue Sep 5 09:23:20 2023 +0800
[fix](RemoteUDF) fix string type do not set PGenericType #23832
---
.../data_types/serde/data_type_string_serde.cpp | 2 +
.../ecosystem/udf/remote-user-defined-function.md | 49 +++++++++++++++++++--
.../ecosystem/udf/remote-user-defined-function.md | 50 ++++++++++++++++++++--
.../org/apache/doris/udf/FunctionServiceImpl.java | 39 ++++++++++++++---
4 files changed, 128 insertions(+), 12 deletions(-)
diff --git a/be/src/vec/data_types/serde/data_type_string_serde.cpp
b/be/src/vec/data_types/serde/data_type_string_serde.cpp
index 9db727e949..85c16c8c2c 100644
--- a/be/src/vec/data_types/serde/data_type_string_serde.cpp
+++ b/be/src/vec/data_types/serde/data_type_string_serde.cpp
@@ -68,6 +68,8 @@ Status
DataTypeStringSerDe::deserialize_one_cell_from_text(IColumn& column, Slic
Status DataTypeStringSerDe::write_column_to_pb(const IColumn& column, PValues&
result, int start,
int end) const {
result.mutable_bytes_value()->Reserve(end - start);
+ auto ptype = result.mutable_type();
+ ptype->set_id(PGenericType::STRING);
for (size_t row_num = start; row_num < end; ++row_num) {
StringRef data = column.get_data_at(row_num);
result.add_string_value(data.to_string());
diff --git a/docs/en/docs/ecosystem/udf/remote-user-defined-function.md
b/docs/en/docs/ecosystem/udf/remote-user-defined-function.md
index 4cffb59e6e..5ccd362728 100644
--- a/docs/en/docs/ecosystem/udf/remote-user-defined-function.md
+++ b/docs/en/docs/ecosystem/udf/remote-user-defined-function.md
@@ -88,9 +88,19 @@ Instructions:
Sample:
```sql
-CREATE FUNCTION rpc_add(INT, INT) RETURNS INT PROPERTIES (
- "SYMBOL"="add_int",
- "OBJECT_FILE"="127.0.0.1:9090",
+CREATE FUNCTION rpc_add_two(INT,INT) RETURNS INT PROPERTIES (
+ "SYMBOL"="add_int_two",
+ "OBJECT_FILE"="127.0.0.1:9114",
+ "TYPE"="RPC"
+);
+CREATE FUNCTION rpc_add_one(INT) RETURNS INT PROPERTIES (
+ "SYMBOL"="add_int_one",
+ "OBJECT_FILE"="127.0.0.1:9114",
+ "TYPE"="RPC"
+);
+CREATE FUNCTION rpc_add_string(varchar(30)) RETURNS varchar(30) PROPERTIES (
+ "SYMBOL"="add_string",
+ "OBJECT_FILE"="127.0.0.1:9114",
"TYPE"="RPC"
);
```
@@ -106,4 +116,35 @@ The use of UDF is consistent with ordinary function
methods. The only difference
When you no longer need UDF functions, you can delete a UDF function by the
following command, you can refer to `DROP FUNCTION`.
## Example
-Examples of rpc server implementations and cpp/java/python languages are
provided in the `samples/doris-demo/` directory. See the `README.md` in each
directory for details on how to use it.
\ No newline at end of file
+Examples of rpc server implementations and cpp/java/python languages are
provided in the `samples/doris-demo/` directory. See the `README.md` in each
directory for details on how to use it.
+For example, rpc_add_string
+```
+mysql >select rpc_add_string('doris');
++-------------------------+
+| rpc_add_string('doris') |
++-------------------------+
+| doris_rpc_test |
++-------------------------+
+```
+The logs will be displayed.
+
+```
+INFO: fnCall request=function_name: "add_string"
+args {
+ type {
+ id: STRING
+ }
+ has_null: false
+ string_value: "doris"
+}
+INFO: fnCall res=result {
+ type {
+ id: STRING
+ }
+ has_null: false
+ string_value: "doris_rpc_test"
+}
+status {
+ status_code: 0
+}
+```
\ No newline at end of file
diff --git a/docs/zh-CN/docs/ecosystem/udf/remote-user-defined-function.md
b/docs/zh-CN/docs/ecosystem/udf/remote-user-defined-function.md
index 70acd24022..2346566d94 100644
--- a/docs/zh-CN/docs/ecosystem/udf/remote-user-defined-function.md
+++ b/docs/zh-CN/docs/ecosystem/udf/remote-user-defined-function.md
@@ -89,9 +89,19 @@ PROPERTIES (["key"="value"][,...])
示例：
```sql
-CREATE FUNCTION rpc_add(INT, INT) RETURNS INT PROPERTIES (
- "SYMBOL"="add_int",
- "OBJECT_FILE"="127.0.0.1:9090",
+CREATE FUNCTION rpc_add_two(INT,INT) RETURNS INT PROPERTIES (
+ "SYMBOL"="add_int_two",
+ "OBJECT_FILE"="127.0.0.1:9114",
+ "TYPE"="RPC"
+);
+CREATE FUNCTION rpc_add_one(INT) RETURNS INT PROPERTIES (
+ "SYMBOL"="add_int_one",
+ "OBJECT_FILE"="127.0.0.1:9114",
+ "TYPE"="RPC"
+);
+CREATE FUNCTION rpc_add_string(varchar(30)) RETURNS varchar(30) PROPERTIES (
+ "SYMBOL"="add_string",
+ "OBJECT_FILE"="127.0.0.1:9114",
"TYPE"="RPC"
);
```
@@ -108,3 +118,37 @@ UDF 的使用与普通的函数方式一致，唯一的区别在于，内置函
## 示例
在`samples/doris-demo/` 目录中提供和 cpp/java/python 语言的rpc server
实现示例。具体使用方法见每个目录下的`README.md`
+例如rpc_add_string
+```
+mysql >select rpc_add_string('doris');
++-------------------------+
+| rpc_add_string('doris') |
++-------------------------+
+| doris_rpc_test |
++-------------------------+
+```
+日志会显示
+
+```
+INFO: fnCall request=function_name: "add_string"
+args {
+ type {
+ id: STRING
+ }
+ has_null: false
+ string_value: "doris"
+}
+INFO: fnCall res=result {
+ type {
+ id: STRING
+ }
+ has_null: false
+ string_value: "doris_rpc_test"
+}
+status {
+ status_code: 0
+}
+```
+
+
+
diff --git
a/samples/doris-demo/remote-udf-java-demo/src/main/java/org/apache/doris/udf/FunctionServiceImpl.java
b/samples/doris-demo/remote-udf-java-demo/src/main/java/org/apache/doris/udf/FunctionServiceImpl.java
index fded80505f..e9797e202f 100644
---
a/samples/doris-demo/remote-udf-java-demo/src/main/java/org/apache/doris/udf/FunctionServiceImpl.java
+++
b/samples/doris-demo/remote-udf-java-demo/src/main/java/org/apache/doris/udf/FunctionServiceImpl.java
@@ -41,8 +41,8 @@ public class FunctionServiceImpl extends
PFunctionServiceGrpc.PFunctionServiceIm
// symbol is functionName
String functionName = request.getFunctionName();
logger.info("fnCall request=" + request);
- FunctionService.PFunctionCallResponse res;
- if ("add_int".equals(functionName)) {
+ FunctionService.PFunctionCallResponse res = null;
+ if ("add_int_two".equals(functionName)) {
res = FunctionService.PFunctionCallResponse.newBuilder()
.setStatus(Types.PStatus.newBuilder().setStatusCode(0).build())
.addResult(Types.PValues.newBuilder().setHasNull(false)
@@ -52,9 +52,26 @@ public class FunctionServiceImpl extends
PFunctionServiceGrpc.PFunctionServiceIm
.getInt32Value(i)).collect(Collectors.toList()))
.setType(Types.PGenericType.newBuilder().setId(Types.PGenericType.TypeId.INT32).build())
.build()).build();
- } else {
+ }
+ else if ("add_int_one".equals(functionName)) {
res = FunctionService.PFunctionCallResponse.newBuilder()
-
.setStatus(Types.PStatus.newBuilder().setStatusCode(1).build()).build();
+
.setStatus(Types.PStatus.newBuilder().setStatusCode(0).build())
+ .addResult(Types.PValues.newBuilder().setHasNull(false)
+ .addAllInt32Value(IntStream.range(0,
request.getArgs(0)
+ .getInt32ValueCount())
+ .mapToObj(i ->
request.getArgs(0).getInt32Value(i) + 1).collect(Collectors.toList()))
+
.setType(Types.PGenericType.newBuilder().setId(Types.PGenericType.TypeId.INT32).build())
+ .build()).build();
+ }
+ else if ("add_string".equals(functionName)) {
+ res = FunctionService.PFunctionCallResponse.newBuilder()
+
.setStatus(Types.PStatus.newBuilder().setStatusCode(0).build())
+ .addResult(Types.PValues.newBuilder().setHasNull(false)
+ .addAllStringValue(IntStream.range(0,
request.getArgs(0)
+ .getStringValueCount())
+ .mapToObj(i ->
request.getArgs(0).getStringValue(i) +
"_rpc_test").collect(Collectors.toList()))
+
.setType(Types.PGenericType.newBuilder().setId(Types.PGenericType.TypeId.STRING).build())
+ .build()).build();
}
logger.info("fnCall res=" + res);
ok(responseObserver, res);
@@ -66,12 +83,24 @@ public class FunctionServiceImpl extends
PFunctionServiceGrpc.PFunctionServiceIm
// symbol is functionName
logger.info("checkFn request=" + request);
int status = 0;
- if ("add_int".equals(request.getFunction().getFunctionName())) {
+ if ("add_int_two".equals(request.getFunction().getFunctionName())) {
// check inputs count
if (request.getFunction().getInputsCount() != 2) {
status = -1;
}
}
+ if ("add_int_one".equals(request.getFunction().getFunctionName())) {
+ // check inputs count
+ if (request.getFunction().getInputsCount() != 1) {
+ status = -1;
+ }
+ }
+ if ("add_string".equals(request.getFunction().getFunctionName())) {
+ // check inputs count
+ if (request.getFunction().getInputsCount() != 1) {
+ status = -1;
+ }
+ }
FunctionService.PCheckFunctionResponse res =
FunctionService.PCheckFunctionResponse.newBuilder()
.setStatus(Types.PStatus.newBuilder().setStatusCode(status).build()).build();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
