5.4.19-20241103_17309482

Author: lgjpolardbx

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM polardbx/polardbxbasejava:20221129
+FROM polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx/polardbxbasejava:20221129
 
 WORKDIR /home/admin
 

polardbx-calcite/pom.xml

@@ -39,6 +39,12 @@ limitations under the License.
           <groupId>org.apache.calcite.avatica</groupId>
           <artifactId>avatica-core</artifactId>
           <version>${avatica.core.version}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.apache.httpcomponents</groupId>
+                  <artifactId>httpcore</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
       <dependency>
           <groupId>org.apache.calcite</groupId>
@@ -51,11 +57,6 @@ limitations under the License.
           <version>${avatica-serve.version}</version>
           <scope>test</scope>
       </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>${commons-dbcp.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -95,6 +96,7 @@ limitations under the License.
       <groupId>com.yahoo.datasketches</groupId>
       <artifactId>sketches-core</artifactId>
       <version>${sketches-core.version}</version>
+        <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -164,17 +166,20 @@ limitations under the License.
       <version>9.3-1102-jdbc3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
+
+      <dependency>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+          <version>${slf4j_version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>log4j-over-slf4j</artifactId>
+      </dependency>
 
     <dependency>
       <groupId>sqlline</groupId>
@@ -203,6 +208,11 @@ limitations under the License.
           <version>${mockito.verison}</version>
           <scope>test</scope>
       </dependency>
+      <dependency>
+          <groupId>com.alibaba.polardbx</groupId>
+          <artifactId>polardbx-net</artifactId>
+          <version>${parent.version}</version>
+      </dependency>
   </dependencies>
 
     <build>
@@ -302,24 +312,6 @@ limitations under the License.
                 </executions>
             </plugin>
 
-            <!-- Parent module has the same plugin and does the work of
-                 generating -sources.jar for each project. But without the
-                 plugin declared here, IDEs don't know the sources are
-                 available. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                            <goal>test-jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

polardbx-calcite/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java

@@ -16,6 +16,11 @@
  */
 package org.apache.calcite.adapter.jdbc;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
 import org.apache.calcite.avatica.AvaticaUtils;
 import org.apache.calcite.avatica.SqlType;
 import org.apache.calcite.linq4j.tree.Expression;
@@ -38,12 +43,7 @@
 import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.calcite.util.Util;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
-
+import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -53,7 +53,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import javax.sql.DataSource;
 
 /**
  * Implementation of {@link Schema} that is backed by a JDBC data source.
@@ -186,12 +185,7 @@ public static SqlDialect createDialect(SqlDialectFactory dialectFactory,
   /** Creates a JDBC data source with the given specification. */
   public static DataSource dataSource(String url, String driverClassName,
       String username, String password) {
-    if (url.startsWith("jdbc:hsqldb:")) {
-      // Prevent hsqldb from screwing up java.util.logging.
-      System.setProperty("hsqldb.reconfig_logging", "false");
-    }
-    return JdbcUtils.DataSourcePool.INSTANCE.get(url, driverClassName, username,
-        password);
+    throw  new IllegalAccessError();
   }
 
   public boolean isMutable() {