This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch iotdb in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 0e50f480b1e2bab6a2ccf87dc6d93f3891e97491 Author: Lin Xintao <[email protected]> AuthorDate: Sun Oct 13 20:10:16 2024 +0800 remove get escape code and change the function in filteroperator --- .../src/main/codegen/templates/FilterOperatorsTemplate.ftl | 4 +--- .../java/org/apache/tsfile/common/regexp/LikePattern.java | 14 -------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/java/tsfile/src/main/codegen/templates/FilterOperatorsTemplate.ftl b/java/tsfile/src/main/codegen/templates/FilterOperatorsTemplate.ftl index ee1ae842..77d394d1 100644 --- a/java/tsfile/src/main/codegen/templates/FilterOperatorsTemplate.ftl +++ b/java/tsfile/src/main/codegen/templates/FilterOperatorsTemplate.ftl @@ -51,8 +51,6 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static org.apache.tsfile.common.regexp.LikePattern.getEscapeCharacter; - /* * This class is generated using freemarker and the ${.template_name} template. */ @@ -1294,7 +1292,7 @@ public final class ${className} { LikePattern.compile( ReadWriteIOUtils.readString(buffer), ReadWriteIOUtils.readBool(buffer) - ? getEscapeCharacter(Optional.of(ReadWriteIOUtils.readString(buffer))) + ? Optional.of(ReadWriteIOUtils.readString(buffer).charAt(0)) : Optional.empty()); } diff --git a/java/tsfile/src/main/java/org/apache/tsfile/common/regexp/LikePattern.java b/java/tsfile/src/main/java/org/apache/tsfile/common/regexp/LikePattern.java index b7633779..bda6ef3a 100644 --- a/java/tsfile/src/main/java/org/apache/tsfile/common/regexp/LikePattern.java +++ b/java/tsfile/src/main/java/org/apache/tsfile/common/regexp/LikePattern.java @@ -74,7 +74,6 @@ public class LikePattern { @Override public String toString() { - // 既要有pattern，又考虑escape return "LikePattern{" + "pattern='" + pattern @@ -82,17 +81,4 @@ public class LikePattern { + (escape.map(character -> ", escape=" + character).orElse("")) + '}'; } - - public static Optional<Character> getEscapeCharacter(Optional<String> escape) { - if (escape.isPresent()) { - String escapeString = escape.get(); - if (escapeString.length() == 1) { - return Optional.of(escapeString.charAt(0)); - } else { - throw new IllegalArgumentException("Escape string must be a single character"); - } - } else { - return Optional.empty(); - } - } }
