Skip to content

Commit 48e5773

Browse files
committed
modify method name
1 parent 3ef6a95 commit 48e5773

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,19 +253,19 @@ public static String firstUpperCase(String str) {
253253
return str.substring(0, 1).toUpperCase() + str.substring(1);
254254
}
255255

256-
public static String quoteTable(String table) {
256+
public static String addQuoteForTableName(String table) {
257257
String[] parts = table.split("\\.");
258258
StringBuilder sb = new StringBuilder();
259259
for (int i = 0; i < parts.length; ++i) {
260260
if (i != 0) {
261261
sb.append(".");
262262
}
263-
sb.append(DtStringUtil.quoteColumn(parts[i]));
263+
sb.append(DtStringUtil.addQuoteForColumn(parts[i]));
264264
}
265265
return sb.toString();
266266
}
267267

268-
public static String quoteColumn(String column) {
268+
public static String addQuoteForColumn(String column) {
269269
return getStartQuote() + column + getEndQuote();
270270
}
271271

oracle/oracle-sink/src/main/java/com/dtstack/flink/sql/sink/oracle/OracleSink.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ public void buildSql(String tableName, List<String> fields) {
5757

5858
private void buildInsertSql(String tableName, List<String> fields) {
5959

60-
tableName = DtStringUtil.quoteTable(tableName);
60+
tableName = DtStringUtil.addQuoteForTableName(tableName);
6161
String sqlTmp = "insert into " + tableName + " (${fields}) values (${placeholder})";
6262

6363
List<String> adaptFields = Lists.newArrayList();
64-
fields.forEach(field -> adaptFields.add(DtStringUtil.quoteColumn(field)));
64+
fields.forEach(field -> adaptFields.add(DtStringUtil.addQuoteForColumn(field)));
6565

6666
String fieldsStr = StringUtils.join(adaptFields, ",");
6767
String placeholder = "";
@@ -84,7 +84,7 @@ private void buildInsertSql(String tableName, List<String> fields) {
8484
*/
8585
@Override
8686
public String buildUpdateSql(String tableName, List<String> fieldNames, Map<String, List<String>> realIndexes, List<String> fullField) {
87-
tableName = DtStringUtil.quoteTable(tableName);
87+
tableName = DtStringUtil.addQuoteForTableName(tableName);
8888
StringBuilder sb = new StringBuilder();
8989

9090
sb.append("MERGE INTO " + tableName + " T1 USING "
@@ -112,10 +112,10 @@ public String quoteColumns(List<String> column) {
112112
}
113113

114114
public String quoteColumns(List<String> column, String table) {
115-
String prefix = StringUtils.isBlank(table) ? "" : DtStringUtil.quoteTable(table) + ".";
115+
String prefix = StringUtils.isBlank(table) ? "" : DtStringUtil.addQuoteForTableName(table) + ".";
116116
List<String> list = new ArrayList<>();
117117
for (String col : column) {
118-
list.add(prefix + DtStringUtil.quoteColumn(col));
118+
list.add(prefix + DtStringUtil.addQuoteForColumn(col));
119119
}
120120
return StringUtils.join(list, ",");
121121
}
@@ -148,18 +148,18 @@ protected List<String> keyColList(Map<String, List<String>> realIndexes) {
148148
* @return
149149
*/
150150
public String getUpdateSql(List<String> updateColumn, List<String> fullColumn, String leftTable, String rightTable, List<String> indexCols) {
151-
String prefixLeft = StringUtils.isBlank(leftTable) ? "" : DtStringUtil.quoteTable(leftTable) + ".";
152-
String prefixRight = StringUtils.isBlank(rightTable) ? "" : DtStringUtil.quoteTable(rightTable) + ".";
151+
String prefixLeft = StringUtils.isBlank(leftTable) ? "" : DtStringUtil.addQuoteForTableName(leftTable) + ".";
152+
String prefixRight = StringUtils.isBlank(rightTable) ? "" : DtStringUtil.addQuoteForTableName(rightTable) + ".";
153153
List<String> list = new ArrayList<>();
154154
for (String col : fullColumn) {
155155
// filter index column
156156
if (indexCols == null || indexCols.size() == 0 || containsIgnoreCase(indexCols,col)) {
157157
continue;
158158
}
159159
if (containsIgnoreCase(updateColumn,col)) {
160-
list.add(prefixLeft + DtStringUtil.quoteColumn(col) + "=" + prefixRight + DtStringUtil.quoteColumn(col));
160+
list.add(prefixLeft + DtStringUtil.addQuoteForColumn(col) + "=" + prefixRight + DtStringUtil.addQuoteForColumn(col));
161161
} else {
162-
list.add(prefixLeft + DtStringUtil.quoteColumn(col) + "=null");
162+
list.add(prefixLeft + DtStringUtil.addQuoteForColumn(col) + "=null");
163163
}
164164
}
165165
return StringUtils.join(list, ",");
@@ -176,7 +176,7 @@ public String updateKeySql(Map<String, List<String>> updateKey) {
176176
for (Map.Entry<String, List<String>> entry : updateKey.entrySet()) {
177177
List<String> colList = new ArrayList<>();
178178
for (String col : entry.getValue()) {
179-
colList.add("T1." + DtStringUtil.quoteColumn(col) + "=T2." + DtStringUtil.quoteColumn(col));
179+
colList.add("T1." + DtStringUtil.addQuoteForColumn(col) + "=T2." + DtStringUtil.addQuoteForColumn(col));
180180
}
181181
exprList.add(StringUtils.join(colList, " AND "));
182182
}
@@ -195,7 +195,7 @@ public String makeValues(List<String> column) {
195195
if (i != 0) {
196196
sb.append(",");
197197
}
198-
sb.append("? " + DtStringUtil.quoteColumn(column.get(i)));
198+
sb.append("? " + DtStringUtil.addQuoteForColumn(column.get(i)));
199199
}
200200
sb.append(" FROM DUAL");
201201
return sb.toString();

rdb/rdb-sink/src/main/java/com/dtstack/flink/sql/sink/rdb/format/ExtendOutputFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public boolean isReplaceInsertQuery() throws SQLException {
6363
*/
6464
public void fillRealIndexes() throws SQLException {
6565
Map<String, List<String>> map = Maps.newHashMap();
66-
ResultSet rs = getDbConn().getMetaData().getIndexInfo(null, null, DtStringUtil.quoteTable(getTableName()), true, false);
66+
ResultSet rs = getDbConn().getMetaData().getIndexInfo(null, null, DtStringUtil.addQuoteForTableName(getTableName()), true, false);
6767

6868
while (rs.next()) {
6969
String indexName = rs.getString("INDEX_NAME");

0 commit comments

Comments
 (0)