From 814840f8267bba94376ab48df4974b1c7ce615ec Mon Sep 17 00:00:00 2001 From: "Arthur.Zhang" Date: Sat, 10 Jul 2021 10:10:41 +0800 Subject: [PATCH] [refactor] Make Regex more simple and clear (#6141) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Remove Redundant character escape ‘\\}’ and ‘\\:’ 2. Replace ‘{0,1}’ to ‘?’ --- .../src/main/java/org/apache/doris/common/ConfigBase.java | 2 +- .../src/main/java/org/apache/doris/common/util/TimeUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ConfigBase.java b/fe/fe-core/src/main/java/org/apache/doris/common/ConfigBase.java index dc16cf2ff7..1011ead7e9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ConfigBase.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ConfigBase.java @@ -120,7 +120,7 @@ public class ConfigBase { // the "CONFIG_VALUE" should be replaced be env variable CONFIG_VALUE private void replacedByEnv(Properties props) throws Exception { // pattern to match string like "{CONFIG_VALUE}" - Pattern pattern = Pattern.compile("\\$\\{([^\\}]*)\\}"); + Pattern pattern = Pattern.compile("\\$\\{([^}]*)\\}"); for (String key : props.stringPropertyNames()) { String value = props.getProperty(key); Matcher m = pattern.matcher(value); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/TimeUtils.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/TimeUtils.java index 4feded8076..11fee36e1b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/TimeUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/TimeUtils.java @@ -73,7 +73,7 @@ public class TimeUtils { + "((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))" + "(\\s(((0?[0-9])|([1][0-9])|([2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$"); - private static final Pattern TIMEZONE_OFFSET_FORMAT_REG = Pattern.compile("^[+-]{0,1}\\d{1,2}\\:\\d{2}$"); + private static final Pattern TIMEZONE_OFFSET_FORMAT_REG = Pattern.compile("^[+-]?\\d{1,2}:\\d{2}$"); public static Date MIN_DATE = null; public static Date MAX_DATE = null;