use lower_camel for config names

kgyrtkirk · May 17, 2024 · 652cc20 · 652cc20
1 parent 94f9386
commit 652cc20
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java b/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.sql.calcite;
 
+import com.google.common.base.CaseFormat;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
@@ -156,10 +157,10 @@ public Class<? extends QueryComponentSupplier> fromString(String name) throws Ex
   }
 
   private static final Set<String> KNOWN_CONFIG_KEYS = ImmutableSet.<String>builder()
-      .add(NumMergeBuffers.class.getSimpleName())
-      .add(MinTopNThreshold.class.getSimpleName())
-      .add(ResultCache.class.getSimpleName())
-      .add(ComponentSupplier.class.getSimpleName())
+      .add(NumMergeBuffers.PROCESSOR.getConfigName())
+      .add(MinTopNThreshold.PROCESSOR.getConfigName())
+      .add(ResultCache.PROCESSOR.getConfigName())
+      .add(ComponentSupplier.PROCESSOR.getConfigName())
       .build();
 
   public final int numMergeBuffers;
@@ -408,6 +409,11 @@ public ConfigOptionProcessor(Class<? extends Annotation> annotationClass)
       this.annotationClass = annotationClass;
     }
 
+    public final String getConfigName()
+    {
+      return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, annotationClass.getSimpleName());
+    }
+
     @SuppressWarnings("unchecked")
     public final T fromAnnotations(List<Annotation> annotations) throws Exception
     {
@@ -436,7 +442,7 @@ public final T defaultValue() throws Exception
 
     public final T fromMap(Map<String, String> map) throws Exception
     {
-      String key = annotationClass.getSimpleName();
+      String key = getConfigName();
       String value = map.get(key);
       if (value == null) {
         return defaultValue();

diff --git a/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/decoupled.iq b/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/decoupled.iq
@@ -1,5 +1,5 @@
 !set plannerStrategy DECOUPLED
-!use druidtest://?NumMergeBuffers=3
+!use druidtest://?numMergeBuffers=3
 !set outputformat mysql
 
 select cityName, count(case when delta > 0 then channel end) as cnt, count(1) as aall

diff --git a/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/join.iq b/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/join.iq
@@ -1,4 +1,4 @@
-!use druidtest://?NumMergeBuffers=3
+!use druidtest://?numMergeBuffers=3
 !set outputformat mysql
 
 with v as (

diff --git a/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/numMerge.iq b/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/numMerge.iq
@@ -1,4 +1,4 @@
-!use druidtest://?NumMergeBuffers=3
+!use druidtest://?numMergeBuffers=3
 !set outputformat mysql
 
 SELECT

diff --git a/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/supplier.iq b/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/supplier.iq
@@ -1,4 +1,4 @@
-!use druidtest://?ComponentSupplier=NestedComponentSupplier
+!use druidtest://?componentSupplier=NestedComponentSupplier
 !set outputformat mysql
 
 select count(1) from nested;