adapt the calcite for customer GLD

src/connector/jdbc/pom.xml

@@ -59,6 +59,29 @@
             <version>4.13</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- calcite -->
+        <dependency>
+            <groupId>org.apache.calcite</groupId>
+            <artifactId>calcite-core</artifactId>
+            <version>1.23.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.calcite.avatica</groupId>
+            <artifactId>avatica-core</artifactId>
+            <version>1.17.0</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.47</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

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

@@ -16,7 +16,10 @@ package com.taosdata.jdbc;
 
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.*;
 import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.logging.Logger;
 
@@ -118,17 +121,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));
@@ -153,13 +210,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
-	 *            host and port in form of of [host][:port]
-	 * 
+     * @param hostPortPair 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];
@@ -203,8 +256,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,
-				info.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
+        DriverPropertyInfo portProp = new DriverPropertyInfo(PROPERTY_KEY_PORT, info.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
         portProp.required = false;
 
         DriverPropertyInfo dbProp = new DriverPropertyInfo(PROPERTY_KEY_DBNAME, info.getProperty(PROPERTY_KEY_DBNAME));
@@ -214,8 +266,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,
-				info.getProperty(PROPERTY_KEY_PASSWORD));
+        DriverPropertyInfo passwordProp = new DriverPropertyInfo(PROPERTY_KEY_PASSWORD, info.getProperty(PROPERTY_KEY_PASSWORD));
         passwordProp.required = true;
 
         DriverPropertyInfo[] propertyInfo = new DriverPropertyInfo[5];
@@ -231,7 +282,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) {
@@ -263,7 +313,7 @@ public class TSDBDriver implements java.sql.Driver {
             url = url.trim().substring(url.indexOf("?") + 1);
         } else {
             // without user & password so return
-			if(!url.trim().isEmpty()) {
+            if (!url.trim().isEmpty()) {
                 String dbName = url.trim();
                 urlProps.setProperty(PROPERTY_KEY_DBNAME, dbName);
             }
@@ -284,7 +334,7 @@ public class TSDBDriver implements java.sql.Driver {
         String[] queryStrings = url.trim().split("&");
         for (String queryStr : queryStrings) {
             String[] kvPair = queryStr.trim().split("=");
-			if (kvPair.length < 2){
+            if (kvPair.length < 2) {
                 continue;
             }
             setPropertyValue(urlProps, kvPair);
@@ -339,9 +389,7 @@ public class TSDBDriver implements java.sql.Driver {
     /**
      * Returns the host property
      *
-	 * @param props
-	 *            the java.util.Properties instance to retrieve the hostname from.
-	 * 
+     * @param props the java.util.Properties instance to retrieve the hostname from.
      * @return the host
      */
     public String host(Properties props) {
@@ -351,9 +399,7 @@ public class TSDBDriver implements java.sql.Driver {
     /**
      * Returns the port number property
      *
-	 * @param props
-	 *            the properties to get the port number from
-	 * 
+     * @param props the properties to get the port number from
      * @return the port number
      */
     public int port(Properties props) {
@@ -363,9 +409,7 @@ public class TSDBDriver implements java.sql.Driver {
     /**
      * Returns the database property from <code>props</code>
      *
-	 * @param props
-	 *            the Properties to look for the database property.
-	 * 
+     * @param props 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/cases/CalciteTest.java

+package com.taosdata.jdbc.cases;
+
+import org.apache.calcite.adapter.jdbc.JdbcSchema;
+import org.apache.calcite.jdbc.CalciteConnection;
+import org.apache.calcite.schema.SchemaPlus;
+import org.apache.calcite.sql.parser.SqlParseException;
+import org.apache.commons.dbcp2.BasicDataSource;
+
+import java.sql.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+public class CalciteTest {
+
+    public static void main(String[] args) throws SqlParseException, ClassNotFoundException, SQLException {
+
+        //创建Calcite Connection对象
+        Class.forName("org.apache.calcite.jdbc.Driver");
+        Properties info = new Properties();
+        info.setProperty("caseSensitive", "false");
+        Connection connection = DriverManager.getConnection("jdbc:calcite:", info);
+        CalciteConnection calciteConnection = connection.unwrap(CalciteConnection.class);
+        SchemaPlus rootSchema = calciteConnection.getRootSchema();
+
+        // JDBC adapter
+        Class.forName("com.mysql.jdbc.Driver");
+        BasicDataSource dataSource = new BasicDataSource();
+        dataSource.setUrl("jdbc:mysql://192.168.56.101:3306");
+        dataSource.setUsername("root");
+        dataSource.setPassword("123456");
+        Map<String, String> map = new HashMap<>();
+        JdbcSchema schema = JdbcSchema.create(rootSchema, "hr", dataSource, null, null);
+        rootSchema.add("hr", schema);
+
+        Statement statement = calciteConnection.createStatement();
+        ResultSet resultSet = statement.executeQuery("select * from hr.depts");
+
+        while (resultSet.next()) {
+            ResultSetMetaData metaData = resultSet.getMetaData();
+            for (int i = 1; i <= metaData.getColumnCount(); i++) {
+                String columnLabel = metaData.getColumnLabel(i);
+                System.out.println(columnLabel + " : " + resultSet.getString(i));
+            }
+        }
+        resultSet.close();
+        statement.close();
+        connection.close();
+
+
+        //创建TDengine的数据源schema
+//        Class.forName("com.taosdata.jdbc.TSDBDriver");
+//        String url = "jdbc:TAOS://127.0.0.1:6030/hdb";
+//        dataSource.setUrl(url);
+//        dataSource.setUsername("root");
+//        dataSource.setPassword("taosdata");
+
+//        Class.forName("com.mysql.jdbc.Driver");
+//        String url = "jdbc:mysql://localhost:3306/hdb";
+//        BasicDataSource dataSource = new BasicDataSource();
+//        dataSource.setUrl(url);
+//        dataSource.setUsername("root");
+//        dataSource.setPassword("123456");
+        //这里hdb是在tdengine中创建的数据库名
+//        JdbcSchema schema = JdbcSchema.create(rootSchema, "test", dataSource, null, "test");
+//        Schema schema = JdbcSchema.create(rootSchema, "test", dataSource, "hdb", null);
+        //创建新的schema自动映射到原来的hdb数据库
+//        rootSchema.add("test", schema);
+
+//        Statement stmt = calciteConnection.createStatement();
+        //查询schema test中的表，表名是tdengine中的表
+//        ResultSet rs = stmt.executeQuery("select * from test.t");
+//        for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+//            System.out.println(rs.getMetaData().getColumnName(i));
+//        }
+//        while (rs.next()) {
+//            System.out.println(rs.getObject(1));
+//        }
+    }
+}