move from protobuf struct value

spiraldb · Jun 7, 2024 · 730d9f9 · 730d9f9
1 parent 681e7b3
commit 730d9f9
Show file tree

Hide file tree

Showing 3 changed files with 169 additions and 263 deletions.
diff --git a/vortex-scalar/Cargo.toml b/vortex-scalar/Cargo.toml
@@ -33,7 +33,7 @@ workspace = true
 
 [features]
 # Uncomment for improved IntelliJ support
-# default = ["flatbuffers", "proto", "serde"]
+default = ["flatbuffers", "proto", "serde"]
 flatbuffers = [
     "dep:flatbuffers",
     "dep:flexbuffers",

diff --git a/vortex-scalar/proto/vortex/scalar/scalar.proto b/vortex-scalar/proto/vortex/scalar/scalar.proto
@@ -4,12 +4,29 @@ package vortex.scalar;
 
 import "vortex/dtype/dtype.proto";
 import "google/protobuf/struct.proto";
+import "google/protobuf/wrappers.proto";
 
 message Scalar {
   vortex.dtype.DType dtype = 1;
   ScalarValue value = 2;
 }
 
 message ScalarValue {
-  google.protobuf.Value value = 1;
+  oneof kind {
+    google.protobuf.NullValue null_value = 1;
+    bool bool_value = 2;
+    int32 int32_value = 3;
+    int64 int64_value = 4;
+    uint32 uint32_value = 5;
+    uint64 uint64_value = 6;
+    float float_value = 7;
+    double double_value = 8;
+    string string_value = 9;
+    bytes bytes_value = 10;
+    ListValue list_value = 12;
+  }
+}
+
+message ListValue {
+  repeated ScalarValue values = 1;
 }