From ec5e61b475fe680b6e74d9ff549b6faf2c487121 Mon Sep 17 00:00:00 2001 From: ZhangCheng Date: Thu, 24 Oct 2024 14:41:54 +0800 Subject: [PATCH 1/2] Add index columns not empty judgement for IndexColumnTokenGenerator --- .../generator/select/EncryptIndexColumnTokenGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptIndexColumnTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptIndexColumnTokenGenerator.java index d6d07f01a7666..17c6e230b1c76 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptIndexColumnTokenGenerator.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptIndexColumnTokenGenerator.java @@ -56,7 +56,8 @@ public final class EncryptIndexColumnTokenGenerator implements CollectionSQLToke @Override public boolean isGenerateSQLToken(final SQLStatementContext sqlStatementContext) { - return sqlStatementContext instanceof IndexAvailable && sqlStatementContext instanceof TableAvailable && !((TableAvailable) sqlStatementContext).getTablesContext().getTableNames().isEmpty(); + return sqlStatementContext instanceof IndexAvailable && sqlStatementContext instanceof TableAvailable && !((TableAvailable) sqlStatementContext).getTablesContext().getTableNames().isEmpty() + && !((IndexAvailable) sqlStatementContext).getIndexColumns().isEmpty(); } @Override From d34ade3bcdb452d2591bdfcf57598989066b0185 Mon Sep 17 00:00:00 2001 From: ZhangCheng Date: Thu, 24 Oct 2024 14:43:22 +0800 Subject: [PATCH 2/2] Add index columns not empty judgement for IndexColumnTokenGenerator --- RELEASE-NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index e6ec554700cac..7fa6c77e94c8a 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -12,6 +12,7 @@ 1. SQL Parser: Support parsing Doris INSTR - [#33289](https://github.com/apache/shardingsphere/pull/33289) 1. Agent: Simplify the use of Agent's Docker Image - [#33356](https://github.com/apache/shardingsphere/pull/33356) 1. Add arguments not null check when creating RouteUnit - [#33382](https://github.com/apache/shardingsphere/pull/33382) +1. Add index columns not empty judgement for IndexColumnTokenGenerator - [#33384](https://github.com/apache/shardingsphere/pull/33384) ### Bug Fixes