feat: add doc store

dbpunk-labs · imotai · Jul 28, 2023 · Jun 13, 2023 · Jun 14, 2023 · Jun 19, 2023
commit 3c03fd0cceed66a44996176517d345f88923edf3
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,4 +19,5 @@ ethers = {git="https://github.com/imotai/ethers-rs", rev="d526191b7972e8cf4412fe
 tonic = {git="https://github.com/hyperium/tonic", rev="ae7580160431cd25c1eecda4c85014ef6ce8d93f"}
 tonic-web = {git="https://github.com/hyperium/tonic", rev="ae7580160431cd25c1eecda4c85014ef6ce8d93f"}
 arweave-rs = {git="https://github.com/imotai/arweave-rs", rev="7ac5027305db833e4d9b62c967309d5df8fba4f2"}
+ejdb2rs = {git="https://github.com/imotai/ejdb2rs", rev="c937a085eda043bd854a0ef4d3e7bb63650610d1"}
 serde_json= "1.0"
diff --git a/src/proto/proto/db3_database_v2.proto b/src/proto/proto/db3_database_v2.proto
@@ -54,111 +54,29 @@ message EventTable {
 message Collection {
   bytes id = 1;
   string name = 2;
-  repeated Index index_list = 3;
+  repeated Index index_fields = 3;
   bytes sender = 4;
 }
 
+enum IndexType {
+    UniqueKey = 0;
+    StringKey = 1;
+    Int64Key = 2;
+    DoubleKey = 3;
+}
+
+message Index {
+  string path = 1;
+  IndexType index_type = 2;
+}
+
 message Document {
   bytes id = 1;
   bytes doc = 2;
   bytes owner = 3;
   bytes tx_id = 4;
 }
 
-message Index {
-  // A field in an index.
-  // The field_path describes which field is indexed, the value_mode describes
-  // how the field value is indexed.
-  message IndexField {
-    // The supported orderings.
-    enum Order {
-      // The ordering is unspecified. Not a valid option.
-      ORDER_UNSPECIFIED = 0;
-
-      // The field is ordered by ascending field value.
-      ASCENDING = 1;
-
-      // The field is ordered by descending field value.
-      DESCENDING = 2;
-    }
-
-    // The supported array value configurations.
-    enum ArrayConfig {
-      // The index does not support additional array queries.
-      ARRAY_CONFIG_UNSPECIFIED = 0;
-
-      // The index supports array containment queries.
-      CONTAINS = 1;
-    }
-
-    // Can be __name__.
-    // For single field indexes, this must match the name of the field or may
-    // be omitted.
-    string field_path = 1;
-
-    // How the field value is indexed.
-    oneof value_mode {
-      // Indicates that this field supports ordering by the specified order or
-      // comparing using =, !=, <, <=, >, >=.
-      Order order = 2;
-
-      // Indicates that this field supports operations on `array_value`s.
-      ArrayConfig array_config = 3;
-    }
-  }
-
-  // The state of an index. During index creation, an index will be in the
-  // `CREATING` state. If the index is created successfully, it will transition
-  // to the `READY` state. If the index creation encounters a problem, the index
-  // will transition to the `NEEDS_REPAIR` state.
-  enum State {
-    // The state is unspecified.
-    STATE_UNSPECIFIED = 0;
-
-    // The index is being created.
-    // There is an active long-running operation for the index.
-    // The index is updated when writing a document.
-    // Some index data may exist.
-    CREATING = 1;
-
-    // The index is ready to be used.
-    // The index is updated when writing a document.
-    // The index is fully populated from all stored documents it applies to.
-    READY = 2;
-
-    // The index was being created, but something went wrong.
-    // There is no active long-running operation for the index,
-    // and the most recently finished long-running operation failed.
-    // The index is not updated when writing a document.
-    // Some index data may exist.
-    // Use the google.longrunning.Operations API to determine why the operation
-    // that last attempted to create this index failed, then re-create the
-    // index.
-    NEEDS_REPAIR = 3;
-  }
-
-  // Output only. A server defined name for this index.
-  // The form of this name for composite indexes will be:
-  // `projects/{project_id}/databases/{database_id}/collectionGroups/{collection_id}/indexes/{composite_index_id}`
-  // For single field indexes, this field will be empty.
-  string name = 1;
-  // Id of the index filed in the collection
-  uint32 id = 2;
-
-  // The fields supported by this index.
-  //
-  // For composite indexes, this is always 2 or more fields.
-  // The last field entry is always for the field path `__name__`. If, on
-  // creation, `__name__` was not specified as the last field, it will be added
-  // automatically with the same direction as that of the last field defined. If
-  // the final field in a composite index is not directional, the `__name__`
-  // will be ordered ASCENDING (unless explicitly specified).
-  //
-  // For single field indexes, this will always be exactly one entry with a
-  // field path equal to the field path of the associated field.
-  repeated IndexField fields = 3;
-}
-
 // A Firestore query.
 message StructuredQuery {
   // A filter.

diff --git a/src/proto/proto/db3_mutation_v2.proto b/src/proto/proto/db3_mutation_v2.proto
@@ -27,7 +27,7 @@ message DocumentDatabaseMutation {
 }
 
 message CollectionMutation {
-  repeated db3_database_v2_proto.Index index = 1;
+  repeated db3_database_v2_proto.Index index_fields = 1;
   string collection_name = 2;
 }
 

diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml
@@ -35,3 +35,5 @@ timer = "0.2.0"
 arweave-rs = {workspace=true}
 url = "2.4.0"
 http = "0.2"
+moka = "0.11.2"
+ejdb2rs = {workspace=true}
diff --git a/src/storage/src/db_store_v2.rs b/src/storage/src/db_store_v2.rs
@@ -219,7 +219,7 @@ impl DBStoreV2 {
         let col = Collection {
             id: id.as_ref().to_vec(),
             name: collection.collection_name.to_string(),
-            index_list: collection.index.to_vec(),
+            index_fields: collection.index_fields.to_vec(),
             sender: sender.as_ref().to_vec(),
         };
         let mut buf = BytesMut::with_capacity(1024);
@@ -338,7 +338,7 @@ mod tests {
             assert!(false);
         }
         let collection = CollectionMutation {
-            index: vec![],
+            index_fields: vec![],
             collection_name: "col1".to_string(),
         };
         let result =

diff --git a/src/storage/src/lib.rs b/src/storage/src/lib.rs
@@ -26,6 +26,7 @@ pub mod db_owner_key;
 pub mod db_owner_key_v2;
 pub mod db_store;
 pub mod db_store_v2;
+pub mod doc_store;
 pub mod key;
 pub mod mutation_store;
 pub mod state_store;