Removed loaded

.github/workflows/build.yml

@@ -8,8 +8,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - postgres: 17
-            os: ubuntu-22.04
           - postgres: 16
             os: ubuntu-22.04
           - postgres: 15
@@ -23,7 +21,7 @@ jobs:
           - postgres: 11
             os: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: ankane/setup-postgres@v1
         with:
           postgres-version: ${{ matrix.postgres }}
@@ -45,7 +43,7 @@ jobs:
     runs-on: macos-latest
     if: ${{ !startsWith(github.ref_name, 'windows') }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: ankane/setup-postgres@v1
         with:
           postgres-version: 14
@@ -67,7 +65,7 @@ jobs:
     runs-on: windows-latest
     if: ${{ !startsWith(github.ref_name, 'mac') }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: ankane/setup-postgres@v1
         with:
           postgres-version: 14

CHANGELOG.md

@@ -1,7 +1,3 @@
-## 0.6.0 (unreleased)
-
-- Added support for sparse vectors
-
 ## 0.5.1 (2023-10-10)
 
 - Improved performance of HNSW index builds

Makefile

@@ -3,8 +3,8 @@ EXTVERSION = 0.5.1
 
 MODULE_big = vector
 DATA = $(wildcard sql/*--*.sql)
-OBJS = src/hnsw.o src/hnswbuild.o src/hnswinsert.o src/hnswscan.o src/hnswutils.o src/hnswvacuum.o src/ivfbuild.o src/ivfflat.o src/ivfinsert.o src/ivfkmeans.o src/ivfscan.o src/ivfutils.o src/ivfvacuum.o src/svector.o src/vector.o
+OBJS = src/hnsw.o src/hnswbuild.o src/hnswinsert.o src/hnswscan.o src/hnswutils.o src/hnswvacuum.o src/ivfbuild.o src/ivfflat.o src/ivfinsert.o src/ivfkmeans.o src/ivfscan.o src/ivfutils.o src/ivfvacuum.o src/vector.o
-HEADERS = src/svector.h src/vector.h
+HEADERS = src/vector.h
 
 TESTS = $(wildcard test/sql/*.sql)
 REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))

Makefile.win

@@ -1,8 +1,8 @@
 EXTENSION = vector
 EXTVERSION = 0.5.1
 
-OBJS = src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\svector.obj src\vector.obj
+OBJS = src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\vector.obj
-HEADERS = src\svector.h src\vector.h
+HEADERS = src\vector.h
 
 REGRESS = btree cast copy functions input ivfflat_cosine ivfflat_ip ivfflat_l2 ivfflat_options ivfflat_unlogged
 REGRESS_OPTS = --inputdir=test --load-extension=$(EXTENSION)
@@ -56,7 +56,7 @@ install:
 	copy $(EXTENSION).control "$(SHAREDIR)\extension"
 	copy sql\$(EXTENSION)--*.sql "$(SHAREDIR)\extension"
 	mkdir "$(INCLUDEDIR_SERVER)\extension\$(EXTENSION)"
-	for %f in ($(HEADERS)) do copy %f "$(INCLUDEDIR_SERVER)\extension\$(EXTENSION)"
+	copy $(HEADERS) "$(INCLUDEDIR_SERVER)\extension\$(EXTENSION)"
 
 installcheck:
 	"$(BINDIR)\pg_regress" --bindir="$(BINDIR)" $(REGRESS_OPTS) $(REGRESS)

README.md

@@ -26,7 +26,7 @@ make install # may need sudo
 
 See the [installation notes](#installation-notes) if you run into issues
 
-You can also install it with [Docker](#docker), [Homebrew](#homebrew), [PGXN](#pgxn), [APT](#apt), [Yum](#yum), or [conda-forge](#conda-forge), and it comes preinstalled with [Postgres.app](#postgresapp) and many [hosted providers](#hosted-postgres). There are also instructions for [GitHub Actions](https://github.com/pgvector/setup-pgvector).
+You can also install it with [Docker](#docker), [Homebrew](#homebrew), [PGXN](#pgxn), [APT](#apt), [Yum](#yum), or [conda-forge](#conda-forge), and it comes preinstalled with [Postgres.app](#postgresapp) and many [hosted providers](#hosted-postgres)
 
 ## Getting Started
 
@@ -215,23 +215,6 @@ SELECT ...
 COMMIT;
 ```
 
-### Indexing Progress
-
-Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING) with Postgres 12+
-
-```sql
-SELECT phase, round(100.0 * tuples_done / nullif(tuples_total, 0), 1) AS "%" FROM pg_stat_progress_create_index;
-```
-
-The phases for IVFFlat are:
-
-1. `initializing`
-2. `performing k-means`
-3. `assigning tuples`
-4. `loading tuples`
-
-Note: `%` is only populated during the `loading tuples` phase
-
 ## HNSW
 
 An HNSW index creates a multilayer graph. It has slower build times and uses more memory than IVFFlat, but has better query performance (in terms of speed-recall tradeoff). There’s no training step like IVFFlat, so the index can be created without any data in the table.
@@ -288,18 +271,22 @@ SELECT ...
 COMMIT;
 ```
 
-### Indexing Progress
+## Indexing Progress
 
 Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING) with Postgres 12+
 
 ```sql
-SELECT phase, round(100.0 * blocks_done / nullif(blocks_total, 0), 1) AS "%" FROM pg_stat_progress_create_index;
+SELECT phase, tuples_done, tuples_total FROM pg_stat_progress_create_index;
 ```
 
-The phases for HNSW are:
+The phases are:
 
 1. `initializing`
-2. `loading tuples`
+2. `performing k-means` - IVFFlat only
+3. `assigning tuples` - IVFFlat only
+4. `loading tuples`
+
+Note: `tuples_done` and `tuples_total` are only populated during the `loading tuples` phase
 
 ## Filtering
 
@@ -330,15 +317,13 @@ CREATE TABLE items (embedding vector(3), category_id int) PARTITION BY LIST(cate
 
 ## Hybrid Search
 
-Use together with Postgres [full-text search](https://www.postgresql.org/docs/current/textsearch-intro.html) for hybrid search.
+Use together with Postgres [full-text search](https://www.postgresql.org/docs/current/textsearch-intro.html) for hybrid search ([Python example](https://github.com/pgvector/pgvector-python/blob/master/examples/hybrid_search.py)).
 
 ```sql
 SELECT id, content FROM items, plainto_tsquery('hello search') query
     WHERE textsearch @@ query ORDER BY ts_rank_cd(textsearch, query) DESC LIMIT 5;
 ```
 
-You can use [Reciprocal Rank Fusion](https://github.com/pgvector/pgvector-python/blob/master/examples/hybrid_search_rrf.py) or a [cross-encoder](https://github.com/pgvector/pgvector-python/blob/master/examples/hybrid_search.py) to combine results.
-
 ## Performance
 
 Use `EXPLAIN ANALYZE` to debug performance.
@@ -369,33 +354,12 @@ To speed up queries with an IVFFlat index, increase the number of inverted lists
 CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops) WITH (lists = 1000);
 ```
 
-## Sparse Vectors
-
-Create a sparse vector column with 10 dimensions
-
-```sql
-CREATE TABLE items (id bigserial PRIMARY KEY, embedding svector(10));
-```
-
-Insert vectors
-
-```sql
-INSERT INTO items (embedding) VALUES ('(0,1),(1,2),(2,3)|10|'), ('(0,4),(1,5),(4,6)|10|');
-```
-
-Get the nearest neighbors by L2 distance
-
-```sql
-SELECT * FROM items ORDER BY embedding <-> '(0,3),(1,1),(2,2)|10|' LIMIT 5;
-```
-
 ## Languages
 
 Use pgvector from any language with a Postgres client. You can even generate and store vectors in one language and query them in another.
 
 Language | Libraries / Examples
 --- | ---
-C | [pgvector-c](https://github.com/pgvector/pgvector-c)
 C++ | [pgvector-cpp](https://github.com/pgvector/pgvector-cpp)
 C# | [pgvector-dotnet](https://github.com/pgvector/pgvector-dotnet)
 Crystal | [pgvector-crystal](https://github.com/pgvector/pgvector-crystal)
@@ -403,11 +367,10 @@ Dart | [pgvector-dart](https://github.com/pgvector/pgvector-dart)
 Elixir | [pgvector-elixir](https://github.com/pgvector/pgvector-elixir)
 Go | [pgvector-go](https://github.com/pgvector/pgvector-go)
 Haskell | [pgvector-haskell](https://github.com/pgvector/pgvector-haskell)
-Java, Kotlin, Groovy, Scala | [pgvector-java](https://github.com/pgvector/pgvector-java)
+Java, Scala | [pgvector-java](https://github.com/pgvector/pgvector-java)
-JavaScript, TypeScript | [pgvector-node](https://github.com/pgvector/pgvector-node)
 Julia | [pgvector-julia](https://github.com/pgvector/pgvector-julia)
 Lua | [pgvector-lua](https://github.com/pgvector/pgvector-lua)
-Nim | [pgvector-nim](https://github.com/pgvector/pgvector-nim)
+Node.js | [pgvector-node](https://github.com/pgvector/pgvector-node)
 Perl | [pgvector-perl](https://github.com/pgvector/pgvector-perl)
 PHP | [pgvector-php](https://github.com/pgvector/pgvector-php)
 Python | [pgvector-python](https://github.com/pgvector/pgvector-python)
@@ -415,7 +378,6 @@ R | [pgvector-r](https://github.com/pgvector/pgvector-r)
 Ruby | [pgvector-ruby](https://github.com/pgvector/pgvector-ruby), [Neighbor](https://github.com/ankane/neighbor)
 Rust | [pgvector-rust](https://github.com/pgvector/pgvector-rust)
 Swift | [pgvector-swift](https://github.com/pgvector/pgvector-swift)
-Zig | [pgvector-zig](https://github.com/pgvector/pgvector-zig)
 
 ## Frequently Asked Questions
 
@@ -431,55 +393,6 @@ Yes, pgvector uses the write-ahead log (WAL), which allows for replication and p
 
 You’ll need to use [dimensionality reduction](https://en.wikipedia.org/wiki/Dimensionality_reduction) at the moment.
 
-#### Can I store vectors with different dimensions in the same column?
-
-You can use `vector` as the type (instead of `vector(3)`).
-
-```sql
-CREATE TABLE embeddings (model_id bigint, item_id bigint, embedding vector, PRIMARY KEY (model_id, item_id));
-```
-
-However, you can only create indexes on rows with the same number of dimensions (using [expression](https://www.postgresql.org/docs/current/indexes-expressional.html) and [partial](https://www.postgresql.org/docs/current/indexes-partial.html) indexing):
-
-```sql
-CREATE INDEX ON embeddings USING hnsw ((embedding::vector(3)) vector_l2_ops) WHERE (model_id = 123);
-```
-
-and query with:
-
-```sql
-SELECT * FROM embeddings WHERE model_id = 123 ORDER BY embedding::vector(3) <-> '[3,1,2]' LIMIT 5;
-```
-
-#### Can I store vectors with more precision?
-
-You can use the `double precision[]` or `numeric[]` type to store vectors with more precision.
-
-```sql
-CREATE TABLE items (id bigserial PRIMARY KEY, embedding double precision[]);
-
--- use {} instead of [] for Postgres arrays
-INSERT INTO items (embedding) VALUES ('{1,2,3}'), ('{4,5,6}');
-```
-
-Optionally, add a [check constraint](https://www.postgresql.org/docs/current/ddl-constraints.html) to ensure data can be converted to the `vector` type and has the expected dimensions.
-
-```sql
-ALTER TABLE items ADD CHECK (vector_dims(embedding::vector) = 3);
-```
-
-Use [expression indexing](https://www.postgresql.org/docs/current/indexes-expressional.html) to index (at a lower precision):
-
-```sql
-CREATE INDEX ON items USING hnsw ((embedding::vector(3)) vector_l2_ops);
-```
-
-and query with:
-
-```sql
-SELECT * FROM items ORDER BY embedding::vector(3) <-> '[3,1,2]' LIMIT 5;
-```
-
 ## Troubleshooting
 
 #### Why isn’t a query using an index?
@@ -493,8 +406,6 @@ SELECT ...
 COMMIT;
 ```
 
-Also, if the table is small, a table scan may be faster.
-
 #### Why isn’t a query using a parallel table scan?
 
 The planner doesn’t consider [out-of-line storage](https://www.postgresql.org/docs/current/storage-toast.html) in cost estimates, which can make a serial scan look cheaper. You can reduce the cost of a parallel scan for a query with:
@@ -684,7 +595,7 @@ pgvector is available on [these providers](https://github.com/pgvector/pgvector/
 
 ## Upgrading
 
-[Install](#installation) the latest version (use the same method as the original installation). Then in each database you want to upgrade, run:
+Install the latest version. Then in each database you want to upgrade, run:
 
 ```sql
 ALTER EXTENSION vector UPDATE;

sql/vector--0.5.1--0.6.0.sql

@@ -1,79 +0,0 @@
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION vector UPDATE TO '0.6.0'" to load this file. \quit
-
-CREATE TYPE svector;
-
-CREATE FUNCTION svector_in(cstring, oid, integer) RETURNS svector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_out(svector) RETURNS cstring
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_typmod_in(cstring[]) RETURNS integer
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_recv(internal, oid, integer) RETURNS svector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_send(svector) RETURNS bytea
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE TYPE svector (
-	INPUT     = svector_in,
-	OUTPUT    = svector_out,
-	TYPMOD_IN = svector_typmod_in,
-	RECEIVE   = svector_recv,
-	SEND      = svector_send,
-	STORAGE   = external
-);
-
-CREATE FUNCTION l2_distance(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME', 'svector_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION inner_product(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME', 'svector_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION cosine_distance(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME', 'svector_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION jaccard_distance(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME', 'svector_jaccard_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_l2_squared_distance(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_negative_inner_product(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector(svector, integer, boolean) RETURNS svector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_to_svector(vector, integer, boolean) RETURNS svector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_to_vector(svector, integer, boolean) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE CAST (svector AS svector)
-	WITH FUNCTION svector(svector, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (svector AS vector)
-	WITH FUNCTION svector_to_vector(svector, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (vector AS svector)
-	WITH FUNCTION vector_to_svector(vector, integer, boolean) AS IMPLICIT;
-
-CREATE OPERATOR <-> (
-	LEFTARG = svector, RIGHTARG = svector, PROCEDURE = l2_distance,
-	COMMUTATOR = '<->'
-);
-
-CREATE OPERATOR <#> (
-	LEFTARG = svector, RIGHTARG = svector, PROCEDURE = svector_negative_inner_product,
-	COMMUTATOR = '<#>'
-);
-
-CREATE OPERATOR <=> (
-	LEFTARG = svector, RIGHTARG = svector, PROCEDURE = cosine_distance,
-	COMMUTATOR = '<=>'
-);

sql/vector.sql

@@ -290,92 +290,3 @@ CREATE OPERATOR CLASS vector_cosine_ops
 	OPERATOR 1 <=> (vector, vector) FOR ORDER BY float_ops,
 	FUNCTION 1 vector_negative_inner_product(vector, vector),
 	FUNCTION 2 vector_norm(vector);
-
---- svector type
-
-CREATE TYPE svector;
-
-CREATE FUNCTION svector_in(cstring, oid, integer) RETURNS svector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_out(svector) RETURNS cstring
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_typmod_in(cstring[]) RETURNS integer
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_recv(internal, oid, integer) RETURNS svector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_send(svector) RETURNS bytea
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE TYPE svector (
-	INPUT     = svector_in,
-	OUTPUT    = svector_out,
-	TYPMOD_IN = svector_typmod_in,
-	RECEIVE   = svector_recv,
-	SEND      = svector_send,
-	STORAGE   = external
-);
-
--- svector functions
-
-CREATE FUNCTION l2_distance(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME', 'svector_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION inner_product(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME', 'svector_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION cosine_distance(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME', 'svector_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION jaccard_distance(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME', 'svector_jaccard_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- svector private functions
-
-CREATE FUNCTION svector_l2_squared_distance(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_negative_inner_product(svector, svector) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- svector cast functions
-
-CREATE FUNCTION svector(svector, integer, boolean) RETURNS svector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_to_svector(vector, integer, boolean) RETURNS svector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION svector_to_vector(svector, integer, boolean) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- svector casts
-
-CREATE CAST (svector AS svector)
-	WITH FUNCTION svector(svector, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (svector AS vector)
-	WITH FUNCTION svector_to_vector(svector, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (vector AS svector)
-	WITH FUNCTION vector_to_svector(vector, integer, boolean) AS IMPLICIT;
-
--- svector operators
-
-CREATE OPERATOR <-> (
-	LEFTARG = svector, RIGHTARG = svector, PROCEDURE = l2_distance,
-	COMMUTATOR = '<->'
-);
-
-CREATE OPERATOR <#> (
-	LEFTARG = svector, RIGHTARG = svector, PROCEDURE = svector_negative_inner_product,
-	COMMUTATOR = '<#>'
-);
-
-CREATE OPERATOR <=> (
-	LEFTARG = svector, RIGHTARG = svector, PROCEDURE = cosine_distance,
-	COMMUTATOR = '<=>'
-);

src/hnsw.c

@@ -33,6 +33,12 @@ HnswInit(void)
 					  HNSW_DEFAULT_EF_CONSTRUCTION, HNSW_MIN_EF_CONSTRUCTION, HNSW_MAX_EF_CONSTRUCTION
 #if PG_VERSION_NUM >= 130000
 					  ,AccessExclusiveLock
+#endif
+		);
+	add_int_reloption(hnsw_relopt_kind, "dimensions", "Number of dimensions",
+					  HNSW_DEFAULT_DIMENSIONS, HNSW_MIN_DIMENSIONS, HNSW_MAX_DIMENSIONS
+#if PG_VERSION_NUM >= 130000
+					  ,AccessExclusiveLock
 #endif
 		);
 
@@ -125,6 +131,7 @@ hnswoptions(Datum reloptions, bool validate)
 	static const relopt_parse_elt tab[] = {
 		{"m", RELOPT_TYPE_INT, offsetof(HnswOptions, m)},
 		{"ef_construction", RELOPT_TYPE_INT, offsetof(HnswOptions, efConstruction)},
+		{"dimensions", RELOPT_TYPE_INT, offsetof(HnswOptions, dimensions)},
 	};
 
 #if PG_VERSION_NUM >= 130000

src/hnsw.h

@@ -42,6 +42,9 @@
 #define HNSW_DEFAULT_EF_SEARCH	40
 #define HNSW_MIN_EF_SEARCH		1
 #define HNSW_MAX_EF_SEARCH		1000
+#define HNSW_DEFAULT_DIMENSIONS	-1
+#define HNSW_MIN_DIMENSIONS		1
+#define HNSW_MAX_DIMENSIONS		HNSW_MAX_DIM
 
 /* Tuple types */
 #define HNSW_ELEMENT_TUPLE_TYPE  1
@@ -59,7 +62,7 @@
 
 #define HNSW_MAX_SIZE (BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(HnswPageOpaqueData)) - sizeof(ItemIdData))
 
-#define HNSW_ELEMENT_TUPLE_SIZE(_dim)	MAXALIGN(offsetof(HnswElementTupleData, vec) + VECTOR_SIZE(_dim))
+#define HNSW_ELEMENT_TUPLE_SIZE(_datum)	MAXALIGN(offsetof(HnswElementTupleData, value) + VARSIZE_ANY(_datum))
 #define HNSW_NEIGHBOR_TUPLE_SIZE(level, m)	MAXALIGN(offsetof(HnswNeighborTupleData, indextids) + ((level) + 2) * (m) * sizeof(ItemPointerData))
 
 #define HnswPageGetOpaque(page)	((HnswPageOpaque) PageGetSpecialPointer(page))
@@ -103,7 +106,7 @@ typedef struct HnswElementData
 	OffsetNumber offno;
 	OffsetNumber neighborOffno;
 	BlockNumber neighborPage;
-	Vector	   *vec;
+	Datum		value;
 }			HnswElementData;
 
 typedef HnswElementData * HnswElement;
@@ -134,6 +137,7 @@ typedef struct HnswOptions
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	int			m;				/* number of connections */
 	int			efConstruction; /* size of dynamic candidate list */
+	int			dimensions;
 }			HnswOptions;
 
 typedef struct HnswBuildState
@@ -204,7 +208,7 @@ typedef struct HnswElementTupleData
 	ItemPointerData heaptids[HNSW_HEAPTIDS];
 	ItemPointerData neighbortid;
 	uint16		unused2;
-	Vector		vec;
+	char		value[FLEXIBLE_ARRAY_MEMBER];
 }			HnswElementTupleData;
 
 typedef HnswElementTupleData * HnswElementTuple;
@@ -262,6 +266,7 @@ typedef struct HnswVacuumState
 /* Methods */
 int			HnswGetM(Relation index);
 int			HnswGetEfConstruction(Relation index);
+int			HnswGetDimensions(Relation index);
 FmgrInfo   *HnswOptionalProcInfo(Relation index, uint16 procnum);
 bool		HnswNormValue(FmgrInfo *procinfo, Oid collation, Datum *value, Vector * result);
 void		HnswCommitBuffer(Buffer buf, GenericXLogState *state);

src/hnswbuild.c

@@ -8,6 +8,7 @@
 #include "lib/pairingheap.h"
 #include "nodes/pg_list.h"
 #include "storage/bufmgr.h"
+#include "utils/datum.h"
 #include "utils/memutils.h"
 
 #if PG_VERSION_NUM >= 140000
@@ -105,8 +106,6 @@ CreateElementPages(HnswBuildState * buildstate)
 {
 	Relation	index = buildstate->index;
 	ForkNumber	forkNum = buildstate->forkNum;
-	int			dimensions = buildstate->dimensions;
-	Size		etupSize;
 	Size		maxSize;
 	HnswElementTuple etup;
 	HnswNeighborTuple ntup;
@@ -118,10 +117,9 @@ CreateElementPages(HnswBuildState * buildstate)
 
 	/* Calculate sizes */
 	maxSize = HNSW_MAX_SIZE;
-	etupSize = HNSW_ELEMENT_TUPLE_SIZE(dimensions);
 
 	/* Allocate once */
-	etup = palloc0(etupSize);
+	etup = palloc0(BLCKSZ);
 	ntup = palloc0(BLCKSZ);
 
 	/* Prepare first page */
@@ -133,12 +131,14 @@ CreateElementPages(HnswBuildState * buildstate)
 	foreach(lc, buildstate->elements)
 	{
 		HnswElement element = lfirst(lc);
+		Size		etupSize;
 		Size		ntupSize;
 		Size		combinedSize;
 
 		HnswSetElementTuple(etup, element);
 
 		/* Calculate sizes */
+		etupSize = HNSW_ELEMENT_TUPLE_SIZE(element->value);
 		ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(element->level, buildstate->m);
 		combinedSize = etupSize + ntupSize + sizeof(ItemIdData);
 
@@ -273,18 +273,15 @@ InsertTuple(Relation index, Datum *values, HnswElement element, HnswBuildState *
 	int			m = buildstate->m;
 
 	/* Detoast once for all calls */
-	Datum		value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
+	element->value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
 
 	/* Normalize if needed */
 	if (buildstate->normprocinfo != NULL)
 	{
-		if (!HnswNormValue(buildstate->normprocinfo, collation, &value, buildstate->normvec))
+		if (!HnswNormValue(buildstate->normprocinfo, collation, &element->value, buildstate->normvec))
 			return false;
 	}
 
-	/* Copy value to element so accessible outside of memory context */
-	memcpy(element->vec, DatumGetVector(value), VECTOR_SIZE(buildstate->dimensions));
-
 	/* Insert element in graph */
 	HnswInsertElement(element, entryPoint, NULL, procinfo, collation, m, efConstruction, false);
 
@@ -360,7 +357,6 @@ BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
 
 	/* Allocate necessary memory outside of memory context */
 	element = HnswInitElement(tid, buildstate->m, buildstate->ml, buildstate->maxLevel);
-	element->vec = palloc(VECTOR_SIZE(buildstate->dimensions));
 
 	/* Use memory context since detoast can allocate */
 	oldCtx = MemoryContextSwitchTo(buildstate->tmpCtx);
@@ -368,9 +364,8 @@ BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
 	/* Insert tuple */
 	inserted = InsertTuple(index, values, element, buildstate, &dup);
 
-	/* Reset memory context */
+	/* Switch memory context */
 	MemoryContextSwitchTo(oldCtx);
-	MemoryContextReset(buildstate->tmpCtx);
 
 	/* Add outside memory context */
 	if (dup != NULL)
@@ -378,11 +373,20 @@ BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
 
 	/* Add to buildstate or free */
 	if (inserted)
+	{
+		element->value = datumCopy(element->value, false, -1);
 		buildstate->elements = lappend(buildstate->elements, element);
+	}
 	else
+	{
+		element->value = PointerGetDatum(NULL);
 		HnswFreeElement(element);
 	}
 
+	/* Reset memory context */
+	MemoryContextReset(buildstate->tmpCtx);
+}
+
 /*
  * Get the max number of elements that fit into maintenance_work_mem
  */
@@ -395,6 +399,7 @@ HnswGetMaxInMemoryElements(int m, double ml, int dimensions)
 	elementSize += sizeof(HnswNeighborArray) * (avgLevel + 1);
 	elementSize += sizeof(HnswCandidate) * (m * (avgLevel + 2));
 	elementSize += sizeof(ItemPointerData);
+	/* TODO Handle non-vector types */
 	elementSize += VECTOR_SIZE(dimensions);
 	return (maintenance_work_mem * 1024L) / elementSize;
 }
@@ -412,6 +417,9 @@ InitBuildState(HnswBuildState * buildstate, Relation heap, Relation index, Index
 
 	buildstate->m = HnswGetM(index);
 	buildstate->efConstruction = HnswGetEfConstruction(index);
+	buildstate->dimensions = HnswGetDimensions(index);
+
+	if (buildstate->dimensions < 0)
 		buildstate->dimensions = TupleDescAttr(index->rd_att, 0)->atttypmod;
 
 	/* Require column to have dimensions to be indexed */

src/hnswinsert.c

@@ -123,7 +123,6 @@ WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPag
 	Size		minCombinedSize;
 	HnswElementTuple etup;
 	BlockNumber currentPage = insertPage;
-	int			dimensions = e->vec->dim;
 	HnswNeighborTuple ntup;
 	Buffer		nbuf;
 	Page		npage;
@@ -132,7 +131,7 @@ WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPag
 	BlockNumber newInsertPage = InvalidBlockNumber;
 
 	/* Calculate sizes */
-	etupSize = HNSW_ELEMENT_TUPLE_SIZE(dimensions);
+	etupSize = HNSW_ELEMENT_TUPLE_SIZE(e->value);
 	ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(e->level, m);
 	combinedSize = etupSize + ntupSize + sizeof(ItemIdData);
 	maxSize = HNSW_MAX_SIZE;
@@ -405,7 +404,7 @@ HnswAddDuplicate(Relation index, HnswElement element, HnswElement dup)
 	Buffer		buf;
 	Page		page;
 	GenericXLogState *state;
-	Size		etupSize = HNSW_ELEMENT_TUPLE_SIZE(dup->vec->dim);
+	Size		etupSize = HNSW_ELEMENT_TUPLE_SIZE(dup->value);
 	HnswElementTuple etup;
 	int			i;
 
@@ -515,7 +514,7 @@ HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_ti
 
 	/* Create an element */
 	element = HnswInitElement(heap_tid, m, HnswGetMl(m), HnswGetMaxLevel(m));
-	element->vec = DatumGetVector(value);
+	element->value = value;
 
 	/* Prevent concurrent inserts when likely updating entry point */
 	if (entryPoint == NULL || element->level > entryPoint->level)

src/hnswutils.c

@@ -4,6 +4,7 @@
 
 #include "hnsw.h"
 #include "storage/bufmgr.h"
+#include "utils/datum.h"
 #include "vector.h"
 
 /*
@@ -34,6 +35,20 @@ HnswGetEfConstruction(Relation index)
 	return HNSW_DEFAULT_EF_CONSTRUCTION;
 }
 
+/*
+ * Get the number of dimensions in the index
+ */
+int
+HnswGetDimensions(Relation index)
+{
+	HnswOptions *opts = (HnswOptions *) index->rd_options;
+
+	if (opts)
+		return opts->dimensions;
+
+	return HNSW_DEFAULT_DIMENSIONS;
+}
+
 /*
  * Get proc
  */
@@ -187,7 +202,8 @@ HnswFreeElement(HnswElement element)
 {
 	HnswFreeNeighbors(element);
 	list_free_deep(element->heaptids);
-	pfree(element->vec);
+	if (DatumGetPointer(element->value))
+		pfree(DatumGetPointer(element->value));
 	pfree(element);
 }
 
@@ -214,7 +230,7 @@ HnswInitElementFromBlock(BlockNumber blkno, OffsetNumber offno)
 	element->blkno = blkno;
 	element->offno = offno;
 	element->neighbors = NULL;
-	element->vec = NULL;
+	element->value = PointerGetDatum(NULL);
 	return element;
 }
 
@@ -324,7 +340,7 @@ HnswSetElementTuple(HnswElementTuple etup, HnswElement element)
 		else
 			ItemPointerSetInvalid(&etup->heaptids[i]);
 	}
-	memcpy(&etup->vec, element->vec, VECTOR_SIZE(element->vec->dim));
+	memcpy(&etup->value, DatumGetPointer(element->value), VARSIZE_ANY(element->value));
 }
 
 /*
@@ -447,8 +463,9 @@ HnswLoadElementFromTuple(HnswElement element, HnswElementTuple etup, bool loadHe
 
 	if (loadVec)
 	{
-		element->vec = palloc(VECTOR_SIZE(etup->vec.dim));
+		Datum		value = PointerGetDatum(&etup->value);
-		memcpy(element->vec, &etup->vec, VECTOR_SIZE(etup->vec.dim));
+
+		element->value = datumCopy(value, false, -1);
 	}
 }
 
@@ -476,7 +493,7 @@ HnswLoadElement(HnswElement element, float *distance, Datum *q, Relation index,
 
 	/* Calculate distance */
 	if (distance != NULL)
-		*distance = (float) DatumGetFloat8(FunctionCall2Coll(procinfo, collation, *q, PointerGetDatum(&etup->vec)));
+		*distance = (float) DatumGetFloat8(FunctionCall2Coll(procinfo, collation, *q, PointerGetDatum(&etup->value)));
 
 	UnlockReleaseBuffer(buf);
 }
@@ -487,7 +504,7 @@ HnswLoadElement(HnswElement element, float *distance, Datum *q, Relation index,
 static float
 GetCandidateDistance(HnswCandidate * hc, Datum q, FmgrInfo *procinfo, Oid collation)
 {
-	return DatumGetFloat8(FunctionCall2Coll(procinfo, collation, q, PointerGetDatum(hc->element->vec)));
+	return DatumGetFloat8(FunctionCall2Coll(procinfo, collation, q, hc->element->value));
 }
 
 /*
@@ -750,7 +767,7 @@ HnswGetDistance(HnswElement a, HnswElement b, int lc, FmgrInfo *procinfo, Oid co
 		}
 	}
 
-	return DatumGetFloat8(FunctionCall2Coll(procinfo, collation, PointerGetDatum(a->vec), PointerGetDatum(b->vec)));
+	return DatumGetFloat8(FunctionCall2Coll(procinfo, collation, a->value, b->value));
 }
 
 /*
@@ -877,7 +894,7 @@ HnswFindDuplicate(HnswElement e)
 		HnswCandidate *neighbor = &neighbors->items[i];
 
 		/* Exit early since ordered by distance */
-		if (vector_cmp_internal(e->vec, neighbor->element->vec) != 0)
+		if (!datumIsEqual(e->value, neighbor->element->value, false, -1))
 			break;
 
 		/* Check for space */
@@ -930,13 +947,13 @@ HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int m, int lc, int
 		/* Load elements on insert */
 		if (index != NULL)
 		{
-			Datum		q = PointerGetDatum(hc->element->vec);
+			Datum		q = hc->element->value;
 
 			for (int i = 0; i < currentNeighbors->length; i++)
 			{
 				HnswCandidate *hc3 = &currentNeighbors->items[i];
 
-				if (hc3->element->vec == NULL)
+				if (!DatumGetPointer(hc3->element->value))
 					HnswLoadElement(hc3->element, &hc3->distance, &q, index, procinfo, collation, true);
 				else
 					hc3->distance = GetCandidateDistance(hc3, q, procinfo, collation);
@@ -1017,7 +1034,7 @@ HnswInsertElement(HnswElement element, HnswElement entryPoint, Relation index, F
 	List	   *w;
 	int			level = element->level;
 	int			entryLevel;
-	Datum		q = PointerGetDatum(element->vec);
+	Datum		q = element->value;
 	HnswElement skipElement = existing ? element : NULL;
 
 	/* No neighbors if no entry point */

src/hnswvacuum.c

@@ -93,7 +93,7 @@ RemoveHeapTids(HnswVacuumState * vacuumstate)
 
 				if (itemUpdated)
 				{
-					Size		etupSize = HNSW_ELEMENT_TUPLE_SIZE(etup->vec.dim);
+					Size		etupSize = HNSW_ELEMENT_TUPLE_SIZE(PointerGetDatum(&etup->value));
 
 					/* Mark rest as invalid */
 					for (int i = idx; i < HNSW_HEAPTIDS; i++)
@@ -481,6 +481,7 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 			HnswNeighborTuple ntup;
 			Size		etupSize;
 			Size		ntupSize;
+			Datum		value;
 			Buffer		nbuf;
 			Page		npage;
 			BlockNumber neighborPage;
@@ -504,8 +505,11 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 			if (ItemPointerIsValid(&etup->heaptids[0]))
 				continue;
 
+			/* Get datum */
+			value = PointerGetDatum(&etup->value);
+
 			/* Calculate sizes */
-			etupSize = HNSW_ELEMENT_TUPLE_SIZE(etup->vec.dim);
+			etupSize = HNSW_ELEMENT_TUPLE_SIZE(value);
 			ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(etup->level, vacuumstate->m);
 
 			/* Get neighbor page */
@@ -528,7 +532,7 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 
 			/* Overwrite element */
 			etup->deleted = 1;
-			MemSet(&etup->vec.x, 0, etup->vec.dim * sizeof(float));
+			MemSet(&etup->value, 0, VARSIZE_ANY(value));
 
 			/* Overwrite neighbors */
 			for (int i = 0; i < ntup->count; i++)

src/svector.c

@@ -1,705 +0,0 @@
-#include "postgres.h"
-
-#include <math.h>
-
-#include "fmgr.h"
-#include "libpq/pqformat.h"
-#include "svector.h"
-#include "utils/array.h"
-#include "vector.h"
-
-#if PG_VERSION_NUM >= 120000
-#include "common/shortest_dec.h"
-#include "utils/float.h"
-#else
-#include <float.h>
-#include "utils/builtins.h"
-#endif
-
-/*
- * Ensure same dimensions
- */
-static inline void
-CheckDims(SVector * a, SVector * b)
-{
-	if (a->dim != b->dim)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("different svector dimensions %d and %d", a->dim, b->dim)));
-}
-
-/*
- * Ensure expected dimensions
- */
-static inline void
-CheckExpectedDim(int32 typmod, int dim)
-{
-	if (typmod != -1 && typmod != dim)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("expected %d dimensions, not %d", typmod, dim)));
-}
-
-/*
- * Ensure valid dimensions
- */
-static inline void
-CheckDim(int dim)
-{
-	if (dim < 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("svector must have at least 1 dimension")));
-
-	if (dim > SVECTOR_MAX_DIM)
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("svector cannot have more than %d dimensions", SVECTOR_MAX_DIM)));
-}
-
-/*
- * Ensure valid nnz
- */
-static inline void
-CheckNnz(int nnz, int dim)
-{
-	if (nnz < 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("svector must have at least one element")));
-
-	if (nnz > dim)
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("svector cannot have more elements than dimensions")));
-}
-
-/*
- * Ensure valid index
- */
-static inline void
-CheckIndex(int32 *indices, int i, int dim)
-{
-	int32		index = indices[i];
-
-	if (index < 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("index must not be negative")));
-
-	if (index >= dim)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("index must be less than dimensions")));
-
-	if (i > 0)
-	{
-		if (index < indices[i - 1])
-			ereport(ERROR,
-					(errcode(ERRCODE_DATA_EXCEPTION),
-					 errmsg("indexes must be in ascending order")));
-
-		if (index == indices[i - 1])
-			ereport(ERROR,
-					(errcode(ERRCODE_DATA_EXCEPTION),
-					 errmsg("indexes must not contain duplicates")));
-	}
-}
-
-/*
- * Ensure finite element
- */
-static inline void
-CheckElement(float value)
-{
-	if (isnan(value))
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("NaN not allowed in svector")));
-
-	if (isinf(value))
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("infinite value not allowed in svector")));
-}
-
-/*
- * Allocate and initialize a new sparse vector
- */
-SVector *
-InitSVector(int dim, int nnz)
-{
-	SVector    *result;
-	int			size;
-
-	size = SVECTOR_SIZE(nnz);
-	result = (SVector *) palloc0(size);
-	SET_VARSIZE(result, size);
-	result->dim = dim;
-	result->nnz = nnz;
-
-	return result;
-}
-
-/*
- * Convert textual representation to internal representation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_in);
-Datum
-svector_in(PG_FUNCTION_ARGS)
-{
-	char	   *str = PG_GETARG_CSTRING(0);
-	int32		typmod = PG_GETARG_INT32(2);
-	int			dim;
-	char	   *pt;
-	SVector    *result;
-	float	   *rvalues;
-	char	   *lit = pstrdup(str);
-	int			n;
-	int32	   *indices;
-	float	   *values;
-	int			index;
-	float		value;
-	int			maxNnz;
-	int			nnz = 0;
-
-	/* TODO Improve code and checks after deciding on format */
-
-	maxNnz = 1;
-	pt = str;
-	while (*pt != '\0')
-	{
-		if (*pt == ',')
-			maxNnz++;
-
-		pt++;
-	}
-	maxNnz /= 2;
-
-	indices = palloc(maxNnz * sizeof(int32));
-	values = palloc(maxNnz * sizeof(float));
-
-	while (sscanf(str, "(%d,%f)%n", &index, &value, &n) == 2)
-	{
-		/* TODO Better error */
-		if (nnz == maxNnz)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("ran out of buffer: \"%s\"", lit)));
-
-		/* TODO Decide whether to store zero values */
-		indices[nnz] = index;
-		values[nnz] = value;
-		nnz++;
-
-		str += n;
-
-		if (*str == ',')
-			str++;
-		else if (*str == '|')
-			break;
-		else
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("malformed svector literal: \"%s\"", lit)));
-	}
-
-	if (sscanf(str, "|%d|%n", &dim, &n) != 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("malformed svector literal: \"%s\"", lit)));
-
-	str += n;
-
-	if (*str != '\0')
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("malformed svector literal: \"%s\"", lit),
-				 errdetail("Junk after closing pipe.")));
-
-	pfree(lit);
-
-	CheckDim(dim);
-	CheckExpectedDim(typmod, dim);
-
-	result = InitSVector(dim, nnz);
-	rvalues = SVECTOR_VALUES(result);
-	for (int i = 0; i < nnz; i++)
-	{
-		result->indices[i] = indices[i];
-		rvalues[i] = values[i];
-
-		CheckIndex(result->indices, i, dim);
-		CheckElement(rvalues[i]);
-	}
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * Convert internal representation to textual representation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_out);
-Datum
-svector_out(PG_FUNCTION_ARGS)
-{
-	SVector    *svector = PG_GETARG_SVECTOR_P(0);
-	float	   *values = SVECTOR_VALUES(svector);
-	char	   *buf;
-	char	   *ptr;
-	int			n;
-
-	/* TODO Improve code after deciding on format */
-
-#if PG_VERSION_NUM < 120000
-	int			ndig = FLT_DIG + extra_float_digits;
-
-	if (ndig < 1)
-		ndig = 1;
-
-#define FLOAT_SHORTEST_DECIMAL_LEN (ndig + 10)
-#endif
-
-	/* TODO Move */
-#define APPEND_CHAR(ptr, ch) (*(ptr)++ = (ch))
-
-	/* TODO Improve */
-	buf = (char *) palloc((FLOAT_SHORTEST_DECIMAL_LEN + 20) * svector->nnz + 20);
-	ptr = buf;
-
-	for (int i = 0; i < svector->nnz; i++)
-	{
-		if (i > 0)
-			APPEND_CHAR(ptr, ',');
-
-		n = sprintf(ptr, "(%d,", svector->indices[i]);
-		ptr += n;
-
-#if PG_VERSION_NUM >= 120000
-		n = float_to_shortest_decimal_bufn(values[i], ptr);
-#else
-		n = sprintf(ptr, "%.*g", ndig, values[i]);
-#endif
-		ptr += n;
-
-		APPEND_CHAR(ptr, ')');
-	}
-
-	n = sprintf(ptr, "|%d|", svector->dim);
-	ptr += n;
-
-	APPEND_CHAR(ptr, '\0');
-
-	PG_FREE_IF_COPY(svector, 0);
-	PG_RETURN_CSTRING(buf);
-}
-
-/*
- * Convert type modifier
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_typmod_in);
-Datum
-svector_typmod_in(PG_FUNCTION_ARGS)
-{
-	ArrayType  *ta = PG_GETARG_ARRAYTYPE_P(0);
-	int32	   *tl;
-	int			n;
-
-	tl = ArrayGetIntegerTypmods(ta, &n);
-
-	if (n != 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid type modifier")));
-
-	if (*tl < 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("dimensions for type svector must be at least 1")));
-
-	if (*tl > SVECTOR_MAX_DIM)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("dimensions for type svector cannot exceed %d", SVECTOR_MAX_DIM)));
-
-	PG_RETURN_INT32(*tl);
-}
-
-/*
- * Convert external binary representation to internal representation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_recv);
-Datum
-svector_recv(PG_FUNCTION_ARGS)
-{
-	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
-	int32		typmod = PG_GETARG_INT32(2);
-	SVector    *result;
-	int32		dim;
-	int32		nnz;
-	int32		unused;
-	float	   *values;
-
-	dim = pq_getmsgint(buf, sizeof(int32));
-	nnz = pq_getmsgint(buf, sizeof(int32));
-	unused = pq_getmsgint(buf, sizeof(int32));
-
-	CheckDim(dim);
-	CheckNnz(nnz, dim);
-	CheckExpectedDim(typmod, dim);
-
-	if (unused != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("expected unused to be 0, not %d", unused)));
-
-	result = InitSVector(dim, nnz);
-	values = SVECTOR_VALUES(result);
-
-	for (int i = 0; i < nnz; i++)
-	{
-		result->indices[i] = pq_getmsgint(buf, sizeof(int32));
-		CheckIndex(result->indices, i, dim);
-	}
-
-	for (int i = 0; i < nnz; i++)
-	{
-		values[i] = pq_getmsgfloat4(buf);
-		CheckElement(values[i]);
-	}
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * Convert internal representation to the external binary representation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_send);
-Datum
-svector_send(PG_FUNCTION_ARGS)
-{
-	SVector    *svec = PG_GETARG_SVECTOR_P(0);
-	float	   *values = SVECTOR_VALUES(svec);
-	StringInfoData buf;
-
-	pq_begintypsend(&buf);
-	pq_sendint(&buf, svec->dim, sizeof(int32));
-	pq_sendint(&buf, svec->nnz, sizeof(int32));
-	pq_sendint(&buf, svec->unused, sizeof(int32));
-	for (int i = 0; i < svec->nnz; i++)
-		pq_sendint(&buf, svec->indices[i], sizeof(int32));
-	for (int i = 0; i < svec->nnz; i++)
-		pq_sendfloat4(&buf, values[i]);
-
-	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
-}
-
-/*
- * Convert sparse vector to sparse vector
- * This is needed to check the type modifier
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector);
-Datum
-svector(PG_FUNCTION_ARGS)
-{
-	SVector    *svec = PG_GETARG_SVECTOR_P(0);
-	int32		typmod = PG_GETARG_INT32(1);
-
-	CheckExpectedDim(typmod, svec->dim);
-
-	PG_RETURN_POINTER(svec);
-}
-
-/*
- * Convert dense vector to sparse vector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_to_svector);
-Datum
-vector_to_svector(PG_FUNCTION_ARGS)
-{
-	Vector	   *vec = PG_GETARG_VECTOR_P(0);
-	int32		typmod = PG_GETARG_INT32(1);
-	SVector    *result;
-	int			dim = vec->dim;
-	int			nnz = 0;
-	float	   *values;
-	int			j = 0;
-
-	CheckDim(dim);
-	CheckExpectedDim(typmod, dim);
-
-	for (int i = 0; i < dim; i++)
-	{
-		if (vec->x[i] != 0)
-			nnz++;
-	}
-
-	result = InitSVector(dim, nnz);
-	values = SVECTOR_VALUES(result);
-	for (int i = 0; i < dim; i++)
-	{
-		if (vec->x[i] != 0)
-		{
-			/* Safety check */
-			if (j == nnz)
-				elog(ERROR, "safety check failed");
-
-			result->indices[j] = i;
-			values[j] = vec->x[i];
-			j++;
-		}
-	}
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- *  Get the L2 squared distance between sparse vectors
- */
-static double
-l2_distance_squared_internal(SVector * a, SVector * b)
-{
-	float	   *ax = SVECTOR_VALUES(a);
-	float	   *bx = SVECTOR_VALUES(b);
-	double		distance = 0.0;
-	int			bpos = 0;
-
-	for (int i = 0; i < a->nnz; i++)
-	{
-		int			ai = a->indices[i];
-		int			bi = -1;
-
-		for (int j = bpos; j < b->nnz; j++)
-		{
-			bi = b->indices[j];
-
-			if (ai == bi)
-			{
-				double		diff = ax[i] - bx[j];
-
-				distance += diff * diff;
-			}
-			else if (ai > bi)
-				distance += bx[j] * bx[j];
-
-			/* Update start for next iteration */
-			if (ai >= bi)
-				bpos = j + 1;
-
-			/* Found or passed it */
-			if (bi >= ai)
-				break;
-		}
-
-		if (ai != bi)
-			distance += ax[i] * ax[i];
-	}
-
-	for (int j = bpos; j < b->nnz; j++)
-		distance += bx[j] * bx[j];
-
-	return distance;
-}
-
-/*
- * Get the L2 distance between sparse vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_l2_distance);
-Datum
-svector_l2_distance(PG_FUNCTION_ARGS)
-{
-	SVector    *a = PG_GETARG_SVECTOR_P(0);
-	SVector    *b = PG_GETARG_SVECTOR_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8(sqrt(l2_distance_squared_internal(a, b)));
-}
-
-/*
- * Get the L2 squared distance between sparse vectors
- * This saves a sqrt calculation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_l2_squared_distance);
-Datum
-svector_l2_squared_distance(PG_FUNCTION_ARGS)
-{
-	SVector    *a = PG_GETARG_SVECTOR_P(0);
-	SVector    *b = PG_GETARG_SVECTOR_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8(l2_distance_squared_internal(a, b));
-}
-
-/*
- * Get the inner product of two sparse vectors
- */
-static double
-inner_product_internal(SVector * a, SVector * b)
-{
-	float	   *ax = SVECTOR_VALUES(a);
-	float	   *bx = SVECTOR_VALUES(b);
-	double		distance = 0.0;
-	int			bpos = 0;
-
-	for (int i = 0; i < a->nnz; i++)
-	{
-		int			ai = a->indices[i];
-
-		for (int j = bpos; j < b->nnz; j++)
-		{
-			int			bi = b->indices[j];
-
-			/* Only update when the same index */
-			if (ai == bi)
-				distance += ax[i] * bx[j];
-
-			/* Update start for next iteration */
-			if (ai >= bi)
-				bpos = j + 1;
-
-			/* Found or passed it */
-			if (bi >= ai)
-				break;
-		}
-	}
-
-	return distance;
-}
-
-/*
- * Get the inner product of two sparse vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_inner_product);
-Datum
-svector_inner_product(PG_FUNCTION_ARGS)
-{
-	SVector    *a = PG_GETARG_SVECTOR_P(0);
-	SVector    *b = PG_GETARG_SVECTOR_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8(inner_product_internal(a, b));
-}
-
-/*
- * Get the negative inner product of two sparse vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_negative_inner_product);
-Datum
-svector_negative_inner_product(PG_FUNCTION_ARGS)
-{
-	SVector    *a = PG_GETARG_SVECTOR_P(0);
-	SVector    *b = PG_GETARG_SVECTOR_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8(-inner_product_internal(a, b));
-}
-
-/*
- * Get the cosine distance between two sparse vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_cosine_distance);
-Datum
-svector_cosine_distance(PG_FUNCTION_ARGS)
-{
-	SVector    *a = PG_GETARG_SVECTOR_P(0);
-	SVector    *b = PG_GETARG_SVECTOR_P(1);
-	float	   *ax = SVECTOR_VALUES(a);
-	float	   *bx = SVECTOR_VALUES(b);
-	float		norma = 0.0;
-	float		normb = 0.0;
-	double		similarity;
-
-	CheckDims(a, b);
-
-	similarity = inner_product_internal(a, b);
-
-	/* Auto-vectorized */
-	for (int i = 0; i < a->nnz; i++)
-		norma += ax[i] * ax[i];
-
-	/* Auto-vectorized */
-	for (int i = 0; i < b->nnz; i++)
-		normb += bx[i] * bx[i];
-
-	/* Use sqrt(a * b) over sqrt(a) * sqrt(b) */
-	similarity /= sqrt((double) norma * (double) normb);
-
-#ifdef _MSC_VER
-	/* /fp:fast may not propagate NaN */
-	if (isnan(similarity))
-		PG_RETURN_FLOAT8(NAN);
-#endif
-
-	/* Keep in range */
-	if (similarity > 1)
-		similarity = 1.0;
-	else if (similarity < -1)
-		similarity = -1.0;
-
-	PG_RETURN_FLOAT8(1.0 - similarity);
-}
-
-/*
- * Get the weighted Jaccard distance between two sparse vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_jaccard_distance);
-Datum
-svector_jaccard_distance(PG_FUNCTION_ARGS)
-{
-	SVector    *a = PG_GETARG_SVECTOR_P(0);
-	SVector    *b = PG_GETARG_SVECTOR_P(1);
-	float	   *ax = SVECTOR_VALUES(a);
-	float	   *bx = SVECTOR_VALUES(b);
-	double		num = 0.0;
-	double		denom = 0.0;
-	int			bpos = 0;
-
-	CheckDims(a, b);
-
-	/*
-	 * Weighted Jaccard distance is not defined for vectors with negative
-	 * values. Could check and return NaN if minimal impact on performance.
-	 */
-
-	for (int i = 0; i < a->nnz; i++)
-	{
-		int			ai = a->indices[i];
-		int			bi = -1;
-
-		for (int j = bpos; j < b->nnz; j++)
-		{
-			bi = b->indices[j];
-
-			if (ai == bi)
-			{
-				num += ax[i] < bx[j] ? ax[i] : bx[j];
-				denom += ax[i] > bx[j] ? ax[i] : bx[j];
-			}
-			else if (ai > bi)
-				denom += bx[j];
-
-			/* Update start for next iteration */
-			if (ai >= bi)
-				bpos = j + 1;
-
-			/* Found or passed it */
-			if (bi >= ai)
-				break;
-		}
-
-		if (ai != bi)
-			denom += ax[i];
-	}
-
-	for (int j = bpos; j < b->nnz; j++)
-		denom += bx[j];
-
-	if (denom > 0)
-		PG_RETURN_FLOAT8(1.0 - (num / denom));
-	else
-		PG_RETURN_FLOAT8(NAN);
-}

src/svector.h

@@ -1,23 +0,0 @@
-#ifndef SVECTOR_H
-#define SVECTOR_H
-
-#define SVECTOR_MAX_DIM 100000
-
-#define SVECTOR_SIZE(_nnz)		(offsetof(SVector, indices) + (_nnz) * sizeof(int32) + (_nnz * sizeof(float)))
-#define SVECTOR_VALUES(x)		((float *) (((char *) (x)) + offsetof(SVector, indices) + (x)->nnz * sizeof(int32)))
-#define DatumGetSVector(x)		((SVector *) PG_DETOAST_DATUM(x))
-#define PG_GETARG_SVECTOR_P(x)	DatumGetSVector(PG_GETARG_DATUM(x))
-#define PG_RETURN_SVECTOR_P(x)	PG_RETURN_POINTER(x)
-
-typedef struct SVector
-{
-	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int32		dim;			/* number of dimensions */
-	int32		nnz;
-	int32		unused;
-	int32		indices[FLEXIBLE_ARRAY_MEMBER];
-}			SVector;
-
-SVector    *InitSVector(int dim, int nnz);
-
-#endif

src/vector.c

@@ -9,7 +9,6 @@
 #include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
 #include "port.h"				/* for strtof() */
-#include "svector.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
@@ -90,7 +89,7 @@ CheckDim(int dim)
 }
 
 /*
- * Ensure finite element
+ * Ensure finite elements
  */
 static inline void
 CheckElement(float value)
@@ -438,18 +437,17 @@ vector_send(PG_FUNCTION_ARGS)
 
 /*
  * Convert vector to vector
- * This is needed to check the type modifier
  */
 PGDLLEXPORT PG_FUNCTION_INFO_V1(vector);
 Datum
 vector(PG_FUNCTION_ARGS)
 {
-	Vector	   *vec = PG_GETARG_VECTOR_P(0);
+	Vector	   *arg = PG_GETARG_VECTOR_P(0);
 	int32		typmod = PG_GETARG_INT32(1);
 
-	CheckExpectedDim(typmod, vec->dim);
+	CheckExpectedDim(typmod, arg->dim);
 
-	PG_RETURN_POINTER(vec);
+	PG_RETURN_POINTER(arg);
 }
 
 /*
@@ -466,6 +464,7 @@ array_to_vector(PG_FUNCTION_ARGS)
 	bool		typbyval;
 	char		typalign;
 	Datum	   *elemsp;
+	bool	   *nullsp;
 	int			nelemsp;
 
 	if (ARR_NDIM(array) > 1)
@@ -479,7 +478,7 @@ array_to_vector(PG_FUNCTION_ARGS)
 				 errmsg("array must not contain nulls")));
 
 	get_typlenbyvalalign(ARR_ELEMTYPE(array), &typlen, &typbyval, &typalign);
-	deconstruct_array(array, ARR_ELEMTYPE(array), typlen, typbyval, typalign, &elemsp, NULL, &nelemsp);
+	deconstruct_array(array, ARR_ELEMTYPE(array), typlen, typbyval, typalign, &elemsp, &nullsp, &nelemsp);
 
 	CheckDim(nelemsp);
 	CheckExpectedDim(typmod, nelemsp);
@@ -513,12 +512,6 @@ array_to_vector(PG_FUNCTION_ARGS)
 				 errmsg("unsupported array type")));
 	}
 
-	/*
-	 * Free allocation from deconstruct_array. Do not free individual elements
-	 * when pass-by-reference since they point to original array.
-	 */
-	pfree(elemsp);
-
 	/* Check elements */
 	for (int i = 0; i < result->dim; i++)
 		CheckElement(result->x[i]);
@@ -1152,26 +1145,3 @@ vector_avg(PG_FUNCTION_ARGS)
 
 	PG_RETURN_POINTER(result);
 }
-
-/*
- * Convert sparse vector to dense vector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(svector_to_vector);
-Datum
-svector_to_vector(PG_FUNCTION_ARGS)
-{
-	SVector    *svec = PG_GETARG_SVECTOR_P(0);
-	int32		typmod = PG_GETARG_INT32(1);
-	Vector	   *result;
-	int			dim = svec->dim;
-	float	   *values = SVECTOR_VALUES(svec);
-
-	CheckDim(dim);
-	CheckExpectedDim(typmod, dim);
-
-	result = InitVector(dim);
-	for (int i = 0; i < svec->nnz; i++)
-		result->x[svec->indices[i]] = values[i];
-
-	PG_RETURN_POINTER(result);
-}

test/expected/functions.out

@@ -54,85 +54,85 @@ SELECT vector_norm('[3e37,4e37]')::real;
        5e+37
 (1 row)
 
-SELECT l2_distance('[0,0]'::vector, '[3,4]');
+SELECT l2_distance('[0,0]', '[3,4]');
  l2_distance 
 -------------
            5
 (1 row)
 
-SELECT l2_distance('[0,0]'::vector, '[0,1]');
+SELECT l2_distance('[0,0]', '[0,1]');
  l2_distance 
 -------------
            1
 (1 row)
 
-SELECT l2_distance('[1,2]'::vector, '[3]');
+SELECT l2_distance('[1,2]', '[3]');
 ERROR:  different vector dimensions 2 and 1
-SELECT l2_distance('[3e38]'::vector, '[-3e38]');
+SELECT l2_distance('[3e38]', '[-3e38]');
  l2_distance 
 -------------
     Infinity
 (1 row)
 
-SELECT inner_product('[1,2]'::vector, '[3,4]');
+SELECT inner_product('[1,2]', '[3,4]');
  inner_product 
 ---------------
             11
 (1 row)
 
-SELECT inner_product('[1,2]'::vector, '[3]');
+SELECT inner_product('[1,2]', '[3]');
 ERROR:  different vector dimensions 2 and 1
-SELECT inner_product('[3e38]'::vector, '[3e38]');
+SELECT inner_product('[3e38]', '[3e38]');
  inner_product 
 ---------------
       Infinity
 (1 row)
 
-SELECT cosine_distance('[1,2]'::vector, '[2,4]');
+SELECT cosine_distance('[1,2]', '[2,4]');
  cosine_distance 
 -----------------
                0
 (1 row)
 
-SELECT cosine_distance('[1,2]'::vector, '[0,0]');
+SELECT cosine_distance('[1,2]', '[0,0]');
  cosine_distance 
 -----------------
              NaN
 (1 row)
 
-SELECT cosine_distance('[1,1]'::vector, '[1,1]');
+SELECT cosine_distance('[1,1]', '[1,1]');
  cosine_distance 
 -----------------
                0
 (1 row)
 
-SELECT cosine_distance('[1,0]'::vector, '[0,2]');
+SELECT cosine_distance('[1,0]', '[0,2]');
  cosine_distance 
 -----------------
                1
 (1 row)
 
-SELECT cosine_distance('[1,1]'::vector, '[-1,-1]');
+SELECT cosine_distance('[1,1]', '[-1,-1]');
  cosine_distance 
 -----------------
                2
 (1 row)
 
-SELECT cosine_distance('[1,2]'::vector, '[3]');
+SELECT cosine_distance('[1,2]', '[3]');
 ERROR:  different vector dimensions 2 and 1
-SELECT cosine_distance('[1,1]'::vector, '[1.1,1.1]');
+SELECT cosine_distance('[1,1]', '[1.1,1.1]');
  cosine_distance 
 -----------------
                0
 (1 row)
 
-SELECT cosine_distance('[1,1]'::vector, '[-1.1,-1.1]');
+SELECT cosine_distance('[1,1]', '[-1.1,-1.1]');
  cosine_distance 
 -----------------
                2
 (1 row)
 
-SELECT cosine_distance('[3e38]'::vector, '[3e38]');
+SELECT cosine_distance('[3e38]', '[3e38]');
  cosine_distance 
 -----------------
              NaN

test/expected/svector.out

@@ -1,140 +0,0 @@
-SELECT '(0,1.5),(2,3.5)|5|'::svector;
-      svector       
---------------------
- (0,1.5),(2,3.5)|5|
-(1 row)
-
-SELECT '(0,1.5),(2,3.5)|5|'::svector::vector;
-     vector      
------------------
- [1.5,0,3.5,0,0]
-(1 row)
-
-SELECT '(0,1.5),(2,3.5)|5|'::svector::vector(5);
-     vector      
------------------
- [1.5,0,3.5,0,0]
-(1 row)
-
-SELECT '(0,1.5),(2,3.5)|5|'::svector::vector(4);
-ERROR:  expected 4 dimensions, not 5
-SELECT '[0,1.5,0,3.5,0]'::vector::svector;
-      svector       
---------------------
- (1,1.5),(3,3.5)|5|
-(1 row)
-
-SELECT '(0,0),(1,1),(2,0)|3|'::svector;
-       svector        
-----------------------
- (0,0),(1,1),(2,0)|3|
-(1 row)
-
-SELECT '|5|'::svector;
- svector 
----------
- |5|
-(1 row)
-
-SELECT '|-1|'::svector;
-ERROR:  svector must have at least 1 dimension
-LINE 1: SELECT '|-1|'::svector;
-               ^
-SELECT '|100001|'::svector;
-ERROR:  svector cannot have more than 100000 dimensions
-LINE 1: SELECT '|100001|'::svector;
-               ^
-SELECT '|16001|'::svector::vector;
-ERROR:  vector cannot have more than 16000 dimensions
-SELECT '(-1,1)|1|'::svector;
-ERROR:  index must not be negative
-LINE 1: SELECT '(-1,1)|1|'::svector;
-               ^
-SELECT '(1,1)|1|'::svector;
-ERROR:  index must be less than dimensions
-LINE 1: SELECT '(1,1)|1|'::svector;
-               ^
-SELECT '|1|'::svector(2);
-ERROR:  expected 2 dimensions, not 1
-SELECT l2_distance('|2|'::svector, '(0,3),(1,4)|2|');
- l2_distance 
--------------
-           5
-(1 row)
-
-SELECT l2_distance('|2|'::svector, '(1,1)|2|');
- l2_distance 
--------------
-           1
-(1 row)
-
-SELECT '|2|'::svector <-> '(0,3),(1,4)|2|';
- ?column? 
-----------
-        5
-(1 row)
-
-SELECT inner_product('(0,1),(1,2)|2|'::svector, '(0,2),(1,4)|2|');
- inner_product 
----------------
-            10
-(1 row)
-
-SELECT svector_negative_inner_product('(0,1),(1,2)|2|', '(0,2),(1,4)|2|');
- svector_negative_inner_product 
---------------------------------
-                            -10
-(1 row)
-
-SELECT cosine_distance('(0,1),(1,2)|2|'::svector, '(0,2),(1,4)|2|');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('(0,1),(1,2)|2|'::svector, '|2|');
- cosine_distance 
------------------
-             NaN
-(1 row)
-
-SELECT cosine_distance('(0,1),(1,1)|2|'::svector, '(0,-1),(1,-1)|2|');
- cosine_distance 
------------------
-               2
-(1 row)
-
-SELECT cosine_distance('(0,1)|2|'::svector, '(1,2)|2|');
- cosine_distance 
------------------
-               1
-(1 row)
-
-SELECT cosine_distance('|1|'::svector, '|1|');
- cosine_distance 
------------------
-             NaN
-(1 row)
-
-SELECT cosine_distance('(0,1)|2|'::svector, '(0,1)|3|');
-ERROR:  different svector dimensions 2 and 3
-SELECT jaccard_distance('(0,1)|2|', '(0,1)|2|');
- jaccard_distance 
-------------------
-                0
-(1 row)
-
-SELECT jaccard_distance('(0,1)|2|', '(1,1)|2|');
- jaccard_distance 
-------------------
-                1
-(1 row)
-
-SELECT jaccard_distance('|1|', '|1|');
- jaccard_distance 
-------------------
-              NaN
-(1 row)
-
-SELECT jaccard_distance('(0,1)|2|', '(0,1)|3|');
-ERROR:  different svector dimensions 2 and 3

test/sql/functions.sql

@@ -13,24 +13,24 @@ SELECT vector_norm('[3,4]');
 SELECT vector_norm('[0,1]');
 SELECT vector_norm('[3e37,4e37]')::real;
 
-SELECT l2_distance('[0,0]'::vector, '[3,4]');
+SELECT l2_distance('[0,0]', '[3,4]');
-SELECT l2_distance('[0,0]'::vector, '[0,1]');
+SELECT l2_distance('[0,0]', '[0,1]');
-SELECT l2_distance('[1,2]'::vector, '[3]');
+SELECT l2_distance('[1,2]', '[3]');
-SELECT l2_distance('[3e38]'::vector, '[-3e38]');
+SELECT l2_distance('[3e38]', '[-3e38]');
 
-SELECT inner_product('[1,2]'::vector, '[3,4]');
+SELECT inner_product('[1,2]', '[3,4]');
-SELECT inner_product('[1,2]'::vector, '[3]');
+SELECT inner_product('[1,2]', '[3]');
-SELECT inner_product('[3e38]'::vector, '[3e38]');
+SELECT inner_product('[3e38]', '[3e38]');
 
-SELECT cosine_distance('[1,2]'::vector, '[2,4]');
+SELECT cosine_distance('[1,2]', '[2,4]');
-SELECT cosine_distance('[1,2]'::vector, '[0,0]');
+SELECT cosine_distance('[1,2]', '[0,0]');
-SELECT cosine_distance('[1,1]'::vector, '[1,1]');
+SELECT cosine_distance('[1,1]', '[1,1]');
-SELECT cosine_distance('[1,0]'::vector, '[0,2]');
+SELECT cosine_distance('[1,0]', '[0,2]');
-SELECT cosine_distance('[1,1]'::vector, '[-1,-1]');
+SELECT cosine_distance('[1,1]', '[-1,-1]');
-SELECT cosine_distance('[1,2]'::vector, '[3]');
+SELECT cosine_distance('[1,2]', '[3]');
-SELECT cosine_distance('[1,1]'::vector, '[1.1,1.1]');
+SELECT cosine_distance('[1,1]', '[1.1,1.1]');
-SELECT cosine_distance('[1,1]'::vector, '[-1.1,-1.1]');
+SELECT cosine_distance('[1,1]', '[-1.1,-1.1]');
-SELECT cosine_distance('[3e38]'::vector, '[3e38]');
+SELECT cosine_distance('[3e38]', '[3e38]');
 
 SELECT l1_distance('[0,0]', '[3,4]');
 SELECT l1_distance('[0,0]', '[0,1]');

test/sql/svector.sql

@@ -1,36 +0,0 @@
-SELECT '(0,1.5),(2,3.5)|5|'::svector;
-SELECT '(0,1.5),(2,3.5)|5|'::svector::vector;
-SELECT '(0,1.5),(2,3.5)|5|'::svector::vector(5);
-SELECT '(0,1.5),(2,3.5)|5|'::svector::vector(4);
-SELECT '[0,1.5,0,3.5,0]'::vector::svector;
-
-SELECT '(0,0),(1,1),(2,0)|3|'::svector;
-
-SELECT '|5|'::svector;
-SELECT '|-1|'::svector;
-SELECT '|100001|'::svector;
-SELECT '|16001|'::svector::vector;
-
-SELECT '(-1,1)|1|'::svector;
-SELECT '(1,1)|1|'::svector;
-
-SELECT '|1|'::svector(2);
-
-SELECT l2_distance('|2|'::svector, '(0,3),(1,4)|2|');
-SELECT l2_distance('|2|'::svector, '(1,1)|2|');
-SELECT '|2|'::svector <-> '(0,3),(1,4)|2|';
-
-SELECT inner_product('(0,1),(1,2)|2|'::svector, '(0,2),(1,4)|2|');
-SELECT svector_negative_inner_product('(0,1),(1,2)|2|', '(0,2),(1,4)|2|');
-
-SELECT cosine_distance('(0,1),(1,2)|2|'::svector, '(0,2),(1,4)|2|');
-SELECT cosine_distance('(0,1),(1,2)|2|'::svector, '|2|');
-SELECT cosine_distance('(0,1),(1,1)|2|'::svector, '(0,-1),(1,-1)|2|');
-SELECT cosine_distance('(0,1)|2|'::svector, '(1,2)|2|');
-SELECT cosine_distance('|1|'::svector, '|1|');
-SELECT cosine_distance('(0,1)|2|'::svector, '(0,1)|3|');
-
-SELECT jaccard_distance('(0,1)|2|', '(0,1)|2|');
-SELECT jaccard_distance('(0,1)|2|', '(1,1)|2|');
-SELECT jaccard_distance('|1|', '|1|');
-SELECT jaccard_distance('(0,1)|2|', '(0,1)|3|');

test/t/019_hnsw_array.pl

@@ -0,0 +1,113 @@
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More;
+
+my $node;
+my @queries = ();
+my @expected;
+my $limit = 20;
+
+sub test_recall
+{
+	my ($min, $operator) = @_;
+	my $correct = 0;
+	my $total = 0;
+
+	my $explain = $node->safe_psql("postgres", qq(
+		SET enable_seqscan = off;
+		EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v $operator '$queries[0]' LIMIT $limit;
+	));
+	like($explain, qr/Index Scan/);
+
+	for my $i (0 .. $#queries)
+	{
+		my $actual = $node->safe_psql("postgres", qq(
+			SET enable_seqscan = off;
+			SELECT i FROM tst ORDER BY v $operator '$queries[$i]' LIMIT $limit;
+		));
+		my @actual_ids = split("\n", $actual);
+		my %actual_set = map { $_ => 1 } @actual_ids;
+
+		my @expected_ids = split("\n", $expected[$i]);
+
+		foreach (@expected_ids)
+		{
+			if (exists($actual_set{$_}))
+			{
+				$correct++;
+			}
+			$total++;
+		}
+	}
+
+	cmp_ok($correct / $total, ">=", $min, $operator);
+}
+
+# Initialize node
+$node = get_new_node('node');
+$node->init;
+$node->start;
+
+# Create table
+$node->safe_psql("postgres", "CREATE EXTENSION vector;");
+$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v float4[3]);");
+$node->safe_psql("postgres",
+	"INSERT INTO tst SELECT i, ARRAY[random(), random(), random()] FROM generate_series(1, 10000) i;"
+);
+
+$node->safe_psql("postgres", qq(
+	CREATE FUNCTION float4_l2_distance(float4[], float4[]) RETURNS float8
+		AS 'BEGIN RETURN l2_distance(\$1::vector, \$2::vector); END;'
+		LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
+
+	CREATE FUNCTION float4_l2_squared_distance(float4[], float4[]) RETURNS float8
+		AS 'BEGIN RETURN vector_l2_squared_distance(\$1::vector, \$2::vector); END;'
+		LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
+
+	CREATE OPERATOR <-> (
+		LEFTARG = float4[], RIGHTARG = float4[], PROCEDURE = float4_l2_distance,
+		COMMUTATOR = '<->'
+	);
+
+	CREATE OPERATOR CLASS float4_l2_ops
+		FOR TYPE float4[] USING hnsw AS
+		OPERATOR 1 <-> (float4[], float4[]) FOR ORDER BY float_ops,
+		FUNCTION 1 float4_l2_squared_distance(float4[], float4[]);
+));
+
+# Generate queries
+for (1 .. 20)
+{
+	my $r1 = rand();
+	my $r2 = rand();
+	my $r3 = rand();
+	push(@queries, "{$r1,$r2,$r3}");
+}
+
+# Check each index type
+my @operators = ("<->");
+my @opclasses = ("float4_l2_ops");
+
+for my $i (0 .. $#operators)
+{
+	my $operator = $operators[$i];
+	my $opclass = $opclasses[$i];
+
+	# Get exact results
+	@expected = ();
+	foreach (@queries)
+	{
+		my $res = $node->safe_psql("postgres", "SELECT i FROM tst ORDER BY v $operator '$_' LIMIT $limit;");
+		push(@expected, $res);
+	}
+
+	# Add index
+	$node->safe_psql("postgres", "CREATE INDEX ON tst USING hnsw (v $opclass) WITH (dimensions = 3);");
+
+	my $min = $operator eq "<#>" ? 0.80 : 0.99;
+	test_recall($min, $operator);
+}
+
+done_testing();