implements submit-tx with put/delete/evict

naomijub · May 20, 2023 · 4b11d31 · 4b11d31
1 parent 8db5380
commit 4b11d31
Show file tree

Hide file tree

Showing 17 changed files with 1,114 additions and 146 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ kibit:
 lint: fmt kibit
 
 proto:
-	protoc --clojure_out=grpc-client,grpc-server:src --proto_path=resources resources/service.proto
+	protoc --clojure_out=grpc-client,grpc-server:src --proto_path=resources resources/transactions.proto resources/service.proto
 
 all: proto lint
 

diff --git a/kreya/grpc/com/xtdb/protos/GrpcApi/SubmitTx-request.json b/kreya/grpc/com/xtdb/protos/GrpcApi/SubmitTx-request.json
@@ -3,13 +3,8 @@
     {
       "put": {
         "xtId": "id1",
-        "document": "Via Security"
-      }
-    },
-    {
-      "put": {
-        "xtId": "id2",
-        "document": "Rustic Plastic Sausages Graphic Interface incubate"
+        "idType":"Keyword",
+        "document": {"key": "value"}
       }
     }
   ]

diff --git a/project.clj b/project.clj
@@ -8,7 +8,7 @@
   :plugins [[lein-cljfmt "0.9.2"]
             [lein-kibit "0.1.8"]
             [jonase/eastwood "1.4.0"]]
-  :dependencies [[org.clojure/clojure "1.10.3"]
+  :dependencies [[org.clojure/clojure "1.11.0"]
                  [com.xtdb/xtdb-core "1.22.1"]
                  [io.pedestal/pedestal.service "0.5.9"]
                  [com.cognitect/anomalies "0.1.12"]

diff --git a/resources/json.proto b/resources/json.proto
diff --git a/resources/transactions.proto b/resources/transactions.proto
@@ -1,7 +1,8 @@
 syntax = "proto3";
 
 package com.xtdb.protos;
-import "json.proto";
+import "google/protobuf/struct.proto";
+
 
 message Transaction {
     oneof transaction_type {
@@ -11,17 +12,27 @@ message Transaction {
     }
 }
 
+enum IdType {
+    Uuid = 0;
+    Keyword = 1;
+    String = 2;
+    Int = 3;
+}
+
 message Put {
-    string xt_id = 1;
-    com.xtdb.protos.Value document = 2;
+    IdType id_type = 1;
+    string xt_id = 2;
+    google.protobuf.Struct document = 3;
 }
 
 message Delete {
     string document_id = 1;
+    IdType id_type = 2;
 }
 
 message Evict {
     string document_id = 1;
+    IdType id_type = 2;
 }
 
 message SubmitRequest {