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

Improved variable names

Browse Source
This commit is contained in:
Andrew Kane
2023-09-03 16:49:24 -07:00
parent 41bdf24cb7
commit 3431acef94
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/hnswscan.c
View File

@@ -181,7 +181,7 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
while (list_length(so->w) > 0) while (list_length(so->w) > 0)
{ {
HnswCandidate *hc = llast(so->w); HnswCandidate *hc = llast(so->w);
ItemPointer tid; ItemPointer heaptid;
BlockNumber indexblkno; BlockNumber indexblkno;
/* Move to next element if no valid heap TIDs */ /* Move to next element if no valid heap TIDs */
@@ -191,7 +191,7 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
continue; continue;
} }
tid = llast(hc->element->heaptids); heaptid = llast(hc->element->heaptids);
indexblkno = hc->element->blkno; indexblkno = hc->element->blkno;
hc->element->heaptids = list_delete_last(hc->element->heaptids); hc->element->heaptids = list_delete_last(hc->element->heaptids);
@@ -199,9 +199,9 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
MemoryContextSwitchTo(oldCtx); MemoryContextSwitchTo(oldCtx);
#if PG_VERSION_NUM >= 120000 #if PG_VERSION_NUM >= 120000
scan->xs_heaptid = *tid; scan->xs_heaptid = *heaptid;
#else #else
scan->xs_ctup.t_self = *tid; scan->xs_ctup.t_self = *heaptid;
#endif #endif
/* Unpin buffer */ /* Unpin buffer */

10
src/ivfscan.c
View File

@@ -279,7 +279,7 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
so->tupdesc = CreateTemplateTupleDesc(3, false); so->tupdesc = CreateTemplateTupleDesc(3, false);
#endif #endif
TupleDescInitEntry(so->tupdesc, (AttrNumber) 1, "distance", FLOAT8OID, -1, 0); TupleDescInitEntry(so->tupdesc, (AttrNumber) 1, "distance", FLOAT8OID, -1, 0);
TupleDescInitEntry(so->tupdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0); TupleDescInitEntry(so->tupdesc, (AttrNumber) 2, "heaptid", TIDOID, -1, 0);
TupleDescInitEntry(so->tupdesc, (AttrNumber) 3, "indexblkno", INT4OID, -1, 0); TupleDescInitEntry(so->tupdesc, (AttrNumber) 3, "indexblkno", INT4OID, -1, 0);
/* Prep sort */ /* Prep sort */
@@ -379,17 +379,17 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
if (tuplesort_gettupleslot(so->sortstate, true, false, so->slot, NULL)) if (tuplesort_gettupleslot(so->sortstate, true, false, so->slot, NULL))
{ {
ItemPointer tid = (ItemPointer) DatumGetPointer(slot_getattr(so->slot, 2, &so->isnull)); ItemPointer heaptid = (ItemPointer) DatumGetPointer(slot_getattr(so->slot, 2, &so->isnull));
BlockNumber indexblkno = DatumGetInt32(slot_getattr(so->slot, 3, &so->isnull)); BlockNumber indexblkno = DatumGetInt32(slot_getattr(so->slot, 3, &so->isnull));
#if PG_VERSION_NUM >= 120000 #if PG_VERSION_NUM >= 120000
scan->xs_heaptid = *tid; scan->xs_heaptid = *heaptid;
#else #else
scan->xs_ctup.t_self = *tid; scan->xs_ctup.t_self = *heaptid;
#endif #endif
/* Keep track of info needed to mark tuple as dead */ /* Keep track of info needed to mark tuple as dead */
so->heaptid = *tid; so->heaptid = *heaptid;
/* Unpin buffer */ /* Unpin buffer */
if (BufferIsValid(so->buf)) if (BufferIsValid(so->buf))