Update to use OpenSearchDSL

Signed-off-by: acarbonetto <[email protected]>
Bit-Quill · Aug 22, 2023 · ba5b851 · ba5b851
1 parent 3b8d006
commit ba5b851
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 915 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/expression/DSL.java b/core/src/main/java/org/opensearch/sql/expression/DSL.java
@@ -615,10 +615,6 @@ public static FunctionExpression xor(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.XOR, expressions);
   }
 
-  public static FunctionExpression nested(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.NESTED, expressions);
-  }
-
   public static FunctionExpression not(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.NOT, expressions);
   }
@@ -827,54 +823,6 @@ public static FunctionExpression typeof(Expression value) {
     return compile(FunctionProperties.None, BuiltinFunctionName.TYPEOF, value);
   }
 
-  public static FunctionExpression match(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.MATCH, args);
-  }
-
-  public static FunctionExpression match_phrase(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.MATCH_PHRASE, args);
-  }
-
-  public static FunctionExpression match_phrase_prefix(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.MATCH_PHRASE_PREFIX, args);
-  }
-
-  public static FunctionExpression multi_match(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.MULTI_MATCH, args);
-  }
-
-  public static FunctionExpression simple_query_string(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.SIMPLE_QUERY_STRING, args);
-  }
-
-  public static FunctionExpression query(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.QUERY, args);
-  }
-
-  public static FunctionExpression query_string(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.QUERY_STRING, args);
-  }
-
-  public static FunctionExpression match_bool_prefix(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.MATCH_BOOL_PREFIX, args);
-  }
-
-  public static FunctionExpression wildcard_query(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.WILDCARD_QUERY, args);
-  }
-
-  public static FunctionExpression score(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.SCORE, args);
-  }
-
-  public static FunctionExpression scorequery(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.SCOREQUERY, args);
-  }
-
-  public static FunctionExpression score_query(Expression... args) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.SCORE_QUERY, args);
-  }
-
   public static FunctionExpression now(FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.NOW, args);
   }

diff --git a/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionRepository.java b/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionRepository.java
@@ -91,8 +91,9 @@ public static synchronized BuiltinFunctionRepository getInstance(DataSourceServi
         for (DataSourceMetadata metadata : dataSourceService.getDataSourceMetadata(true)) {
           dataSourceService
               .getDataSource(metadata.getName())
-              .getStorageEngine().getFunctions().
-              forEach(repository::register);
+              .getStorageEngine()
+              .getFunctions()
+              .forEach(repository::register);
         }
       }
       instance.put(dataSourceServiceHash, repository);

diff --git a/...main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java b/...main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java
@@ -80,6 +80,9 @@ public OpenSearchDataSourceMetadataStorage(
 
   @Override
   public List<DataSourceMetadata> getDataSourceMetadata() {
+    if (this.clusterService.state() == null) {
+      return Collections.emptyList();
+    }
     if (!this.clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME)) {
       createDataSourcesIndex();
       return Collections.emptyList();