Skip to content

Commit

Permalink
[Java] Upgrade to SBE 1.31.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
@vyazelenko
vyazelenko committed Apr 4, 2024
1 parent 09ad5d5 commit 142ea17
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 44 deletions.
80 changes: 40 additions & 40 deletions artio-core/src/main/java/uk/co/real_logic/artio/DebugLogger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ public void logSbeMessage(final LogTag tag, final StartReplayEncoder encoder)
appendStart();
startReplay.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
RedactSequenceUpdateEncoder.BLOCK_LENGTH,
RedactSequenceUpdateEncoder.SCHEMA_VERSION);
startReplay.appendTo(builder);
Expand All @@ -871,7 +871,7 @@ public void logSbeMessage(final LogTag tag, final ReplayCompleteEncoder encoder)
appendStart();
replayComplete.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
RedactSequenceUpdateEncoder.BLOCK_LENGTH,
RedactSequenceUpdateEncoder.SCHEMA_VERSION);
replayComplete.appendTo(builder);
Expand All @@ -883,7 +883,7 @@ public void logSbeMessage(final LogTag tag, final RedactSequenceUpdateEncoder en
appendStart();
redactSequenceUpdate.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
RedactSequenceUpdateEncoder.BLOCK_LENGTH,
RedactSequenceUpdateEncoder.SCHEMA_VERSION);
redactSequenceUpdate.appendTo(builder);
Expand All @@ -895,7 +895,7 @@ public void logSbeMessage(final LogTag tag, final SeqIndexSyncEncoder encoder)
appendStart();
seqIndexSync.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
SeqIndexSyncEncoder.BLOCK_LENGTH,
SeqIndexSyncEncoder.SCHEMA_VERSION);
seqIndexSync.appendTo(builder);
Expand All @@ -907,7 +907,7 @@ public void logSbeMessage(final LogTag tag, final ThrottleConfigurationEncoder e
appendStart();
throttleConfiguration.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ThrottleConfigurationEncoder.BLOCK_LENGTH,
ThrottleConfigurationEncoder.SCHEMA_VERSION);
throttleConfiguration.appendTo(builder);
Expand All @@ -919,7 +919,7 @@ public void logSbeMessage(final LogTag tag, final ThrottleConfigurationReplyEnco
appendStart();
throttleConfigurationReply.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ThrottleConfigurationReplyEncoder.BLOCK_LENGTH,
ThrottleConfigurationReplyEncoder.SCHEMA_VERSION);
throttleConfigurationReply.appendTo(builder);
Expand All @@ -931,7 +931,7 @@ public void logSbeMessage(final LogTag tag, final ManageSessionEncoder encoder)
appendStart();
manageSession.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ManageSessionEncoder.BLOCK_LENGTH,
ManageSessionEncoder.SCHEMA_VERSION);
manageSession.appendTo(builder);
Expand All @@ -945,7 +945,7 @@ public void logSbeMessage(
appendStart();
disconnect.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
DisconnectEncoder.BLOCK_LENGTH,
DisconnectEncoder.SCHEMA_VERSION);
disconnect.appendTo(builder);
Expand All @@ -959,7 +959,7 @@ public void logSbeMessage(
appendStart();
connect.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ConnectEncoder.BLOCK_LENGTH,
ConnectEncoder.SCHEMA_VERSION);
connect.appendTo(builder);
Expand All @@ -973,7 +973,7 @@ public void logSbeMessage(
appendStart();
resetSessionIds.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ResetSessionIdsEncoder.BLOCK_LENGTH,
ResetSessionIdsEncoder.SCHEMA_VERSION);
resetSessionIds.appendTo(builder);
Expand All @@ -987,7 +987,7 @@ public void logSbeMessage(
appendStart();
resetSequenceNumber.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ResetSequenceNumberEncoder.BLOCK_LENGTH,
ResetSequenceNumberEncoder.SCHEMA_VERSION);
resetSequenceNumber.appendTo(builder);
Expand All @@ -1001,7 +1001,7 @@ public void logSbeMessage(
appendStart();
resetLibrarySequenceNumber.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ResetLibrarySequenceNumberEncoder.BLOCK_LENGTH,
ResetLibrarySequenceNumberEncoder.SCHEMA_VERSION);
resetLibrarySequenceNumber.appendTo(builder);
Expand All @@ -1015,7 +1015,7 @@ public void logSbeMessage(
appendStart();
requestDisconnect.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
RequestDisconnectEncoder.BLOCK_LENGTH,
RequestDisconnectEncoder.SCHEMA_VERSION);
requestDisconnect.appendTo(builder);
Expand All @@ -1029,7 +1029,7 @@ public void logSbeMessage(
appendStart();
midConnectionDisconnect.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
MidConnectionDisconnectEncoder.BLOCK_LENGTH,
MidConnectionDisconnectEncoder.SCHEMA_VERSION);
midConnectionDisconnect.appendTo(builder);
Expand All @@ -1043,7 +1043,7 @@ public void logSbeMessage(
appendStart();
initiateConnection.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
InitiateConnectionEncoder.BLOCK_LENGTH,
InitiateConnectionEncoder.SCHEMA_VERSION);
initiateConnection.appendTo(builder);
Expand All @@ -1057,7 +1057,7 @@ public void logSbeMessage(
appendStart();
error.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ErrorEncoder.BLOCK_LENGTH,
ErrorEncoder.SCHEMA_VERSION);
error.appendTo(builder);
Expand All @@ -1075,7 +1075,7 @@ public void logSbeMessage(
builder.append(streamId);
applicationHeartbeat.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ApplicationHeartbeatEncoder.BLOCK_LENGTH,
ApplicationHeartbeatEncoder.SCHEMA_VERSION);
applicationHeartbeat.appendTo(builder);
Expand All @@ -1089,7 +1089,7 @@ public void logSbeMessage(
appendStart();
libraryConnect.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
LibraryConnectEncoder.BLOCK_LENGTH,
LibraryConnectEncoder.SCHEMA_VERSION);
libraryConnect.appendTo(builder);
Expand All @@ -1103,7 +1103,7 @@ public void logSbeMessage(
appendStart();
releaseSession.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ReleaseSessionEncoder.BLOCK_LENGTH,
ReleaseSessionEncoder.SCHEMA_VERSION);
releaseSession.appendTo(builder);
Expand All @@ -1117,7 +1117,7 @@ public void logSbeMessage(
appendStart();
releaseSessionReply.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ReleaseSessionReplyEncoder.BLOCK_LENGTH,
ReleaseSessionReplyEncoder.SCHEMA_VERSION);
releaseSessionReply.appendTo(builder);
Expand All @@ -1131,7 +1131,7 @@ public void logSbeMessage(
appendStart();
requestSession.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
RequestSessionEncoder.BLOCK_LENGTH,
RequestSessionEncoder.SCHEMA_VERSION);
requestSession.appendTo(builder);
Expand All @@ -1145,7 +1145,7 @@ public void logSbeMessage(
appendStart();
requestSessionReply.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
RequestSessionReplyEncoder.BLOCK_LENGTH,
RequestSessionReplyEncoder.SCHEMA_VERSION);
requestSessionReply.appendTo(builder);
Expand All @@ -1159,7 +1159,7 @@ public void logSbeMessage(
appendStart();
libraryTimeout.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
LibraryTimeoutEncoder.BLOCK_LENGTH,
LibraryTimeoutEncoder.SCHEMA_VERSION);
libraryTimeout.appendTo(builder);
Expand All @@ -1173,7 +1173,7 @@ public void logSbeMessage(
appendStart();
controlNotification.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ControlNotificationEncoder.BLOCK_LENGTH,
ControlNotificationEncoder.SCHEMA_VERSION);
controlNotification.appendTo(builder);
Expand All @@ -1187,7 +1187,7 @@ public void logSbeMessage(
appendStart();
slowStatusNotification.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
SlowStatusNotificationEncoder.BLOCK_LENGTH,
SlowStatusNotificationEncoder.SCHEMA_VERSION);
slowStatusNotification.appendTo(builder);
Expand All @@ -1201,7 +1201,7 @@ public void logSbeMessage(
appendStart();
followerSessionRequest.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
FollowerSessionRequestEncoder.BLOCK_LENGTH,
FollowerSessionRequestEncoder.SCHEMA_VERSION);
followerSessionRequest.appendTo(builder);
Expand All @@ -1215,7 +1215,7 @@ public void logSbeMessage(
appendStart();
followerSessionReply.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
FollowerSessionReplyEncoder.BLOCK_LENGTH,
FollowerSessionReplyEncoder.SCHEMA_VERSION);
followerSessionReply.appendTo(builder);
Expand All @@ -1229,7 +1229,7 @@ public void logSbeMessage(
appendStart();
endOfDay.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
EndOfDayEncoder.BLOCK_LENGTH,
EndOfDayEncoder.SCHEMA_VERSION);
endOfDay.appendTo(builder);
Expand All @@ -1243,7 +1243,7 @@ public void logSbeMessage(
appendStart();
writeMetaData.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
WriteMetaDataEncoder.BLOCK_LENGTH,
WriteMetaDataEncoder.SCHEMA_VERSION);
writeMetaData.appendTo(builder);
Expand All @@ -1257,7 +1257,7 @@ public void logSbeMessage(
appendStart();
writeMetaDataReply.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
WriteMetaDataReplyEncoder.BLOCK_LENGTH,
WriteMetaDataReplyEncoder.SCHEMA_VERSION);
writeMetaDataReply.appendTo(builder);
Expand All @@ -1271,7 +1271,7 @@ public void logSbeMessage(
appendStart();
readMetaData.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ReadMetaDataEncoder.BLOCK_LENGTH,
ReadMetaDataEncoder.SCHEMA_VERSION);
readMetaData.appendTo(builder);
Expand All @@ -1285,7 +1285,7 @@ public void logSbeMessage(
appendStart();
readMetaDataReply.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ReadMetaDataReplyEncoder.BLOCK_LENGTH,
ReadMetaDataReplyEncoder.SCHEMA_VERSION);
readMetaDataReply.appendTo(builder);
Expand All @@ -1299,7 +1299,7 @@ public void logSbeMessage(
appendStart();
replayMessages.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ReplayMessagesEncoder.BLOCK_LENGTH,
ReplayMessagesEncoder.SCHEMA_VERSION);
replayMessages.appendTo(builder);
Expand All @@ -1313,7 +1313,7 @@ public void logSbeMessage(
appendStart();
replayMessagesReply.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ReplayMessagesReplyEncoder.BLOCK_LENGTH,
ReplayMessagesReplyEncoder.SCHEMA_VERSION);
replayMessagesReply.appendTo(builder);
Expand All @@ -1327,7 +1327,7 @@ public void logSbeMessage(
appendStart();
validResendRequest.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ValidResendRequestEncoder.BLOCK_LENGTH,
ValidResendRequestEncoder.SCHEMA_VERSION);
validResendRequest.appendTo(builder);
Expand All @@ -1341,7 +1341,7 @@ public void logSbeMessage(
appendStart();
libraryExtendPosition.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
LibraryExtendPositionEncoder.BLOCK_LENGTH,
LibraryExtendPositionEncoder.SCHEMA_VERSION);
libraryExtendPosition.appendTo(builder);
Expand All @@ -1353,7 +1353,7 @@ public void logSbeMessage(final LogTag tag, final InitiateILinkConnectionEncoder
appendStart();
initiateILinkConnection.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
InitiateILinkConnectionEncoder.BLOCK_LENGTH,
InitiateILinkConnectionEncoder.SCHEMA_VERSION);
initiateILinkConnection.appendTo(builder);
Expand All @@ -1365,7 +1365,7 @@ public void logSbeMessage(final LogTag tag, final ILinkConnectEncoder encoder)
appendStart();
iLinkConnect.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ILinkConnectEncoder.BLOCK_LENGTH,
ILinkConnectEncoder.SCHEMA_VERSION);
iLinkConnect.appendTo(builder);
Expand All @@ -1377,7 +1377,7 @@ public void logSbeMessage(final LogTag tag, final ThrottleRejectEncoder encoder)
appendStart();
throttleReject.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ThrottleRejectEncoder.BLOCK_LENGTH,
ThrottleRejectEncoder.SCHEMA_VERSION);
throttleReject.appendTo(builder);
Expand All @@ -1389,7 +1389,7 @@ public void logSbeMessage(final LogTag tag, final ThrottleNotificationEncoder en
appendStart();
throttleNotification.wrap(
encoder.buffer(),
encoder.initialOffset(),
encoder.offset(),
ThrottleNotificationEncoder.BLOCK_LENGTH,
ThrottleNotificationEncoder.SCHEMA_VERSION);
throttleNotification.appendTo(builder);
Expand Down
2 changes: 1 addition & 1 deletion artio-core/src/main/java/uk/co/real_logic/artio/engine/framer/FixContexts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ else if (sessionId == Session.UNKNOWN)
FixDictionary.of(FixDictionary.find(lastFixDictionary)) : dictionary;
final SessionContext sessionContext = new SessionContext(compositeKey,
sessionId, sequenceIndex, lastLogonTime, lastSequenceResetTime, this,
sessionIdDecoder.initialOffset(),
sessionIdDecoder.offset(),
initialSequenceIndex, thisDictionary, reproductionEnabled);
compositeToContext.put(compositeKey, sessionContext);
}
Expand Down
2 changes: 1 addition & 1 deletion ...-core/src/main/java/uk/co/real_logic/artio/engine/framer/ReproductionProtocolHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void onMessage(
clock.advanceTimeTo(message.timestamp());
validateLibraryId(message.libraryId());

final int initialOffset = message.initialOffset() - MessageHeaderDecoder.ENCODED_LENGTH;
final int initialOffset = message.offset() - MessageHeaderDecoder.ENCODED_LENGTH;
final int fullLength = (offset + length) - initialOffset;
final int messageOffset = offset - initialOffset;
final long connectionId = message.connection();
Expand Down
2 changes: 1 addition & 1 deletion artio-core/src/main/java/uk/co/real_logic/artio/engine/logger/FixMessagePredicates.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void onMessage(
{
final int actingVersion = message.sbeSchemaVersion();
final int actingBlockLength = message.sbeBlockLength();
final int initialOffset = message.initialOffset();
final int initialOffset = message.offset();

if (predicate.test(message))
{
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def jmhVersion = '1.37'
def byteBuddyVersion = '1.14.13'

def agronaVersion = '1.21.1'
def sbeVersion = '1.30.0'
def sbeVersion = '1.31.0'
def aeronVersion = '1.43.0'
def artioGroup = 'uk.co.real-logic'
def iLink3Enabled = false
Expand Down

0 comments on commit 142ea17

Please sign in to comment.