[incubator-sdap-in-situ-data-services] branch master updated: Update query-by-id method to accept index as parameter (#20)

[nchung]

This is an automated email from the ASF dual-hosted git repository.

nchung pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-sdap-in-situ-data-services.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c78bfe  Update query-by-id method to accept index as parameter (#20)
2c78bfe is described below

commit 2c78bfe87b69813d2655a81cbd55d0a82e0a5f2e
Author: Jason Min-Liang Kang <jasonmlk...@gmail.com>
AuthorDate: Thu May 11 16:33:36 2023 -0700

    Update query-by-id method to accept index as parameter (#20)
    
    * Update query-by-id method to accept index as parameter
    
    * Update changelog
---
 CHANGELOG.md                              | 3 +++
 parquet_flask/aws/es_abstract.py          | 2 +-
 parquet_flask/aws/es_middleware.py        | 4 ++--
 parquet_flask/io_logic/metadata_tbl_es.py | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b971674..946f6df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic 
Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+
+### Changed
+- Updated Elasticsearch *query_by_id* method to accept an *index* as argument
 - SDAP-462: Updated query logic so that depth -99999 is treated as surface 
(i.e. depth 0)
 - SDAP-463: Added capability to further partition parquet objects/files by 
platform
 ### Changed
diff --git a/parquet_flask/aws/es_abstract.py b/parquet_flask/aws/es_abstract.py
index 532537a..c34180a 100644
--- a/parquet_flask/aws/es_abstract.py
+++ b/parquet_flask/aws/es_abstract.py
@@ -58,7 +58,7 @@ class ESAbstract(ABC):
         return
 
     @abstractmethod
-    def query_by_id(self, doc_id):
+    def query_by_id(self, doc_id, index=None):
         return
 
     @abstractmethod
diff --git a/parquet_flask/aws/es_middleware.py 
b/parquet_flask/aws/es_middleware.py
index 0d4e34b..7a8c46c 100644
--- a/parquet_flask/aws/es_middleware.py
+++ b/parquet_flask/aws/es_middleware.py
@@ -188,8 +188,8 @@ class ESMiddleware(ESAbstract):
             'items': first_batch['hits']['hits'],
         }
 
-    def query_by_id(self, doc_id):
-        index = self.__validate_index(None)
+    def query_by_id(self, doc_id, index=None):
+        index = self.__validate_index(index)
         dsl = {
             'query': {
                 'term': {'_id': doc_id}
diff --git a/parquet_flask/io_logic/metadata_tbl_es.py 
b/parquet_flask/io_logic/metadata_tbl_es.py
index 02b7443..bce6c8d 100644
--- a/parquet_flask/io_logic/metadata_tbl_es.py
+++ b/parquet_flask/io_logic/metadata_tbl_es.py
@@ -46,7 +46,7 @@ class MetadataTblES(MetadataTblInterface):
         return
 
     def get_by_s3_url(self, s3_url):
-        result = self.__es.query_by_id(s3_url)
+        result = self.__es.query_by_id(s3_url, 
CDMSConstants.entry_file_records_index)
         if result is None:
             return None
         return result['_source']