Adding perf improvements ofr ObjectNode mapping (Azure#18859)

FabianMeiswinkel · web-flow · commit 49446fe1d43e · 2021-01-29T16:36:13.000+01:00
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/README.md b/sdk/cosmos/azure-cosmos-dotnet-benchmark/README.md
@@ -63,7 +63,9 @@ Copyright (C) 2019 CosmosBenchmark
 
   --partitionKeyPath     Container partition key path
 
-  -pl                   Degree of parallism
+  -pl                    Degree of parallism
+  
+  -w                     Workload name
 
   --itemTemplateFile     Item template
 
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml
@@ -80,6 +80,19 @@ Licensed under the MIT License.
       <version>4.13.1</version> <!-- {x-version-update;junit:junit;external_dependency} -->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>6.14.3</version> <!-- {x-version-update;org.testng:testng;external_dependency} -->
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.16.1</version> <!-- {x-version-update;org.assertj:assertj-core;external_dependency} -->
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/BenchmarkConfig.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/BenchmarkConfig.java
@@ -16,8 +16,8 @@ public class BenchmarkConfig {
     public final static String USER_AGENT_SUFFIX = "cosmosdbdotnetbenchmark";
 
     @Parameter(names = "-w", description = "Type of Workload:\n"
-        + "\tReadTExists - run a READ workload that prints both throughput and latency *\n"
         + "\tInsert - run a Insert workload that prints both throughput and latency\n"
+        + "\tInsertWithoutExplicitPKAndId - same as Insert, but parsing PK and id from ObjectNode\n"
         , converter = Operation.OperationTypeConverter.class)
     private Operation operation = Operation.Insert;
 
@@ -239,8 +239,8 @@ public boolean isHelp() {
     }
 
     public enum Operation {
-        ReadTExists,
-        Insert;
+        Insert,
+        InsertWithoutExplicitPKAndId;
 
         static Operation fromString(String code) {
 
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/IBenchmarkOperation.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/IBenchmarkOperation.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
 import reactor.core.publisher.Mono;
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/IExecutionStrategy.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/IExecutionStrategy.java
@@ -1,6 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
-import com.azure.cosmos.implementation.guava25.base.Function;
+import java.util.function.Supplier;
 
 interface IExecutionStrategy {
     RunSummary execute(
@@ -11,7 +14,7 @@ RunSummary execute(
 
     static IExecutionStrategy startNew(
         BenchmarkConfig config,
-        Function<Void, IBenchmarkOperation> benchmarkOperation) {
+        Supplier<IBenchmarkOperation> benchmarkOperation) {
 
         return new ParallelExecutionStrategy(config, benchmarkOperation);
     }
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/IExecutor.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/IExecutor.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
 import reactor.core.publisher.Mono;
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/JsonHelper.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/JsonHelper.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
 import com.azure.cosmos.implementation.Utils;
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/Main.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/Main.java
@@ -8,7 +8,6 @@
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.ThrottlingRetryOptions;
 import com.azure.cosmos.dotnet.benchmark.operations.InsertBenchmarkOperation;
-import com.azure.cosmos.implementation.guava25.base.Function;
 import com.azure.cosmos.models.CosmosItemResponse;
 import com.azure.cosmos.models.PartitionKey;
 import com.azure.cosmos.models.PartitionKeyDefinition;
@@ -25,6 +24,7 @@
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
+import java.util.function.Supplier;
 
 public class Main {
 
@@ -99,7 +99,7 @@ public static void main(String[] args) throws Exception {
             Utility.traceInformation("");
 
             int opsPerTask = cfg.getItemCount() / taskCount;
-            Function<Void, IBenchmarkOperation> benchmarkFactory =
+            Supplier<IBenchmarkOperation> benchmarkFactory =
                 getBenchmarkFactory(cfg, partitionKeyPath, cosmosClient);
 
             IExecutionStrategy execution = IExecutionStrategy.startNew(cfg, benchmarkFactory);
@@ -167,21 +167,35 @@ public static void main(String[] args) throws Exception {
                 cosmosClient.close();
             }
         }
-
     }
 
-    private static Function<Void, IBenchmarkOperation> getBenchmarkFactory(
+    private static Supplier<IBenchmarkOperation> getBenchmarkFactory(
         BenchmarkConfig cfg,
         String partitionKeyPath,
         CosmosAsyncClient cosmosClient) throws IOException {
 
         String sampleItem = new String(Files.readAllBytes(Paths.get(cfg.getItemTemplateFile())));
 
-        return (dummy) -> new InsertBenchmarkOperation(
-            cosmosClient,
-            cfg.getDatabase(),
-            cfg.getContainer(),
-            partitionKeyPath,
-            sampleItem);
+        switch (cfg.getOperation())
+        {
+            case InsertWithoutExplicitPKAndId:
+                return () -> new InsertBenchmarkOperation(
+                    cosmosClient,
+                    cfg.getDatabase(),
+                    cfg.getContainer(),
+                    partitionKeyPath,
+                    sampleItem,
+                    false);
+            default:
+                return () -> new InsertBenchmarkOperation(
+                    cosmosClient,
+                    cfg.getDatabase(),
+                    cfg.getContainer(),
+                    partitionKeyPath,
+                    sampleItem,
+                    true);
+        }
+
+
     }
 }
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/OperationResult.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/OperationResult.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
 import com.azure.cosmos.implementation.guava25.base.Function;
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/ParallelExecutionStrategy.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/ParallelExecutionStrategy.java
@@ -1,6 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
-import com.azure.cosmos.implementation.guava25.base.Function;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
 
@@ -17,12 +19,12 @@
 
 public class ParallelExecutionStrategy implements IExecutionStrategy {
     private static final long OUTPUT_LOOP_DELAY_IN_MS = 1000;
-    private final Function<Void, IBenchmarkOperation> benchmarkOperation;
+    private final Supplier<IBenchmarkOperation> benchmarkOperation;
     private final BenchmarkConfig config;
     private final AtomicInteger pendingExecutorCount = new AtomicInteger();
 
     public ParallelExecutionStrategy(BenchmarkConfig config,
-                                     Function<Void, IBenchmarkOperation> benchmarkOperation) {
+                                     Supplier<IBenchmarkOperation> benchmarkOperation) {
 
         this.config = config;
         this.benchmarkOperation = benchmarkOperation;
@@ -37,7 +39,7 @@ public RunSummary execute(
 
         IExecutor warmupExecutor = new SerialOperationExecutor(
             "Warmup",
-            this.benchmarkOperation.apply(null));
+            this.benchmarkOperation.get());
 
         // Block while warmup happens
         warmupExecutor.execute(
@@ -62,7 +64,7 @@ public RunSummary execute(
             .flatMap((i) -> {
                     executors[i] = new SerialOperationExecutor(
                         String.valueOf(i),
-                        this.benchmarkOperation.apply(null));
+                        this.benchmarkOperation.get());
 
                     return executors[i].execute(
                         serialExecutorIterationCount,
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/RunSummary.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/RunSummary.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/SerialOperationExecutor.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/SerialOperationExecutor.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
 import reactor.core.publisher.Flux;
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/Summary.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/Summary.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
 class Summary {
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/TelemetrySpan.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/TelemetrySpan.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark;
 
 import java.util.Arrays;
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/operations/InsertBenchmarkOperation.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/main/java/com/azure/cosmos/dotnet/benchmark/operations/InsertBenchmarkOperation.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.cosmos.dotnet.benchmark.operations;
 
 import com.azure.cosmos.CosmosAsyncClient;
@@ -18,20 +21,23 @@ public class InsertBenchmarkOperation implements IBenchmarkOperation {
     private final String databaseName;
     private final String partitionKeyPath;
     private final ObjectNode sampleJsonNode;
+    private final boolean explicitlyProvidePKAndId;
     private PartitionKey partitionKey;
 
     public InsertBenchmarkOperation(
         CosmosAsyncClient cosmosClient,
         String databaseName,
         String containerName,
         String partitionKeyPath,
-        String sampleJson) {
+        String sampleJson,
+        boolean explicitlyProvidePKAndId) {
 
         this.databaseName = databaseName;
         this.containerName = containerName;
         this.partitionKeyPath = partitionKeyPath.replace("/", "");
         this.sampleJsonNode = (ObjectNode)JsonHelper.fromJsonString(sampleJson);
         this.container = cosmosClient.getDatabase(databaseName).getContainer(containerName);
+        this.explicitlyProvidePKAndId = explicitlyProvidePKAndId;
     }
 
     @Override
@@ -52,10 +58,12 @@ public Mono<Object> prepare() {
 
     @Override
     public Mono<OperationResult> executeOnce() {
-        Mono<CosmosItemResponse<ObjectNode>> createTask = this.container.createItem(
-            this.sampleJsonNode,
-            this.partitionKey,
-            null);
+        Mono<CosmosItemResponse<ObjectNode>> createTask = this.explicitlyProvidePKAndId ?
+            this.container.createItem(
+                this.sampleJsonNode,
+                this.partitionKey,
+                null)
+            : this.container.createItem(this.sampleJsonNode);
 
         return createTask
             .map((r) -> {
diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/test/java/BasicOperationTest.java b/sdk/cosmos/azure-cosmos-dotnet-benchmark/src/test/java/BasicOperationTest.java
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/InternalObjectNode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/InternalObjectNode.java
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemTest.java
diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml
