diff --git a/src/ivfflat.c b/src/ivfflat.c index ef926a8..1d7a686 100644 --- a/src/ivfflat.c +++ b/src/ivfflat.c @@ -142,6 +142,10 @@ ivfflatcostestimate(PlannerInfo *root, IndexPath *path, double loop_count, *indexSelectivity = costs.indexSelectivity; *indexCorrelation = costs.indexCorrelation; *indexPages = costs.numIndexPages; + + elog(INFO, "ivfflatcostestimate = %f", costs.indexTotalCost); + /* Cost estimates for parallel workers applied outside of amcostestimate */ + elog(INFO, "parallel_workers = %d, parallel aware = %d", path->path.parallel_workers, path->path.parallel_aware); } /* @@ -182,6 +186,25 @@ ivfflatvalidate(Oid opclassoid) return true; } +static Size +ivfflatestimateparallelscan() +{ + elog(INFO, "ivfflatestimateparallelscan"); + return 0; +} + +static void +ivfflatinitparallelscan(void *target) +{ + elog(INFO, "ivfflatinitparallelscan"); +} + +static void +ivfflatparallelrescan(IndexScanDesc scan) +{ + elog(INFO, "ivfflatparallelrescan"); +} + /* * Define index handler * @@ -209,7 +232,7 @@ ivfflathandler(PG_FUNCTION_ARGS) amroutine->amstorage = false; amroutine->amclusterable = false; amroutine->ampredlocks = false; - amroutine->amcanparallel = false; + amroutine->amcanparallel = true; amroutine->amcaninclude = false; #if PG_VERSION_NUM >= 130000 amroutine->amusemaintenanceworkmem = false; /* not used during VACUUM */ @@ -243,9 +266,9 @@ ivfflathandler(PG_FUNCTION_ARGS) amroutine->amrestrpos = NULL; /* Interface functions to support parallel index scans */ - amroutine->amestimateparallelscan = NULL; - amroutine->aminitparallelscan = NULL; - amroutine->amparallelrescan = NULL; + amroutine->amestimateparallelscan = ivfflatestimateparallelscan; + amroutine->aminitparallelscan = ivfflatinitparallelscan; + amroutine->amparallelrescan = ivfflatparallelrescan; PG_RETURN_POINTER(amroutine); } diff --git a/src/ivfscan.c b/src/ivfscan.c index fa3961b..7c961df 100644 --- a/src/ivfscan.c +++ b/src/ivfscan.c @@ -126,6 +126,9 @@ GetScanItems(IndexScanDesc scan, Datum value) */ BufferAccessStrategy bas = GetAccessStrategy(BAS_BULKREAD); + if (scan->parallel_scan != NULL) + elog(INFO, "parallel scan"); + /* Search closest probes lists */ while (!pairingheap_is_empty(so->listQueue)) { diff --git a/test/sql/ivfflat_parallel.sql b/test/sql/ivfflat_parallel.sql new file mode 100644 index 0000000..351742b --- /dev/null +++ b/test/sql/ivfflat_parallel.sql @@ -0,0 +1,16 @@ +-- SET force_parallel_mode = on; +SET parallel_setup_cost = 10; +SET parallel_tuple_cost = 0.000001; +SET min_parallel_table_scan_size = 1; +SET min_parallel_index_scan_size = 1; + +CREATE TABLE t (id integer, val vector(3)); +ALTER TABLE t ALTER COLUMN val SET STORAGE PLAIN; +INSERT INTO t (id, val) SELECT n, ARRAY[random(), random(), random()] FROM generate_series(1,1000000) n; +CREATE INDEX ON t USING ivfflat (val) WITH (lists = 10); +SET ivfflat.probes = 4; + +EXPLAIN SELECT * FROM t ORDER BY val <-> '[0.5,0.5,0.5]' LIMIT 5; +SELECT * FROM t ORDER BY val <-> '[0.5,0.5,0.5]' LIMIT 5; + +DROP TABLE t;