Skip to content
This repository was archived by the owner on Feb 16, 2019. It is now read-only.

Commit a6c2c10

Browse files
committed
Update to 64bit event number
1 parent 75e028c commit a6c2c10

40 files changed

Lines changed: 1403 additions & 1404 deletions

‎src/EventStore.ClientAPI.NetCore/ClientOperations/AppendToStreamOperation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ internal class AppendToStreamOperation : OperationBase<WriteResult, ClientMessag
1212
{
1313
private readonly bool _requireMaster;
1414
private readonly string _stream;
15-
private readonly int _expectedVersion;
15+
private readonly long _expectedVersion;
1616
private readonly IEnumerable<EventData> _events;
1717

1818
private bool _wasCommitTimeout;
@@ -21,7 +21,7 @@ public AppendToStreamOperation(ILogger log,
2121
TaskCompletionSource<WriteResult> source,
2222
bool requireMaster,
2323
string stream,
24-
int expectedVersion,
24+
long expectedVersion,
2525
IEnumerable<EventData> events,
2626
UserCredentials userCredentials)
2727
: base(log, source, TcpCommand.WriteEvents, TcpCommand.WriteEventsCompleted, userCredentials)

‎src/EventStore.ClientAPI.NetCore/ClientOperations/ConditionalAppendToStreamOperation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ internal class ConditionalAppendToStreamOperation : OperationBase<ConditionalWri
1212
{
1313
private readonly bool _requireMaster;
1414
private readonly string _stream;
15-
private readonly int _expectedVersion;
15+
private readonly long _expectedVersion;
1616
private readonly IEnumerable<EventData> _events;
1717

1818
private bool _wasCommitTimeout;
@@ -21,7 +21,7 @@ public ConditionalAppendToStreamOperation(ILogger log,
2121
TaskCompletionSource<ConditionalWriteResult> source,
2222
bool requireMaster,
2323
string stream,
24-
int expectedVersion,
24+
long expectedVersion,
2525
IEnumerable<EventData> events,
2626
UserCredentials userCredentials)
2727
: base(log, source, TcpCommand.WriteEvents, TcpCommand.WriteEventsCompleted, userCredentials)

‎src/EventStore.ClientAPI.NetCore/ClientOperations/ConnectToPersistentSubscriptionOperation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected override bool InspectPackage(TcpPackage package, out InspectionResult
8585
return false;
8686
}
8787

88-
protected override PersistentEventStoreSubscription CreateSubscriptionObject(long lastCommitPosition, int? lastEventNumber)
88+
protected override PersistentEventStoreSubscription CreateSubscriptionObject(long lastCommitPosition, long? lastEventNumber)
8989
{
9090
return new PersistentEventStoreSubscription(this, _streamId, lastCommitPosition, lastEventNumber);
9191
}

‎src/EventStore.ClientAPI.NetCore/ClientOperations/CreatePersistentSubscriptionOperation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal class CreatePersistentSubscriptionOperation : OperationBase<PersistentS
1414
private readonly string _stream;
1515
private readonly string _groupName;
1616
private readonly bool _resolveLinkTos;
17-
private readonly int _startFromBeginning;
17+
private readonly long _startFromBeginning;
1818
private readonly int _messageTimeoutMilliseconds;
1919
private readonly bool _recordStatistics;
2020
private readonly int _maxRetryCount;

‎src/EventStore.ClientAPI.NetCore/ClientOperations/DeleteStreamOperation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ internal class DeleteStreamOperation : OperationBase<DeleteResult, ClientMessage
1010
{
1111
private readonly bool _requireMaster;
1212
private readonly string _stream;
13-
private readonly int _expectedVersion;
13+
private readonly long _expectedVersion;
1414
private readonly bool _hardDelete;
1515

1616
public DeleteStreamOperation(ILogger log, TaskCompletionSource<DeleteResult> source,
17-
bool requireMaster, string stream, int expectedVersion, bool hardDelete,
17+
bool requireMaster, string stream, long expectedVersion, bool hardDelete,
1818
UserCredentials userCredentials)
1919
:base(log, source, TcpCommand.DeleteStream, TcpCommand.DeleteStreamCompleted, userCredentials)
2020
{

‎src/EventStore.ClientAPI.NetCore/ClientOperations/ReadEventOperation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ namespace EventStore.ClientAPI.ClientOperations
99
internal class ReadEventOperation : OperationBase<EventReadResult, ClientMessage.ReadEventCompleted>
1010
{
1111
private readonly string _stream;
12-
private readonly int _eventNumber;
12+
private readonly long _eventNumber;
1313
private readonly bool _resolveLinkTo;
1414
private readonly bool _requireMaster;
1515

1616
public ReadEventOperation(ILogger log, TaskCompletionSource<EventReadResult> source,
17-
string stream, int eventNumber, bool resolveLinkTo, bool requireMaster, UserCredentials userCredentials)
17+
string stream, long eventNumber, bool resolveLinkTo, bool requireMaster, UserCredentials userCredentials)
1818
: base(log, source, TcpCommand.ReadEvent, TcpCommand.ReadEventCompleted, userCredentials)
1919
{
2020
_stream = stream;

‎src/EventStore.ClientAPI.NetCore/ClientOperations/ReadStreamEventsBackwardOperation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ namespace EventStore.ClientAPI.ClientOperations
99
internal class ReadStreamEventsBackwardOperation : OperationBase<StreamEventsSlice, ClientMessage.ReadStreamEventsCompleted>
1010
{
1111
private readonly string _stream;
12-
private readonly int _fromEventNumber;
12+
private readonly long _fromEventNumber;
1313
private readonly int _maxCount;
1414
private readonly bool _resolveLinkTos;
1515
private readonly bool _requireMaster;
1616

1717
public ReadStreamEventsBackwardOperation(ILogger log, TaskCompletionSource<StreamEventsSlice> source,
18-
string stream, int fromEventNumber, int maxCount, bool resolveLinkTos,
18+
string stream, long fromEventNumber, int maxCount, bool resolveLinkTos,
1919
bool requireMaster, UserCredentials userCredentials)
2020
: base(log, source, TcpCommand.ReadStreamEventsBackward, TcpCommand.ReadStreamEventsBackwardCompleted, userCredentials)
2121
{

‎src/EventStore.ClientAPI.NetCore/ClientOperations/ReadStreamEventsForwardOperation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ namespace EventStore.ClientAPI.ClientOperations
99
internal class ReadStreamEventsForwardOperation : OperationBase<StreamEventsSlice, ClientMessage.ReadStreamEventsCompleted>
1010
{
1111
private readonly string _stream;
12-
private readonly int _fromEventNumber;
12+
private readonly long _fromEventNumber;
1313
private readonly int _maxCount;
1414
private readonly bool _resolveLinkTos;
1515
private readonly bool _requireMaster;
1616

1717
public ReadStreamEventsForwardOperation(ILogger log, TaskCompletionSource<StreamEventsSlice> source,
18-
string stream, int fromEventNumber, int maxCount, bool resolveLinkTos,
18+
string stream, long fromEventNumber, int maxCount, bool resolveLinkTos,
1919
bool requireMaster, UserCredentials userCredentials)
2020
: base(log, source, TcpCommand.ReadStreamEventsForward, TcpCommand.ReadStreamEventsForwardCompleted, userCredentials)
2121
{

‎src/EventStore.ClientAPI.NetCore/ClientOperations/StartTransactionOperation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ internal class StartTransactionOperation : OperationBase<EventStoreTransaction,
1111
{
1212
private readonly bool _requireMaster;
1313
private readonly string _stream;
14-
private readonly int _expectedVersion;
14+
private readonly long _expectedVersion;
1515
private readonly IEventStoreTransactionConnection _parentConnection;
1616

1717
public StartTransactionOperation(ILogger log, TaskCompletionSource<EventStoreTransaction> source,
18-
bool requireMaster, string stream, int expectedVersion, IEventStoreTransactionConnection parentConnection,
18+
bool requireMaster, string stream, long expectedVersion, IEventStoreTransactionConnection parentConnection,
1919
UserCredentials userCredentials)
2020
: base(log, source, TcpCommand.TransactionStart, TcpCommand.TransactionStartCompleted, userCredentials)
2121
{

‎src/EventStore.ClientAPI.NetCore/ClientOperations/SubscriptionOperation.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public void DropSubscription(SubscriptionDropReason reason, Exception exc, TcpPa
208208

209209
if (reason != SubscriptionDropReason.UserInitiated)
210210
{
211-
exc = exc ?? new Exception(string.Format("No exception provided for subscription drop reason '{0}", reason));
211+
exc = exc ?? new Exception($"Subscription dropped for {reason}");
212212
_source.TrySetException(exc);
213213
}
214214

@@ -220,7 +220,7 @@ public void DropSubscription(SubscriptionDropReason reason, Exception exc, TcpPa
220220
}
221221
}
222222

223-
protected void ConfirmSubscription(long lastCommitPosition, int? lastEventNumber)
223+
protected void ConfirmSubscription(long lastCommitPosition, long? lastEventNumber)
224224
{
225225
if (lastCommitPosition < -1)
226226
throw new ArgumentOutOfRangeException("lastCommitPosition", string.Format("Invalid lastCommitPosition {0} on subscription confirmation.", lastCommitPosition));
@@ -234,7 +234,7 @@ protected void ConfirmSubscription(long lastCommitPosition, int? lastEventNumber
234234
_source.SetResult(_subscription);
235235
}
236236

237-
protected abstract T CreateSubscriptionObject(long lastCommitPosition, int? lastEventNumber);
237+
protected abstract T CreateSubscriptionObject(long lastCommitPosition, long? lastEventNumber);
238238

239239
protected void EventAppeared(ResolvedEvent e)
240240
{

0 commit comments

Comments
 (0)