Merge branch 'main' into users/akataria/nonStreamingOrderBy

Author: aayush3011

.github/workflows/event-processor.yml

@@ -33,7 +33,7 @@ jobs:
     if: ${{ github.event_name == 'issues' && github.event.action == 'opened' }}
     steps:
       - name: 'Az CLI login'
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
             client-id: ${{ secrets.AZURE_CLIENT_ID }}
             tenant-id: ${{ secrets.AZURE_TENANT_ID }}

.vscode/cspell.json

@@ -136,10 +136,12 @@
     "sdk/cosmos/azure-cosmos-spark_3-2_2-12/**",
     "sdk/cosmos/azure-cosmos-spark_3-3_2-12/**",
     "sdk/cosmos/azure-cosmos-spark_3-4_2-12/**",
+    "sdk/cosmos/azure-cosmos-spark_3-5_2-12/**",
     "sdk/core/azure-core-test/**",
     "sdk/cosmos/azure-cosmos-encryption/**",
     "sdk/cosmos/azure-cosmos-spark_3_2-12/**",
     "sdk/spring/azure-spring-data-cosmos/**",
+    "sdk/cosmos/azure-cosmos-kafka-connect/**",
     "sdk/deviceupdate/azure-iot-deviceupdate/**",
     "sdk/e2e/src/**",
     "sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/**",
@@ -186,15 +188,13 @@
     "sdk/servicebus/azure-messaging-servicebus-stress/templates/**",
     "sdk/servicebus/azure-messaging-servicebus-stress/workbooks/**",
     "sdk/servicebus/azure-messaging-servicebus-stress/Dockerfile",
-    "sdk/search/azure-search-documents/**",
     "sdk/storage/azure-storage-internal-avro/**",
     "sdk/storage/azure-storage-queue/**",
     "sdk/synapse/azure-analytics-synapse-accesscontrol/**",
     "sdk/synapse/azure-analytics-synapse-managedprivateendpoints/**",
     "sdk/synapse/azure-analytics-synapse-monitoring/**",
     "sdk/synapse/azure-analytics-synapse-spark/**",
     "sdk/storage/azure-storage-blob-nio/**",
-    "sdk/tables/.idea/**",
     "sdk/template/azure-sdk-template/**",
     "sdk/template/azure-sdk-template-three/**",
     "sdk/template/azure-sdk-template-two/**",
@@ -205,18 +205,23 @@
     "sdk/videoanalyzer/azure-media-videoanalyzer-edge/**",
     "sdk/synapse/azure-analytics-synapse-artifacts/**",
     "sdk/webpubsub/azure-messaging-webpubsub/**",
-    "sdk/tables/azure-data-tables/**",
     "sdk/textanalytics/azure-ai-textanalytics/**",
     "sdk/storage/azure-storage-file-datalake/**",
     "sdk/maps/azure-maps-elevation/**",
     "sdk/maps/azure-maps-geolocation/**",
     "sdk/maps/azure-maps-timezone/**",
-    "sdk/search/.idea/**",
     "sdk/devcenter/azure-developer-devcenter/**",
     "sdk/loadtesting/azure-developer-loadtesting/**",
     "sdk/serialization/azure-json-gson/**",
     "sdk/serialization/azure-json/**",
-    "sdk/serialization/azure-xml/**"
+    "sdk/serialization/azure-xml/**",
+    "sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/HotelsData.json",
+    "sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/OcrSkillLanguage.java",
+    "sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/PhoneticEncoder.java",
+    "sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/StemmerTokenFilterLanguage.java",
+    "sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/SnowballTokenFilterLanguage.java",
+    "sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TextTranslationSkillLanguage.java",
+    "sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/TokenFilterName.java"
   ],
   "words": [
     "adal",
@@ -225,6 +230,7 @@
     "amqp",
     "Amqp",
     "AMQP",
+    "AOAI",
     "apacheavro",
     "Apim",
     "AUHours",
@@ -354,6 +360,7 @@
     "netapp",
     "Netezza",
     "odata",
+    "OAI",
     "ODBC",
     "okhttp",
     "OTLP",
@@ -420,6 +427,42 @@
     "XLint"
   ],
   "overrides": [
+    {
+      "filename": "sdk/search/azure-search-documents/**",
+      "words": [
+        "ADLS",
+        "mysearch",
+        "TFIDF",
+        "Decompounder",
+        "NGRAM",
+        "Bangla",
+        "Rslp",
+        "vectorizer",
+        "vectorizable",
+        "vectorizers",
+        "hnsw",
+        "rerank",
+        "reranker",
+        "mytext",
+        "myocr",
+        "econo",
+        "azsearch",
+        "bokmaal",
+        "bokmal",
+        "adlsgen",
+        "sorani",
+        "mylocation",
+        "myloc",
+        "dari",
+        "hitel"
+      ]
+    },
+    {
+      "filename": "sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/HotelsData.json",
+      "words": [
+        "*"
+      ]
+    },
     {
       "filename": "sdk/identity/cgmanifest.json",
       "words":[
@@ -723,7 +766,7 @@
       "words": [
         "Pfast",
         "Pdirect",
-	      "Pmulti",
+	    "Pmulti",
         "Psplit",
         "Pquery",
         "Pcfp",

common/perf-test-core/pom.xml

@@ -34,14 +34,21 @@
 
   <properties>
     <relative.path.to.eng.folder>../..</relative.path.to.eng.folder>
+    <test.dir>src/test/java</test.dir>
+    <jacoco.skip>true</jacoco.skip>
+    <!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
+    <javaModulesSurefireArgLine>
+      --add-exports com.azure.core.test.perf/com.azure.perf.test.core=ALL-UNNAMED
+    </javaModulesSurefireArgLine>
+
   </properties>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
+        <version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
         <configuration>
           <rules>
             <bannedDependencies>
@@ -52,7 +59,7 @@
                 <include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
 
                 <include>io.projectreactor:reactor-core:[3.4.36]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
-                <include>io.vertx:vertx-codegen:[4.5.5]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
+                <include>io.vertx:vertx-codegen:[4.5.7]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
@@ -75,28 +82,46 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.14.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.14.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.11.19</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
+      <version>1.11.20</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-jdk-httpclient</artifactId>
-      <version>1.0.0-beta.11</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
+      <version>1.0.0-beta.12</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-vertx</artifactId>
-      <version>1.0.0-beta.16</version> <!-- {x-version-update;com.azure:azure-core-http-vertx;dependency} -->
+      <version>1.0.0-beta.17</version> <!-- {x-version-update;com.azure:azure-core-http-vertx;dependency} -->
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-codegen</artifactId>
-      <version>4.5.5</version> <!-- {x-version-update;io.vertx:vertx-codegen;external_dependency} -->
+      <version>4.5.7</version> <!-- {x-version-update;io.vertx:vertx-codegen;external_dependency} -->
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

common/perf-test-core/src/main/java/com/azure/perf/test/core/RepeatingInputStream.java

@@ -3,6 +3,8 @@
 
 package com.azure.perf.test.core;
 
+import com.azure.core.util.BinaryData;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Random;
@@ -11,32 +13,44 @@
  * Represents a repeating input stream with mark support enabled.
  */
 public class RepeatingInputStream extends InputStream {
-    private static final int RANDOM_BYTES_LENGTH = Integer.parseInt(
-        System.getProperty("azure.core.perf.test.data.buffer.size", "1048576")); // 1MB default;
     private static final byte[] RANDOM_BYTES;
     private final long size;
 
     private long mark = 0;
     private long readLimit = Long.MAX_VALUE;
     private long pos = 0;
-
+    private final byte[] source;
     static {
+        int randomLength = Integer.parseInt(
+            System.getProperty("azure.core.perf.test.data.buffer.size", "1048576")); // 1MB default;
+
         Random random = new Random(0);
-        RANDOM_BYTES = new byte[RANDOM_BYTES_LENGTH];
+        RANDOM_BYTES = new byte[randomLength];
         random.nextBytes(RANDOM_BYTES);
     }
 
     /**
      * Creates an Instance of the repeating input stream.
      * @param size the size of the stream.
      */
-    public  RepeatingInputStream(long size) {
+    public RepeatingInputStream(long size) {
         this.size = size;
+        this.source = RANDOM_BYTES;
+    }
+
+    /**
+     * Creates an instance of the stream which repeats the given buffer.
+     * @param source the buffer to repeat. Must be relatively small and fit into memory.
+     * @param size the size of the stream.
+     */
+    public RepeatingInputStream(BinaryData source, long size) {
+        this.size = size;
+        this.source = source.toBytes();
     }
 
     @Override
     public synchronized int read() {
-        return (pos < size) ? (RANDOM_BYTES[(int) (pos++ % RANDOM_BYTES_LENGTH)] & 0xFF) : -1;
+        return (pos < size) ? getByte(pos) : -1;
     }
 
     @Override
@@ -50,12 +64,14 @@ public synchronized int read(byte[] b, int off, int len) {
             return -1;
         }
 
-        int readCount = Math.min(len, RANDOM_BYTES_LENGTH);
-        long remaining = this.size - this.pos;
-        if (remaining < readCount) {
-            readCount = (int) remaining;
+        int posSrc = (int)(pos % source.length);
+        int readCount = Math.min(len, source.length - posSrc);
+
+        long remainingDest = this.size - this.pos;
+        if (remainingDest < readCount) {
+            readCount = (int) remainingDest;
         }
-        System.arraycopy(RANDOM_BYTES, 0, b, off, readCount);
+        System.arraycopy(source, posSrc, b, off, readCount);
         pos += readCount;
 
         return readCount;
@@ -95,5 +111,9 @@ public int available() throws IOException {
             return (int) remaining;
         }
     }
+
+    private int getByte(long pos) {
+        return source[(int)(pos % source.length)] & 0xFF;
+    }
 }
 

common/perf-test-core/src/test/java/com/azure/perf/test/core/RepeatingInputStreamTests.java

@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.perf.test.core;
+
+import com.azure.core.util.BinaryData;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class RepeatingInputStreamTests {
+    @ParameterizedTest
+    @ValueSource(ints = {100, 2 * 1024 * 1024})
+    public void generateRandomStream(int length) throws IOException {
+        RepeatingInputStream stream = new RepeatingInputStream(length);
+        assertEquals(length, stream.available());
+        assertTrue(stream.markSupported());
+
+        byte[] allBytes = readAllBytes(stream, length, length);
+
+        assertEquals(0, stream.available());
+        stream.reset();
+        assertEquals(length, stream.available());
+
+        assertContentEquals(allBytes, stream, 11);
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {10, 100, 2 * 1024 * 1024})
+    public void generateStreamFromSource(int length) throws IOException {
+        String bufferStr = "Sample content - we'll repeat this string.";
+        String expected = String.join("", Collections.nCopies((length/bufferStr.length()) + 1, bufferStr)).substring(0, length);
+
+        RepeatingInputStream stream = new RepeatingInputStream(BinaryData.fromString(bufferStr), length);
+        assertEquals(length, stream.available());
+
+        byte[] allBytes = readAllBytes(stream, length, length);
+        assertEquals(expected, new String(allBytes, StandardCharsets.UTF_8));
+        stream.reset();
+
+        assertContentEquals(allBytes, stream, 37);
+    }
+
+    private byte[] readAllBytes(InputStream actual, int step, int length) throws IOException {
+        byte[] buffer = new byte[length];
+        int pos = 0;
+        int read;
+        while ((read = actual.read(buffer, pos, step)) > 0) {
+            pos += read;
+        }
+
+        return buffer;
+    }
+
+    private void assertContentEquals(byte[] expected, InputStream actual, int step) throws IOException {
+        byte[] buffer = readAllBytes(actual, step, expected.length);
+        for (int i = 0; i < expected.length; i ++) {
+            assertEquals(expected[i], buffer[i]);
+        }
+    }
+}
+