refactor(indexer): add BaseVecIndexer, BaseKVIndexer rename old

Signed-off-by: Han Xiao <[email protected]>
jina-ai · Apr 1, 2020 · ab405ea · ab405ea
1 parent 1514b4f
commit ab405ea
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/jina/executors/requests.py b/jina/executors/requests.py
@@ -24,8 +24,8 @@ def get_default_reqs(cls_mro: List[type]) -> Dict:
 
             if cls.__name__ != cls_mro[0].__name__:
                 from ..logging import default_logger
-                default_logger.warning(f'"requests.on" setting of {cls_mro[0]} fallback to general {cls} setting, '
-                                       f'because you did not specify {cls_mro[0]}')
+                default_logger.debug(f'"requests.on" setting of {cls_mro[0]} fallback to general {cls} setting, '
+                                     f'because you did not specify {cls_mro[0]}')
             return copy.deepcopy(_defaults[cls.__name__])
         except FileNotFoundError:
             pass

diff --git a/jina/flow/__init__.py b/jina/flow/__init__.py
@@ -607,7 +607,6 @@ def to_swarm_yaml(self, path: TextIO):
 
         for k, v in self._pod_nodes.items():
             swarm_yml['services'][k] = {
-                'image': self.image_name,
                 'command': v.to_cli_command(),
                 'deploy': {'replicas': 1}
             }

diff --git a/tests/yaml/npvec.yml b/tests/yaml/npvec.yml
@@ -8,7 +8,7 @@ components:
     metas:
       name: my_vec_indexer  # a customized name
       workspace: $TEST_WORKDIR
-  - !ProtobufIndexer
+  - !BasePbIndexer
     with:
       index_filename: chunk.gzip
     metas:

diff --git a/tests/yaml/test-compound-indexer.yml b/tests/yaml/test-compound-indexer.yml
@@ -1,11 +1,11 @@
 !CompoundExecutor
 components:
-  - !ProtobufIndexer
+  - !BasePbIndexer
     with:
       index_filename: tmp1
     metas:
       name: test1
-  - !ProtobufIndexer
+  - !BasePbIndexer
     with:
       index_filename: tmp2
     metas:

diff --git a/tests/yaml/test-compound-indexer2.yml b/tests/yaml/test-compound-indexer2.yml
@@ -1,6 +1,6 @@
 !CompoundExecutor
 components:
-  - !ProtobufIndexer
+  - !BasePbIndexer
     with:
       index_filename: metaproto
     metas: