This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 1d668e08410 Remove useless
shardingsphere-sql-federation-executor-original dependency (#26077)
1d668e08410 is described below
commit 1d668e084104c3f56e58b0a4cd97de74e33dde76
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Tue Jun 6 16:54:08 2023 +0800
Remove useless shardingsphere-sql-federation-executor-original dependency
(#26077)
* Remove useless shardingsphere-sql-federation-executor-original dependency
* Remove useless shardingsphere-sql-federation-executor-original dependency
---
.../shardingsphere-jdbc/optional-plugins/_index.cn.md | 1 -
.../shardingsphere-jdbc/optional-plugins/_index.en.md | 1 -
.../distsql/parser/core/EncryptDistSQLStatementVisitor.java | 10 ++++++----
jdbc/core/pom.xml | 5 -----
proxy/backend/core/pom.xml | 5 -----
report/pom.xml | 5 -----
.../asserts/segment/distsql/rdl/EncryptColumnAssert.java | 2 +-
7 files changed, 7 insertions(+), 22 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
index 9c5f6398d37..c589f738953 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
@@ -27,7 +27,6 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存
- `org.apache.shardingsphere:shardingsphere-single-core`，单表（所有的分片数据源中仅唯一存在的表）核心
- `org.apache.shardingsphere:shardingsphere-sql-federation-core`，联邦查询执行器核心
-
`org.apache.shardingsphere:shardingsphere-sql-federation-executor-advanced`，联邦查询执行器的
`advanced` 实现
--
`org.apache.shardingsphere:shardingsphere-sql-federation-executor-original`，联邦查询执行器的
`original` 实现
- `org.apache.shardingsphere:shardingsphere-sql-parser-mysql`， SQL 解析的 MySQL
方言实现
- `org.apache.shardingsphere:shardingsphere-sql-parser-opengauss`， SQL 解析的
OpenGauss 方言实现
- `org.apache.shardingsphere:shardingsphere-sql-parser-oracle`， SQL 解析的 Oracle
方言解析实现
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
index e4779fc2912..b4475c086a3 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
@@ -27,7 +27,6 @@ All the built-in plugins for ShardingSphere-JDBC are listed
below in the form of
- `org.apache.shardingsphere:shardingsphere-single-core`, single-table (only
the only table that exists in all sharded data sources) core
- `org.apache.shardingsphere:shardingsphere-sql-federation-core`, federation
query executor core
- `org.apache.shardingsphere:shardingsphere-sql-federation-executor-advanced`,
the `advanced` implementation of federated query executor
-- `org.apache.shardingsphere:shardingsphere-sql-federation-executor-original`,
the `original` implementation of federated query executor
- `org.apache.shardingsphere:shardingsphere-sql-parser-mysql`, MySQL dialect
implementation of SQL parsing
- `org.apache.shardingsphere:shardingsphere-sql-parser-opengauss`, OpenGauss
dialect implementation of SQL parsing
- `org.apache.shardingsphere:shardingsphere-sql-parser-oracle`, Oracle dialect
implementation of SQL parsing
diff --git
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
index 770cfe9e4ce..855018df646 100644
---
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
+++
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
@@ -86,10 +86,12 @@ public final class EncryptDistSQLStatementVisitor extends
EncryptDistSQLStatemen
public ASTNode visitEncryptColumnDefinition(final
EncryptColumnDefinitionContext ctx) {
return new
EncryptColumnSegment(getIdentifierValue(ctx.columnDefinition().columnName()),
new
EncryptColumnItemSegment(getIdentifierValue(ctx.cipherColumnDefinition().cipherColumnName()),
(AlgorithmSegment) visit(ctx.encryptAlgorithm().algorithmDefinition())),
- null == ctx.assistedQueryColumnDefinition() ? null : new
EncryptColumnItemSegment(getIdentifierValue(ctx.assistedQueryColumnDefinition().assistedQueryColumnName()),
- null == ctx.assistedQueryAlgorithm() ? null :
(AlgorithmSegment) visit(ctx.assistedQueryAlgorithm().algorithmDefinition())),
- null == ctx.likeQueryColumnDefinition() ? null : new
EncryptColumnItemSegment(getIdentifierValue(ctx.likeQueryColumnDefinition().likeQueryColumnName()),
- null == ctx.likeQueryAlgorithm() ? null :
(AlgorithmSegment) visit(ctx.likeQueryAlgorithm().algorithmDefinition())));
+ null == ctx.assistedQueryColumnDefinition() ? null
+ : new
EncryptColumnItemSegment(getIdentifierValue(ctx.assistedQueryColumnDefinition().assistedQueryColumnName()),
+ null == ctx.assistedQueryAlgorithm() ? null :
(AlgorithmSegment) visit(ctx.assistedQueryAlgorithm().algorithmDefinition())),
+ null == ctx.likeQueryColumnDefinition() ? null
+ : new
EncryptColumnItemSegment(getIdentifierValue(ctx.likeQueryColumnDefinition().likeQueryColumnName()),
+ null == ctx.likeQueryAlgorithm() ? null :
(AlgorithmSegment) visit(ctx.likeQueryAlgorithm().algorithmDefinition())));
}
@Override
diff --git a/jdbc/core/pom.xml b/jdbc/core/pom.xml
index 0c26ad784f0..9cbf3ee51a6 100644
--- a/jdbc/core/pom.xml
+++ b/jdbc/core/pom.xml
@@ -160,11 +160,6 @@
<artifactId>shardingsphere-sql-federation-executor-advanced</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-sql-federation-executor-original</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-sql-parser-core</artifactId>
diff --git a/proxy/backend/core/pom.xml b/proxy/backend/core/pom.xml
index 58c17a7eb0a..75c4abcd2c0 100644
--- a/proxy/backend/core/pom.xml
+++ b/proxy/backend/core/pom.xml
@@ -203,11 +203,6 @@
<artifactId>shardingsphere-sql-federation-executor-advanced</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-sql-federation-executor-original</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-logging-core</artifactId>
diff --git a/report/pom.xml b/report/pom.xml
index c98b630c5d9..c9d47804f66 100644
--- a/report/pom.xml
+++ b/report/pom.xml
@@ -587,11 +587,6 @@
<artifactId>shardingsphere-sql-federation-executor-advanced</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-sql-federation-executor-original</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-logging-core</artifactId>
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptColumnAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptColumnAssert.java
index 47a96317f1c..bcfdf427e81 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptColumnAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptColumnAssert.java
@@ -64,7 +64,7 @@ public final class EncryptColumnAssert {
assertThat(assertContext.getText(String.format("`%s`'s
assertion error", actual.getClass().getSimpleName())),
actual.getLikeQuery().getName(),
is(expected.getLikeQuery().getName()));
AlgorithmAssert.assertIs(assertContext,
actual.getLikeQuery().getEncryptor(), expected.getLikeQuery().getEncryptor());
- }
+ }
}
}
}
