From eb2eb25b66cf31a2ec593991c62fb2c8cb541cb1 Mon Sep 17 00:00:00 2001 From: Bhaskar Mallapragada Date: Thu, 10 Oct 2019 21:41:12 +0530 Subject: [PATCH 1/5] CI-fixes --- .../com/azure/data/cosmos/CosmosScripts.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosScripts.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosScripts.java index 9afc676ab7b1..303c98947c40 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosScripts.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosScripts.java @@ -249,7 +249,11 @@ CosmosStoredProcedureResponse mapStoredProcedureResponseAndBlock(Mono Iterator> getFeedIterator(Flux> itemFlux) { From e19d1ec7f5f783020afff12c606f44dbf93bd514 Mon Sep 17 00:00:00 2001 From: Bhaskar Mallapragada Date: Tue, 15 Oct 2019 02:33:18 +0530 Subject: [PATCH 2/5] CI-fixes --- .../azure/data/cosmos/internal/FeedResponseListValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java index 43172b1016e0..6e3d95d19eb1 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java @@ -276,7 +276,7 @@ public void validate(List> feedList) { if (shouldHaveMetrics) { QueryMetrics queryMetrics = BridgeInternal.createQueryMetricsFromCollection(BridgeInternal.queryMetricsFromFeedResponse(feedPage).values()); assertThat(queryMetrics.getIndexHitDocumentCount()).isGreaterThanOrEqualTo(0); - assertThat(queryMetrics.getRetrievedDocumentSize()).isGreaterThan(0); + assertThat(queryMetrics.getRetrievedDocumentSize()).isGreaterThanOrEqualTo(0); assertThat(queryMetrics.getTotalQueryExecutionTime().compareTo(Duration.ZERO)).isGreaterThan(0); assertThat(queryMetrics.getOutputDocumentCount()).isGreaterThan(0); assertThat(queryMetrics.getRetrievedDocumentCount()).isGreaterThan(0); From a28a72bf6827263cb03163052cf31b4f69de8dfe Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Mon, 14 Oct 2019 18:22:00 -0700 Subject: [PATCH 3/5] Updated query metrics validation checks --- .../cosmos/internal/FeedResponseListValidator.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java index 6e3d95d19eb1..a3e57c03ac8b 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/internal/FeedResponseListValidator.java @@ -173,7 +173,7 @@ public Builder allPagesSatisfy(FeedResponseValidator pageValidator) { public void validate(List> feedList) { for(FeedResponse fp: feedList) { - pageValidator.validate(fp); + pageValidator.validate(fp); } } }); @@ -191,15 +191,15 @@ public void validate(List> feedList) { if (value instanceof Double) { Double d = result.getDouble("_aggregate"); - assertThat(d).isEqualTo(value); + assertThat(d).isEqualTo(value); } else if (value instanceof Integer) { Integer d = result.getInt("_aggregate"); - assertThat(d).isEqualTo(value); + assertThat(d).isEqualTo(value); } else if (value instanceof String) { String d = result.getString("_aggregate"); - assertThat(d).isEqualTo(value); + assertThat(d).isEqualTo(value); } else if (value instanceof Document){ assertThat(result.toString()).isEqualTo(value.toString()); @@ -279,8 +279,8 @@ public void validate(List> feedList) { assertThat(queryMetrics.getRetrievedDocumentSize()).isGreaterThanOrEqualTo(0); assertThat(queryMetrics.getTotalQueryExecutionTime().compareTo(Duration.ZERO)).isGreaterThan(0); assertThat(queryMetrics.getOutputDocumentCount()).isGreaterThan(0); - assertThat(queryMetrics.getRetrievedDocumentCount()).isGreaterThan(0); - assertThat(queryMetrics.getDocumentLoadTime().compareTo(Duration.ZERO)).isGreaterThan(0); + assertThat(queryMetrics.getRetrievedDocumentCount()).isGreaterThanOrEqualTo(0); + assertThat(queryMetrics.getDocumentLoadTime().compareTo(Duration.ZERO)).isGreaterThanOrEqualTo(0); assertThat(queryMetrics.getDocumentWriteTime().compareTo(Duration.ZERO)).isGreaterThanOrEqualTo(0); assertThat(queryMetrics.getVMExecutionTime().compareTo(Duration.ZERO)).isGreaterThan(0); assertThat(queryMetrics.getQueryPreparationTimes().getLogicalPlanBuildTime().compareTo(Duration.ZERO)).isGreaterThan(0); From 413ebc910701d1c9e90f8b4985bae7f90405b608 Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Tue, 15 Oct 2019 13:49:53 -0700 Subject: [PATCH 4/5] Fixed stored procedure path in test --- .../rx/MultiMasterConflictResolutionTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java index 8555cbf267ca..e2aac37341ac 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java @@ -95,15 +95,16 @@ public void conflictResolutionPolicyCRUD() { // 1. CUSTOM with valid sprocLink // 2. CUSTOM with null sprocLink, should default to empty string // 3. CUSTOM with empty sprocLink, should default to empty string - testConflictResolutionPolicyRequiringPath(ConflictResolutionMode.CUSTOM, - new String[] { "randomSprocName", null, "" }, new String[] { "randomSprocName", "", "" }); + testConflictResolutionPolicyRequiringPath(ConflictResolutionMode.CUSTOM, new String[] { "dbs/mydb/colls" + + "/mycoll/sprocs/randomSprocName", null, "" }, new String[] { "dbs/mydb/colls/mycoll/sprocs" + + "/randomSprocName", "", "" }); } private void testConflictResolutionPolicyRequiringPath(ConflictResolutionMode conflictResolutionMode, String[] paths, String[] expectedPaths) { - for (int i = 0; i < paths.length; i++) { + for (int i = 0; i < paths.length; i++) { CosmosContainerProperties collectionSettings = new CosmosContainerProperties(UUID.randomUUID().toString(), partitionKeyDef); - + if (conflictResolutionMode == ConflictResolutionMode.LAST_WRITER_WINS) { collectionSettings.setConflictResolutionPolicy(ConflictResolutionPolicy.createLastWriterWinsPolicy(paths[i])); } else { @@ -111,7 +112,7 @@ private void testConflictResolutionPolicyRequiringPath(ConflictResolutionMode co } collectionSettings = database.createContainer(collectionSettings, new CosmosContainerRequestOptions()).block().getProperties(); assertThat(collectionSettings.getConflictResolutionPolicy().getMode()).isEqualTo(conflictResolutionMode); - + if (conflictResolutionMode == ConflictResolutionMode.LAST_WRITER_WINS) { assertThat(collectionSettings.getConflictResolutionPolicy().getConflictResolutionPath()).isEqualTo(expectedPaths[i]); } else { @@ -119,7 +120,7 @@ private void testConflictResolutionPolicyRequiringPath(ConflictResolutionMode co } } } - + @Test(groups = "multi-master", timeOut = TIMEOUT) public void invalidConflictResolutionPolicy_LastWriterWinsWithStoredProc() throws Exception { CosmosContainerProperties collection = new CosmosContainerProperties(UUID.randomUUID().toString(), partitionKeyDef); From 2b3e78861af77fd81c5fb3abf91c0bf4fa7eb42e Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Tue, 15 Oct 2019 15:26:12 -0700 Subject: [PATCH 5/5] Fixed emulator path to public emulator --- eng/pipelines/templates/variables/globals.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml index 82e14a0b4207..1087d8658e2e 100644 --- a/eng/pipelines/templates/variables/globals.yml +++ b/eng/pipelines/templates/variables/globals.yml @@ -1,7 +1,7 @@ variables: - DefaultOptions: '--batch-mode --fail-at-end --settings eng/settings.xml' - LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - MemoryOptions: '-Xmx3072m' - #Agent.Source.Git.ShallowFetchDepth: 1 - skipComponentGovernanceDetection: true - EmulatorMsiUrl: 'https://acpedaily1.blob.core.windows.net/emulator/azure-cosmos-emulator.msi' + DefaultOptions: '--batch-mode --fail-at-end --settings eng/settings.xml' + LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + MemoryOptions: '-Xmx3072m' + #Agent.Source.Git.ShallowFetchDepth: 1 + skipComponentGovernanceDetection: true + EmulatorMsiUrl: 'https://aka.ms/cosmosdb-emulator'