Use faster bulk insert interface

ysimonson · ysimonson · commit 3be213a547e0 · 2020-10-19T20:09:51.000-04:00
diff --git a/indradb/__init__.py b/indradb/__init__.py
@@ -2,8 +2,7 @@
 from indradb.models import Vertex, EdgeKey, Edge, VertexProperty, \
     EdgeProperty, RangeVertexQuery, SpecificVertexQuery, PipeVertexQuery, \
     SpecificEdgeQuery, PipeEdgeQuery, BulkInsertVertex, BulkInsertEdge, \
-    BulkInsertVertexProperty, BulkInsertEdgeProperty, VertexProperties, \
-    EdgeProperties, Property
+    VertexProperties, EdgeProperties, Property
 from indradb.transaction import Transaction
 
 __all__ = [
@@ -20,8 +19,6 @@
     "PipeEdgeQuery",
     "BulkInsertVertex",
     "BulkInsertEdge",
-    "BulkInsertVertexProperty",
-    "BulkInsertEdgeProperty",
     "VertexProperties",
     "EdgeProperties",
     "Property",
diff --git a/indradb/indradb.capnp b/indradb/indradb.capnp
@@ -1,4 +1,4 @@
-@0xa24c698a359c7c15;
+@0x8c6320575f4b9483;
 
 using Timestamp = UInt64;
 using Uuid = Data;
@@ -100,19 +100,11 @@ struct BulkInsertItem {
     union {
         vertex :group {
             vertex @0 :Vertex;
+            props @1 :List(Property);
         }
         edge :group {
-            key @1 :EdgeKey;
-        }
-        vertexProperty :group {
-            id @2 :Uuid;
-            name @3 :Text;
-            value @4 :Json;
-        }
-        edgeProperty :group {
-            key @5 :EdgeKey;
-            name @6 :Text;
-            value @7 :Json;
+            key @2 :EdgeKey;
+            props @3 :List(Property);
         }
     }
 }
diff --git a/indradb/models.py b/indradb/models.py
@@ -361,59 +361,39 @@ def to_message(self):
         return message
 
 class BulkInsertVertex(_BaseModel):
-    __slots__ = ["vertex"]
+    __slots__ = ["vertex", "props"]
 
     def __init__(self, vertex):
         self.vertex = vertex
+        self.props = props
 
     def to_message(self):
         message = indradb_capnp.BulkInsertItem.new_message()
         container = message.init("vertex")
         container.vertex = self.vertex.to_message()
+
+        props = message.init("props", len(self.props))
+        for i, prop in enumerate(self.props):
+            props[i] = prop.to_message()
+
         return message
 
 class BulkInsertEdge(_BaseModel):
-    __slots__ = ["key"]
+    __slots__ = ["key", "props"]
 
     def __init__(self, key):
         self.key = key
+        self.props = props
 
     def to_message(self):
         message = indradb_capnp.BulkInsertItem.new_message()
         container = message.init("edge")
         container.key = self.key.to_message()
-        return message
-
-class BulkInsertVertexProperty(_BaseModel):
-    __slots__ = ["id", "name", "value"]
 
-    def __init__(self, id, name, value):
-        self.id = id
-        self.name = name
-        self.value = value
-
-    def to_message(self):
-        message = indradb_capnp.BulkInsertItem.new_message()
-        container = message.init("vertexProperty")
-        container.id = self.id.bytes
-        container.name = self.name
-        container.value = json.dumps(self.value)
-        return message
-
-class BulkInsertEdgeProperty(_BaseModel):
-    __slots__ = ["key", "name", "value"]
-
-    def __init__(self, key, name, value):
-        self.key = key
-        self.name = name
-        self.value = value
-
-    def to_message(self):
-        message = indradb_capnp.BulkInsertItem.new_message()
-        container = message.init("edgeProperty")
-        container.key = self.key.to_message()
-        container.name = self.name
-        container.value = json.dumps(self.value)
+        props = message.init("props", len(self.props))
+        for i, prop in enumerate(self.props):
+            props[i] = prop.to_message()
+        
         return message
 
 class Property(_BaseModel):
@@ -433,6 +413,12 @@ def __init__(self, name, value):
         self.name = name
         self.value = value
 
+    def to_message(self):
+        message = indradb_capnp.Property.new_message()
+        message.name = self.name
+        message.value = json.dumps(self.value)
+        return message
+
     @classmethod
     def from_message(cls, message):
         return cls(
diff --git a/indradb_server b/indradb_server
@@ -1 +1 @@
-Subproject commit f064f774d7b6bc8af58c205012b68c9dae58a444
+Subproject commit 686269275744b63308138b07fbfdc70185f9617e
