Minor cleanup.

Signed-off-by: currantw <[email protected]>
Bit-Quill · Jan 30, 2025 · 028c183 · 028c183
1 parent 289dfa2
commit 028c183
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java b/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java
@@ -482,8 +482,8 @@ public LogicalPlan visitFlatten(Flatten node, AnalysisContext context) {
     if (fieldType != STRUCT) {
       String msg =
           StringUtils.format(
-              "Invalid field type '%s' for flatten command. Supported field types: '%s'.",
-              fieldType, STRUCT.typeName());
+              "Invalid field type for flatten command. Expected '%s' but got '%s'.",
+              STRUCT.typeName(), fieldType);
       throw new IllegalArgumentException(msg);
     }
 

diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/FlattenOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/FlattenOperator.java
@@ -28,9 +28,7 @@ public class FlattenOperator extends PhysicalPlan {
   private final PhysicalPlan input;
   private final ReferenceExpression field;
 
-  private static final String PATH_SEPARATOR = ".";
-  private static final Pattern PATH_SEPARATOR_PATTERN =
-      Pattern.compile(PATH_SEPARATOR, Pattern.LITERAL);
+  private static final Pattern PATH_SEPARATOR_PATTERN = Pattern.compile(".", Pattern.LITERAL);
 
   @Override
   public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {

diff --git a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalFlattenTest.java b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalFlattenTest.java
@@ -124,8 +124,7 @@ void testInvalidType() {
         assertThrows(IllegalArgumentException.class, () -> analyze(actualUnresolvedPlan))
             .getMessage();
     assertEquals(
-        "Invalid field type 'INTEGER' for flatten command. Supported field types: 'STRUCT'.",
-        actualMsg);
+        "Invalid field type for flatten command. Expected 'STRUCT' but got 'INTEGER'.", actualMsg);
   }
 
   @Test