Merge branch 'master' into dev/parse_opengauss_create_index

apache · Oct 18, 2023 · fbe67b2 · fbe67b2
2 parents e8743b6 + 10dc2dd
commit fbe67b2
Show file tree

Hide file tree

Showing 814 changed files with 3,645 additions and 2,635 deletions.
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -71,7 +71,7 @@ jobs:
           remote_key: ${{ secrets.NIGHTLIES_RSYNC_KEY }}
 
   build-proxy-image:
-    if: ${{ needs.global-environment.outputs.GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE == 'true' }}
+    if: github.repository == 'apache/shardingsphere'
     name: Build Proxy Image
     needs: global-environment
     runs-on: ${{ needs.global-environment.outputs.GLOBAL_RUNS_ON }}

diff --git a/.github/workflows/required-reusable.yml b/.github/workflows/required-reusable.yml
@@ -43,6 +43,7 @@ jobs:
             echo ${line} >> $GITHUB_OUTPUT
           done
           echo "GLOBAL_REPOSITORY=${{ env.GLOBAL_REPOSITORY }}"
+          echo "DISABLE_CI=${{ env.DISABLE_CI }}"
           GLOBAL_CACHE_PREFIX=$(echo '${{ env.GLOBAL_REPOSITORY }}' | sed 's/\//_/g')
           echo "GLOBAL_CACHE_PREFIX=${GLOBAL_CACHE_PREFIX}" >> $GITHUB_OUTPUT
       - name: Check If Job is Executable
@@ -56,13 +57,9 @@ jobs:
           if [ ${{ toJSON(github.repository) }} = ${{ steps.import-variables.outputs.GLOBAL_REPOSITORY }} ]; then
             echo "GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE=true" >> $GITHUB_OUTPUT
             echo "GLOBAL_JOB_ENABLED=false" >> $GITHUB_OUTPUT
-            echo '${{ env.JSON_LABELS }}' | while read line
-            do
-              if [ ${line}="type: ${{ steps.import-variables.outputs.RUNNABLE_CI_LABEL }}" ] || [ -z "${{ steps.import-variables.outputs.RUNNABLE_CI_LABEL }}" ]; then
-                echo "GLOBAL_JOB_ENABLED=true" >> $GITHUB_OUTPUT
-                break
-              fi
-            done
+            if [ -z "${{ steps.import-variables.outputs.DISABLE_CI }}"] || [ "${{ steps.import-variables.outputs.DISABLE_CI }}"=="false" ] ; then
+              echo "GLOBAL_JOB_ENABLED=true" >> $GITHUB_OUTPUT
+            fi
           fi
     outputs:
       GLOBAL_RUNS_ON: ${{ steps.import-variables.outputs.GLOBAL_RUNS_ON }}

diff --git a/.github/workflows/resources/filter/filters.yml b/.github/workflows/resources/filter/filters.yml
@@ -22,9 +22,9 @@ pipeline:
   - '.github/workflows/e2e-operation.yml'
   - 'infra/**/src/main/**'
   - 'mode/**/src/main/**'
-  - 'features/encrypt/src/main/**'
-  - 'features/features/readwrite-splitting/src/main/**'
-  - 'features/sharding/src/main/**'
+  - 'features/encrypt/**/src/main/**'
+  - 'features/readwrite-splitting/**/src/main/**'
+  - 'features/sharding/**/src/main/**'
   - 'proxy/**/src/main/**'
   - 'jdbc/core/src/main/**'
   - '**/*-distsql*/**/src/main/**'

diff --git a/.github/workflows/resources/variables/env-variables.properties b/.github/workflows/resources/variables/env-variables.properties
@@ -1,3 +1,3 @@
 GLOBAL_REPOSITORY=apache/shardingsphere
 GLOBAL_RUNS_ON=ubuntu-latest
-RUNNABLE_CI_LABEL=
+DISABLE_CI=false
diff --git a/.gitignore b/.gitignore
@@ -39,7 +39,6 @@ logs/
 *.diff
 *.patch
 *.tmp
-.hugo_build.lock
 
 # system ignore
 .DS_Store
@@ -51,3 +50,8 @@ gen/
 
 # profiler ignore
 .profiler/
+
+# hugo ignore
+public/
+.hugo_build.lock
+*.html-e
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,11 +2,11 @@ You can report a bug, submit a new feature enhancement recommendation, or commit
 
 ## Reporting Bug
 
- - Before report a bug, please search from google to confirm you cannot find any hint on it.
- - Look [issues List](https://github.com/apache/shardingsphere/issues) to confirm this issue is not a duplicated one.
+ - Before reporting a bug, please search from google to confirm that you cannot find any hint on it.
+ - Look at the [issues List](https://github.com/apache/shardingsphere/issues) to confirm this issue is not a duplicated one.
  - [Create](https://github.com/apache/shardingsphere/issues/new) a new issue.
  - Define a clear and descriptive title for the issue.
- - If bug reported, please provide information below:
+ - If a bug is reported, please provide information below:
        - Details for reproduce bug step by step. Include SQL, configuration, expected results, actual results and tracing log.
        - ShardingSphere and your OS version.
        - Source code that reproduce the bug on GitHub, can be linked here.
@@ -18,7 +18,7 @@ You can report a bug, submit a new feature enhancement recommendation, or commit
        - Explain why this enhancement is general feature for most developers.
        - List similar features which already available in other product if possible. Both open source and commercial software are available.
  - Assign label after issue created. Label should be bug, enhancement, discussion and so on.
- - Please pay attention on the issue and provide more information during discuss.
+ - Please pay attention to the issue and provide more information during discuss.
  - Please close issue when it is resolved. If you don't close it, we will close it after 3 days。
  - If this issue has new information, please reopen it again. Please note, issue can reopen which only closed by yourself.
 

diff --git a/...ore/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java b/...ore/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java
@@ -20,11 +20,11 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.agent.plugin.core.enums.SQLStatementType;
-import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement;
-import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement;
-import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement;
-import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement;
+import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
+import org.apache.shardingsphere.distsql.statement.ral.RALStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
+import org.apache.shardingsphere.distsql.statement.rql.RQLStatement;
+import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.DCLStatement;

diff --git a/...a/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java b/...a/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
@@ -22,9 +22,9 @@
 import org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfiguration;
 import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.collector.MetricsCollectorFixture;
 import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.TargetAdviceObjectFixture;
-import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement;
-import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement;
-import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
+import org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement;
+import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement;
 import org.apache.shardingsphere.migration.distsql.statement.ShowMigrationListStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;

diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -215,7 +215,7 @@ Apache 2.0 licenses
 The following components are provided under the Apache License. See project link for details.
 The text of each license is the standard Apache 2.0 license.
 
-    accessors-smart 2.4.7: https://www.minidev.net/, Apache 2.0
+    accessors-smart 2.4.9: https://www.minidev.net/, Apache 2.0
     aggdesigner-algorithm 6.0: Apache 2.0
     apiguardian-api 1.1.2: https://github.com/apiguardian-team/apiguardian, Apache 2.0
     audience-annotations 0.12.0: https://github.com/apache/yetus, Apache 2.0
@@ -224,31 +224,35 @@ The text of each license is the standard Apache 2.0 license.
     caffeine 2.9.3: https://github.com/ben-manes/caffeine, Apache 2.0
     calcite-core 1.35.0: https://calcite.apache.org, Apache 2.0
     calcite-linq4j 1.35.0: https://calcite.apache.org, Apache 2.0
-    commons-codec 1.15: https://github.com/apache/commons-codec, Apache 2.0
+    commons-codec 1.16.0: https://github.com/apache/commons-codec, Apache 2.0
     commons-collections4 4.4: https://github.com/apache/commons-collections, Apache 2.0
+    commons-dbcp2 2.6.0: https://commons.apache.org/proper/commons-dbcp, Apache 2.0
     commons-exec 1.3: https://github.com/apache/commons-exec, Apache 2.0
     commons-io 2.11.0: https://github.com/apache/commons-io, Apache 2.0
     commons-lang 2.4: https://github.com/apache/commons-lang, Apache 2.0
     commons-lang3 3.12.0: https://github.com/apache/commons-lang, Apache 2.0
+    commons-math3 3.6.1: https://commons.apache.org/proper/commons-math, Apache 2.0
+    commons-pool2 2.6.1: https://commons.apache.org/proper/commons-pool, Apache 2.0
     commons-logging 1.1.3: https://github.com/apache/commons-logging, Apache 2.0
-    curator-client 5.4.0:  https://github.com/apache/curator, Apache 2.0
-    curator-framework 5.4.0:  https://github.com/apache/curator, Apache 2.0
-    curator-recipes 5.4.0:  https://github.com/apache/curator, Apache 2.0
-    error_prone_annotations 2.11.0: https://github.com/google/error-prone, Apache 2.0
+    curator-client 5.5.0:  https://github.com/apache/curator, Apache 2.0
+    curator-framework 5.5.0:  https://github.com/apache/curator, Apache 2.0
+    curator-recipes 5.5.0:  https://github.com/apache/curator, Apache 2.0
+    error_prone_annotations 2.22.0: https://github.com/google/error-prone, Apache 2.0
     failsafe 2.4.4: https://github.com/jhalterman/failsafe, Apache 2.0
     failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
     freemarker 2.3.31: https://freemarker.apache.org/, Apache 2.0
     groovy 4.0.10: https://groovy.apache.org/, Apache 2.0
-    grpc-api 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
-    grpc-context 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
-    grpc-core 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
-    grpc-grpclb 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
-    grpc-netty 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
-    grpc-protobuf 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
-    grpc-protobuf-lite 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
-    grpc-stub 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
-    gson 2.9.1: https://github.com/google/gson, Apache 2.0
-    guava 30.0-jre: https://github.com/google/guava, Apache 2.0
+    grpc-api 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    grpc-context 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    grpc-core 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    grpc-grpclb 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    grpc-netty 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    grpc-protobuf 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    grpc-protobuf-lite 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    grpc-stub 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    grpc-util 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+    gson 2.10.1: https://github.com/google/gson, Apache 2.0
+    guava 32.1.2-jre: https://github.com/google/guava, Apache 2.0
     HikariCP 4.0.3: https://github.com/brettwooldridge/HikariCP, Apache 2.0
     httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0
     httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
@@ -259,46 +263,46 @@ The text of each license is the standard Apache 2.0 license.
     jackson-dataformat-yaml 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
     jackson-datatype-jsr310 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
     jcl-over-slf4j 1.7.36: https://github.com/qos-ch/slf4j, Apache 2.0
-    jetcd-api 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
-    jetcd-common 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
-    jetcd-core 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
-    jetcd-grpc 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
-    json-path 2.7.0: https://github.com/jayway/JsonPath, Apache 2.0
-    json-smart 2.4.7: https://www.minidev.net/, Apache 2.0
+    jetcd-api 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0
+    jetcd-common 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0
+    jetcd-core 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0
+    jetcd-grpc 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0
+    json-path 2.8.0: https://github.com/jayway/JsonPath, Apache 2.0
+    json-smart 2.4.10: https://www.minidev.net/, Apache 2.0
     json-simple 1.1.1: https://code.google.com/archive/p/json-simple/, Apache 2.0
     jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
     memory 0.9.0, Apache 2.0
-    netty-buffer 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-codec 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-codec-http 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-codec-http2 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-codec-socks 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-common 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-handler 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-handler-proxy 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-resolver 4.1.90.Final: https://github.com/netty, Apache 2.0
+    netty-buffer 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-codec 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-codec-http 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-codec-http2 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-codec-socks 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-common 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-handler 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-handler-proxy 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-resolver 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-transport 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-transport-classes-epoll 4.1.99.Final: https://github.com/netty, Apache 2.0
+    netty-transport-native-epoll 4.1.99.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
+    netty-transport-native-epoll 4.1.99.Final-linux-x86_64: https://github.com/netty, Apache 2.0
+    netty-transport-native-unix-common 4.1.99.Final: https://github.com/netty, Apache 2.0
     netty-tcnative-boringssl-static 2.0.59.Final: https://github.com/netty/netty-tcnative, Apache 2.0
     netty-tcnative-boringssl-static 2.0.59.Final-linux-aarch_64: https://github.com/netty/netty-tcnative, Apache 2.0
     netty-tcnative-boringssl-static 2.0.59.Final-linux-x86_64: https://github.com/netty/netty-tcnative, Apache 2.0
     netty-tcnative-boringssl-static 2.0.59.Final-osx-aarch_64: https://github.com/netty/netty-tcnative, Apache 2.0
     netty-tcnative-boringssl-static 2.0.59.Final-osx-x86_64: https://github.com/netty/netty-tcnative, Apache 2.0
     netty-tcnative-boringssl-static 2.0.59.Final-windows-x86_64: https://github.com/netty/netty-tcnative, Apache 2.0
     netty-tcnative-classes 2.0.59.Final: https://github.com/netty/netty-tcnative, Apache 2.0
-    netty-transport 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-transport-classes-epoll 4.1.90.Final: https://github.com/netty, Apache 2.0
-    netty-transport-native-epoll 4.1.90.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
-    netty-transport-native-epoll 4.1.90.Final-linux-x86_64: https://github.com/netty, Apache 2.0
-    netty-transport-native-unix-common 4.1.90.Final: https://github.com/netty, Apache 2.0
-    perfmark-api 0.25.0: https://github.com/perfmark/perfmark, Apache 2.0
-    proto-google-common-protos 2.9.0: https://github.com/googleapis/common-protos-java, Apache 2.0
-    proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
+    perfmark-api 0.26.0: https://github.com/perfmark/perfmark, Apache 2.0
+    proto-google-common-protos 2.22.0: https://github.com/googleapis/common-protos-java, Apache 2.0
+    proj4j 1.2.2: https://github.com/locationtech/proj4j, Apache 2.0
     quartz 2.3.2: https://github.com/quartz-scheduler/quartz, Apache 2.0
     sketches-core 0.9.0, Apache 2.0
     snakeyaml 1.33: https://bitbucket.org/snakeyaml/snakeyaml, Apache 2.0
     transmittable-thread-local 2.14.2: https://github.com/alibaba/transmittable-thread-local, Apache 2.0
     uzaygezen-core 0.2: https://code.google.com/p/uzaygezen, Apache 2.0
-    zookeeper 3.8.1: https://github.com/apache/zookeeper, Apache 2.0
-    zookeeper-jute 3.8.1: https://github.com/apache/zookeeper, Apache 2.0
+    zookeeper 3.9.0: https://github.com/apache/zookeeper, Apache 2.0
+    zookeeper-jute 3.9.0: https://github.com/apache/zookeeper, Apache 2.0
 
 ========================================================================
 Apache 2.0 licenses
@@ -321,11 +325,11 @@ The following components are provided under a BSD license. See project link for
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
     antlr4-runtime 4.10.1: https://github.com/antlr/antlr4, BSD-3-Clause
-    asm 9.1: https://github.com/llbit/ow2-asm, BSD-3-Clause
-    commons-compiler 3.1.8: https://github.com/janino-compiler/janino, BSD-3-Clause
+    asm 9.3: https://github.com/llbit/ow2-asm, BSD-3-Clause
+    commons-compiler 3.1.9: https://github.com/janino-compiler/janino, BSD-3-Clause
     janino 3.1.9: https://github.com/janino-compiler/janino, BSD-3-Clause
     opengauss-jdbc 3.1.0-og: https://gitee.com/opengauss/openGauss-connector-jdbc, BSD-2-Clause
-    postgresql 42.4.1: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
+    postgresql 42.4.3: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
     protobuf-java 3.21.12: https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
     protobuf-java-util 3.21.12: https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
     jts-io-common 1.19.0: https://github.com/locationtech/jts, EDL 1.0
@@ -351,10 +355,10 @@ EPL licenses
 The following components are provided under the EPL License. See project link for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
-    logback-classic 1.2.11: https://github.com/qos-ch/logback, EPL 1.0
-    logback-core 1.2.11: https://github.com/qos-ch/logback, EPL 1.0
+    logback-classic 1.2.12: https://github.com/qos-ch/logback, EPL 1.0
+    logback-core 1.2.12: https://github.com/qos-ch/logback, EPL 1.0
     mchange-commons-java 0.2.15: https://github.com/swaldman/mchange-commons-java, EPL 1.0
-    h2 2.1.214: https://github.com/h2database/h2database, EPL 1.0
+    h2 2.2.224: https://github.com/h2database/h2database, EPL 1.0
 
 ========================================================================
 MIT licenses
@@ -367,6 +371,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     bcprov-jdk15on 1.70: https://www.bouncycastle.org, MIT
     bctls-jdk15on 1.70: https://www.bouncycastle.org, MIT
     bcutil-jdk15on 1.70: https://www.bouncycastle.org, MIT
-    checker-qual 3.5.0: https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
+    checker-qual 3.39.0: https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
     jul-to-slf4j 1.7.36: https://www.slf4j.org, MIT
     slf4j-api 1.7.36: https://www.slf4j.org, MIT