Update GSQL Client 2.6.2 (#109)

tigergraph · Aug 15, 2020 · f6663cc · f6663cc
1 parent c5f5004
commit f6663cc
Show file tree

Hide file tree

Showing 23 changed files with 1,664 additions and 1,918 deletions.
diff --git a/tools/clients/README.md b/tools/clients/README.md
@@ -8,7 +8,8 @@ If you simply want to access TigerGraph remotely, please refer to our official d
 ## Version Compatibility
 | GSQL Client  | Server |
 | :----------- | :---------------- |
-| `3.0.0`      | `3.0.0`<br>`2.6.*`<br>`2.5.*`<br>`2.4.*`<br>`2.3.2` |
-| `2.6.0`      | `2.6.*`<br>`2.5.*`<br>`2.4.*`<br>`2.3.2` |
+| `3.0.0`      | `3.0.0`<br>`2.6.1`<br>`2.6.0`<br>`2.5.*`<br>`2.4.*`<br>`2.3.2` |
+| `2.6.2`      | `2.6.*`<br>`2.5.*`<br>`2.4.*`<br>`2.3.2` |
+| `2.6.0`      | `2.6.1`<br>`2.6.0`<br>`2.5.*`<br>`2.4.*`<br>`2.3.2` |
 | `2.5.2`      | `2.5.*`<br>`2.4.*`<br>`2.3.2` |
 | `2.5.0`      | `2.5.0`<br>`2.4.*`<br>`2.3.2` |
diff --git a/tools/clients/make_aio_gsql_client.sh b/tools/clients/make_aio_gsql_client.sh
@@ -41,9 +41,10 @@ EOT
 ########################################################################
 # 2. add each version. Make sure we can CD to the first GLE directory. #
 ########################################################################
-cd $GLE_DIR; git pull && git checkout tg_3.0.0_dev; cd -
+cd $GLE_DIR; git pull && git checkout tg_2.6.2_dev; cd -
 #                     client path branch/tag                      version_string is_tag?
-./new_gsql_version.sh $GLE_DIR    tg_3.0.0_dev                    v3_0_0
+# ./new_gsql_version.sh $GLE_DIR    tg_3.0.0_dev                    v3_0_0
+./new_gsql_version.sh $GLE_DIR    tg_2.6.2_dev                    v2_6_2
 ./new_gsql_version.sh $GLE_DIR    tg_2.6.0_dev                    v2_6_0
 ./new_gsql_version.sh $GLE_DIR    tg_2.5.2_dev                    v2_5_2
 ./new_gsql_version.sh $GLE_DIR    tg_2.5.0_dev                    v2_5_0

diff --git a/tools/clients/pom.xml b/tools/clients/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.tigergraph.client</groupId>
     <name>gsql_client</name>
     <artifactId>gsql_client</artifactId>
-    <version>3.0.0</version>
+    <version>2.6.2</version>
     <url>http://maven.apache.org</url>
     <build>
         <plugins>
@@ -123,17 +123,17 @@
             <version>2.11</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
-        <dependency>
+        <!-- <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.5</version>
-        </dependency>
+        </dependency> -->
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
-        <dependency>
+        <!-- <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
             <version>2.13.1</version>
-        </dependency>
+        </dependency> -->
         <!-- https://mvnrepository.com/artifact/org.json/json -->
         <dependency>
             <groupId>org.json</groupId>

diff --git a/tools/clients/src/main/java/com/tigergraph/client/Driver.java b/tools/clients/src/main/java/com/tigergraph/client/Driver.java
@@ -19,14 +19,14 @@ public static void main(String[] args) {
                 System.out.println( "You may use 'GSQL_CLIENT_VERSION=v? java ...' or \n    'java -DGSQL_CLIENT_VERSION=v? ...' to specify the version");
             }
             if ( i==1 ) {
-                Supported_Versions = Supported_Versions + "v3_0_0 ";
+                Supported_Versions = Supported_Versions + "v2_6_2 ";
             }
-            if ( ( i==1 && Gsql_Client_Version.equalsIgnoreCase("v3_0_0") ) ||
-                 ( i==2 && (!Gsql_Client_Version.equalsIgnoreCase("v3_0_0")) )){
+            if ( ( i==1 && Gsql_Client_Version.equalsIgnoreCase("v2_6_2") ) ||
+                 ( i==2 && (!Gsql_Client_Version.equalsIgnoreCase("v2_6_2")) )){
                 try {
                     System.out.println("========================");
-                    System.out.println("Trying version: v3_0_0");
-                    com.tigergraph.v3_0_0.client.Driver.main(args);
+                    System.out.println("Trying version: v2_6_2");
+                    com.tigergraph.v2_6_2.client.Driver.main(args);
                 } catch (SecurityException e) {
                     ;
                 }

diff --git a/...gergraph/v3_0_0/client/AutoCompleter.java → ...gergraph/v2_6_2/client/AutoCompleter.java b/...gergraph/v3_0_0/client/AutoCompleter.java → ...gergraph/v2_6_2/client/AutoCompleter.java
@@ -1,4 +1,4 @@
-package com.tigergraph.v3_0_0.client;
+package com.tigergraph.v2_6_2.client;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,7 +18,7 @@ public AutoCompleter(String[] keyWords) {
   public int complete(String buffer, int cursor, List<CharSequence> candidates) {
     int identifierStart = findIdentifierStart(buffer, cursor);
     String identifierPrefix =
-        identifierStart != -1 ? buffer.substring(identifierStart, cursor) : "";
+      identifierStart != -1 ? buffer.substring(identifierStart, cursor) : "";
 
     if (identifierStart != -1) {
       List<CharSequence> myCandidates = findMatchingVariables(identifierPrefix);