liuyu/pgvector
1
0
Fork 0
mirror of https://github.com/pgvector/pgvector.git synced 2026-07-12 23:56:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restored collation for consistency [skip ci]

Browse Source
This commit is contained in:
Andrew Kane
2024-04-25 13:46:45 -07:00
parent 38e365ed58
commit 1fdfff7349
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hnsw.h
View File

@@ -377,7 +377,7 @@ typedef struct HnswVacuumState
int HnswGetM(Relation index); int HnswGetM(Relation index);
int HnswGetEfConstruction(Relation index); int HnswGetEfConstruction(Relation index);
FmgrInfo *HnswOptionalProcInfo(Relation index, uint16 procnum); FmgrInfo *HnswOptionalProcInfo(Relation index, uint16 procnum);
Datum HnswNormValue(const HnswTypeInfo * typeInfo, Datum value); Datum HnswNormValue(const HnswTypeInfo * typeInfo, Oid collation, Datum value);
bool HnswCheckNorm(FmgrInfo *procinfo, Oid collation, Datum value); bool HnswCheckNorm(FmgrInfo *procinfo, Oid collation, Datum value);
Buffer HnswNewBuffer(Relation index, ForkNumber forkNum); Buffer HnswNewBuffer(Relation index, ForkNumber forkNum);
void HnswInitPage(Buffer buf, Page page); void HnswInitPage(Buffer buf, Page page);

2
src/hnswbuild.c
View File

@@ -498,7 +498,7 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn
if (!HnswCheckNorm(buildstate->normprocinfo, buildstate->collation, value)) if (!HnswCheckNorm(buildstate->normprocinfo, buildstate->collation, value))
return false; return false;
value = HnswNormValue(typeInfo, value); value = HnswNormValue(typeInfo, buildstate->collation, value);
} }
/* Get datum size */ /* Get datum size */

2
src/hnswinsert.c
View File

@@ -630,7 +630,7 @@ HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_ti
if (!HnswCheckNorm(normprocinfo, collation, value)) if (!HnswCheckNorm(normprocinfo, collation, value))
return; return;
value = HnswNormValue(typeInfo, value); value = HnswNormValue(typeInfo, collation, value);
} }
HnswInsertTupleOnDisk(index, value, values, isnull, heap_tid, false); HnswInsertTupleOnDisk(index, value, values, isnull, heap_tid, false);

2
src/hnswscan.c
View File

@@ -61,7 +61,7 @@ GetScanValue(IndexScanDesc scan)
/* Fine if normalization fails */ /* Fine if normalization fails */
if (so->normprocinfo != NULL) if (so->normprocinfo != NULL)
value = HnswNormValue(so->typeInfo, value); value = HnswNormValue(so->typeInfo, so->collation, value);
} }
return value; return value;

4
src/hnswutils.c
View File

@@ -156,9 +156,9 @@ HnswOptionalProcInfo(Relation index, uint16 procnum)
* Normalize value * Normalize value
*/ */
Datum Datum
HnswNormValue(const HnswTypeInfo * typeInfo, Datum value) HnswNormValue(const HnswTypeInfo * typeInfo, Oid collation, Datum value)
{ {
return DirectFunctionCall1(typeInfo->normalize, value); return DirectFunctionCall1Coll(typeInfo->normalize, collation, value);
} }
/* /*