(shardingsphere) branch master updated: Refactor LogicalOperator (#33740)

[zh...@apache.org]

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 c48158bdebe Refactor LogicalOperator (#33740)
c48158bdebe is described below

commit c48158bdebece908695961615420df03e22f07b5
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Nov 20 23:23:55 2024 +0800

    Refactor LogicalOperator (#33740)
---
 .../statement/core/enums/LogicalOperator.java      | 25 +++++++---------------
 .../statement/core/enums/LogicalOperatorTest.java  | 21 +++++++-----------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/enums/LogicalOperator.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/enums/LogicalOperator.java
index 8906a117cbb..7cb9eef2729 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/enums/LogicalOperator.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/enums/LogicalOperator.java
@@ -17,7 +17,8 @@
 
 package org.apache.shardingsphere.sql.parser.statement.core.enums;
 
-import java.util.HashMap;
+import com.cedarsoftware.util.CaseInsensitiveMap;
+
 import java.util.Map;
 import java.util.Optional;
 
@@ -28,23 +29,13 @@ public enum LogicalOperator {
     
     AND, OR;
     
-    private static final Map<String, LogicalOperator> MAPS = new HashMap<>(16, 1F);
+    private static final Map<String, LogicalOperator> LOGICAL_OPERATORS = new CaseInsensitiveMap<>(4, 1F);
     
     static {
-        MAPS.put("and", AND);
-        MAPS.put("And", AND);
-        MAPS.put("aNd", AND);
-        MAPS.put("anD", AND);
-        MAPS.put("ANd", AND);
-        MAPS.put("AnD", AND);
-        MAPS.put("aND", AND);
-        MAPS.put("AND", AND);
-        MAPS.put("&&", AND);
-        MAPS.put("or", OR);
-        MAPS.put("Or", OR);
-        MAPS.put("oR", OR);
-        MAPS.put("OR", OR);
-        MAPS.put("||", OR);
+        LOGICAL_OPERATORS.put("AND", AND);
+        LOGICAL_OPERATORS.put("&&", AND);
+        LOGICAL_OPERATORS.put("OR", OR);
+        LOGICAL_OPERATORS.put("||", OR);
     }
     
     /**
@@ -54,6 +45,6 @@ public enum LogicalOperator {
      * @return logical operator value
      */
     public static Optional<LogicalOperator> valueFrom(final String text) {
-        return Optional.ofNullable(MAPS.get(text));
+        return Optional.ofNullable(LOGICAL_OPERATORS.get(text));
     }
 }
diff --git a/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/enums/LogicalOperatorTest.java b/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/enums/LogicalOperatorTest.java
index cc5a70c19d8..6f261fb82cb 100644
--- a/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/enums/LogicalOperatorTest.java
+++ b/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/enums/LogicalOperatorTest.java
@@ -19,39 +19,34 @@ package org.apache.shardingsphere.sql.parser.statement.core.enums;
 
 import org.junit.jupiter.api.Test;
 
+import java.util.Optional;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class LogicalOperatorTest {
     
     @Test
     void assertValueFromAndText() {
-        assertTrue(LogicalOperator.valueFrom("AND").isPresent());
-        assertThat(LogicalOperator.valueFrom("AND").get(), is(LogicalOperator.AND));
-        assertTrue(LogicalOperator.valueFrom("and").isPresent());
-        assertThat(LogicalOperator.valueFrom("and").get(), is(LogicalOperator.AND));
+        assertThat(LogicalOperator.valueFrom("AND"), is(Optional.of(LogicalOperator.AND)));
+        assertThat(LogicalOperator.valueFrom("and"), is(Optional.of(LogicalOperator.AND)));
     }
     
     @Test
     void assertValueFromAndSymbol() {
-        assertTrue(LogicalOperator.valueFrom("&&").isPresent());
-        assertThat(LogicalOperator.valueFrom("&&").get(), is(LogicalOperator.AND));
+        assertThat(LogicalOperator.valueFrom("&&"), is(Optional.of(LogicalOperator.AND)));
     }
     
     @Test
     void assertValueFromOrText() {
-        assertTrue(LogicalOperator.valueFrom("OR").isPresent());
-        assertThat(LogicalOperator.valueFrom("OR").get(), is(LogicalOperator.OR));
-        assertTrue(LogicalOperator.valueFrom("or").isPresent());
-        assertThat(LogicalOperator.valueFrom("or").get(), is(LogicalOperator.OR));
+        assertThat(LogicalOperator.valueFrom("OR"), is(Optional.of(LogicalOperator.OR)));
+        assertThat(LogicalOperator.valueFrom("or"), is(Optional.of(LogicalOperator.OR)));
     }
     
     @Test
     void assertValueFromOrSymbol() {
-        assertTrue(LogicalOperator.valueFrom("||").isPresent());
-        assertThat(LogicalOperator.valueFrom("||").get(), is(LogicalOperator.OR));
+        assertThat(LogicalOperator.valueFrom("||"), is(Optional.of(LogicalOperator.OR)));
     }
     
     @Test