Merge remote-tracking branch 'origin/develop' into feature/td-1371

src/connector/jdbc/pom.xml

@@ -7,6 +7,7 @@
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
+
     <description>TDengine JDBC Driver</description>
     <licenses>
         <license>

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java

@@ -53,66 +53,12 @@ public class TSDBConnection implements Connection {
     public TSDBConnection(Properties info, TSDBDatabaseMetaData meta) throws SQLException {
         this.dbMetaData = meta;
 
-        //load taos.cfg start
-        File cfgDir = loadConfigDir(info.getProperty(TSDBDriver.PROPERTY_KEY_CONFIG_DIR));
-        File cfgFile = cfgDir.listFiles((dir, name) -> "taos.cfg".equalsIgnoreCase(name))[0];
-        List<String> endpoints = loadConfigEndpoints(cfgFile);
-        if (!endpoints.isEmpty()) {
-            info.setProperty(TSDBDriver.PROPERTY_KEY_HOST, endpoints.get(0).split(":")[0]);
-            info.setProperty(TSDBDriver.PROPERTY_KEY_PORT, endpoints.get(0).split(":")[1]);
-        }
-        //load taos.cfg end
-
         connect(info.getProperty(TSDBDriver.PROPERTY_KEY_HOST),
                 Integer.parseInt(info.getProperty(TSDBDriver.PROPERTY_KEY_PORT, "0")),
                 info.getProperty(TSDBDriver.PROPERTY_KEY_DBNAME), info.getProperty(TSDBDriver.PROPERTY_KEY_USER),
                 info.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD));
     }
 
-    private List<String> loadConfigEndpoints(File cfgFile) {
-        List<String> endpoints = new ArrayList<>();
-        try (BufferedReader reader = new BufferedReader(new FileReader(cfgFile))) {
-            String line = null;
-            while ((line = reader.readLine()) != null) {
-                if (line.trim().startsWith("firstEp") || line.trim().startsWith("secondEp")) {
-                    endpoints.add(line.substring(line.indexOf('p') + 1).trim());
-                }
-                if (endpoints.size() > 1)
-                    break;
-            }
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return endpoints;
-    }
-
-    /**
-     * @param cfgDirPath
-     * @return return the config dir
-     **/
-    private File loadConfigDir(String cfgDirPath) {
-        if (cfgDirPath == null)
-            return loadDefaultConfigDir();
-        File cfgDir = new File(cfgDirPath);
-        if (!cfgDir.exists())
-            return loadDefaultConfigDir();
-        return cfgDir;
-    }
-
-    /**
-     * @return search the default config dir, if the config dir is not exist will return null
-     */
-    private File loadDefaultConfigDir() {
-        File cfgDir;
-        File cfgDir_linux = new File("/etc/taos");
-        cfgDir = cfgDir_linux.exists() ? cfgDir_linux : null;
-        File cfgDir_windows = new File("C:\\TDengine\\cfg");
-        cfgDir = (cfgDir == null && cfgDir_windows.exists()) ? cfgDir_windows : cfgDir;
-        return cfgDir;
-    }
-
     private void connect(String host, int port, String dbName, String user, String password) throws SQLException {
         this.connector = new TSDBJNIConnector();
         this.connector.connect(host, port, dbName, user, password);

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java

@@ -68,15 +68,15 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
 	}
 
 	public boolean nullsAreSortedLow() throws SQLException {
-		return false;
+		return !nullsAreSortedHigh();
 	}
 
 	public boolean nullsAreSortedAtStart() throws SQLException {
-		return false;
+		return true;
 	}
 
 	public boolean nullsAreSortedAtEnd() throws SQLException {
-		return false;
+		return !nullsAreSortedAtStart();
 	}
 
 	public String getDatabaseProductName() throws SQLException {

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java

@@ -14,7 +14,12 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
+
+import java.io.*;
+
 import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.logging.Logger;
 
@@ -39,9 +44,11 @@ import java.util.logging.Logger;
  */
 public class TSDBDriver implements java.sql.Driver {
 
+
     @Deprecated
-	private static final String URL_PREFIX1 = "jdbc:tsdb://";
+    private static final String URL_PREFIX1 = "jdbc:TSDB://";
-	private static final String URL_PREFIX  = "jdbc:taos://";
+
+    private static final String URL_PREFIX = "jdbc:TAOS://";
 
     /**
      * Key used to retrieve the database value from the properties instance passed
@@ -72,6 +79,7 @@ public class TSDBDriver implements java.sql.Driver {
      */
     public static final String PROPERTY_KEY_USER = "user";
 
+
     /**
      * Key for the configuration file directory of TSDB client in properties instance
      */
@@ -95,6 +103,7 @@ public class TSDBDriver implements java.sql.Driver {
 
     public static final String PROPERTY_KEY_PROTOCOL = "protocol";
 
+
     /**
      * Index for port coming out of parseHostPortPair().
      */
@@ -115,17 +124,71 @@ public class TSDBDriver implements java.sql.Driver {
         }
     }
 
+    private List<String> loadConfigEndpoints(File cfgFile) {
+        List<String> endpoints = new ArrayList<>();
+        try (BufferedReader reader = new BufferedReader(new FileReader(cfgFile))) {
+            String line = null;
+            while ((line = reader.readLine()) != null) {
+                if (line.trim().startsWith("firstEp") || line.trim().startsWith("secondEp")) {
+                    endpoints.add(line.substring(line.indexOf('p') + 1).trim());
+                }
+                if (endpoints.size() > 1)
+                    break;
+            }
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return endpoints;
+    }
+
+    /**
+     * @param cfgDirPath
+     * @return return the config dir
+     **/
+    private File loadConfigDir(String cfgDirPath) {
+        if (cfgDirPath == null)
+            return loadDefaultConfigDir();
+        File cfgDir = new File(cfgDirPath);
+        if (!cfgDir.exists())
+            return loadDefaultConfigDir();
+        return cfgDir;
+    }
+
+    /**
+     * @return search the default config dir, if the config dir is not exist will return null
+     */
+    private File loadDefaultConfigDir() {
+        File cfgDir;
+        File cfgDir_linux = new File("/etc/taos");
+        cfgDir = cfgDir_linux.exists() ? cfgDir_linux : null;
+        File cfgDir_windows = new File("C:\\TDengine\\cfg");
+        cfgDir = (cfgDir == null && cfgDir_windows.exists()) ? cfgDir_windows : cfgDir;
+        return cfgDir;
+    }
+
     public Connection connect(String url, Properties info) throws SQLException {
         if (url == null) {
             throw new SQLException(TSDBConstants.WrapErrMsg("url is not set!"));
         }
 
         Properties props = null;
-
         if ((props = parseURL(url, info)) == null) {
             return null;
         }
 
+        //load taos.cfg start
+        if (info.getProperty(TSDBDriver.PROPERTY_KEY_HOST) == null && info.getProperty(TSDBDriver.PROPERTY_KEY_PORT) == null){
+            File cfgDir = loadConfigDir(info.getProperty(TSDBDriver.PROPERTY_KEY_CONFIG_DIR));
+            File cfgFile = cfgDir.listFiles((dir, name) -> "taos.cfg".equalsIgnoreCase(name))[0];
+            List<String> endpoints = loadConfigEndpoints(cfgFile);
+            if (!endpoints.isEmpty()) {
+                info.setProperty(TSDBDriver.PROPERTY_KEY_HOST, endpoints.get(0).split(":")[0]);
+                info.setProperty(TSDBDriver.PROPERTY_KEY_PORT, endpoints.get(0).split(":")[1]);
+            }
+        }
+
         try {
             TSDBJNIConnector.init((String) props.get(PROPERTY_KEY_CONFIG_DIR), (String) props.get(PROPERTY_KEY_LOCALE), (String) props.get(PROPERTY_KEY_CHARSET),
                     (String) props.get(PROPERTY_KEY_TIME_ZONE));
@@ -150,13 +213,9 @@ public class TSDBDriver implements java.sql.Driver {
      * and the element of index PORT_NUMBER_INDEX being the port (or null if not
      * specified).
      *
-	 * @param hostPortPair
+     * @param hostPortPair host and port in form of of [host][:port]
-	 *            host and port in form of of [host][:port]
-	 * 
      * @return array containing host and port as Strings
-	 * 
+     * @throws SQLException if a parse error occurs
-	 * @throws SQLException
-	 *             if a parse error occurs
      */
     protected static String[] parseHostPortPair(String hostPortPair) throws SQLException {
         String[] splitValues = new String[2];
@@ -200,8 +259,7 @@ public class TSDBDriver implements java.sql.Driver {
         DriverPropertyInfo hostProp = new DriverPropertyInfo(PROPERTY_KEY_HOST, info.getProperty(PROPERTY_KEY_HOST));
         hostProp.required = true;
 
-		DriverPropertyInfo portProp = new DriverPropertyInfo(PROPERTY_KEY_PORT,
+        DriverPropertyInfo portProp = new DriverPropertyInfo(PROPERTY_KEY_PORT, info.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
-				info.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
         portProp.required = false;
 
         DriverPropertyInfo dbProp = new DriverPropertyInfo(PROPERTY_KEY_DBNAME, info.getProperty(PROPERTY_KEY_DBNAME));
@@ -211,8 +269,7 @@ public class TSDBDriver implements java.sql.Driver {
         DriverPropertyInfo userProp = new DriverPropertyInfo(PROPERTY_KEY_USER, info.getProperty(PROPERTY_KEY_USER));
         userProp.required = true;
 
-		DriverPropertyInfo passwordProp = new DriverPropertyInfo(PROPERTY_KEY_PASSWORD,
+        DriverPropertyInfo passwordProp = new DriverPropertyInfo(PROPERTY_KEY_PASSWORD, info.getProperty(PROPERTY_KEY_PASSWORD));
-				info.getProperty(PROPERTY_KEY_PASSWORD));
         passwordProp.required = true;
 
         DriverPropertyInfo[] propertyInfo = new DriverPropertyInfo[5];
@@ -228,7 +285,6 @@ public class TSDBDriver implements java.sql.Driver {
     /**
      * example: jdbc:TSDB://127.0.0.1:0/db?user=root&password=your_password
      */
-
     public Properties parseURL(String url, Properties defaults) throws java.sql.SQLException {
         Properties urlProps = (defaults != null) ? defaults : new Properties();
         if (url == null) {
@@ -337,9 +393,7 @@ public class TSDBDriver implements java.sql.Driver {
     /**
      * Returns the host property
      *
-	 * @param props
+     * @param props the java.util.Properties instance to retrieve the hostname from.
-	 *            the java.util.Properties instance to retrieve the hostname from.
-	 * 
      * @return the host
      */
     public String host(Properties props) {
@@ -349,9 +403,7 @@ public class TSDBDriver implements java.sql.Driver {
     /**
      * Returns the port number property
      *
-	 * @param props
+     * @param props the properties to get the port number from
-	 *            the properties to get the port number from
-	 * 
      * @return the port number
      */
     public int port(Properties props) {
@@ -361,9 +413,7 @@ public class TSDBDriver implements java.sql.Driver {
     /**
      * Returns the database property from <code>props</code>
      *
-	 * @param props
+     * @param props the Properties to look for the database property.
-	 *            the Properties to look for the database property.
-	 * 
      * @return the database name.
      */
     public String database(Properties props) {

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java

@@ -242,7 +242,7 @@ public class TSDBStatement implements Statement {
 
     public void addBatch(String sql) throws SQLException {
         if (batchedArgs == null) {
-            batchedArgs = new ArrayList<String>();
+            batchedArgs = new ArrayList<>();
         }
         batchedArgs.add(sql);
     }