Bill-hbrhbr commented on code in PR #13003:
URL: https://github.com/apache/pinot/pull/13003#discussion_r1585512209
##########
pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/TextIndexConfig.java:
##########
@@ -168,13 +209,18 @@ public AbstractBuilder(TextIndexConfig other) {
_luceneUseCompoundFile = other._luceneUseCompoundFile;
_luceneMaxBufferSizeMB = other._luceneMaxBufferSizeMB;
_luceneAnalyzerClass = other._luceneAnalyzerClass;
+ _luceneAnalyzerClassArgs = other._luceneAnalyzerClassArgs;
+ _luceneAnalyzerClassArgTypes = other._luceneAnalyzerClassArgTypes;
+ _luceneQueryParserClass = other._luceneQueryParserClass;
_enablePrefixSuffixMatchingInPhraseQueries =
other._enablePrefixSuffixMatchingInPhraseQueries;
}
public TextIndexConfig build() {
return new TextIndexConfig(false, _fstType, _rawValueForTextIndex,
_enableQueryCache, _useANDForMultiTermQueries,
_stopWordsInclude, _stopWordsExclude, _luceneUseCompoundFile,
_luceneMaxBufferSizeMB, _luceneAnalyzerClass,
- _enablePrefixSuffixMatchingInPhraseQueries);
+ CsvParser.serialize(_luceneAnalyzerClassArgs, false, false),
+ CsvParser.serialize(_luceneAnalyzerClassArgTypes, false, false),
Review Comment:
```suggestion
CsvParser.serialize(_luceneAnalyzerClassArgs, true, false),
CsvParser.serialize(_luceneAnalyzerClassArgTypes, true, false),
```
##########
pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/CsvParser.java:
##########
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.spi.utils;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+
+public class CsvParser {
+ private CsvParser() {
+ // Hide utility class default constructor
+ }
+
+ /**
+ * Parse the input csv string with customizable parsing behavior.
Sometimes the individual values may contain comma
+ * and other white space characters. These characters are sometimes
expected to be part of the actual argument.
+ *
+ * @param input string to split on comma
+ * @param escapeComma if true, we do not split on escaped commas, and we
replace "\," with "," after the split
+ * @param trim whether we should trim each tokenized terms
+ * @return a list of values, empty list if input is empty or null
+ */
+ public static List<String> parse(@Nullable String input, boolean
escapeComma, boolean trim) {
+ if (null == input || input.isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ Stream<String> tokenStream;
+ if (escapeComma) {
+ // Use regular expression to split on "," unless it is "\,"
+ tokenStream = Arrays.stream(input.split("(?<!\\\\),"))
+ .map(s -> s.replace("\\,", ","));
+ } else {
+ tokenStream = Arrays.stream(input.split(","));
+ }
+
+ if (trim) {
+ tokenStream = tokenStream.map(String::trim);
+ }
+
+ return tokenStream.collect(Collectors.toList());
+ }
+
+ /**
+ * Parse the input list of string with customized serialization behavior.
+ * @param input containing a list of string to be serialized
+ * @param escapeComma if true, escape commas by replacing "," with "\,"
before the join
+ * @param trim whether we should trim each tokenized terms before
serialization
+ * @return serialized string representing the input list of string
+ */
+ public static String serialize(List<String> input, boolean escapeComma,
boolean trim) {
+ Stream<String> tokenStream = input.stream();
+ if (escapeComma) {
+ tokenStream = tokenStream.map(s -> s.replaceAll(",", "\\,"));
Review Comment:
```suggestion
tokenStream = tokenStream.map(s -> s.replaceAll(",",
Matcher.quoteReplacement("\\,")));
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
