refactor: update test and default yaml

jina-ai · Apr 17, 2020 · cb60046 · cb60046
1 parent 705c7ac
commit cb60046
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 14 deletions.
diff --git a/...ces/executors.requests.BaseVecIndexer.yml → .../executors.requests.BaseVectorIndexer.yml b/...ces/executors.requests.BaseVecIndexer.yml → .../executors.requests.BaseVectorIndexer.yml
@@ -2,6 +2,6 @@ on:
   ControlRequest:
     - !ControlReqDriver {}
   SearchRequest:
-    - !ChunkSearchDriver {}
+    - !VectorSearchDriver {}
   IndexRequest:
-    - !ChunkIndexDriver {}
+    - !VectorIndexDriver {}
diff --git a/jina/resources/executors.requests.ChunkIndexer.yml b/jina/resources/executors.requests.ChunkIndexer.yml
@@ -0,0 +1,35 @@
+on:
+  SearchRequest:
+    - !VectorSearchDriver
+      with:
+        executor: BaseVectorIndexer
+    - !PruneDriver
+      with:
+        level: chunk
+        pruned:
+          - embedding
+          - raw_bytes
+          - blob
+          - text
+    - !KVSearchDriver
+      with:
+        executor: BaseKVIndexer
+        level: chunk
+  IndexRequest:
+    - !VectorIndexDriver
+      with:
+        executor: BaseVectorIndexer
+    - !PruneDriver
+      with:
+        level: chunk
+        pruned:
+          - embedding
+          - raw_bytes
+          - blob
+          - text
+    - !KVIndexDriver
+      with:
+        level: chunk
+        executor: BaseKVIndexer
+  ControlRequest:
+    - !ControlReqDriver {}
diff --git a/jina/resources/executors.requests.ChunkPbIndexer.yml b/jina/resources/executors.requests.ChunkPbIndexer.yml
@@ -2,6 +2,10 @@ on:
   ControlRequest:
     - !ControlReqDriver {}
   SearchRequest:
-    - !ChunkPbSearchDriver {}
+    - !KVSearchDriver
+      with:
+        level: chunk
   IndexRequest:
-    - !ChunkPbIndexDriver {}
+    - !KVIndexDriver
+      with:
+        level: chunk
diff --git a/jina/resources/executors.requests.DocPbIndexer.yml b/jina/resources/executors.requests.DocPbIndexer.yml
@@ -2,10 +2,17 @@ on:
   ControlRequest:
     - !ControlReqDriver {}
   SearchRequest:
-    - !DocPbSearchDriver
+    - !KVSearchDriver
       with:
-        method: query
+        level: doc
     - !TopKFilterDriver {}
   IndexRequest:
-    - !DocPruneDriver {}
-    - !DocPbIndexDriver {}
+    - !PruneDriver
+      with:
+        level: doc
+        pruned:
+          - chunks
+          - raw_bytes
+    - !KVIndexDriver
+      with:
+        level: doc
diff --git a/tests/yaml/test-driver.yml b/tests/yaml/test-driver.yml
@@ -1,6 +1,7 @@
-- !DocPbSearchDriver
+- !KVSearchDriver
   with:
     executor: blah
     method: goto
+    level: doc
 - !ControlReqDriver {}
 - !BaseDriver {}
diff --git a/tests/yaml/test-exec-with-driver.yml b/tests/yaml/test-exec-with-driver.yml
@@ -8,6 +8,4 @@ requests:
       - !EncodeDriver
         with:
           method: encode
-      - !ChunkPruneDriver {}
-    ControlRequest:
-      - !ControlReqDriver {}
+      - !ChunkPruneDriver {}
diff --git a/tests/yaml/test-index.yml b/tests/yaml/test-index.yml
@@ -6,11 +6,11 @@ metas:
 requests:
   on:
     SearchRequest:
-      - !ChunkSearchDriver
+      - !VectorSearchDriver
         with:
           method: query
     IndexRequest:
-      - !ChunkIndexDriver
+      - !VectorIndexDriver
         with:
           method: add
     ControlRequest:

diff --git a/tests/yaml/test-joint.yml b/tests/yaml/test-joint.yml
@@ -0,0 +1,17 @@
+!ChunkIndexer
+components:
+  - !NumpyIndexer
+    with:
+      index_filename: vec.gz
+    metas:
+      name: vecidx  # a customized name
+      workspace: $TEST_WORKDIR
+  - !BasePbIndexer
+    with:
+      index_filename: chunk.gz
+    metas:
+      name: chunkidx
+      workspace: $TEST_WORKDIR
+metas:
+  name: chunk_compound_indexer
+  workspace: $TEST_WORKDIR