refactor findIndexWithDimensionAndType to avoid waiting on unrelated indexes

Author: austin-denoble

src/integration/java/io/pinecone/helpers/IndexManager.java

@@ -36,34 +36,20 @@ public static PineconeConnection createIndexIfNotExistsDataPlane(int dimension,
         return new PineconeConnection(config);
     }
 
-    public static String createIndexIfNotExistsControlPlane(Pinecone pinecone, int dimension, String indexType) throws IOException, InterruptedException {
-        String indexName = findIndexWithDimensionAndType(pinecone, dimension, indexType);
-
-        return (indexName.isEmpty()) ? createNewIndex(pinecone, dimension, indexType) : indexName;
-    }
-
-    public static String findIndexWithDimensionAndType(Pinecone pinecone, int dimension, String indexType)
-            throws InterruptedException {
+    public static String findIndexWithDimensionAndType(Pinecone pinecone, int dimension, String indexType) {
         String indexName = "";
-        int i = 0;
         List<IndexModel> indexModels = pinecone.listIndexes().getIndexes();
         if(indexModels == null) {
             return indexName;
         }
-        while (i < indexModels.size()) {
-            IndexModel indexModel = waitUntilIndexIsReady(pinecone, indexModels.get(i).getName());
+
+        for (IndexModel indexModel : indexModels) {
             if (indexModel.getDimension() == dimension
-                    &&
-                    (
-                            indexType.equalsIgnoreCase(IndexModelSpec.SERIALIZED_NAME_POD)
-                                    && indexModel.getSpec().getPod() != null
-                                    && indexModel.getSpec().getPod().getReplicas() == 1
-                                    && indexModel.getSpec().getPod().getPodType().equalsIgnoreCase("p1.x1")
-                    )
-                    || (indexType.equalsIgnoreCase(IndexModelSpec.SERIALIZED_NAME_SERVERLESS))) {
+                && (indexType.equalsIgnoreCase(IndexModelSpec.SERIALIZED_NAME_POD) && indexModel.getSpec().getPod() != null)
+                || (indexType.equalsIgnoreCase(IndexModelSpec.SERIALIZED_NAME_SERVERLESS) && indexModel.getSpec().getServerless() != null)
+            ) {
                 return indexModel.getName();
             }
-            i++;
         }
         return indexName;
     }
@@ -117,7 +103,7 @@ public static IndexModel waitUntilIndexIsReady(Pinecone pinecone, String indexNa
         return waitUntilIndexIsReady(pinecone, indexName, 300000);
     }
 
-    public static PineconeConnection createNewIndexAndConnect(Pinecone pinecone, String indexName, int dimension, IndexMetric metric, CreateIndexRequestSpec spec) throws InterruptedException, PineconeException {
+    public static PineconeConnection createNewIndexAndConnect(Pinecone pinecone, String indexName, int dimension, IndexMetric metric, CreateIndexRequestSpec spec, boolean waitUntilIndexIsReady) throws InterruptedException, PineconeException {
         String apiKey = System.getenv("PINECONE_API_KEY");
         CreateIndexRequest createIndexRequest = new CreateIndexRequest().name(indexName).dimension(dimension).metric(metric).spec(spec);
         pinecone.createIndex(createIndexRequest);

src/integration/java/io/pinecone/integration/controlPlane/pod/CollectionTest.java

@@ -45,7 +45,7 @@ public static void setUp() throws InterruptedException {
                 new CreateIndexRequestSpecPod().pods(1).podType("p1.x1").replicas(1).environment(environment);
         CreateIndexRequestSpec spec = new CreateIndexRequestSpec().pod(podSpec);
         PineconeConnection dataPlaneConnection = createNewIndexAndConnect(controlPlaneClient, indexName, dimension,
-                indexMetric, spec);
+                indexMetric, spec, true);
         VectorServiceGrpc.VectorServiceBlockingStub blockingStub = dataPlaneConnection.getBlockingStub();
         indexes.add(indexName);
 
@@ -119,7 +119,7 @@ public void testIndexFromCollectionHappyPath() throws InterruptedException {
         assertTrue(collection.getSize() > 0);
 
         // Create index from collection
-        String newIndexName = RandomStringBuilder.build("index-from-col", 5);
+        String newIndexName = RandomStringBuilder.build("from-col", 5);
         logger.info("Creating index " + newIndexName + " from collection " + collectionName);
 
         CreateIndexRequestSpecPod podSpec =
@@ -179,7 +179,7 @@ public void testIndexFromDifferentMetricCollection() throws InterruptedException
                 new CreateIndexRequestSpecPod().environment(environment).sourceCollection(collectionName);
         CreateIndexRequestSpec spec = new CreateIndexRequestSpec().pod(podSpec);
         PineconeConnection dataPlaneConnection = createNewIndexAndConnect(controlPlaneClient, newIndexName, dimension
-                , targetMetric, spec);
+                , targetMetric, spec, false);
         indexes.add(newIndexName);
 
         IndexModel newIndex = controlPlaneClient.describeIndex(newIndexName);