This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6c68d9f42ac Remove useless cosId nanoId keyword in DistSQL and update
license (#28393)
6c68d9f42ac is described below
commit 6c68d9f42ac7492bef766ca46c45e62bf60f7a24
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Fri Sep 8 15:14:25 2023 +0800
Remove useless cosId nanoId keyword in DistSQL and update license (#28393)
---
.../proxy-native/src/main/release-docs/LICENSE | 4 +---
.../main/release-docs/licenses/LICENSE-jnanoid.txt | 26 ----------------------
distribution/proxy/src/main/release-docs/LICENSE | 4 +---
.../main/release-docs/licenses/LICENSE-jnanoid.txt | 26 ----------------------
features/encrypt/distsql/handler/pom.xml | 5 -----
features/sharding/core/pom.xml | 10 ---------
.../src/main/antlr4/imports/sharding/BaseRule.g4 | 6 -----
.../src/main/antlr4/imports/sharding/Keyword.g4 | 24 --------------------
jdbc/core/pom.xml | 5 -----
9 files changed, 2 insertions(+), 108 deletions(-)
diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE
b/distribution/proxy-native/src/main/release-docs/LICENSE
index ec977cc692f..f41740785cd 100644
--- a/distribution/proxy-native/src/main/release-docs/LICENSE
+++ b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -234,7 +234,6 @@ The text of each license is the standard Apache 2.0 license.
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
- cosid-core 1.18.5: https://github.com/Ahoo-Wang/CosId, Apache 2.0
error_prone_annotations 2.11.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
@@ -324,7 +323,7 @@ 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
- janino 3.1.8: 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
protobuf-java 3.21.12:
https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
@@ -371,4 +370,3 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
checker-qual 3.5.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
- jnanoid 2.0.0: https://github.com/aventrix/jnanoid, MIT
diff --git
a/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jnanoid.txt
b/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jnanoid.txt
deleted file mode 100644
index 65014f7b502..00000000000
---
a/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jnanoid.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-jnanoid License
----------------
-
-MIT License
-
-Copyright (c) 2017 The JNanoID Authors
-Copyright (c) 2017 Aventrix LLC
-Copyright (c) 2017 Andrey Sitnik
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/distribution/proxy/src/main/release-docs/LICENSE
b/distribution/proxy/src/main/release-docs/LICENSE
index ec977cc692f..f41740785cd 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -234,7 +234,6 @@ The text of each license is the standard Apache 2.0 license.
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
- cosid-core 1.18.5: https://github.com/Ahoo-Wang/CosId, Apache 2.0
error_prone_annotations 2.11.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
@@ -324,7 +323,7 @@ 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
- janino 3.1.8: 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
protobuf-java 3.21.12:
https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
@@ -371,4 +370,3 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
checker-qual 3.5.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
- jnanoid 2.0.0: https://github.com/aventrix/jnanoid, MIT
diff --git
a/distribution/proxy/src/main/release-docs/licenses/LICENSE-jnanoid.txt
b/distribution/proxy/src/main/release-docs/licenses/LICENSE-jnanoid.txt
deleted file mode 100644
index 65014f7b502..00000000000
--- a/distribution/proxy/src/main/release-docs/licenses/LICENSE-jnanoid.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-jnanoid License
----------------
-
-MIT License
-
-Copyright (c) 2017 The JNanoID Authors
-Copyright (c) 2017 Aventrix LLC
-Copyright (c) 2017 Andrey Sitnik
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/features/encrypt/distsql/handler/pom.xml
b/features/encrypt/distsql/handler/pom.xml
index f17743d9417..235c722f2fa 100644
--- a/features/encrypt/distsql/handler/pom.xml
+++ b/features/encrypt/distsql/handler/pom.xml
@@ -37,11 +37,6 @@
<artifactId>shardingsphere-encrypt-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-encrypt-sm</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-encrypt-distsql-statement</artifactId>
diff --git a/features/sharding/core/pom.xml b/features/sharding/core/pom.xml
index 04f293dbce5..826168dbb10 100644
--- a/features/sharding/core/pom.xml
+++ b/features/sharding/core/pom.xml
@@ -78,16 +78,6 @@
<artifactId>shardingsphere-sql-federation-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-sharding-cosid</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-sharding-nanoid</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-infra-expr-core</artifactId>
diff --git
a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/BaseRule.g4
b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/BaseRule.g4
index f1587ee566a..7d08bef733f 100644
---
a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/BaseRule.g4
+++
b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/BaseRule.g4
@@ -39,9 +39,6 @@ buildInShardingAlgorithmType
| AUTO_INTERVAL
| INLINE
| INTERVAL
- | COSID_MOD
- | COSID_INTERVAL
- | COSID_INTERVAL_SNOWFLAKE
| COMPLEX_INLINE
| HINT_INLINE
| CLASS_BASED
@@ -49,10 +46,7 @@ buildInShardingAlgorithmType
buildInKeyGenerateAlgorithmType
: SNOWFLAKE
- | NANOID
| UUID
- | COSID
- | COSID_SNOWFLAKE
;
buildInShardingAuditAlgorithmType
diff --git
a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Keyword.g4
b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Keyword.g4
index cb6a0481498..1ede9e3a993 100644
---
a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Keyword.g4
+++
b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Keyword.g4
@@ -215,10 +215,6 @@ MOD
: M O D
;
-COSID_MOD
- : C O S I D UL_ M O D
- ;
-
HASH_MOD
: H A S H UL_ M O D
;
@@ -243,14 +239,6 @@ INTERVAL
: I N T E R V A L
;
-COSID_INTERVAL
- : C O S I D UL_ I N T E R V A L
- ;
-
-COSID_INTERVAL_SNOWFLAKE
- : C O S I D UL_ I N T E R V A L UL_ S N O W F L A K E
- ;
-
COMPLEX_INLINE
: C O M P L E X UL_ I N L I N E
;
@@ -267,22 +255,10 @@ SNOWFLAKE
: S N O W F L A K E
;
-NANOID
- : N A N O I D
- ;
-
UUID
: U U I D
;
-COSID
- : C O S I D
- ;
-
-COSID_SNOWFLAKE
- : C O S I D UL_ S N O W F L A K E
- ;
-
STANDARD
: S T A N D A R D
;
diff --git a/jdbc/core/pom.xml b/jdbc/core/pom.xml
index 54ba0c10438..bae493cf8cc 100644
--- a/jdbc/core/pom.xml
+++ b/jdbc/core/pom.xml
@@ -139,11 +139,6 @@
<artifactId>shardingsphere-encrypt-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-encrypt-sm</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-mask-core</artifactId>
