Skip to content

fix(postgres): back fulltext indexes with a GIN tsvector index #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HarshMN2345 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(postgres): back fulltext indexes with a GIN tsvector index #993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/Database/Adapter/Postgres.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ class Postgres extends SQL
{
public const MAX_IDENTIFIER_NAME = 63;

/**
* Text search configuration for fulltext indexes and search queries.
* Matches the default_text_search_config of the official images, which
* search relied on implicitly before.
*/
public const FULLTEXT_CONFIG = 'english';

/**
* @inheritDoc
*/
Expand Down Expand Up @@ -912,6 +919,11 @@ public function createIndex(string $collection, string $id, string $type, array
Database::INDEX_HNSW_COSINE => " USING HNSW ({$attributes} vector_cosine_ops)",
Database::INDEX_HNSW_DOT => " USING HNSW ({$attributes} vector_ip_ops)",
Database::INDEX_OBJECT => " USING GIN ({$attributes})",
Database::INDEX_FULLTEXT =>
" USING GIN (" . implode(', ', array_map(
fn ($attr) => $this->getFulltextVector(trim($attr)),
explode(',', $attributes)
)) . ")",
Database::INDEX_TRIGRAM =>
" USING GIN (" . implode(', ', array_map(
fn ($attr) => "$attr gin_trgm_ops",
Expand Down Expand Up @@ -1682,15 +1694,15 @@ protected function getSQLCondition(Query $query, array &$binds, ?string $forColl
return '0 = 1';
}
$binds[":{$placeholder}_0"] = $fulltextValue;
return "to_tsvector(regexp_replace({$attribute}, '[^\w]+',' ','g')) @@ websearch_to_tsquery(:{$placeholder}_0)";
return "{$this->getFulltextVector($attribute)} @@ websearch_to_tsquery('" . self::FULLTEXT_CONFIG . "', :{$placeholder}_0)";

case Query::TYPE_NOT_SEARCH:
$fulltextValue = $this->getFulltextValue($query->getValue());
if ($fulltextValue === '') {
return '1 = 1';
}
$binds[":{$placeholder}_0"] = $fulltextValue;
return "NOT (to_tsvector(regexp_replace({$attribute}, '[^\w]+',' ','g')) @@ websearch_to_tsquery(:{$placeholder}_0))";
return "NOT ({$this->getFulltextVector($attribute)} @@ websearch_to_tsquery('" . self::FULLTEXT_CONFIG . "', :{$placeholder}_0))";

case Query::TYPE_VECTOR_DOT:
case Query::TYPE_VECTOR_COSINE:
Expand Down Expand Up @@ -1849,6 +1861,19 @@ protected function getSQLPermissionsCondition(
return '(' . \implode(' OR ', $permissions) . ')';
}

/**
* Build the tsvector expression used by both fulltext indexes and search queries.
* The text search configuration must be explicit so the expression is IMMUTABLE
* and can be indexed; both sides must produce the exact same expression.
*
* @param string $attribute Quoted column name
* @return string
*/
protected function getFulltextVector(string $attribute): string
{
return "to_tsvector('" . self::FULLTEXT_CONFIG . "', regexp_replace({$attribute}, '[^\w]+',' ','g'))";
}

/**
* @param string $value
* @return string
Expand Down
Loading