Skip to content

Commit 39d34a3

Browse files
shenyunlongshenyunlong
committed
mvn format code
 Link: https://code.alibaba-inc.com/oceanbase/obkv-table-client-java/codereview/11943370 * format code
1 parent c853af2 commit 39d34a3

File tree

5 files changed

+68
-63
lines changed

5 files changed

+68
-63
lines changed

‎src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,8 +1507,8 @@ public Map<String, Object> execute(ObPair<Long, ObTable> obPair) throws Exceptio
15071507
checkObTableOperationResult(obTable.getIp(), obTable.getPort(), request, result);
15081508

15091509
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1510-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "GET", endpoint, rowKey,
1511-
(ObTableOperationResult) result, getTableTime - startTime,
1510+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "GET", endpoint,
1511+
rowKey, (ObTableOperationResult) result, getTableTime - startTime,
15121512
System.currentTimeMillis() - getTableTime));
15131513
return ((ObTableOperationResult) result).getEntity().getSimpleProperties();
15141514
}
@@ -1543,8 +1543,8 @@ public Long execute(ObPair<Long, ObTable> obPair) throws Exception {
15431543
request.setPartitionId(partId);
15441544
ObPayload result = obPair.getRight().execute(request);
15451545
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1546-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "UPDATE", endpoint, rowKey,
1547-
(ObTableOperationResult) result, getTableTime - start,
1546+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "UPDATE", endpoint,
1547+
rowKey, (ObTableOperationResult) result, getTableTime - start,
15481548
System.currentTimeMillis() - getTableTime));
15491549
checkObTableOperationResult(obTable.getIp(), obTable.getPort(), request, result);
15501550
return ((ObTableOperationResult) result).getAffectedRows();
@@ -1582,8 +1582,8 @@ public ObPayload execute(ObPair<Long, ObTable> obPair) throws Exception {
15821582
request.setPartitionId(partId);
15831583
ObPayload result = obTable.execute(request);
15841584
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1585-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "UPDATE", endpoint, rowKey,
1586-
(ObTableOperationResult) result, TableTime - start,
1585+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "UPDATE",
1586+
endpoint, rowKey, (ObTableOperationResult) result, TableTime - start,
15871587
System.currentTimeMillis() - TableTime));
15881588
checkResult(obTable.getIp(), obTable.getPort(), request, result);
15891589
return result;
@@ -1625,10 +1625,10 @@ private String logMessage(String traceId, String tableName, String methodName, S
16251625
String res = String.valueOf(result.getAffectedRows());
16261626

16271627
StringBuilder stringBuilder = new StringBuilder();
1628-
stringBuilder.append(traceId).append(",").append(database).append(",").append(tableName).append(",")
1629-
.append(methodName).append(",").append(endpoint).append(",").append(argsValue)
1630-
.append(",").append(result.toString()).append(",").append(res).append(",")
1631-
.append(routeTableTime).append(",").append(executeTime).append(",")
1628+
stringBuilder.append(traceId).append(",").append(database).append(",").append(tableName)
1629+
.append(",").append(methodName).append(",").append(endpoint).append(",")
1630+
.append(argsValue).append(",").append(result.toString()).append(",").append(res)
1631+
.append(",").append(routeTableTime).append(",").append(executeTime).append(",")
16321632
.append(executeTime + routeTableTime);
16331633
return stringBuilder.toString();
16341634
}
@@ -1658,10 +1658,10 @@ private String logMessage(String traceId, String tableName, String methodName, S
16581658
String errorCodeStringValue = resultCode.toString();
16591659

16601660
StringBuilder stringBuilder = new StringBuilder();
1661-
stringBuilder.append(traceId).append(",").append(database).append(",").append(tableName).append(",")
1662-
.append(methodName).append(",").append(endpoint).append(",").append(argsValue)
1663-
.append(",").append(errorCodeStringValue).append(",").append(res).append(",")
1664-
.append(routeTableTime).append(",").append(executeTime).append(",")
1661+
stringBuilder.append(traceId).append(",").append(database).append(",").append(tableName)
1662+
.append(",").append(methodName).append(",").append(endpoint).append(",")
1663+
.append(argsValue).append(",").append(errorCodeStringValue).append(",").append(res)
1664+
.append(",").append(routeTableTime).append(",").append(executeTime).append(",")
16651665
.append(executeTime + routeTableTime);
16661666
return stringBuilder.toString();
16671667
}
@@ -1694,8 +1694,8 @@ public Long execute(ObPair<Long, ObTable> obPair) throws Exception {
16941694
request.setPartitionId(partId);
16951695
ObPayload result = obPair.getRight().execute(request);
16961696
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1697-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "DELETE", endpoint, rowKey,
1698-
(ObTableOperationResult) result, getTableTime - start,
1697+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "DELETE", endpoint,
1698+
rowKey, (ObTableOperationResult) result, getTableTime - start,
16991699
System.currentTimeMillis() - getTableTime));
17001700
checkObTableOperationResult(obTable.getIp(), obTable.getPort(), request, result);
17011701
return ((ObTableOperationResult) result).getAffectedRows();
@@ -1730,8 +1730,8 @@ public ObPayload execute(ObPair<Long, ObTable> obPair) throws Exception {
17301730
request.setPartitionId(partId);
17311731
ObPayload result = obTable.execute(request);
17321732
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1733-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "DELETE", endpoint, rowKey,
1734-
(ObTableOperationResult) result, TableTime - start,
1733+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "DELETE",
1734+
endpoint, rowKey, (ObTableOperationResult) result, TableTime - start,
17351735
System.currentTimeMillis() - TableTime));
17361736
checkResult(obTable.getIp(), obTable.getPort(), request, result);
17371737
return result;
@@ -1767,8 +1767,8 @@ public Long execute(ObPair<Long, ObTable> obPair) throws Exception {
17671767
request.setPartitionId(partId);
17681768
ObPayload result = obPair.getRight().execute(request);
17691769
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1770-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INSERT", endpoint, rowKey,
1771-
(ObTableOperationResult) result, getTableTime - start,
1770+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INSERT", endpoint,
1771+
rowKey, (ObTableOperationResult) result, getTableTime - start,
17721772
System.currentTimeMillis() - getTableTime));
17731773
checkObTableOperationResult(obTable.getIp(), obTable.getPort(), request, result);
17741774
return ((ObTableOperationResult) result).getAffectedRows();
@@ -1806,8 +1806,8 @@ public ObPayload execute(ObPair<Long, ObTable> obPair) throws Exception {
18061806
request.setPartitionId(partId);
18071807
ObPayload result = obTable.execute(request);
18081808
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1809-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INSERT", endpoint, rowKey,
1810-
(ObTableOperationResult) result, TableTime - start,
1809+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INSERT",
1810+
endpoint, rowKey, (ObTableOperationResult) result, TableTime - start,
18111811
System.currentTimeMillis() - TableTime));
18121812
checkResult(obTable.getIp(), obTable.getPort(), request, result);
18131813
return result;
@@ -1843,8 +1843,8 @@ public Long execute(ObPair<Long, ObTable> obPair) throws Exception {
18431843
request.setPartitionId(partId);
18441844
ObPayload result = obPair.getRight().execute(request);
18451845
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1846-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "REPLACE", endpoint, rowKey,
1847-
(ObTableOperationResult) result, getTableTime - start,
1846+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "REPLACE",
1847+
endpoint, rowKey, (ObTableOperationResult) result, getTableTime - start,
18481848
System.currentTimeMillis() - getTableTime));
18491849
checkObTableOperationResult(obTable.getIp(), obTable.getPort(), request, result);
18501850
return ((ObTableOperationResult) result).getAffectedRows();
@@ -1882,8 +1882,8 @@ public ObPayload execute(ObPair<Long, ObTable> obPair) throws Exception {
18821882
request.setPartitionId(partId);
18831883
ObPayload result = obTable.execute(request);
18841884
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1885-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "REPLACE", endpoint, rowKey,
1886-
(ObTableOperationResult) result, TableTime - start,
1885+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "REPLACE",
1886+
endpoint, rowKey, (ObTableOperationResult) result, TableTime - start,
18871887
System.currentTimeMillis() - TableTime));
18881888
checkResult(obTable.getIp(), obTable.getPort(), request, result);
18891889
return result;
@@ -1919,8 +1919,8 @@ public Long execute(ObPair<Long, ObTable> obPair) throws Exception {
19191919
request.setPartitionId(partId);
19201920
ObPayload result = obPair.getRight().execute(request);
19211921
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1922-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INERT_OR_UPDATE", endpoint, rowKey,
1923-
(ObTableOperationResult) result, getTableTime - start,
1922+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INERT_OR_UPDATE",
1923+
endpoint, rowKey, (ObTableOperationResult) result, getTableTime - start,
19241924
System.currentTimeMillis() - getTableTime));
19251925
checkObTableOperationResult(obTable.getIp(), obTable.getPort(), request, result);
19261926
return ((ObTableOperationResult) result).getAffectedRows();
@@ -1959,9 +1959,9 @@ public ObPayload execute(ObPair<Long, ObTable> obPair) throws Exception {
19591959
request.setPartitionId(partId);
19601960
ObPayload result = obTable.execute(request);
19611961
String endpoint = obTable.getIp() + ":" + obTable.getPort();
1962-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INERT_OR_UPDATE", endpoint, rowKey,
1963-
(ObTableOperationResult) result, TableTime - start,
1964-
System.currentTimeMillis() - TableTime));
1962+
MONITOR.info(logMessage(tableName, formatTraceMessage(request),
1963+
"INERT_OR_UPDATE", endpoint, rowKey, (ObTableOperationResult) result,
1964+
TableTime - start, System.currentTimeMillis() - TableTime));
19651965
checkResult(obTable.getIp(), obTable.getPort(), request, result);
19661966
return result;
19671967
}
@@ -2008,8 +2008,8 @@ public Map<String, Object> execute(ObPair<Long, ObTable> obPair) throws Exceptio
20082008
request.setPartitionId(partId);
20092009
ObPayload result = obPair.getRight().execute(request);
20102010
String endpoint = obTable.getIp() + ":" + obTable.getPort();
2011-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INCREMENT", endpoint, rowKey,
2012-
(ObTableOperationResult) result, getTableTime - start,
2011+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INCREMENT",
2012+
endpoint, rowKey, (ObTableOperationResult) result, getTableTime - start,
20132013
System.currentTimeMillis() - getTableTime));
20142014
checkObTableOperationResult(obTable.getIp(), obTable.getPort(), request, result);
20152015
return ((ObTableOperationResult) result).getEntity().getSimpleProperties();
@@ -2053,8 +2053,8 @@ public ObPayload execute(ObPair<Long, ObTable> obPair) throws Exception {
20532053
request.setPartitionId(partId);
20542054
ObPayload result = obTable.execute(request);
20552055
String endpoint = obTable.getIp() + ":" + obTable.getPort();
2056-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INCREMENT", endpoint, rowKey,
2057-
(ObTableOperationResult) result, TableTime - start,
2056+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "INCREMENT",
2057+
endpoint, rowKey, (ObTableOperationResult) result, TableTime - start,
20582058
System.currentTimeMillis() - TableTime));
20592059
checkResult(obTable.getIp(), obTable.getPort(), request, result);
20602060
return result;
@@ -2087,8 +2087,8 @@ public Map<String, Object> execute(ObPair<Long, ObTable> obPair) throws Exceptio
20872087
request.setPartitionId(partId);
20882088
ObPayload result = obPair.getRight().execute(request);
20892089
String endpoint = obTable.getIp() + ":" + obTable.getPort();
2090-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "APPEND", endpoint, rowKey,
2091-
(ObTableOperationResult) result, getTableTime - start,
2090+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "APPEND", endpoint,
2091+
rowKey, (ObTableOperationResult) result, getTableTime - start,
20922092
System.currentTimeMillis() - getTableTime));
20932093
checkObTableOperationResult(obTable.getIp(), obTable.getPort(), request, result);
20942094
return ((ObTableOperationResult) result).getEntity().getSimpleProperties();
@@ -2127,8 +2127,8 @@ public ObPayload execute(ObPair<Long, ObTable> obPair) throws Exception {
21272127
request.setPartitionId(partId);
21282128
ObPayload result = obTable.execute(request);
21292129
String endpoint = obTable.getIp() + ":" + obTable.getPort();
2130-
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "APPEND", endpoint, rowKey,
2131-
(ObTableOperationResult) result, TableTime - start,
2130+
MONITOR.info(logMessage(tableName, formatTraceMessage(request), "APPEND",
2131+
endpoint, rowKey, (ObTableOperationResult) result, TableTime - start,
21322132
System.currentTimeMillis() - TableTime));
21332133
checkResult(obTable.getIp(), obTable.getPort(), request, result);
21342134
return result;
@@ -2188,9 +2188,9 @@ public ObPayload execute(ObPair<Long, ObTable> obPair) throws Exception {
21882188
} else {
21892189
curRowKey = rowKey;
21902190
}
2191-
MONITOR.info(logMessage(formatTraceMessage(request), tableQuery.toString(), type.toString(), endpoint,
2192-
curRowKey, (ObTableQueryAndMutateResult) result, TableTime - start,
2193-
System.currentTimeMillis() - TableTime));
2191+
MONITOR.info(logMessage(formatTraceMessage(request), tableQuery.toString(),
2192+
type.toString(), endpoint, curRowKey, (ObTableQueryAndMutateResult) result,
2193+
TableTime - start, System.currentTimeMillis() - TableTime));
21942194
checkResult(obTable.getIp(), obTable.getPort(), request, result);
21952195
return result;
21962196
}

‎src/main/java/com/alipay/oceanbase/rpc/bolt/transport/ObTableConnection.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ private synchronized void login() throws Exception {
153153
}
154154

155155
String endpoint = obTable.getIp() + ":" + obTable.getPort();
156-
MONITOR.info(logMessage(formatTraceMessage(request), "LOGIN", endpoint, System.currentTimeMillis() - start));
156+
MONITOR.info(logMessage(formatTraceMessage(request), "LOGIN", endpoint,
157+
System.currentTimeMillis() - start));
157158
if (tries >= maxTryTimes) {
158159
throw new ObTableServerConnectException("login failed after max " + maxTryTimes
159160
+ " tries " + TraceUtil.formatIpPort(obTable),
@@ -290,7 +291,8 @@ private String logMessage(String traceId, String methodName, String endpoint, lo
290291
}
291292

292293
StringBuilder stringBuilder = new StringBuilder();
293-
stringBuilder.append(traceId).append(",").append(methodName).append(",").append(endpoint).append(",").append(executeTime);
294+
stringBuilder.append(traceId).append(",").append(methodName).append(",").append(endpoint)
295+
.append(",").append(executeTime);
294296
return stringBuilder.toString();
295297
}
296298

0 commit comments

Comments
 (0)