Upgraded to OS 2.0.0-alpah1-SNAPSHOT

Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
opensearch-project · Mar 29, 2022 · 797dbbe · 797dbbe
1 parent 2dbfc18
commit 797dbbe
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 127 deletions.
diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
@@ -3,7 +3,7 @@ name: SQL Java CI
 on: [push, pull_request]
 
 env:
-  OPENSEARCH_VERSION: '2.0.0-SNAPSHOT'
+  OPENSEARCH_VERSION: '2.0.0-alpha1-SNAPSHOT'
 
 jobs:
   build:

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,8 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.0.0-alpha1-SNAPSHOT")
+        buildVersionQualifier = "alpha1"
     }
 
     repositories {
@@ -37,10 +38,15 @@ repositories {
 
 ext {
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
+
 }
 
 allprojects {
-    version = opensearch_version - "-SNAPSHOT" + ".0"
+    version = opensearch_version.tokenize('-')[0] + '.0'
+    if (buildVersionQualifier) {
+        version += "-${buildVersionQualifier}"
+    }
+
     if (isSnapshot) {
         version += "-SNAPSHOT"
     }

diff --git a/bwctest.sh b/bwctest.sh
@@ -34,7 +34,7 @@ function setup_bwc_artifact() {
     # then converts to plugin version by appending ".0" (e.g. 1.2.0.0-SNAPSHOT),
     # assuming one line in build.gradle is 'opensearch_version= System.getProperty("opensearch.version", "<opensearch_version>")'.
     plugin_version=$(grep 'opensearch_version = System.getProperty' build.gradle | \
-        grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+[^"]*' | sed -e 's/\([0-9]\)\([^0-9]*\)$/\1.0\2/')
+        grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+[^"]*' | sed -e 's/\(.*\)\(\.[0-9]\)/\1\2.0/')
     plugin_artifact="./plugin/build/distributions/opensearch-sql-$plugin_version.zip"
     bwc_artifact_dir="./integ-test/src/test/resources/bwc/$plugin_version"
 

diff --git a/integ-test/build.gradle b/integ-test/build.gradle
@@ -53,8 +53,8 @@ configurations.all {
     // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
     resolutionStrategy.force 'commons-codec:commons-codec:1.13'
     resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
-    resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.12.6'
-    resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6'
+    resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.2'
+    resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.2'
 }
 
 dependencies {

diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/JoinAliasWriterRuleIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/JoinAliasWriterRuleIT.java
@@ -81,6 +81,7 @@ public void bothTableAliasNoCommonColumns() throws IOException {
   }
 
   @Test
+  @Ignore
   public void tableNamesWithTypeName() throws IOException {
     sameExplain(
         query(

diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java
@@ -755,7 +755,7 @@ public void dateSearchBraces() throws IOException {
 
     JSONObject response = executeQuery(
         String.format(Locale.ROOT,
-            "SELECT odbc_time FROM %s/odbc WHERE odbc_time < {ts '2015-03-15 00:00:00.000'}",
+            "SELECT odbc_time FROM %s WHERE odbc_time < {ts '2015-03-15 00:00:00.000'}",
             TestsConstants.TEST_INDEX_ODBC));
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {

diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/SourceFieldIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/SourceFieldIT.java
@@ -32,7 +32,7 @@ protected void init() throws Exception {
   @Test
   public void includeTest() throws IOException {
     SearchHits response = query(String.format(
-        "SELECT include('*name','*ge'),include('b*'),include('*ddre*'),include('gender') FROM %s/account LIMIT 1000",
+        "SELECT include('*name','*ge'),include('b*'),include('*ddre*'),include('gender') FROM %s LIMIT 1000",
         TEST_INDEX_ACCOUNT));
     for (SearchHit hit : response.getHits()) {
       Set<String> keySet = hit.getSourceAsMap().keySet();
@@ -48,7 +48,7 @@ public void includeTest() throws IOException {
   public void excludeTest() throws IOException {
 
     SearchHits response = query(String.format(
-        "SELECT exclude('*name','*ge'),exclude('b*'),exclude('*ddre*'),exclude('gender') FROM %s/account LIMIT 1000",
+        "SELECT exclude('*name','*ge'),exclude('b*'),exclude('*ddre*'),exclude('gender') FROM %s LIMIT 1000",
         TEST_INDEX_ACCOUNT));
 
     for (SearchHit hit : response.getHits()) {
@@ -65,7 +65,7 @@ public void excludeTest() throws IOException {
   public void allTest() throws IOException {
 
     SearchHits response = query(String.format(
-        "SELECT exclude('*name','*ge'),include('b*'),exclude('*ddre*'),include('gender') FROM %s/account LIMIT 1000",
+        "SELECT exclude('*name','*ge'),include('b*'),exclude('*ddre*'),include('gender') FROM %s LIMIT 1000",
         TEST_INDEX_ACCOUNT));
 
     for (SearchHit hit : response.getHits()) {

diff --git a/legacy/build.gradle b/legacy/build.gradle
@@ -104,6 +104,5 @@ dependencies {
     testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version:'2.2'
     testImplementation group: 'org.mockito', name: 'mockito-inline', version:'3.12.4'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-    testImplementation group: "org.opensearch.client", name: 'transport', version: "${opensearch_version}"
 
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/From.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/From.java
@@ -14,7 +14,6 @@
  */
 public class From {
     private String index;
-    private String type;
     private String alias;
 
     /**
@@ -23,22 +22,7 @@ public class From {
      * @param from The part after the FROM keyword.
      */
     public From(String from) {
-        if (from.startsWith("<")) {
-            index = from;
-            if (!from.endsWith(">")) {
-                int i = from.lastIndexOf('/');
-                if (-1 < i) {
-                    index = from.substring(0, i);
-                    type = from.substring(i + 1);
-                }
-            }
-            return;
-        }
-        String[] parts = from.split("/");
-        this.index = parts[0].trim();
-        if (parts.length == 2) {
-            this.type = parts[1].trim();
-        }
+        index = from;
     }
 
     public From(String from, String alias) {
@@ -54,14 +38,6 @@ public void setIndex(String index) {
         this.index = index;
     }
 
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
     public String getAlias() {
         return alias;
     }
@@ -73,9 +49,6 @@ public void setAlias(String alias) {
     @Override
     public String toString() {
         StringBuilder str = new StringBuilder(index);
-        if (type != null) {
-            str.append('/').append(type);
-        }
         if (alias != null) {
             str.append(" AS ").append(alias);
         }

diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Query.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Query.java
@@ -44,25 +44,4 @@ public String[] getIndexArr() {
         }
         return indexArr;
     }
-
-    /**
-     * Get the types the query refer to.
-     *
-     * @return list of strings, the types names
-     */
-    public String[] getTypeArr() {
-        List<String> list = new ArrayList<>();
-        From index = null;
-        for (int i = 0; i < from.size(); i++) {
-            index = from.get(i);
-            if (index.getType() != null && index.getType().trim().length() > 0) {
-                list.add(index.getType());
-            }
-        }
-        if (list.size() == 0) {
-            return null;
-        }
-
-        return list.toArray(new String[list.size()]);
-    }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMapping.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMapping.java
@@ -118,8 +118,8 @@ public String path() {
      */
     @SuppressWarnings("unchecked")
     public String type() {
-        FieldMappingMetadata metaData = typeMappings.getOrDefault(fieldName, FieldMappingMetadata.NULL);
-        if (metaData.isNull()) {
+        FieldMappingMetadata metaData = typeMappings.get(fieldName);
+        if (metaData == null) {
             return DescribeResultSet.DEFAULT_OBJECT_DATATYPE;
         }
 

diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/IndexMappings.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/IndexMappings.java
@@ -48,7 +48,7 @@ public IndexMappings() {
 
     public IndexMappings(Metadata metaData) {
         this.indexMappings = buildMappings(metaData.indices(),
-                indexMetaData -> new FieldMappings(indexMetaData.getMappings().valuesIt().next()));
+                indexMetaData -> new FieldMappings(indexMetaData.mapping()));
     }
 
     public IndexMappings(ImmutableOpenMap<String, MappingMetadata> mappings) {

diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/BindingTupleResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/BindingTupleResultSet.java
@@ -36,7 +36,7 @@ public static Schema buildSchema(List<ColumnNode> columnNodes) {
                                                          node.getAlias(),
                                                          node.getType()))
                                                  .collect(Collectors.toList());
-        return new Schema("dummy", "dummy", columnList);
+        return new Schema(columnList);
     }
 
     @VisibleForTesting

diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Schema.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Schema.java
@@ -18,7 +18,6 @@
 public class Schema implements Iterable<Schema.Column> {
 
     private String indexName;
-    private String typeName;
     private List<Column> columns;
 
     private static Set<String> types;
@@ -27,9 +26,8 @@ public class Schema implements Iterable<Schema.Column> {
         types = getTypes();
     }
 
-    public Schema(String indexName, String typeName, List<Column> columns) {
+    public Schema(String indexName, List<Column> columns) {
         this.indexName = indexName;
-        this.typeName = typeName;
         this.columns = columns;
     }
 
@@ -46,10 +44,6 @@ public String getIndexName() {
         return indexName;
     }
 
-    public String getTypeName() {
-        return typeName;
-    }
-
     public List<String> getHeaders() {
         return columns.stream()
                 .map(column -> column.getName())

diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java
@@ -69,7 +69,6 @@ public class SelectResultSet extends ResultSet {
 
     private boolean selectAll;
     private String indexName;
-    private String typeName;
     private List<Schema.Column> columns = new ArrayList<>();
     private ColumnTypeProvider outputColumnType;
 
@@ -105,7 +104,7 @@ public SelectResultSet(Client client,
         } else {
             loadFromEsState(query);
         }
-        this.schema = new Schema(indexName, typeName, columns);
+        this.schema = new Schema(indexName, columns);
         this.head = schema.getHeaders();
         this.dateFieldFormatter = new DateFieldFormatter(indexName, columns, fieldAliasMap);
 
@@ -142,7 +141,7 @@ public void populateResultSetFromCursor(Cursor cursor) {
 
     private void populateResultSetFromDefaultCursor(DefaultCursor cursor) {
         this.columns = cursor.getColumns();
-        this.schema = new Schema(null, null, columns);
+        this.schema = new Schema(columns);
         this.head = schema.getHeaders();
         this.dateFieldFormatter = new DateFieldFormatter(
                 cursor.getIndexPattern(),
@@ -163,50 +162,27 @@ private void populateResultSetFromDefaultCursor(DefaultCursor cursor) {
      */
     private void loadFromEsState(Query query) {
         String indexName = fetchIndexName(query);
-        String typeName = fetchTypeName(query);
         String[] fieldNames = fetchFieldsAsArray(query);
 
         // Reset boolean in the case of JOIN query where multiple calls to loadFromEsState() are made
         selectAll = isSimpleQuerySelectAll(query) || isJoinQuerySelectAll(query, fieldNames);
 
         GetFieldMappingsRequest request = new GetFieldMappingsRequest()
                 .indices(indexName)
-                .types(emptyArrayIfNull(typeName))
                 .fields(selectAllFieldsIfEmpty(fieldNames))
                 .local(true);
         GetFieldMappingsResponse response = client.admin().indices()
                 .getFieldMappings(request)
                 .actionGet();
 
-        Map<String, Map<String, Map<String, FieldMappingMetadata>>> mappings = response.mappings();
-        if (mappings.isEmpty()) {
+        Map<String,  Map<String, FieldMappingMetadata>> mappings = response.mappings();
+        if (mappings.isEmpty() || !mappings.containsKey(indexName)) {
             throw new IllegalArgumentException(String.format("Index type %s does not exist", query.getFrom()));
         }
+        Map<String, FieldMappingMetadata> typeMappings = mappings.get(indexName);
 
-        // Assumption is all indices share the same mapping which is validated in TermFieldRewriter.
-        Map<String, Map<String, FieldMappingMetadata>> indexMappings = mappings.values().iterator().next();
-
-        // if index mappings size is 0 and the expression is a cast: that means that we are casting by alias
-        // if so, add the original field that was being looked at to the mapping (how?)
-
-        /*
-         * There are three cases regarding type name to consider:
-         * 1. If the correct type name was given, its typeMapping is retrieved
-         * 2. If the incorrect type name was given then the response is null
-         * 3. If no type name is given, the indexMapping is searched for a typeMapping
-         */
-        Map<String, FieldMappingMetadata> typeMappings = new HashMap<>();
-        if (indexMappings.containsKey(typeName)) {
-            typeMappings = indexMappings.get(typeName);
-        } else {
-            // Assuming OpenSearch version 6.x, there can be only one type per index so this for loop should grab the only type
-            for (String type : indexMappings.keySet()) {
-                typeMappings = indexMappings.get(type);
-            }
-        }
 
         this.indexName = this.indexName == null ? indexName : (this.indexName + "|" + indexName);
-        this.typeName = this.typeName == null ? typeName : (this.typeName + "|" + typeName);
         this.columns.addAll(renameColumnWithTableAlias(query, populateColumns(query, fieldNames, typeMappings)));
     }
 
@@ -289,10 +265,6 @@ private String fetchIndexName(Query query) {
         return query.getFrom().get(0).getIndex();
     }
 
-    private String fetchTypeName(Query query) {
-        return query.getFrom().get(0).getType();
-    }
-
     /**
      * queryResult is checked to see if it's of type Aggregation in which case the aggregation fields in GROUP BY
      * are returned as well. This prevents returning a Schema of all fields when SELECT * is called with
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: SQL Java CI @@
     on: [push, pull_request]
     env:
-      OPENSEARCH_VERSION: '2.0.0-SNAPSHOT'
+      OPENSEARCH_VERSION: '2.0.0-alpha1-SNAPSHOT'
     jobs:
       build:
@@ Expand Down @@