diff --git a/quickfixj-core/pom.xml b/quickfixj-core/pom.xml index 64937a1f2c..203ab5cc8b 100644 --- a/quickfixj-core/pom.xml +++ b/quickfixj-core/pom.xml @@ -132,12 +132,6 @@ slf4j-api ${slf4j.version} - - com.sleepycat - je - 18.3.12 - true - com.zaxxer HikariCP diff --git a/quickfixj-core/src/main/java/quickfix/SleepycatStore.java b/quickfixj-core/src/main/java/quickfix/SleepycatStore.java deleted file mode 100644 index 3fddd79f54..0000000000 --- a/quickfixj-core/src/main/java/quickfix/SleepycatStore.java +++ /dev/null @@ -1,366 +0,0 @@ -/******************************************************************************* - * Copyright (c) quickfixengine.org All rights reserved. - * - * This file is part of the QuickFIX FIX Engine - * - * This file may be distributed under the terms of the quickfixengine.org - * license as defined by quickfixengine.org and appearing in the file - * LICENSE included in the packaging of this file. - * - * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING - * THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE. - * - * See http://www.quickfixengine.org/LICENSE for licensing information. - * - * Contact ask@quickfixengine.org if any conditions of this licensing - * are not clear to you. - ******************************************************************************/ - -package quickfix; - -import java.io.File; -import java.io.IOException; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; - -import org.quickfixj.CharsetSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.sleepycat.bind.EntryBinding; -import com.sleepycat.bind.tuple.TupleBinding; -import com.sleepycat.bind.tuple.TupleInput; -import com.sleepycat.bind.tuple.TupleOutput; -import com.sleepycat.je.Cursor; -import com.sleepycat.je.Database; -import com.sleepycat.je.DatabaseConfig; -import com.sleepycat.je.DatabaseEntry; -import com.sleepycat.je.DatabaseException; -import com.sleepycat.je.Environment; -import com.sleepycat.je.EnvironmentConfig; -import com.sleepycat.je.LockMode; -import com.sleepycat.je.OperationStatus; - -/** - * Sleepycat message and session state storage. This could be creating - * using the Sleepycat store factory. - * - * @see SleepycatStoreFactory - */ -public class SleepycatStore implements MessageStore { - private final Logger log = LoggerFactory.getLogger(getClass()); - private final SessionID sessionID; // session key - private SessionInfo info; - - private final String dbDir; - private String seqDbName = "seq"; - private String msgDbName = "outmsg"; - - private Database messageDatabase; - private Database sequenceDatabase; - private final SessionIDTupleBinding sessionIDBinding = new SessionIDTupleBinding(); - private final SessionInfoTupleBinding sessionInfoBinding = new SessionInfoTupleBinding(); - private Environment environment; - - private final DatabaseEntry sessionIDKey = new DatabaseEntry(); - private final DatabaseEntry sessionInfoBytes = new DatabaseEntry(); - private final String charsetEncoding = CharsetSupport.getCharset(); - - private static class SessionIDTupleBinding extends TupleBinding { - - /* - * (non-Javadoc) - * - * @see com.sleepycat.bind.tuple.TupleBinding#entryToObject(com.sleepycat.bind.tuple.TupleInput) - */ - public Object entryToObject(TupleInput tupleIn) { - return new SessionID(tupleIn.readString(), tupleIn.readString(), tupleIn.readString(), - tupleIn.readString(), tupleIn.readString(), tupleIn.readString(), tupleIn - .readString(), tupleIn.readString()); - } - - /* - * (non-Javadoc) - * - * @see com.sleepycat.bind.tuple.TupleBinding#objectToEntry(java.lang.Object, - * com.sleepycat.bind.tuple.TupleOutput) - */ - public void objectToEntry(Object object, TupleOutput tupleOut) { - SessionID sessionID = (SessionID) object; - tupleOut.writeString(sessionID.getBeginString()); - tupleOut.writeString(sessionID.getSenderCompID()); - tupleOut.writeString(sessionID.getSenderSubID()); - tupleOut.writeString(sessionID.getSenderLocationID()); - tupleOut.writeString(sessionID.getTargetCompID()); - tupleOut.writeString(sessionID.getTargetSubID()); - tupleOut.writeString(sessionID.getTargetLocationID()); - tupleOut.writeString(sessionID.getSessionQualifier()); - } - } - - private static class SessionInfoTupleBinding extends TupleBinding { - - /* - * (non-Javadoc) - * - * @see com.sleepycat.bind.tuple.TupleBinding#entryToObject(com.sleepycat.bind.tuple.TupleInput) - */ - public Object entryToObject(TupleInput tupleIn) { - return new SessionInfo(SystemTime.getUtcCalendar(new Date(tupleIn.readLong())), tupleIn - .readInt(), tupleIn.readInt()); - } - - /* - * (non-Javadoc) - * - * @see com.sleepycat.bind.tuple.TupleBinding#objectToEntry(java.lang.Object, - * com.sleepycat.bind.tuple.TupleOutput) - */ - public void objectToEntry(Object object, TupleOutput tupleOut) { - SessionInfo sessionInfo = (SessionInfo) object; - tupleOut.writeLong(sessionInfo.getCreationTime().getTimeInMillis()); - tupleOut.writeInt(sessionInfo.getNextSenderMsgSeqNum()); - tupleOut.writeInt(sessionInfo.getNextTargetMsgSeqNum()); - } - } - - private static class SessionInfo { - private int nextSenderMsgSeqNum; - private int nextTargetMsgSeqNum; - private final Calendar creationTime; - - public SessionInfo() { - this(SystemTime.getUtcCalendar(), 1, 1); - } - - public SessionInfo(Calendar creationTime, int nextSenderMsgSeqNum, int nextTargetMsgSeqNum) { - super(); - this.creationTime = creationTime; - this.nextSenderMsgSeqNum = nextSenderMsgSeqNum; - this.nextTargetMsgSeqNum = nextTargetMsgSeqNum; - } - - public Calendar getCreationTime() { - return creationTime; - } - - public int getNextSenderMsgSeqNum() { - return nextSenderMsgSeqNum; - } - - public int getNextTargetMsgSeqNum() { - return nextTargetMsgSeqNum; - } - - //public void setCreationTime(Calendar creationTime) { - // this.creationTime = creationTime; - //} - - public void setNextSenderMsgSeqNum(int nextSenderMsgSeqNum) { - this.nextSenderMsgSeqNum = nextSenderMsgSeqNum; - } - - public void setNextTargetMsgSeqNum(int nextTargetMsgSeqNum) { - this.nextTargetMsgSeqNum = nextTargetMsgSeqNum; - } - } - - public SleepycatStore(SessionID sessionID, String databaseDir, String sequenceDbName, - String messageDbName) throws IOException { - this.sessionID = sessionID; - dbDir = databaseDir; - seqDbName = sequenceDbName; - msgDbName = messageDbName; - open(); - } - - void open() throws IOException { - try { - // Open the environment. Create it if it does not already exist. - EnvironmentConfig envConfig = new EnvironmentConfig(); - envConfig.setAllowCreate(true); - environment = new Environment(new File(dbDir), envConfig); - - DatabaseConfig dbConfig = new DatabaseConfig(); - dbConfig.setAllowCreate(true); - - // Open the database. Create it if it does not already exist. - messageDatabase = environment.openDatabase(null, msgDbName, dbConfig); - sequenceDatabase = environment.openDatabase(null, seqDbName, dbConfig); - - loadSessionInfo(); - } catch (DatabaseException dbe) { - convertToIOExceptionAndRethrow(dbe); - } - } - - void close() throws IOException { - try { - messageDatabase.close(); - sequenceDatabase.close(); - environment.close(); - } catch (DatabaseException e) { - convertToIOExceptionAndRethrow(e); - } - } - - public synchronized void get(int startSequence, int endSequence, Collection messages) - throws IOException { - Cursor cursor = null; - try { - DatabaseEntry sequenceKey = new DatabaseEntry(); - EntryBinding sequenceBinding = TupleBinding.getPrimitiveBinding(Integer.class); - // Must start at start-1 because db will look for next record larger - sequenceBinding.objectToEntry(startSequence - 1, sequenceKey); - - cursor = messageDatabase.openCursor(null, null); - DatabaseEntry messageBytes = new DatabaseEntry(); - OperationStatus retVal = cursor.getSearchKeyRange(sequenceKey, messageBytes, - LockMode.DEFAULT); - - if (retVal == OperationStatus.NOTFOUND) { - log.debug("{}/{} not matched in database {}", sequenceKey, messageBytes, messageDatabase.getDatabaseName()); - } else { - Integer sequenceNumber = (Integer) sequenceBinding.entryToObject(sequenceKey); - while (sequenceNumber <= endSequence) { - messages.add(new String(messageBytes.getData(), charsetEncoding)); - if (log.isDebugEnabled()) { - log.debug("Found record {}=>{} for search key/data: {}=>{}", - sequenceNumber, new String(messageBytes.getData(), charsetEncoding), sequenceKey, messageBytes); - } - cursor.getNext(sequenceKey, messageBytes, LockMode.DEFAULT); - sequenceNumber = (Integer) sequenceBinding.entryToObject(sequenceKey); - } - } - } catch (Exception e) { - convertToIOExceptionAndRethrow(e); - } finally { - try { - if (cursor != null) { - cursor.close(); - } - } catch (DatabaseException dbe) { - convertToIOExceptionAndRethrow(dbe); - } - } - } - - private void convertToIOExceptionAndRethrow(Exception e) throws IOException { - if (e instanceof IOException) { - throw (IOException) e; - } - IOException ioe = new IOException(e.getMessage()); - ioe.setStackTrace(e.getStackTrace()); - throw ioe; - } - - - /* - * (non-Javadoc) - * @see quickfix.MessageStore#getCreationTime() - */ - public Date getCreationTime() throws IOException { - return info.getCreationTime().getTime(); - } - - /* - * (non-Javadoc) - * @see quickfix.MessageStore#getCreationTimeCalendar() - */ - public Calendar getCreationTimeCalendar() throws IOException { - return info.getCreationTime(); - } - - public int getNextSenderMsgSeqNum() throws IOException { - return info.getNextSenderMsgSeqNum(); - } - - public int getNextTargetMsgSeqNum() throws IOException { - return info.getNextTargetMsgSeqNum(); - } - - public void incrNextSenderMsgSeqNum() throws IOException { - info.setNextSenderMsgSeqNum(info.getNextSenderMsgSeqNum() + 1); - storeSessionInfo(); - } - - public void incrNextTargetMsgSeqNum() throws IOException { - info.setNextTargetMsgSeqNum(info.getNextTargetMsgSeqNum() + 1); - storeSessionInfo(); - } - - public void reset() throws IOException { - try { - info = new SessionInfo(); - storeSessionInfo(); - sequenceDatabase.close(); - messageDatabase.close(); - environment.truncateDatabase(null, seqDbName, false); - environment.truncateDatabase(null, msgDbName, false); - environment.close(); - open(); - } catch (DatabaseException e) { - convertToIOExceptionAndRethrow(e); - } - } - - public boolean set(int sequence, String message) throws IOException { - try { - DatabaseEntry sequenceKey = new DatabaseEntry(); - EntryBinding sequenceBinding = TupleBinding.getPrimitiveBinding(Integer.class); - sequenceBinding.objectToEntry(sequence, sequenceKey); - DatabaseEntry messageBytes = new DatabaseEntry(message.getBytes(CharsetSupport.getCharset())); - messageDatabase.put(null, sequenceKey, messageBytes); - } catch (Exception e) { - convertToIOExceptionAndRethrow(e); - } - return true; - } - - public void setNextSenderMsgSeqNum(int next) throws IOException { - info.setNextSenderMsgSeqNum(next); - storeSessionInfo(); - } - - public void setNextTargetMsgSeqNum(int next) throws IOException { - info.setNextTargetMsgSeqNum(next); - storeSessionInfo(); - } - - private void loadSessionInfo() throws IOException { - synchronized (sessionIDKey) { - sessionIDBinding.objectToEntry(sessionID, sessionIDKey); - - try { - sequenceDatabase.get(null, sessionIDKey, sessionInfoBytes, LockMode.DEFAULT); - if (sessionInfoBytes.getSize() > 0) { - info = (SessionInfo) sessionInfoBinding.entryToObject(sessionInfoBytes); - } else { - info = new SessionInfo(); - storeSessionInfo(); - } - } catch (DatabaseException e) { - convertToIOExceptionAndRethrow(e); - } - } - } - - private void storeSessionInfo() throws IOException { - synchronized (sessionIDKey) { - sessionIDBinding.objectToEntry(sessionID, sessionIDKey); - sessionInfoBinding.objectToEntry(info, sessionInfoBytes); - - try { - sequenceDatabase.put(null, sessionIDKey, sessionInfoBytes); - } catch (DatabaseException e) { - convertToIOExceptionAndRethrow(e); - } - } - } - - public void refresh() throws IOException { - loadSessionInfo(); - } -} diff --git a/quickfixj-core/src/main/java/quickfix/SleepycatStoreFactory.java b/quickfixj-core/src/main/java/quickfix/SleepycatStoreFactory.java deleted file mode 100644 index aa7250216c..0000000000 --- a/quickfixj-core/src/main/java/quickfix/SleepycatStoreFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) quickfixengine.org All rights reserved. - * - * This file is part of the QuickFIX FIX Engine - * - * This file may be distributed under the terms of the quickfixengine.org - * license as defined by quickfixengine.org and appearing in the file - * LICENSE included in the packaging of this file. - * - * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING - * THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE. - * - * See http://www.quickfixengine.org/LICENSE for licensing information. - * - * Contact ask@quickfixengine.org if any conditions of this licensing - * are not clear to you. - ******************************************************************************/ - -package quickfix; - -/** - * Message store using the Sleepycat Java Edition database for message and - * sequence number storage. - */ -public class SleepycatStoreFactory implements MessageStoreFactory { - - /** - * Directory path where Sleepycat files are stored. This directory must already - * exist. Required. - */ - public static final String SETTING_SLEEPYCAT_DATABASE_DIR = "SleepycatDatabaseDir"; - - /** - * Database name for the sequence number database. Optional. - */ - public static final String SETTING_SLEEPYCAT_SEQUENCE_DB_NAME = "SleepycatSequenceDbName"; - - /** - * Database name for the message database. Optional. - */ - public static final String SETTING_SLEEPYCAT_MESSAGE_DB_NAME = "SleepycatMessageDbName"; - - private SessionSettings settings = new SessionSettings(); - - public SleepycatStoreFactory(SessionSettings settings) { - this.settings = settings; - } - - public MessageStore create(SessionID sessionID) { - try { - String dbDir = settings.getString(sessionID, SETTING_SLEEPYCAT_DATABASE_DIR); - String seqDbName = "seq"; - if (settings.isSetting(sessionID, SETTING_SLEEPYCAT_SEQUENCE_DB_NAME)) { - seqDbName = settings.getString(sessionID, SETTING_SLEEPYCAT_SEQUENCE_DB_NAME); - } - String msgDbName = "msg"; - if (settings.isSetting(sessionID, SETTING_SLEEPYCAT_MESSAGE_DB_NAME)) { - msgDbName = settings.getString(sessionID, SETTING_SLEEPYCAT_MESSAGE_DB_NAME); - } - return new SleepycatStore(sessionID, dbDir, seqDbName, msgDbName); - } catch (Exception e) { - throw new RuntimeError(e); - } - } -} diff --git a/quickfixj-core/src/test/java/quickfix/AbstractMessageStoreTest.java b/quickfixj-core/src/test/java/quickfix/AbstractMessageStoreTest.java index 40632bc471..8804a260b3 100644 --- a/quickfixj-core/src/test/java/quickfix/AbstractMessageStoreTest.java +++ b/quickfixj-core/src/test/java/quickfix/AbstractMessageStoreTest.java @@ -173,10 +173,6 @@ public void testRefreshMessageStore() throws Exception { public void testSetAndGetMessageWithAsciiCharacters() throws IOException { MessageStore underTest = getStore(); - if (underTest instanceof SleepycatStore) { - return; - } - underTest.set(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVXYZ0123456789"); List messages = new ArrayList<>(); @@ -188,11 +184,7 @@ public void testSetAndGetMessageWithAsciiCharacters() throws IOException { public void testSetAndGetMessageWithUnicodeCharacters() throws IOException { MessageStore underTest = getStore(); - - if (underTest instanceof SleepycatStore) { - return; - } - + CharsetSupport.setCharset("UTF-8"); try { diff --git a/quickfixj-core/src/test/java/quickfix/SleepycatStoreTest.java b/quickfixj-core/src/test/java/quickfix/SleepycatStoreTest.java deleted file mode 100644 index fd3bf23808..0000000000 --- a/quickfixj-core/src/test/java/quickfix/SleepycatStoreTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) quickfixengine.org All rights reserved. - * - * This file is part of the QuickFIX FIX Engine - * - * This file may be distributed under the terms of the quickfixengine.org - * license as defined by quickfixengine.org and appearing in the file - * LICENSE included in the packaging of this file. - * - * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING - * THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE. - * - * See http://www.quickfixengine.org/LICENSE for licensing information. - * - * Contact ask@quickfixengine.org if any conditions of this licensing - * are not clear to you. - ******************************************************************************/ - -package quickfix; - -import java.io.File; -import java.io.IOException; - -public class SleepycatStoreTest extends AbstractMessageStoreTest { - - protected MessageStoreFactory getMessageStoreFactory() throws ConfigError { - SessionSettings settings = new SessionSettings(getConfigurationFileName()); - File tmpfile; - try { - tmpfile = File.createTempFile("test", "txt"); - } catch (IOException e) { - throw new ConfigError(e); - } - File tmpdir = tmpfile.getParentFile(); - settings.setString(getSessionID(), SleepycatStoreFactory.SETTING_SLEEPYCAT_DATABASE_DIR, - tmpdir.getPath()); - return new SleepycatStoreFactory(settings); - } - - protected void tearDown() throws Exception { - try { - ((SleepycatStore) getStore()).close(); - } catch (Exception e) { - } - } - - protected Class getMessageStoreClass() { - return SleepycatStore.class; - } - - protected void closeMessageStore(MessageStore store) throws IOException { - ((SleepycatStore) store).close(); - } - - public void testCloseAndOpen() throws Exception { - SleepycatStore store = (SleepycatStore) getStore(); - store.setNextSenderMsgSeqNum(123); - store.setNextTargetMsgSeqNum(321); - store.close(); - store.open(); - - assertEquals(123, store.getNextSenderMsgSeqNum()); - assertEquals(321, store.getNextTargetMsgSeqNum()); - } -}