Fixed issue with spec being empty

georgia-tech-db · Apr 11, 2024 · 48d9e8f · 48d9e8f
1 parent d822931
commit 48d9e8f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
       - run: psql test -c 'alter database test set enable_seqscan = off'
 
       # setup the database for testing
-      - run: make installcheck REGRESS="pinecone_crud pinecone_medium_create pinecone_zero_vector_insert pinecone_build_after_insert" REGRESS_OPTS="--dbname=test --inputdir=./test --use-existing"
+      - run: make installcheck REGRESS="pinecone_crud pinecone_medium_create pinecone_zero_vector_insert pinecone_build_after_insert pinecone_invalid_config" REGRESS_OPTS="--dbname=test --inputdir=./test --use-existing"
       - if: ${{ failure() }}
         run: cat regression.diffs
   # mac:

diff --git a/src/pinecone/pinecone.h b/src/pinecone/pinecone.h
@@ -200,7 +200,7 @@ IndexBulkDeleteResult *pinecone_bulkdelete(IndexVacuumInfo *info, IndexBulkDelet
 IndexBulkDeleteResult *no_vacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats);
 
 // validate
-void pinecone_spec_validator(const char *spec);
+void pinecone_spec_validator(const PineconeOptions *opts);
 void pinecone_host_validator(const char *spec);
 void validate_api_key(void);
 void validate_vector_nonzero(Vector* vector);

diff --git a/src/pinecone/pinecone_build.c b/src/pinecone/pinecone_build.c
@@ -53,6 +53,9 @@ IndexBuildResult *pinecone_build(Relation heap, Relation index, IndexInfo *index
     PineconeOptions *opts = (PineconeOptions *) index->rd_options;
     IndexBuildResult *result = palloc(sizeof(IndexBuildResult));
     VectorMetric metric = get_opclass_metric(index);
+    // Log spec.
+    pinecone_spec_validator(opts);
+    const char* spec = GET_STRING_RELOPTION(opts, spec);
     cJSON* spec_json = cJSON_Parse(GET_STRING_RELOPTION(opts, spec));
     int dimensions = TupleDescAttr(index->rd_att, 0)->atttypmod;
     char* pinecone_index_name = get_pinecone_index_name(index);

diff --git a/src/pinecone/pinecone_validate.c b/src/pinecone/pinecone_validate.c
@@ -21,16 +21,15 @@ void validate_vector_nonzero(Vector* vector) {
 }
 
 
-void pinecone_spec_validator(const char *spec)
+void pinecone_spec_validator(const PineconeOptions *opts)
 {
-    bool empty = strcmp(spec, "") == 0;
-    if (empty || cJSON_Parse(spec) == NULL)
+    if (opts == NULL || cJSON_Parse(GET_STRING_RELOPTION(opts, spec)) == NULL || strcmp(GET_STRING_RELOPTION(opts, spec), "") == 0)
     {
         ereport(ERROR,
                 (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                (empty ? errmsg("Spec cannot be empty") : errmsg("Invalid spec: %s", spec)),
-                errhint("Spec should be a valid JSON object e.g. WITH (spec='{\"serverless\":{\"cloud\":\"aws\",\"region\":\"us-west-2\"}}').\n \
-                        Refer to https://docs.pinecone.io/reference/create_index")));
+                 errmsg("Invalid spec"),
+                 errhint("Spec should be a valid JSON object e.g. WITH (spec='{\"serverless\":{\"cloud\":\"aws\",\"region\":\"us-west-2\"}}').\n \
+                         Refer to https://docs.pinecone.io/reference/create_index")));
     }
 }
 

diff --git a/test/expected/pinecone_invalid_config.out b/test/expected/pinecone_invalid_config.out
@@ -1,4 +1,5 @@
 SET enable_seqscan = off;
+SET client_min_messages = 'notice';
 ALTER SYSTEM RESET pinecone.api_key;
 SELECT pg_reload_conf();
  pg_reload_conf 
@@ -10,13 +11,15 @@ CREATE TABLE t (val vector(3));
 CREATE INDEX i2 ON t USING pinecone (val) WITH (spec = '{"serverless":{"cloud":"aws","region":"us-west-2"}}');
 ERROR:  Pinecone API key not set
 HINT:  Set the pinecone API key using the pinecone.api_key GUC. E.g. ALTER SYSTEM SET pinecone.api_key TO 'your-api-key'
-ALTER SYSTEM SET pinecone.api_key = '5b2c1031-ba58-4acc-a634-9f943d68822c';
+ALTER SYSTEM SET pinecone.api_key = 'fake-key';
 SELECT pg_reload_conf();
  pg_reload_conf 
 ----------------
  t
 (1 row)
 
 CREATE INDEX i2 ON t USING pinecone (val);
-ERROR:  Spec cannot be empty
-DROP TABLE t;
+ERROR:  Invalid spec
+HINT:  Spec should be a valid JSON object e.g. WITH (spec='{"serverless":{"cloud":"aws","region":"us-west-2"}}').
+                          Refer to https://docs.pinecone.io/reference/create_index
+DROP TABLE t;
diff --git a/test/sql/pinecone_invalid_config.sql b/test/sql/pinecone_invalid_config.sql
@@ -1,9 +1,10 @@
 SET enable_seqscan = off;
+SET client_min_messages = 'notice';
 ALTER SYSTEM RESET pinecone.api_key;
 SELECT pg_reload_conf();
 CREATE TABLE t (val vector(3));
 CREATE INDEX i2 ON t USING pinecone (val) WITH (spec = '{"serverless":{"cloud":"aws","region":"us-west-2"}}');
-ALTER SYSTEM SET pinecone.api_key = '5b2c1031-ba58-4acc-a634-9f943d68822c';
+ALTER SYSTEM SET pinecone.api_key = 'fake-key';
 SELECT pg_reload_conf();
 CREATE INDEX i2 ON t USING pinecone (val);
 DROP TABLE t;