Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@lancelly
lancelly authored Oct 18, 2023
2 parents f3b5b23 + 32aed3e commit a9e62d2
Show file tree
Hide file tree
Showing 193 changed files with 1,479 additions and 962 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.

Expand Down
42 changes: 23 additions & 19 deletions distribution/proxy-native/src/main/release-docs/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -224,16 +224,19 @@ 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
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
Expand All @@ -247,7 +250,8 @@ The text of each license is the standard Apache 2.0 license.
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
gson 2.9.1: https://github.com/google/gson, 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
Expand All @@ -259,10 +263,10 @@ 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
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
Expand All @@ -289,16 +293,16 @@ The text of each license is the standard Apache 2.0 license.
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
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
Expand All @@ -321,8 +325,8 @@ 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.3: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
Expand Down Expand Up @@ -351,8 +355,8 @@ 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.2.224: https://github.com/h2database/h2database, EPL 1.0

Expand Down
42 changes: 23 additions & 19 deletions distribution/proxy/src/main/release-docs/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -224,16 +224,19 @@ 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
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
Expand All @@ -247,7 +250,8 @@ The text of each license is the standard Apache 2.0 license.
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
gson 2.9.1: https://github.com/google/gson, 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
Expand All @@ -259,10 +263,10 @@ 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
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
Expand All @@ -289,16 +293,16 @@ The text of each license is the standard Apache 2.0 license.
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
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
Expand All @@ -321,8 +325,8 @@ 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.3: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
Expand Down Expand Up @@ -351,8 +355,8 @@ 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.2.224: https://github.com/h2database/h2database, EPL 1.0

Expand Down
2 changes: 1 addition & 1 deletion .../document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ chapter = true

ShardingSphere-JDBC 支持所有的数据库 JDBC 驱动和连接池。

示例的数据库驱动为 MySQL，连接池为 HikariCP，可以更换为其他数据库驱动和连接池。当使用 ShardingSphere-JDBC 时，JDBC 池的属性名取决于各自 JDBC 池自己的定义，并不由 ShardingSphere 硬定义，相关的处理可以参考类`org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator`。例如对于 Alibaba Druid 1.2.9 而言，使用 `url` 代替如下示例中的 `jdbcUrl` 是预期行为。
示例的数据库驱动为 MySQL，连接池为 HikariCP，可以更换为其他数据库驱动和连接池。当使用 ShardingSphere-JDBC 时，JDBC 池的属性名取决于各自 JDBC 池自己的定义，并不由 ShardingSphere 定义，相关的处理可以参考类`org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator`。例如对于 Alibaba Druid 1.2.9 而言，使用 `url` 代替如下示例中的 `jdbcUrl` 是预期行为。

## 参数解释

Expand Down
2 changes: 1 addition & 1 deletion .../document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ chapter = true
ShardingSphere-JDBC Supports all JDBC drivers and data source connection pools.

In this example, the database driver is MySQL, and the connection pool is HikariCP, which can be replaced with other database drivers and connection pools.
When using ShardingSphere JDBC, the property name of the JDBC pool depends on the definition of the respective JDBC pool and is not defined by ShardingSphere. For related processing, please refer to the class org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator.
When using ShardingSphere JDBC, the property name of the JDBC pool depends on the definition of the respective JDBC pool and is not defined by ShardingSphere. For related processing, please refer to the class `org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator`.
For example, with Alibaba Druid 1.2.9, using url instead of jdbcUrl in the example below is the expected behavior.

## Parameters
Expand Down
Loading

0 comments on commit a9e62d2

Please sign in to comment.