diff --git a/.github/workflows/k8s-ci.yml b/.github/workflows/k8s-ci.yml index 35706de262e9..58a940fa137f 100644 --- a/.github/workflows/k8s-ci.yml +++ b/.github/workflows/k8s-ci.yml @@ -419,9 +419,9 @@ jobs: - name: Helm Test run: | cd charts - helm template graphscope --set image.registry="",image.tag=${SHORT_SHA} \ + helm template graphscope --set image.registry="",image.tag="${SHORT_SHA}" \ ./graphscope - helm install graphscope --set image.registry="",image.tag=${SHORT_SHA} \ + helm install graphscope --set image.registry="",image.tag="${SHORT_SHA}" \ ./graphscope helm test graphscope --timeout 5m0s export NODE_IP=$(kubectl get pod -lgraphscope.coordinator.name=coordinator-graphscope -ojsonpath="{.items[0].status.hostIP}") diff --git a/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/jna/BooleanConverter.java b/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/jna/BooleanConverter.java new file mode 100644 index 000000000000..a6f38412f115 --- /dev/null +++ b/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/jna/BooleanConverter.java @@ -0,0 +1,24 @@ +package com.alibaba.graphscope.common.jna; + +import com.sun.jna.FromNativeContext; +import com.sun.jna.ToNativeContext; +import com.sun.jna.TypeConverter; + +// to convert java boolean to i32 and define i32 as the native bool type +public class BooleanConverter implements TypeConverter { + @Override + public Object toNative(Object value, ToNativeContext context) { + return Integer.valueOf(Boolean.TRUE.equals(value) ? 1 : 0); + } + + @Override + public Object fromNative(Object value, FromNativeContext context) { + return ((Integer) value).intValue() != 0 ? Boolean.TRUE : Boolean.FALSE; + } + + @Override + public Class nativeType() { + // BOOL is 32-bit int + return Integer.class; + } +} diff --git a/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/jna/IrTypeMapper.java b/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/jna/IrTypeMapper.java index 5858ed26c07d..db43493dde21 100644 --- a/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/jna/IrTypeMapper.java +++ b/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/jna/IrTypeMapper.java @@ -24,5 +24,6 @@ public class IrTypeMapper extends DefaultTypeMapper { private IrTypeMapper() { super(); addTypeConverter(IntEnum.class, new EnumConverter()); + addTypeConverter(Boolean.class, new BooleanConverter()); } } diff --git a/interactive_engine/executor/ir/core/rust-toolchain.toml b/interactive_engine/executor/ir/core/rust-toolchain.toml deleted file mode 100644 index 0f512f6ba2b5..000000000000 --- a/interactive_engine/executor/ir/core/rust-toolchain.toml +++ /dev/null @@ -1,5 +0,0 @@ -[toolchain] -# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. -# https://rust-lang.github.io/rustup/concepts/profiles.html -profile = "default" -channel = "1.60.0" diff --git a/interactive_engine/executor/ir/core/src/plan/ffi.rs b/interactive_engine/executor/ir/core/src/plan/ffi.rs index f8891f378bed..70917c8f7bf1 100644 --- a/interactive_engine/executor/ir/core/src/plan/ffi.rs +++ b/interactive_engine/executor/ir/core/src/plan/ffi.rs @@ -371,7 +371,7 @@ impl TryFrom for common_pb::Variable { #[derive(Default)] pub struct FfiAlias { alias: FfiNameOrId, - is_query_given: bool, + is_query_given: i32, } impl TryFrom for Option { @@ -942,8 +942,11 @@ mod project { use super::*; /// To initialize a project operator. #[no_mangle] - pub extern "C" fn init_project_operator(is_append: bool) -> *const c_void { - let project = Box::new(pb::Project { mappings: vec![], is_append }); + pub extern "C" fn init_project_operator(is_append: i32) -> *const c_void { + let project = Box::new(pb::Project { + mappings: vec![], + is_append: if is_append == 0 { false } else { true }, + }); Box::into_raw(project) as *const c_void } diff --git a/interactive_engine/executor/rust-toolchain.toml b/interactive_engine/executor/rust-toolchain.toml deleted file mode 100644 index 0f512f6ba2b5..000000000000 --- a/interactive_engine/executor/rust-toolchain.toml +++ /dev/null @@ -1,5 +0,0 @@ -[toolchain] -# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. -# https://rust-lang.github.io/rustup/concepts/profiles.html -profile = "default" -channel = "1.60.0"