Skip to content

Commit 271caa0

Browse files
pzygielopzygielo
committed
UnnecessaryStringBuilder - apply rewrite and enable EP
1 parent 4007ab7 commit 271caa0

22 files changed

Lines changed: 212 additions & 553 deletions

‎mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/persist/api/TransactionInfo.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@ public Object clone() {
237237

238238
@Override
239239
public String toString() {
240-
return (new StringBuilder(128).append("TransactionInfo[type=").append(toString(type)).append(", state=").append(state).append(", home broker=")
241-
.append(txnHomeBroker).append(", brokers=").append(Arrays.toString(txnBkrs)).append(']').toString());
240+
return "TransactionInfo[type=" + toString(type) + ", state=" + state + ", home broker=" + txnHomeBroker + ", brokers=" + Arrays.toString(txnBkrs) + ']';
242241
}
243242

244243
public static String toString(int type) {

‎mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/BrokerDAOImpl.java‎

Lines changed: 20 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -75,84 +75,53 @@ class BrokerDAOImpl extends BaseDAOImpl implements BrokerDAO {
7575

7676
tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
7777

78-
insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(URL_COLUMN).append(", ")
79-
.append(VERSION_COLUMN).append(", ").append(STATE_COLUMN).append(", ").append(TAKEOVER_BROKER_COLUMN).append(", ").append(HEARTBEAT_TS_COLUMN)
80-
.append(") VALUES ( ?, ?, ?, ?, ?, ? )").toString();
78+
insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + URL_COLUMN + ", " + VERSION_COLUMN + ", " + STATE_COLUMN + ", " + TAKEOVER_BROKER_COLUMN + ", " + HEARTBEAT_TS_COLUMN + ") VALUES ( ?, ?, ?, ?, ?, ? )";
8179

82-
updateVersionSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(VERSION_COLUMN).append(" = ? ").append(" WHERE ")
83-
.append(ID_COLUMN).append(" = ?").toString();
80+
updateVersionSQL = "UPDATE " + tableName + " SET " + VERSION_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?";
8481

85-
updateURLSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(URL_COLUMN).append(" = ? ").append(" WHERE ")
86-
.append(ID_COLUMN).append(" = ?").toString();
82+
updateURLSQL = "UPDATE " + tableName + " SET " + URL_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?";
8783

88-
resetTakeoverBrokerSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TAKEOVER_BROKER_COLUMN).append(" = NULL, ")
89-
.append(STATE_COLUMN).append(" = ? ").append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(TAKEOVER_BROKER_COLUMN)
90-
.append(" IS NOT NULL").append(" AND ").append(STATE_COLUMN).append(" = ").append(BrokerState.I_FAILOVER_COMPLETE).toString();
84+
resetTakeoverBrokerSQL = "UPDATE " + tableName + " SET " + TAKEOVER_BROKER_COLUMN + " = NULL, " + STATE_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?" + " AND " + TAKEOVER_BROKER_COLUMN + " IS NOT NULL" + " AND " + STATE_COLUMN + " = " + (BrokerState.I_FAILOVER_COMPLETE);
9185

92-
restoreOnTakeoverFailSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TAKEOVER_BROKER_COLUMN).append(" = NULL, ")
93-
.append(STATE_COLUMN).append(" = ? ").append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN).append(" = ")
94-
.append(BrokerState.I_FAILOVER_STARTED).append(" AND ").append(TAKEOVER_BROKER_COLUMN).append(" = ?").toString();
86+
restoreOnTakeoverFailSQL = "UPDATE " + tableName + " SET " + TAKEOVER_BROKER_COLUMN + " = NULL, " + STATE_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = " + (BrokerState.I_FAILOVER_STARTED) + " AND " + TAKEOVER_BROKER_COLUMN + " = ?";
9587

96-
restoreHeartbeatOnTakeoverFailSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(HEARTBEAT_TS_COLUMN)
97-
.append(" = ? ").append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN).append(" = ")
98-
.append(BrokerState.I_FAILOVER_STARTED).append(" AND ").append(HEARTBEAT_TS_COLUMN).append(" = ? ").append(" AND ")
99-
.append(TAKEOVER_BROKER_COLUMN).append(" = ?").toString();
88+
restoreHeartbeatOnTakeoverFailSQL = "UPDATE " + tableName + " SET " + HEARTBEAT_TS_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = " + (BrokerState.I_FAILOVER_STARTED) + " AND " + HEARTBEAT_TS_COLUMN + " = ? " + " AND " + TAKEOVER_BROKER_COLUMN + " = ?";
10089

101-
updateHeartbeatSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(HEARTBEAT_TS_COLUMN).append(" = ?")
102-
.append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
90+
updateHeartbeatSQL = "UPDATE " + tableName + " SET " + HEARTBEAT_TS_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?";
10391

104-
updateHeartbeatAndCheckStateSQL = new StringBuilder(updateHeartbeatSQL).append(" AND ").append(HEARTBEAT_TS_COLUMN).append(" = ?").append(" AND ")
105-
.append(STATE_COLUMN).append(" NOT IN (").append(BrokerState.I_FAILOVER_PENDING).append(", ").append(BrokerState.I_FAILOVER_STARTED)
106-
.append(", ").append(BrokerState.I_FAILOVER_COMPLETE).append(", ").append(BrokerState.I_FAILOVER_FAILED).append(')').toString();
92+
updateHeartbeatAndCheckStateSQL = updateHeartbeatSQL + " AND " + HEARTBEAT_TS_COLUMN + " = ?" + " AND " + STATE_COLUMN + " NOT IN (" + (BrokerState.I_FAILOVER_PENDING) + ", " + (BrokerState.I_FAILOVER_STARTED) + ", " + (BrokerState.I_FAILOVER_COMPLETE) + ", " + (BrokerState.I_FAILOVER_FAILED) + ')';
10793

108-
updateStateThisBrokerSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(STATE_COLUMN).append(" = ?")
109-
.append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN).append(" = ?").append(" AND ")
110-
.append(TAKEOVER_BROKER_COLUMN).append(" IS NULL ").toString();
94+
updateStateThisBrokerSQL = "UPDATE " + tableName + " SET " + STATE_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = ?" + " AND " + TAKEOVER_BROKER_COLUMN + " IS NULL ";
11195

112-
updateStateOtherBrokerSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(STATE_COLUMN).append(" = ?")
113-
.append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN).append(" = ?").append(" AND ")
114-
.append(TAKEOVER_BROKER_COLUMN).append(" = ?").toString();
96+
updateStateOtherBrokerSQL = "UPDATE " + tableName + " SET " + STATE_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = ?" + " AND " + TAKEOVER_BROKER_COLUMN + " = ?";
11597

116-
takeoverSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TAKEOVER_BROKER_COLUMN).append(" = ?, ")
117-
.append(STATE_COLUMN).append(" = ?, ").append(HEARTBEAT_TS_COLUMN).append(" = ?").append(" WHERE ").append(ID_COLUMN).append(" = ?")
118-
.append(" AND ").append(STATE_COLUMN).append(" = ?").append(" AND ").append(HEARTBEAT_TS_COLUMN).append(" = ?").append(" AND ")
119-
.append(TAKEOVER_BROKER_COLUMN).append(" is NULL").toString();
98+
takeoverSQL = "UPDATE " + tableName + " SET " + TAKEOVER_BROKER_COLUMN + " = ?, " + STATE_COLUMN + " = ?, " + HEARTBEAT_TS_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = ?" + " AND " + HEARTBEAT_TS_COLUMN + " = ?" + " AND " + TAKEOVER_BROKER_COLUMN + " is NULL";
12099

121-
deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
100+
deleteSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
122101

123102
/*
124103
* All the supported store sessions for a broker is kept in the session table but for convenience we will load the
125104
* current store session when load the broker info. If a broker doesn't have a current store session, i.e. taken over by
126105
* another broker, then its value will be 0.
127106
*/
128107

129-
selectAllSQL = new StringBuilder(128).append("SELECT bTbl.").append(ID_COLUMN).append(", ").append(URL_COLUMN).append(", ").append(VERSION_COLUMN)
130-
.append(", ").append(STATE_COLUMN).append(", ").append(TAKEOVER_BROKER_COLUMN).append(", ").append(HEARTBEAT_TS_COLUMN).append(", sTbl.")
131-
.append(StoreSessionDAO.ID_COLUMN).append(" AS ").append(STORE_SESSION_ID_COLUMN).append(" FROM ").append(tableName).append(" bTbl LEFT JOIN ")
132-
.append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sTbl ON bTbl.").append(ID_COLUMN).append(" = sTbl.")
133-
.append(StoreSessionDAO.BROKER_ID_COLUMN).append(" AND sTbl.").append(StoreSessionDAO.IS_CURRENT_COLUMN).append(" = 1").toString();
108+
selectAllSQL = "SELECT bTbl." + ID_COLUMN + ", " + URL_COLUMN + ", " + VERSION_COLUMN + ", " + STATE_COLUMN + ", " + TAKEOVER_BROKER_COLUMN + ", " + HEARTBEAT_TS_COLUMN + ", sTbl." + (StoreSessionDAO.ID_COLUMN) + " AS " + STORE_SESSION_ID_COLUMN + " FROM " + tableName + " bTbl LEFT JOIN " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sTbl ON bTbl." + ID_COLUMN + " = sTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " AND sTbl." + (StoreSessionDAO.IS_CURRENT_COLUMN) + " = 1";
134109

135-
selectAllByStateSQL = new StringBuilder(128).append(selectAllSQL).append(" WHERE bTbl.").append(STATE_COLUMN).append(" = ?").toString();
110+
selectAllByStateSQL = selectAllSQL + " WHERE bTbl." + STATE_COLUMN + " = ?";
136111

137-
selectSQL = new StringBuilder(128).append(selectAllSQL).append(" WHERE bTbl.").append(ID_COLUMN).append(" = ?").toString();
112+
selectSQL = selectAllSQL + " WHERE bTbl." + ID_COLUMN + " = ?";
138113

139-
selectHeartbeatSQL = new StringBuilder(128).append("SELECT ").append(HEARTBEAT_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
140-
.append(ID_COLUMN).append(" = ?").toString();
114+
selectHeartbeatSQL = "SELECT " + HEARTBEAT_TS_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
141115

142-
selectAllHeartbeatsSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(", ").append(HEARTBEAT_TS_COLUMN).append(" FROM ")
143-
.append(tableName).toString();
116+
selectAllHeartbeatsSQL = "SELECT " + ID_COLUMN + ", " + HEARTBEAT_TS_COLUMN + " FROM " + tableName;
144117

145-
selectStateSQL = new StringBuilder(128).append("SELECT ").append(STATE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
146-
.append(" = ?").toString();
118+
selectStateSQL = "SELECT " + STATE_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
147119

148-
selectAllStatesSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(", ").append(STATE_COLUMN).append(" FROM ").append(tableName)
149-
.toString();
120+
selectAllStatesSQL = "SELECT " + ID_COLUMN + ", " + STATE_COLUMN + " FROM " + tableName;
150121

151122
// SQL that can be embedded in EXISTS clause to check if the specified
152123
// broker is being takenover (uses by other DAOs)
153-
selectIsBeingTakenOverSQL = new StringBuilder(128).append("SELECT 1 FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ? AND ")
154-
.append(STATE_COLUMN).append(" IN (").append(BrokerState.I_FAILOVER_PENDING).append(", ").append(BrokerState.I_FAILOVER_STARTED).append(", ")
155-
.append(BrokerState.I_FAILOVER_COMPLETE).append(", ").append(BrokerState.I_FAILOVER_FAILED).append(')').toString();
124+
selectIsBeingTakenOverSQL = "SELECT 1 FROM " + tableName + " WHERE " + ID_COLUMN + " = ? AND " + STATE_COLUMN + " IN (" + (BrokerState.I_FAILOVER_PENDING) + ", " + (BrokerState.I_FAILOVER_STARTED) + ", " + (BrokerState.I_FAILOVER_COMPLETE) + ", " + (BrokerState.I_FAILOVER_FAILED) + ')';
156125
}
157126

158127
/**

‎mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConfigRecordDAOImpl.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2020 Payara Services Ltd.
4-
* Copyright 2021, 2022 Contributors to the Eclipse Foundation
4+
* Copyright 2021 Contributors to the Eclipse Foundation
55
*
66
* This program and the accompanying materials are made available under the
77
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -46,14 +46,11 @@ class ConfigRecordDAOImpl extends BaseDAOImpl implements ConfigRecordDAO {
4646

4747
tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
4848

49-
insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(RECORD_COLUMN).append(", ").append(CREATED_TS_COLUMN)
50-
.append(") VALUES ( ?, ? )").toString();
49+
insertSQL = "INSERT INTO " + tableName + " ( " + RECORD_COLUMN + ", " + CREATED_TS_COLUMN + ") VALUES ( ?, ? )";
5150

52-
selectRecordsSinceSQL = new StringBuilder(128).append("SELECT ").append(RECORD_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(" FROM ")
53-
.append(tableName).append(" WHERE ").append(CREATED_TS_COLUMN).append(" > ?").toString();
51+
selectRecordsSinceSQL = "SELECT " + RECORD_COLUMN + ", " + CREATED_TS_COLUMN + " FROM " + tableName + " WHERE " + CREATED_TS_COLUMN + " > ?";
5452

55-
selectAllSQL = new StringBuilder(128).append("SELECT ").append(RECORD_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(" FROM ").append(tableName)
56-
.toString();
53+
selectAllSQL = "SELECT " + RECORD_COLUMN + ", " + CREATED_TS_COLUMN + " FROM " + tableName;
5754
}
5855

5956
/**

‎mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerDAOImpl.java‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
3-
* Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
3+
* Copyright (c) 2021 Contributors to the Eclipse Foundation
44
* Copyright (c) 2020 Payara Services Ltd.
55
*
66
* This program and the accompanying materials are made available under the
@@ -55,9 +55,7 @@ class ConsumerDAOImpl extends BaseDAOImpl implements ConsumerDAO {
5555

5656
tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
5757

58-
insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(CONSUMER_COLUMN)
59-
.append(", ").append(DURABLE_NAME_COLUMN).append(", ").append(CLIENT_ID_COLUMN).append(", ").append(CREATED_TS_COLUMN)
60-
.append(") VALUES ( ?, ?, ?, ?, ? )").toString();
58+
insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + CONSUMER_COLUMN + ", " + DURABLE_NAME_COLUMN + ", " + CLIENT_ID_COLUMN + ", " + CREATED_TS_COLUMN + ") VALUES ( ?, ?, ?, ?, ? )";
6159

6260
/*
6361
* insertNoDupSQLDual = new StringBuilder(128) .append( "INSERT INTO " ).append( tableName ) .append( " ( " ) .append(
@@ -67,23 +65,17 @@ class ConsumerDAOImpl extends BaseDAOImpl implements ConsumerDAO {
6765
* DURABLE_NAME_COLUMN ).append(" = ? ") .append( " AND ").append( CLIENT_ID_COLUMN ).append(" = ? )" ) .toString();
6866
*/
6967

70-
insertNoDupSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(CONSUMER_COLUMN)
71-
.append(", ").append(DURABLE_NAME_COLUMN).append(", ").append(CLIENT_ID_COLUMN).append(", ").append(CREATED_TS_COLUMN)
72-
.append(" ) SELECT ?, ?, ?, ?, ? FROM ").append(tableName).append(" WHERE ").append(DURABLE_NAME_COLUMN).append(" = ? ").append(" AND ")
73-
.append(CLIENT_ID_COLUMN).append(" = ? ").append(" HAVING COUNT(*) ").append(" = 0 ").toString();
68+
insertNoDupSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + CONSUMER_COLUMN + ", " + DURABLE_NAME_COLUMN + ", " + CLIENT_ID_COLUMN + ", " + CREATED_TS_COLUMN + " ) SELECT ?, ?, ?, ?, ? FROM " + tableName + " WHERE " + DURABLE_NAME_COLUMN + " = ? " + " AND " + CLIENT_ID_COLUMN + " = ? " + " HAVING COUNT(*) " + " = 0 ";
7469

75-
deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
70+
deleteSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
7671

77-
selectSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
78-
.append(" = ?").toString();
72+
selectSQL = "SELECT " + CONSUMER_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
7973

80-
selectAllSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_COLUMN).append(" FROM ").append(tableName).toString();
74+
selectAllSQL = "SELECT " + CONSUMER_COLUMN + " FROM " + tableName;
8175

82-
selectExistSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
83-
.append(DURABLE_NAME_COLUMN).append(" = ?").append(" AND ").append(CLIENT_ID_COLUMN).append(" = ?").toString();
76+
selectExistSQL = "SELECT " + CONSUMER_COLUMN + " FROM " + tableName + " WHERE " + DURABLE_NAME_COLUMN + " = ?" + " AND " + CLIENT_ID_COLUMN + " = ?";
8477

85-
selectExistByIDSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
86-
.append(ID_COLUMN).append(" = ?").toString();
78+
selectExistByIDSQL = "SELECT " + CONSUMER_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
8779
}
8880

8981
/**

0 commit comments

Comments
 (0)