This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 656d27314ec Fix equals for EncryptPredicateEqualRightValueToken.
(#22129)
656d27314ec is described below
commit 656d27314ece3723a828f6af3818b837abacc9ba
Author: Chuxin Chen <[email protected]>
AuthorDate: Sun Nov 13 10:55:50 2022 +0800
Fix equals for EncryptPredicateEqualRightValueToken. (#22129)
---
.../token/pojo/EncryptPredicateEqualRightValueToken.java | 15 +++++++++++++--
.../token/pojo/EncryptPredicateInRightValueToken.java | 15 +++++++++++++--
.../jdbc/core/statement/EncryptPreparedStatementTest.java | 4 +---
3 files changed, 27 insertions(+), 7 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
index fb19571c16f..7712790ed04 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
@@ -17,18 +17,17 @@
package org.apache.shardingsphere.encrypt.rewrite.token.pojo;
-import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.Substitutable;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
/**
* Predicate equal right value token for encrypt.
*/
-@EqualsAndHashCode
public final class EncryptPredicateEqualRightValueToken extends SQLToken
implements Substitutable {
@Getter
@@ -52,4 +51,16 @@ public final class EncryptPredicateEqualRightValueToken
extends SQLToken impleme
}
return "?";
}
+
+ @Override
+ public boolean equals(final Object obj) {
+ return obj instanceof EncryptPredicateEqualRightValueToken &&
((EncryptPredicateEqualRightValueToken) obj).getStartIndex() == getStartIndex()
+ && ((EncryptPredicateEqualRightValueToken) obj).getStopIndex()
== stopIndex && ((EncryptPredicateEqualRightValueToken)
obj).indexValues.equals(indexValues)
+ && ((EncryptPredicateEqualRightValueToken)
obj).paramMarkerIndexes.equals(paramMarkerIndexes);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getStartIndex(), stopIndex, indexValues,
paramMarkerIndexes);
+ }
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java
index a4277df5afd..c0317ac2c58 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java
@@ -17,18 +17,17 @@
package org.apache.shardingsphere.encrypt.rewrite.token.pojo;
-import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.Substitutable;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
/**
* Predicate in right value token for encrypt.
*/
-@EqualsAndHashCode
public final class EncryptPredicateInRightValueToken extends SQLToken
implements Substitutable {
@Getter
@@ -64,4 +63,16 @@ public final class EncryptPredicateInRightValueToken extends
SQLToken implements
result.delete(result.length() - 2, result.length()).append(")");
return result.toString();
}
+
+ @Override
+ public boolean equals(final Object obj) {
+ return obj instanceof EncryptPredicateInRightValueToken &&
((EncryptPredicateInRightValueToken) obj).getStartIndex() == getStartIndex()
+ && ((EncryptPredicateInRightValueToken) obj).getStopIndex() ==
stopIndex && ((EncryptPredicateInRightValueToken)
obj).indexValues.equals(indexValues)
+ && ((EncryptPredicateInRightValueToken)
obj).paramMarkerIndexes.equals(paramMarkerIndexes);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getStartIndex(), stopIndex, indexValues,
paramMarkerIndexes);
+ }
}
diff --git
a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
index 86b29634c4d..5ff1e408ef2 100644
---
a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
+++
b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.driver.jdbc.core.statement;
import
org.apache.shardingsphere.driver.jdbc.base.AbstractShardingSphereDataSourceForEncryptTest;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
-import org.junit.Ignore;
import org.junit.Test;
import java.sql.Connection;
@@ -30,8 +29,8 @@ import java.sql.SQLException;
import java.sql.Statement;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public final class EncryptPreparedStatementTest extends
AbstractShardingSphereDataSourceForEncryptTest {
@@ -144,7 +143,6 @@ public final class EncryptPreparedStatementTest extends
AbstractShardingSphereDa
}
@Test
- @Ignore
public void assertSelectWithOr() throws SQLException {
try (PreparedStatement preparedStatement =
getEncryptConnection().prepareStatement(SELECT_SQL_OR)) {
preparedStatement.setObject(1, "plainValue");
