update bulk delete syntax for ES7+

biothings · Nov 1, 2021 · e518ed6 · e518ed6
1 parent b6157ae
commit e518ed6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/biothings/hub/databuild/syncer.py b/biothings/hub/databuild/syncer.py
@@ -661,6 +661,7 @@ def sync_es_jsondiff_worker(diff_file,
 
     # delete: remove from "old"
     for ids in iter_n(diff["delete"], batch_size):
+        # FIXME: bulk delete can fail
         del_skip = indexer.delete_docs(ids)
         res["deleted"] += del_skip[0]
         res["skipped"] += del_skip[1]

diff --git a/biothings/utils/es.py b/biothings/utils/es.py
@@ -281,12 +281,19 @@ def delete_docs(self, ids, step=None):
         step = step or self.step
 
         def _get_bulk(_id):
-            doc = {
-                '_op_type': 'delete',
-                "_index": index_name,
-                "_type": doc_type,
-                "_id": _id
-            }
+            if self._host_major_ver >= 7:
+                doc = {
+                    '_op_type': 'delete',
+                    "_index": index_name,
+                    "_id": _id
+                }
+            else:
+                doc = {
+                    '_op_type': 'delete',
+                    "_index": index_name,
+                    "_type": doc_type,
+                    "_id": _id
+                }
             return doc
         actions = (_get_bulk(_id) for _id in ids)
         return helpers.bulk(self._es, actions, chunk_size=step, stats_only=True, raise_on_error=False)