@@ -54,19 +54,9 @@ class JdbcStore implements MessageStore {
5454
5555 public JdbcStore (SessionSettings settings , SessionID sessionID , DataSource ds ) throws Exception {
5656 this .sessionID = sessionID ;
57- if (settings .isSetting (sessionID , SETTING_JDBC_STORE_SESSIONS_TABLE_NAME )) {
58- sessionTableName = settings
59- .getString (sessionID , SETTING_JDBC_STORE_SESSIONS_TABLE_NAME );
60- } else {
61- sessionTableName = DEFAULT_SESSION_TABLE_NAME ;
62- }
6357
64- if (settings .isSetting (sessionID , SETTING_JDBC_STORE_MESSAGES_TABLE_NAME )) {
65- messageTableName = settings
66- .getString (sessionID , SETTING_JDBC_STORE_MESSAGES_TABLE_NAME );
67- } else {
68- messageTableName = DEFAULT_MESSAGE_TABLE_NAME ;
69- }
58+ sessionTableName = getSessionTableName (settings , sessionID );
59+ messageTableName = getMessageTableName (settings , sessionID );
7060
7161 if (settings .isSetting (sessionID , SETTING_JDBC_SESSION_ID_DEFAULT_PROPERTY_VALUE )) {
7262 defaultSessionIdPropertyValue = settings .getString (sessionID ,
@@ -90,34 +80,67 @@ public JdbcStore(SessionSettings settings, SessionID sessionID, DataSource ds) t
9080 loadCache ();
9181 }
9282
93- private void setSqlStrings () {
94- String idWhereClause = JdbcUtil .getIDWhereClause (extendedSessionIdSupported );
95- String idColumns = JdbcUtil .getIDColumns (extendedSessionIdSupported );
96- String idPlaceholders = JdbcUtil .getIDPlaceholders (extendedSessionIdSupported );
83+ public static String getSessionTableName (SessionSettings settings , SessionID sessionID ) throws ConfigError {
84+ if (settings .isSetting (sessionID , SETTING_JDBC_STORE_SESSIONS_TABLE_NAME )) {
85+ return settings .getString (sessionID , SETTING_JDBC_STORE_SESSIONS_TABLE_NAME );
86+ } else {
87+ return DEFAULT_SESSION_TABLE_NAME ;
88+ }
89+ }
90+
91+ public static String getMessageTableName (SessionSettings settings , SessionID sessionID ) throws ConfigError {
92+ if (settings .isSetting (sessionID , SETTING_JDBC_STORE_MESSAGES_TABLE_NAME )) {
93+ return settings .getString (sessionID , SETTING_JDBC_STORE_MESSAGES_TABLE_NAME );
94+ } else {
95+ return DEFAULT_MESSAGE_TABLE_NAME ;
96+ }
97+ }
98+
99+ public static String getUpdateSequenceNumsSql (String sessionTableName , String idWhereClause ) {
100+ return "UPDATE " + sessionTableName + " SET incoming_seqnum=?, " + "outgoing_seqnum=? WHERE " + idWhereClause ;
101+ }
102+
103+ public static String getInsertSessionSql (String sessionTableName , String idColumns , String idPlaceholders ) {
104+ return "INSERT INTO " + sessionTableName + " (" + idColumns + ", creation_time,incoming_seqnum, outgoing_seqnum) VALUES (" + idPlaceholders + ",?,?,?)" ;
105+ }
97106
98- SQL_UPDATE_SEQNUMS = "UPDATE " + sessionTableName + " SET incoming_seqnum=?, "
99- + "outgoing_seqnum=? WHERE " + idWhereClause ;
107+ public static String getSequenceNumsSql (String sessionTableName , String idWhereClause ) {
108+ return "SELECT creation_time, incoming_seqnum, outgoing_seqnum FROM " + sessionTableName + " WHERE " + idWhereClause ;
109+ }
100110
101- SQL_INSERT_SESSION = "INSERT INTO " + sessionTableName + " (" + idColumns
102- + ", creation_time,incoming_seqnum, outgoing_seqnum) VALUES (" + idPlaceholders
103- + ",?,?,?)" ;
111+ public static String getUpdateMessageSql ( String messageTableName , String idWhereClause ) {
112+ return "UPDATE " + messageTableName + " SET message=? " + "WHERE " + idWhereClause + " and msgseqnum=?" ;
113+ }
104114
105- SQL_GET_SEQNUMS = "SELECT creation_time, incoming_seqnum, outgoing_seqnum FROM "
106- + sessionTableName + " WHERE " + idWhereClause ;
115+ public static String getInsertMessageSql (String messageTableName , String idColumns , String idPlaceholders ) {
116+ return "INSERT INTO " + messageTableName + " (" + idColumns + ", msgseqnum,message) VALUES (" + idPlaceholders + ",?,?)" ;
117+ }
107118
108- SQL_UPDATE_MESSAGE = "UPDATE " + messageTableName + " SET message=? " + "WHERE "
109- + idWhereClause + " and msgseqnum=?" ;
119+ public static String getMessagesSql (String messageTableName , String idWhereClause ) {
120+ return "SELECT message FROM " + messageTableName + " WHERE " + idWhereClause + " and msgseqnum>=? and msgseqnum<=? " + "ORDER BY msgseqnum" ;
121+ }
110122
111- SQL_INSERT_MESSAGE = "INSERT INTO " + messageTableName + " (" + idColumns
112- + ", msgseqnum,message) VALUES (" + idPlaceholders + ",?,?)" ;
123+ public static String getUpdateSessionSql (String sessionTableName , String idWhereClause ) {
124+ return "UPDATE " + sessionTableName + " SET creation_time=?, " + "incoming_seqnum=?, outgoing_seqnum=? " + "WHERE " + idWhereClause ;
125+ }
113126
114- SQL_GET_MESSAGES = "SELECT message FROM " + messageTableName + " WHERE " + idWhereClause
115- + " and msgseqnum>=? and msgseqnum<=? " + "ORDER BY msgseqnum" ;
127+ public static String getDeleteMessagesSql (String messageTableName , String idWhereClause ) {
128+ return "DELETE FROM " + messageTableName + " WHERE " + idWhereClause ;
129+ }
116130
117- SQL_UPDATE_SESSION = "UPDATE " + sessionTableName + " SET creation_time=?, "
118- + "incoming_seqnum=?, outgoing_seqnum=? " + "WHERE " + idWhereClause ;
131+ private void setSqlStrings () {
132+ String idWhereClause = JdbcUtil .getIDWhereClause (extendedSessionIdSupported );
133+ String idColumns = JdbcUtil .getIDColumns (extendedSessionIdSupported );
134+ String idPlaceholders = JdbcUtil .getIDPlaceholders (extendedSessionIdSupported );
119135
120- SQL_DELETE_MESSAGES = "DELETE FROM " + messageTableName + " WHERE " + idWhereClause ;
136+ SQL_UPDATE_SEQNUMS = getUpdateSequenceNumsSql (sessionTableName , idWhereClause );
137+ SQL_INSERT_SESSION = getInsertSessionSql (sessionTableName , idColumns , idPlaceholders );
138+ SQL_GET_SEQNUMS = getSequenceNumsSql (sessionTableName , idWhereClause );
139+ SQL_UPDATE_MESSAGE = getUpdateMessageSql (messageTableName , idWhereClause );
140+ SQL_INSERT_MESSAGE = getInsertMessageSql (messageTableName , idColumns , idPlaceholders );
141+ SQL_GET_MESSAGES = getMessagesSql (messageTableName , idWhereClause );
142+ SQL_UPDATE_SESSION = getUpdateSessionSql (sessionTableName , idWhereClause );
143+ SQL_DELETE_MESSAGES = getDeleteMessagesSql (messageTableName , idWhereClause );
121144 }
122145
123146 private void loadCache () throws SQLException , IOException {
@@ -171,6 +194,32 @@ public int getNextTargetMsgSeqNum() throws IOException {
171194 return cache .getNextTargetMsgSeqNum ();
172195 }
173196
197+ int getNextSenderMsgSeqNumFromDb () throws SQLException {
198+ return getNextMsgSeqNumsFromDb ()[0 ];
199+ }
200+
201+ int getNextTargetMsgSeqNumFromDb () throws SQLException {
202+ return getNextMsgSeqNumsFromDb ()[1 ];
203+ }
204+
205+ int [] getNextMsgSeqNumsFromDb () throws SQLException {
206+ try (Connection connection = dataSource .getConnection ()) {
207+ try (PreparedStatement query = connection .prepareStatement (SQL_GET_SEQNUMS )) {
208+ setSessionIdParameters (query , 1 );
209+
210+ try (ResultSet result = query .executeQuery ()) {
211+ if (result .next ()) {
212+ int targetSeqNum = result .getInt (2 );
213+ int senderSeqNum = result .getInt (3 );
214+ return new int [] {senderSeqNum , targetSeqNum };
215+ } else {
216+ return new int [] {-1 , -1 };
217+ }
218+ }
219+ }
220+ }
221+ }
222+
174223 public void incrNextSenderMsgSeqNum () throws IOException {
175224 cache .incrNextSenderMsgSeqNum ();
176225 setNextSenderMsgSeqNum (cache .getNextSenderMsgSeqNum ());
@@ -238,7 +287,6 @@ public void get(int startSequence, int endSequence, Collection<String> messages)
238287 public boolean set (int sequence , String message ) throws IOException {
239288 Connection connection = null ;
240289 PreparedStatement insert = null ;
241- ResultSet rs = null ;
242290 try {
243291 connection = dataSource .getConnection ();
244292 insert = connection .prepareStatement (SQL_INSERT_MESSAGE );
@@ -263,7 +311,6 @@ public boolean set(int sequence, String message) throws IOException {
263311 }
264312 }
265313 } finally {
266- JdbcUtil .close (sessionID , rs );
267314 JdbcUtil .close (sessionID , insert );
268315 JdbcUtil .close (sessionID , connection );
269316 }
0 commit comments