[CALCITE-6728] Introduce new methods to lookup tables and schemas ins…

…ide schemas
sap-contributions · Dec 19, 2024 · 4bf9f88 · 4bf9f88
1 parent 32e5c08
commit 4bf9f88
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/core/src/test/java/org/apache/calcite/schema/lookup/CachedLookupTest.java b/core/src/test/java/org/apache/calcite/schema/lookup/CachedLookupTest.java
@@ -22,6 +22,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
+/**
+ * Test for CachedLookup.
+ */
 class CachedLookupTest {
   private final Lookup<String> testee = new CachedLookup<>(new MapLookup("a", "1"));
 

diff --git a/core/src/test/java/org/apache/calcite/schema/lookup/ConcatLookupTest.java b/core/src/test/java/org/apache/calcite/schema/lookup/ConcatLookupTest.java
@@ -22,6 +22,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
+/**
+ * Test for ConcatLookup.
+ */
 class ConcatLookupTest {
   private final Lookup<String> testee =
       Lookup.concat(new MapLookup("a", "1"), new MapLookup("b", "2"));

diff --git a/core/src/test/java/org/apache/calcite/schema/lookup/IgnoreCaseLookupTest.java b/core/src/test/java/org/apache/calcite/schema/lookup/IgnoreCaseLookupTest.java
@@ -26,6 +26,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
+/**
+ * Test for IgnoreCaseLookup.
+ */
 class IgnoreCaseLookupTest {
   private final Lookup<String> testee = new IgnoreCaseLookup<String>() {
     @Override public @Nullable String get(final String name) {

diff --git a/core/src/test/java/org/apache/calcite/schema/lookup/LoadingCacheLookupTest.java b/core/src/test/java/org/apache/calcite/schema/lookup/LoadingCacheLookupTest.java
@@ -22,6 +22,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
+/**
+ * Test for LoadingCacheLookup.
+ */
 public class LoadingCacheLookupTest {
 
   private final Lookup<String> testee =

diff --git a/core/src/test/java/org/apache/calcite/schema/lookup/MapLookup.java b/core/src/test/java/org/apache/calcite/schema/lookup/MapLookup.java
@@ -19,31 +19,36 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+/**
+ * Simple test class for Lookup.
+ */
 class MapLookup implements Lookup<String> {
   private final Map<String, String> map;
   private final Map<String, Named<String>> ignoreCaseMap;
 
-  public MapLookup(String... keyAndValues) {
+  MapLookup(String... keyAndValues) {
     this.map = new HashMap<>();
     for (int i = 0; i < keyAndValues.length - 1; i += 2) {
       map.put(keyAndValues[i], keyAndValues[i + 1]);
     }
     this.ignoreCaseMap = this.map.entrySet().stream()
         .collect(
-            Collectors.toMap(entry -> entry.getKey().toLowerCase(),
-            entry -> new Named<>(entry.getKey(), entry.getValue())));
+            Collectors.toMap(
+                entry -> entry.getKey().toLowerCase(Locale.ROOT),
+                entry -> new Named<>(entry.getKey(), entry.getValue())));
   }
 
   @Override public @Nullable String get(final String name) {
     return map.get(name);
   }
 
   @Override public @Nullable Named<String> getIgnoreCase(final String name) {
-    return ignoreCaseMap.get(name.toLowerCase());
+    return ignoreCaseMap.get(name.toLowerCase(Locale.ROOT));
   }
 
   @Override public Set<String> getNames(final LikePattern pattern) {

diff --git a/core/src/test/java/org/apache/calcite/schema/lookup/MappedLookupTest.java b/core/src/test/java/org/apache/calcite/schema/lookup/MappedLookupTest.java
@@ -21,8 +21,10 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.jupiter.api.Assertions.*;
 
+/**
+ * Test for MappedLookup.
+ */
 class MappedLookupTest {
   private final Lookup<String> testee =
       (new MapLookup("a", "1")).map((value, name) -> name + "_" + value);