This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 7914c97c087 Remove useless EncryptOrderByItemTokenGenerator (#32391)
7914c97c087 is described below
commit 7914c97c087317187b0a8f6a6ff6fa117e7d344b
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 4 19:08:55 2024 +0800
Remove useless EncryptOrderByItemTokenGenerator (#32391)
* Remove useless EncryptOrderByItemTokenGenerator
---
.../rewrite/token/EncryptTokenGenerateBuilder.java | 6 +-
.../EncryptOrderByItemTokenGenerator.java | 110 ---------------------
.../EncryptOrderByItemSupportedCheckerTest.java} | 21 ++--
.../token/EncryptTokenGenerateBuilderTest.java | 6 +-
4 files changed, 13 insertions(+), 130 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java
index 70a7e47766e..e7d5f42d457 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java
@@ -27,9 +27,6 @@ import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptAlterTab
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptCreateTableTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptGroupByItemTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptIndexColumnTokenGenerator;
-import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptOrderByItemTokenGenerator;
-import
org.apache.shardingsphere.encrypt.rewrite.token.generator.predicate.EncryptPredicateColumnTokenGenerator;
-import
org.apache.shardingsphere.encrypt.rewrite.token.generator.predicate.EncryptPredicateRightValueTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.assignment.EncryptInsertAssignmentTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.assignment.EncryptUpdateAssignmentTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.insert.EncryptInsertCipherNameTokenGenerator;
@@ -37,6 +34,8 @@ import
org.apache.shardingsphere.encrypt.rewrite.token.generator.insert.EncryptI
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.insert.EncryptInsertDerivedColumnsTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.insert.EncryptInsertOnUpdateTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.insert.EncryptInsertValuesTokenGenerator;
+import
org.apache.shardingsphere.encrypt.rewrite.token.generator.predicate.EncryptPredicateColumnTokenGenerator;
+import
org.apache.shardingsphere.encrypt.rewrite.token.generator.predicate.EncryptPredicateRightValueTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.projection.EncryptInsertSelectProjectionTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.projection.EncryptSelectProjectionTokenGenerator;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
@@ -77,7 +76,6 @@ public final class EncryptTokenGenerateBuilder implements
SQLTokenGeneratorBuild
addSQLTokenGenerator(result, new
EncryptInsertOnUpdateTokenGenerator());
addSQLTokenGenerator(result, new EncryptCreateTableTokenGenerator());
addSQLTokenGenerator(result, new EncryptAlterTableTokenGenerator());
- addSQLTokenGenerator(result, new EncryptOrderByItemTokenGenerator());
addSQLTokenGenerator(result, new EncryptGroupByItemTokenGenerator());
addSQLTokenGenerator(result, new EncryptIndexColumnTokenGenerator());
return result;
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
deleted file mode 100644
index f7dc26c865d..00000000000
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.encrypt.rewrite.token.generator;
-
-import lombok.Setter;
-import
org.apache.shardingsphere.encrypt.exception.syntax.UnsupportedEncryptSQLException;
-import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptRuleAware;
-import org.apache.shardingsphere.encrypt.rule.EncryptRule;
-import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
-import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
-import
org.apache.shardingsphere.infra.binder.context.segment.select.orderby.OrderByItem;
-import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
-import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
-import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
-import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
-import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.CollectionSQLTokenGenerator;
-import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.aware.SchemaMetaDataAware;
-import org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.SQLToken;
-import
org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.generic.SubstitutableColumnNameToken;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.item.ColumnOrderByItemSegment;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Order by item token generator for encrypt.
- */
-@HighFrequencyInvocation
-@Setter
-public final class EncryptOrderByItemTokenGenerator implements
CollectionSQLTokenGenerator<SelectStatementContext>, EncryptRuleAware,
SchemaMetaDataAware {
-
- private EncryptRule encryptRule;
-
- private Map<String, ShardingSphereSchema> schemas;
-
- private ShardingSphereSchema defaultSchema;
-
- @Override
- public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
- return sqlStatementContext instanceof SelectStatementContext &&
containsOrderByItem((SelectStatementContext) sqlStatementContext);
- }
-
- private boolean containsOrderByItem(final SelectStatementContext
sqlStatementContext) {
- if (!sqlStatementContext.getOrderByContext().getItems().isEmpty() &&
!sqlStatementContext.getOrderByContext().isGenerated()) {
- return true;
- }
- for (SelectStatementContext each :
sqlStatementContext.getSubqueryContexts().values()) {
- if (containsOrderByItem(each)) {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public Collection<SQLToken> generateSQLTokens(final SelectStatementContext
sqlStatementContext) {
- Collection<SQLToken> result = new LinkedHashSet<>();
- ShardingSphereSchema schema =
sqlStatementContext.getTablesContext().getSchemaName().map(schemas::get).orElseGet(()
-> defaultSchema);
- for (OrderByItem each : getOrderByItems(sqlStatementContext)) {
- if (each.getSegment() instanceof ColumnOrderByItemSegment) {
- ColumnSegment columnSegment = ((ColumnOrderByItemSegment)
each.getSegment()).getColumn();
- Map<String, String> columnTableNames =
sqlStatementContext.getTablesContext().findTableNames(Collections.singleton(columnSegment),
schema);
-
result.addAll(generateSQLTokens(Collections.singleton(columnSegment),
columnTableNames));
- }
- }
- return result;
- }
-
- private Collection<SubstitutableColumnNameToken> generateSQLTokens(final
Collection<ColumnSegment> columnSegments, final Map<String, String>
columnTableNames) {
- Collection<SubstitutableColumnNameToken> result = new LinkedList<>();
- for (ColumnSegment each : columnSegments) {
- String tableName =
columnTableNames.getOrDefault(each.getExpression(), "");
- Optional<EncryptTable> encryptTable =
encryptRule.findEncryptTable(tableName);
- String columnName = each.getIdentifier().getValue();
- ShardingSpherePreconditions.checkState(!encryptTable.isPresent()
|| !encryptTable.get().isEncryptColumn(columnName), () -> new
UnsupportedEncryptSQLException("ORDER BY"));
- }
- return result;
- }
-
- private Collection<OrderByItem> getOrderByItems(final
SelectStatementContext sqlStatementContext) {
- Collection<OrderByItem> result = new LinkedList<>();
- if (!sqlStatementContext.getOrderByContext().isGenerated()) {
- result.addAll(sqlStatementContext.getOrderByContext().getItems());
- }
- for (SelectStatementContext each :
sqlStatementContext.getSubqueryContexts().values()) {
- result.addAll(getOrderByItems(each));
- }
- return result;
- }
-}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGeneratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptOrderByItemSupportedCheckerTest.java
similarity index 91%
rename from
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGeneratorTest.java
rename to
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptOrderByItemSupportedCheckerTest.java
index 24e9c7fe7fd..21c1eaa0ecd 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGeneratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptOrderByItemSupportedCheckerTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.rewrite.token.generator;
+package org.apache.shardingsphere.encrypt.checker.sql;
import
org.apache.shardingsphere.encrypt.exception.syntax.UnsupportedEncryptSQLException;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
-import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
+import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
import
org.apache.shardingsphere.infra.binder.context.segment.select.orderby.OrderByItem;
import
org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
@@ -48,16 +48,20 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class EncryptOrderByItemTokenGeneratorTest {
+class EncryptOrderByItemSupportedCheckerTest {
- private final EncryptOrderByItemTokenGenerator generator = new
EncryptOrderByItemTokenGenerator();
+ private final EncryptOrderByItemSupportedChecker checker = new
EncryptOrderByItemSupportedChecker();
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@BeforeEach
void setup() {
- generator.setEncryptRule(mockEncryptRule());
- generator.setSchemas(Collections.singletonMap("test",
mock(ShardingSphereSchema.class)));
+ checker.setSchemas(Collections.singletonMap("test",
mock(ShardingSphereSchema.class)));
+ }
+
+ @Test
+ void assertCheck() {
+ assertThrows(UnsupportedEncryptSQLException.class, () ->
checker.check(mockEncryptRule(), buildSelectStatementContext()));
}
private EncryptRule mockEncryptRule() {
@@ -71,11 +75,6 @@ class EncryptOrderByItemTokenGeneratorTest {
return result;
}
- @Test
- void assertGenerateSQLTokens() {
- assertThrows(UnsupportedEncryptSQLException.class, () ->
generator.generateSQLTokens(buildSelectStatementContext()));
- }
-
private SelectStatementContext buildSelectStatementContext() {
SimpleTableSegment simpleTableSegment = new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("t_encrypt")));
simpleTableSegment.setAlias(new AliasSegment(0, 0, new
IdentifierValue("a")));
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
index 5c6a1b68318..0b87a7ac11e 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.encrypt.rewrite.token;
import lombok.SneakyThrows;
import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptRuleAware;
-import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptOrderByItemTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.projection.EncryptSelectProjectionTokenGenerator;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import
org.apache.shardingsphere.infra.binder.context.segment.select.orderby.OrderByItem;
@@ -61,14 +60,11 @@ class EncryptTokenGenerateBuilderTest {
when(selectStatementContext.getWhereSegments()).thenReturn(Collections.emptyList());
EncryptTokenGenerateBuilder encryptTokenGenerateBuilder = new
EncryptTokenGenerateBuilder(encryptRule, selectStatementContext,
Collections.emptyList(), DefaultDatabase.LOGIC_NAME);
Collection<SQLTokenGenerator> sqlTokenGenerators =
encryptTokenGenerateBuilder.getSQLTokenGenerators();
- assertThat(sqlTokenGenerators.size(), is(2));
+ assertThat(sqlTokenGenerators.size(), is(1));
Iterator<SQLTokenGenerator> iterator = sqlTokenGenerators.iterator();
SQLTokenGenerator item1 = iterator.next();
assertThat(item1,
instanceOf(EncryptSelectProjectionTokenGenerator.class));
assertSQLTokenGenerator(item1);
- SQLTokenGenerator item2 = iterator.next();
- assertThat(item2, instanceOf(EncryptOrderByItemTokenGenerator.class));
- assertSQLTokenGenerator(item2);
}
private void assertSQLTokenGenerator(final SQLTokenGenerator
sqlTokenGenerator) {
