From ba851bd626d21266443dd57e0f0666272e7b1efb Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Wed, 23 Oct 2024 17:34:52 +0800 Subject: [PATCH] fix the issue when merge conflicts Signed-off-by: Lantao Jin --- ppl-spark-integration/src/main/antlr4/OpenSearchPPLParser.g4 | 1 + 1 file changed, 1 insertion(+) diff --git a/ppl-spark-integration/src/main/antlr4/OpenSearchPPLParser.g4 b/ppl-spark-integration/src/main/antlr4/OpenSearchPPLParser.g4 index d64db1634..9686b0139 100644 --- a/ppl-spark-integration/src/main/antlr4/OpenSearchPPLParser.g4 +++ b/ppl-spark-integration/src/main/antlr4/OpenSearchPPLParser.g4 @@ -510,6 +510,7 @@ evalFunctionName | coalesceFunctionName | cryptographicFunctionName | jsonFunctionName + | collectionFunctionName ; functionArgs