Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GLSNParsingFix #24756

Merged
merged 2 commits into from
Oct 13, 2021
Merged

GLSNParsingFix #24756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
626482d
import globalSLN parsing fix to V3
Oct 13, 2021
e543bde
update tests
Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/StoreReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ StoreResult createStoreResult(StoreResponse storeResponse,

headerValue = cosmosClientException.responseHeaders().get(WFConstants.BackendHeaders.GLOBAL_COMMITTED_LSN);
if (!Strings.isNullOrEmpty(headerValue)) {
globalCommittedLSN = Integer.parseInt(headerValue);
globalCommittedLSN = Long.parseLong(headerValue);
}

long lsn = -1;
Expand Down
66 changes: 62 additions & 4 deletions ...smos/src/test/java/com/azure/data/cosmos/internal/directconnectivity/StoreReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,26 @@
import com.azure.data.cosmos.ConsistencyLevel;
import com.azure.data.cosmos.CosmosClientException;
import com.azure.data.cosmos.GoneException;
import com.azure.data.cosmos.internal.ISessionContainer;
import com.azure.data.cosmos.PartitionKeyRangeGoneException;
import com.azure.data.cosmos.RequestRateTooLargeException;
import com.azure.data.cosmos.internal.*;
import com.azure.data.cosmos.NotFoundException;
import com.azure.data.cosmos.PartitionIsMigratingException;
import com.azure.data.cosmos.PartitionKeyRangeGoneException;
import com.azure.data.cosmos.PartitionKeyRangeIsSplittingException;
import com.azure.data.cosmos.RequestRateTooLargeException;
import com.azure.data.cosmos.internal.DocumentServiceRequestContext;
import com.azure.data.cosmos.internal.FailureValidator;
import com.azure.data.cosmos.internal.HttpConstants;
import com.azure.data.cosmos.internal.ISessionContainer;
import com.azure.data.cosmos.internal.ISessionToken;
import com.azure.data.cosmos.internal.OperationType;
import com.azure.data.cosmos.internal.PartitionKeyRange;
import com.azure.data.cosmos.internal.RequestChargeTracker;
import com.azure.data.cosmos.internal.ResourceType;
import com.azure.data.cosmos.internal.RxDocumentServiceRequest;
import com.azure.data.cosmos.internal.StoreResponseBuilder;
import com.azure.data.cosmos.internal.Utils;
import com.azure.data.cosmos.internal.VectorSessionToken;
import com.google.common.collect.ImmutableList;
import io.reactivex.Single;
import io.reactivex.subscribers.TestSubscriber;
import org.assertj.core.api.AssertionsForClassTypes;
import org.mockito.Mockito;
Expand Down Expand Up @@ -648,6 +660,52 @@ public Object[][] readMultipleReplicasAsyncArgProvider() {
};
}

@Test(groups = "unit")
public void canParseLongLsn() throws CosmosClientException {
TransportClient transportClient = Mockito.mock(TransportClient.class);
AddressSelector addressSelector = Mockito.mock(AddressSelector.class);
ISessionContainer sessionContainer = Mockito.mock(ISessionContainer.class);

URI primaryURI = URI.create("primaryLoc");

RxDocumentServiceRequest request = RxDocumentServiceRequest.createFromName(
OperationType.Read, "/dbs/db/colls/col/docs/docId", ResourceType.Document);

request.requestContext = Mockito.mock(DocumentServiceRequestContext.class);
request.requestContext.timeoutHelper = Mockito.mock(TimeoutHelper.class);
Mockito.doReturn(true).when(request.requestContext.timeoutHelper).isElapsed();
request.requestContext.resolvedPartitionKeyRange = partitionKeyRangeWithId("12");
request.requestContext.requestChargeTracker = new RequestChargeTracker();

Mockito.doReturn(Mono.just(primaryURI)).when(addressSelector).resolvePrimaryUriAsync(
Mockito.eq(request) , Mockito.eq(false));


StoreReader storeReader = new StoreReader(transportClient, addressSelector, sessionContainer);

long bigLsn = 3629783308L;

// Test parsing GLSN from storeResponse
StoreResponse storeResponse = StoreResponseBuilder.create()
.withLSN(bigLsn)
.withLocalLSN(bigLsn)
.withGlobalCommittedLsn(bigLsn)
.build();

StoreResult result = storeReader.createStoreResult(storeResponse, null, false, false, null);
assertThat(result.globalCommittedLSN).isEqualTo(bigLsn);
assertThat(result.lsn).isEqualTo(bigLsn);

// Test parsing GLSN from cosmosException
GoneException goneException = new GoneException();
goneException.responseHeaders().put(WFConstants.BackendHeaders.GLOBAL_COMMITTED_LSN, Long.toString(bigLsn));
goneException.responseHeaders().put(WFConstants.BackendHeaders.LOCAL_LSN, Long.toString(bigLsn));

result = storeReader.createStoreResult(null, goneException, false, true, null);
assertThat(result.globalCommittedLSN).isEqualTo(bigLsn);
assertThat(result.lsn).isEqualTo(bigLsn);
}

@Test(groups = "unit", dataProvider = "readMultipleReplicasAsyncArgProvider")
public void readMultipleReplicasAsync(boolean includePrimary, int replicaCountToRead, ReadMode readMode) {
// This adds basic tests for StoreReader.readMultipleReplicasAsync(.) without failure
Expand Down