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 a26041db151 Remove DatabaseTypeAware (#33869)
a26041db151 is described below
commit a26041db151f1c67a139d7c146b6a1a51717bc0b
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Dec 1 22:14:14 2024 +0800
Remove DatabaseTypeAware (#33869)
---
.../encrypt/rewrite/aware/DatabaseTypeAware.java | 33 ----------------------
.../rewrite/token/EncryptTokenGenerateBuilder.java | 8 ++----
...ncryptInsertSelectProjectionTokenGenerator.java | 9 ++----
.../EncryptSelectProjectionTokenGenerator.java | 8 ++----
.../select/EncryptGroupByItemTokenGenerator.java | 16 +++++------
.../select/EncryptIndexColumnTokenGenerator.java | 17 +++++------
.../EncryptGroupByItemTokenGeneratorTest.java | 1 -
7 files changed, 21 insertions(+), 71 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/aware/DatabaseTypeAware.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/aware/DatabaseTypeAware.java
deleted file mode 100644
index 87e47b58993..00000000000
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/aware/DatabaseTypeAware.java
+++ /dev/null
@@ -1,33 +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.aware;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-
-/**
- * Database type aware.
- */
-public interface DatabaseTypeAware {
-
- /**
- * Set database type.
- *
- * @param databaseType database type
- */
- void setDatabaseType(DatabaseType databaseType);
-}
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 b3b42278fd3..98b9aba6c08 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
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.encrypt.rewrite.token;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.encrypt.rewrite.aware.DatabaseAware;
-import org.apache.shardingsphere.encrypt.rewrite.aware.DatabaseTypeAware;
import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptConditionsAware;
import org.apache.shardingsphere.encrypt.rewrite.condition.EncryptCondition;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.assignment.EncryptInsertAssignmentTokenGenerator;
@@ -93,14 +92,11 @@ public final class EncryptTokenGenerateBuilder implements
SQLTokenGeneratorBuild
}
private void setUpSQLTokenGenerator(final SQLTokenGenerator
toBeAddedSQLTokenGenerator) {
- if (toBeAddedSQLTokenGenerator instanceof EncryptConditionsAware) {
- ((EncryptConditionsAware)
toBeAddedSQLTokenGenerator).setEncryptConditions(encryptConditions);
- }
if (toBeAddedSQLTokenGenerator instanceof DatabaseAware) {
((DatabaseAware) toBeAddedSQLTokenGenerator).setDatabase(database);
}
- if (toBeAddedSQLTokenGenerator instanceof DatabaseTypeAware) {
- ((DatabaseTypeAware)
toBeAddedSQLTokenGenerator).setDatabaseType(sqlStatementContext.getDatabaseType());
+ if (toBeAddedSQLTokenGenerator instanceof EncryptConditionsAware) {
+ ((EncryptConditionsAware)
toBeAddedSQLTokenGenerator).setEncryptConditions(encryptConditions);
}
}
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptInsertSelectProjectionTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptInsertSelectProjectionTokenGenerator.java
index 4a271a30002..90a75eeab37 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptInsertSelectProjectionTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptInsertSelectProjectionTokenGenerator.java
@@ -19,12 +19,10 @@ package
org.apache.shardingsphere.encrypt.rewrite.token.generator.projection;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-import org.apache.shardingsphere.encrypt.rewrite.aware.DatabaseTypeAware;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.CollectionSQLTokenGenerator;
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.aware.PreviousSQLTokensAware;
import org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.SQLToken;
@@ -38,14 +36,12 @@ import java.util.List;
@HighFrequencyInvocation
@RequiredArgsConstructor
@Setter
-public final class EncryptInsertSelectProjectionTokenGenerator implements
CollectionSQLTokenGenerator<InsertStatementContext>, PreviousSQLTokensAware,
DatabaseTypeAware {
+public final class EncryptInsertSelectProjectionTokenGenerator implements
CollectionSQLTokenGenerator<InsertStatementContext>, PreviousSQLTokensAware {
private final EncryptRule rule;
private List<SQLToken> previousSQLTokens;
- private DatabaseType databaseType;
-
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
return sqlStatementContext instanceof InsertStatementContext && null
!= ((InsertStatementContext) sqlStatementContext).getInsertSelectContext();
@@ -53,6 +49,7 @@ public final class
EncryptInsertSelectProjectionTokenGenerator implements Collec
@Override
public Collection<SQLToken> generateSQLTokens(final InsertStatementContext
sqlStatementContext) {
- return new EncryptProjectionTokenGenerator(previousSQLTokens, rule,
databaseType).generateSQLTokens(sqlStatementContext.getInsertSelectContext().getSelectStatementContext());
+ return new EncryptProjectionTokenGenerator(
+ previousSQLTokens, rule,
sqlStatementContext.getDatabaseType()).generateSQLTokens(sqlStatementContext.getInsertSelectContext().getSelectStatementContext());
}
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptSelectProjectionTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptSelectProjectionTokenGenerator.java
index 13544939be0..0fe07b7e103 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptSelectProjectionTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptSelectProjectionTokenGenerator.java
@@ -19,12 +19,10 @@ package
org.apache.shardingsphere.encrypt.rewrite.token.generator.projection;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-import org.apache.shardingsphere.encrypt.rewrite.aware.DatabaseTypeAware;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.CollectionSQLTokenGenerator;
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.aware.PreviousSQLTokensAware;
import org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.SQLToken;
@@ -38,14 +36,12 @@ import java.util.List;
@HighFrequencyInvocation
@RequiredArgsConstructor
@Setter
-public final class EncryptSelectProjectionTokenGenerator implements
CollectionSQLTokenGenerator<SelectStatementContext>, PreviousSQLTokensAware,
DatabaseTypeAware {
+public final class EncryptSelectProjectionTokenGenerator implements
CollectionSQLTokenGenerator<SelectStatementContext>, PreviousSQLTokensAware {
private final EncryptRule rule;
private List<SQLToken> previousSQLTokens;
- private DatabaseType databaseType;
-
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
return sqlStatementContext instanceof SelectStatementContext &&
!((SelectStatementContext)
sqlStatementContext).getTablesContext().getSimpleTables().isEmpty();
@@ -53,6 +49,6 @@ public final class EncryptSelectProjectionTokenGenerator
implements CollectionSQ
@Override
public Collection<SQLToken> generateSQLTokens(final SelectStatementContext
sqlStatementContext) {
- return new EncryptProjectionTokenGenerator(previousSQLTokens, rule,
databaseType).generateSQLTokens(sqlStatementContext);
+ return new EncryptProjectionTokenGenerator(previousSQLTokens, rule,
sqlStatementContext.getDatabaseType()).generateSQLTokens(sqlStatementContext);
}
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGenerator.java
index 2815c7b5728..2abad5c7304 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGenerator.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.encrypt.rewrite.token.generator.select;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-import org.apache.shardingsphere.encrypt.rewrite.aware.DatabaseTypeAware;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
@@ -52,7 +51,7 @@ import java.util.Optional;
@HighFrequencyInvocation
@RequiredArgsConstructor
@Setter
-public final class EncryptGroupByItemTokenGenerator implements
CollectionSQLTokenGenerator<SelectStatementContext>, SchemaMetaDataAware,
DatabaseTypeAware {
+public final class EncryptGroupByItemTokenGenerator implements
CollectionSQLTokenGenerator<SelectStatementContext>, SchemaMetaDataAware {
private final EncryptRule rule;
@@ -60,8 +59,6 @@ public final class EncryptGroupByItemTokenGenerator
implements CollectionSQLToke
private ShardingSphereSchema defaultSchema;
- private DatabaseType databaseType;
-
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
return sqlStatementContext instanceof SelectStatementContext &&
containsGroupByItem((SelectStatementContext) sqlStatementContext);
@@ -87,13 +84,13 @@ public final class EncryptGroupByItemTokenGenerator
implements CollectionSQLToke
if (each.getSegment() instanceof ColumnOrderByItemSegment) {
ColumnSegment columnSegment = ((ColumnOrderByItemSegment)
each.getSegment()).getColumn();
Map<String, String> columnTableNames =
sqlStatementContext.getTablesContext().findTableNames(Collections.singleton(columnSegment),
schema);
- generateSQLToken(columnSegment,
columnTableNames).ifPresent(result::add);
+ generateSQLToken(columnSegment, columnTableNames,
sqlStatementContext.getDatabaseType()).ifPresent(result::add);
}
}
return result;
}
- private Optional<SubstitutableColumnNameToken> generateSQLToken(final
ColumnSegment columnSegment, final Map<String, String> columnTableNames) {
+ private Optional<SubstitutableColumnNameToken> generateSQLToken(final
ColumnSegment columnSegment, final Map<String, String> columnTableNames, final
DatabaseType databaseType) {
String tableName =
columnTableNames.getOrDefault(columnSegment.getExpression(), "");
Optional<EncryptTable> encryptTable = rule.findEncryptTable(tableName);
String columnName = columnSegment.getIdentifier().getValue();
@@ -104,9 +101,10 @@ public final class EncryptGroupByItemTokenGenerator
implements CollectionSQLToke
int startIndex = columnSegment.getOwner().isPresent() ?
columnSegment.getOwner().get().getStopIndex() + 2 :
columnSegment.getStartIndex();
int stopIndex = columnSegment.getStopIndex();
return Optional.of(encryptColumn.getAssistedQuery()
- .map(optional -> new SubstitutableColumnNameToken(startIndex,
stopIndex, createColumnProjections(optional.getName(),
columnSegment.getIdentifier().getQuoteCharacter()), databaseType))
+ .map(optional -> new SubstitutableColumnNameToken(
+ startIndex, stopIndex,
createColumnProjections(optional.getName(),
columnSegment.getIdentifier().getQuoteCharacter(), databaseType), databaseType))
.orElseGet(() -> new SubstitutableColumnNameToken(startIndex,
stopIndex,
-
createColumnProjections(encryptColumn.getCipher().getName(),
columnSegment.getIdentifier().getQuoteCharacter()), databaseType)));
+
createColumnProjections(encryptColumn.getCipher().getName(),
columnSegment.getIdentifier().getQuoteCharacter(), databaseType),
databaseType)));
}
private Collection<OrderByItem> getGroupByItems(final
SelectStatementContext sqlStatementContext) {
@@ -117,7 +115,7 @@ public final class EncryptGroupByItemTokenGenerator
implements CollectionSQLToke
return result;
}
- private Collection<Projection> createColumnProjections(final String
columnName, final QuoteCharacter quoteCharacter) {
+ private Collection<Projection> createColumnProjections(final String
columnName, final QuoteCharacter quoteCharacter, final DatabaseType
databaseType) {
return Collections.singleton(new ColumnProjection(null, new
IdentifierValue(columnName, quoteCharacter), null, databaseType));
}
}
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 4ff9e998e08..f7e4e9a2c75 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
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.encrypt.rewrite.token.generator.select;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-import org.apache.shardingsphere.encrypt.rewrite.aware.DatabaseTypeAware;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
@@ -48,12 +47,10 @@ import java.util.Optional;
@HighFrequencyInvocation
@RequiredArgsConstructor
@Setter
-public final class EncryptIndexColumnTokenGenerator implements
CollectionSQLTokenGenerator<SQLStatementContext>, DatabaseTypeAware {
+public final class EncryptIndexColumnTokenGenerator implements
CollectionSQLTokenGenerator<SQLStatementContext> {
private final EncryptRule rule;
- private DatabaseType databaseType;
-
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
return sqlStatementContext instanceof IndexAvailable &&
sqlStatementContext instanceof TableAvailable && !((TableAvailable)
sqlStatementContext).getTablesContext().getTableNames().isEmpty()
@@ -67,28 +64,28 @@ public final class EncryptIndexColumnTokenGenerator
implements CollectionSQLToke
Collection<SQLToken> result = new LinkedList<>();
for (ColumnSegment each : ((IndexAvailable)
sqlStatementContext).getIndexColumns()) {
if (encryptTable.isEncryptColumn(each.getIdentifier().getValue()))
{
- generateSQLToken(encryptTable, each).ifPresent(result::add);
+ generateSQLToken(encryptTable, each,
sqlStatementContext.getDatabaseType()).ifPresent(result::add);
}
}
return result;
}
- private Optional<SQLToken> generateSQLToken(final EncryptTable
encryptTable, final ColumnSegment columnSegment) {
+ private Optional<SQLToken> generateSQLToken(final EncryptTable
encryptTable, final ColumnSegment columnSegment, final DatabaseType
databaseType) {
QuoteCharacter quoteCharacter =
columnSegment.getIdentifier().getQuoteCharacter();
int startIndex = columnSegment.getStartIndex();
int stopIndex = columnSegment.getStopIndex();
String columnName = columnSegment.getIdentifier().getValue();
EncryptColumn encryptColumn =
encryptTable.getEncryptColumn(columnName);
String queryColumnName = encryptColumn.getAssistedQuery().isPresent()
? encryptColumn.getAssistedQuery().get().getName() :
encryptColumn.getCipher().getName();
- return getQueryColumnToken(startIndex, stopIndex, queryColumnName,
quoteCharacter);
+ return getQueryColumnToken(startIndex, stopIndex, queryColumnName,
quoteCharacter, databaseType);
}
- private Optional<SQLToken> getQueryColumnToken(final int startIndex, final
int stopIndex, final String queryColumnName, final QuoteCharacter
quoteCharacter) {
- Collection<Projection> columnProjections =
getColumnProjections(queryColumnName, quoteCharacter);
+ private Optional<SQLToken> getQueryColumnToken(final int startIndex, final
int stopIndex, final String queryColumnName, final QuoteCharacter
quoteCharacter, final DatabaseType databaseType) {
+ Collection<Projection> columnProjections =
getColumnProjections(queryColumnName, quoteCharacter, databaseType);
return Optional.of(new SubstitutableColumnNameToken(startIndex,
stopIndex, columnProjections, databaseType));
}
- private Collection<Projection> getColumnProjections(final String
columnName, final QuoteCharacter quoteCharacter) {
+ private Collection<Projection> getColumnProjections(final String
columnName, final QuoteCharacter quoteCharacter, final DatabaseType
databaseType) {
return Collections.singleton(new ColumnProjection(null, new
IdentifierValue(columnName, quoteCharacter), null, databaseType));
}
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGeneratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGeneratorTest.java
index d9ecee17c25..fa76a3f31cb 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGeneratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGeneratorTest.java
@@ -58,7 +58,6 @@ class EncryptGroupByItemTokenGeneratorTest {
void setup() {
generator = new EncryptGroupByItemTokenGenerator(mockEncryptRule());
generator.setSchemas(Collections.singletonMap("test",
mock(ShardingSphereSchema.class)));
- generator.setDatabaseType(databaseType);
}
private EncryptRule mockEncryptRule() {
