Skip to content

Commit 55b22b4

Browse files
修改一部分string.split(正则表达式)错误替换成StringUtils.split()
1 parent a817b62 commit 55b22b4

File tree

8 files changed

+9
-11
lines changed

8 files changed

+9
-11
lines changed

core/src/main/java/com/dtstack/flink/sql/parser/CreateTableParser.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import com.dtstack.flink.sql.util.DtStringUtil;
2424
import com.google.common.collect.Maps;
25-
import org.apache.commons.lang3.StringUtils;
2625

2726
import java.util.List;
2827
import java.util.Map;
@@ -70,7 +69,7 @@ public void parseSql(String sql, SqlTree sqlTree) {
7069
}
7170

7271
private Map parseProp(String propsStr){
73-
String[] strs = StringUtils.split(propsStr.trim(), "'\\s*,");
72+
String[] strs = propsStr.trim().split("'\\s*,");
7473
Map<String, Object> propMap = Maps.newHashMap();
7574
for(int i=0; i<strs.length; i++){
7675
List<String> ss = DtStringUtil.splitIgnoreQuota(strs[i], '=');

core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ private boolean checkFieldsInfo(CreateTmpTableParser.SqlParserResult result, Tab
895895
String fieldsInfo = result.getFieldsInfoStr();
896896
String[] fields = StringUtils.split(fieldsInfo, ",");
897897
for (int i = 0; i < fields.length; i++) {
898-
String[] filed = StringUtils.split(fields[i], "\\s");
898+
String[] filed = fields[i].split("\\s");
899899
if (filed.length < 2 || fields.length != table.getSchema().getColumnNames().length){
900900
return false;
901901
} else {

core/src/main/java/com/dtstack/flink/sql/table/AbsTableParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void parseFieldsInfo(String fieldsInfo, TableInfo tableInfo){
9292
throw new RuntimeException(String.format("table [%s],exists field empty.", tableInfo.getName()));
9393
}
9494

95-
String[] filedInfoArr = StringUtils.split(fieldRow, "\\s+");
95+
String[] filedInfoArr = fieldRow.split("\\s+");
9696
if(filedInfoArr.length < 2 ){
9797
throw new RuntimeException(String.format("table [%s] field [%s] format error.", tableInfo.getName(), fieldRow));
9898
}

core/src/main/java/com/dtstack/flink/sql/util/DtStringUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public static String addJdbcParam(String dbUrl, Map<String, String> addParams, b
180180
return dbUrl;
181181
}
182182

183-
String[] splits = StringUtils.split(dbUrl, "\\?");
183+
String[] splits = dbUrl.split("\\?");
184184
String preStr = splits[0];
185185
Map<String, String> params = Maps.newHashMap();
186186
if(splits.length > 1){

elasticsearch5/elasticsearch5-sink/src/main/java/com/dtstack/flink/sql/sink/elasticsearch/EsUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static Map<String, Object> rowToJsonMap(Row row, List<String> fields, Lis
4242
int i = 0;
4343
for(; i < fields.size(); ++i) {
4444
String field = fields.get(i);
45-
String[] parts = StringUtils.split(field, "\\.");
45+
String[] parts = field.split("\\.");
4646
Map<String, Object> currMap = jsonMap;
4747
for(int j = 0; j < parts.length - 1; ++j) {
4848
String key = parts[j];

hbase/hbase-side/hbase-side-core/src/main/java/com/dtstack/flink/sql/side/hbase/RowKeyBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void init(String rowKeyTempl){
5959
fieldCols = infoAlias;
6060
}
6161

62-
String[] fieldArr = StringUtils.split(fieldCols, "\\+");
62+
String[] fieldArr = fieldCols.split("\\+");
6363
List<ReplaceInfo> fieldList = Lists.newArrayList();
6464
for(String oneField : fieldArr){
6565
ReplaceInfo replaceInfo = getReplaceInfo(oneField);
@@ -109,7 +109,7 @@ private String buildStr(List<ReplaceInfo> fieldList, Map<String, Object> refData
109109

110110
public static String[] splitIgnoreQuotaBrackets(String str, String delimiter){
111111
String splitPatternStr = delimiter + "(?![^()]*+\\))(?![^{}]*+})(?![^\\[\\]]*+\\])";
112-
return StringUtils.split(str, splitPatternStr);
112+
return str.split(splitPatternStr);
113113
}
114114

115115
/**

hbase/hbase-side/hbase-side-core/src/main/java/com/dtstack/flink/sql/side/hbase/table/HbaseSideParser.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.dtstack.flink.sql.table.AbsSideTableParser;
2424
import com.dtstack.flink.sql.table.TableInfo;
2525
import com.dtstack.flink.sql.util.MathUtil;
26-
import org.apache.commons.lang3.StringUtils;
2726

2827
import java.util.Map;
2928
import java.util.regex.Matcher;
@@ -84,7 +83,7 @@ private void dealField(Matcher matcher, TableInfo tableInfo){
8483
String filedDefineStr = matcher.group(1);
8584
String aliasStr = matcher.group(2);
8685

87-
String[] filedInfoArr = StringUtils.split(filedDefineStr, "\\s+");
86+
String[] filedInfoArr = filedDefineStr.split("\\s+");
8887
if(filedInfoArr.length < 2){
8988
throw new RuntimeException(String.format("table [%s] field [%s] format error.", tableInfo.getName(), matcher.group(0)));
9089
}

hbase/hbase-sink/src/main/java/com/dtstack/flink/sql/sink/hbase/table/HbaseSinkParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void parseFieldsInfo(String fieldsInfo, HbaseTableInfo tableInfo){
8181
for(String fieldRow : fieldRows){
8282
fieldRow = fieldRow.trim();
8383

84-
String[] filedInfoArr = StringUtils.split(fieldRow, "\\s+");
84+
String[] filedInfoArr = fieldRow.split("\\s+");
8585
if(filedInfoArr.length < 2 ){
8686
throw new RuntimeException(String.format("table [%s] field [%s] format error.", tableInfo.getName(), fieldRow));
8787
}

0 commit comments

Comments
 (0)