diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2018-04-12 13:02:45 +0300 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2018-04-12 13:02:45 +0300 |
| commit | c9c875a28fa6cbc38c227fb9e656dd7be948166f (patch) | |
| tree | 7ccb3927b72c55294e052999e11bced233b04499 /src/backend/utils | |
| parent | 9e9befac4a2228ae8a5309900645ecd8ead69f53 (diff) | |
| download | postgresql-c9c875a28fa6cbc38c227fb9e656dd7be948166f.tar.gz postgresql-c9c875a28fa6cbc38c227fb9e656dd7be948166f.zip | |
Rename IndexInfo.ii_KeyAttrNumbers array
Rename ii_KeyAttrNumbers to ii_IndexAttrNumbers to prevent confusion with
ii_NumIndexAttrs/ii_NumIndexKeyAttrs. ii_IndexAttrNumbers contains
all attributes including "including" columns, not only key attribute.
Discussion: https://www.postgresql.org/message-id/13123421-1d52-d0e4-c95c-6d69011e0595%40sigaev.ru
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/cache/relcache.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/sort/tuplesort.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index e81c4691ec2..fd2a3cc8c3d 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -5065,7 +5065,7 @@ restart: /* Collect simple attribute references */ for (i = 0; i < indexInfo->ii_NumIndexAttrs; i++) { - int attrnum = indexInfo->ii_KeyAttrNumbers[i]; + int attrnum = indexInfo->ii_IndexAttrNumbers[i]; /* * Since we have covering indexes with non-key columns, we must diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index a0c0d6f701a..e6a8d22feb2 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -3718,7 +3718,7 @@ comparetup_cluster(const SortTuple *a, const SortTuple *b, datum2; bool isnull1, isnull2; - AttrNumber leading = state->indexInfo->ii_KeyAttrNumbers[0]; + AttrNumber leading = state->indexInfo->ii_IndexAttrNumbers[0]; /* Be prepared to compare additional sort keys */ ltup = (HeapTuple) a->tuple; @@ -3761,7 +3761,7 @@ comparetup_cluster(const SortTuple *a, const SortTuple *b, for (; nkey < state->nKeys; nkey++, sortKey++) { - AttrNumber attno = state->indexInfo->ii_KeyAttrNumbers[nkey]; + AttrNumber attno = state->indexInfo->ii_IndexAttrNumbers[nkey]; datum1 = heap_getattr(ltup, attno, tupDesc, &isnull1); datum2 = heap_getattr(rtup, attno, tupDesc, &isnull2); @@ -3833,11 +3833,11 @@ copytup_cluster(Tuplesortstate *state, SortTuple *stup, void *tup) * set up first-column key value, and potentially abbreviate, if it's a * simple column */ - if (state->indexInfo->ii_KeyAttrNumbers[0] == 0) + if (state->indexInfo->ii_IndexAttrNumbers[0] == 0) return; original = heap_getattr(tuple, - state->indexInfo->ii_KeyAttrNumbers[0], + state->indexInfo->ii_IndexAttrNumbers[0], state->tupDesc, &stup->isnull1); @@ -3881,7 +3881,7 @@ copytup_cluster(Tuplesortstate *state, SortTuple *stup, void *tup) tuple = (HeapTuple) mtup->tuple; mtup->datum1 = heap_getattr(tuple, - state->indexInfo->ii_KeyAttrNumbers[0], + state->indexInfo->ii_IndexAttrNumbers[0], state->tupDesc, &mtup->isnull1); } @@ -3935,9 +3935,9 @@ readtup_cluster(Tuplesortstate *state, SortTuple *stup, &tuplen, sizeof(tuplen)); stup->tuple = (void *) tuple; /* set up first-column key value, if it's a simple column */ - if (state->indexInfo->ii_KeyAttrNumbers[0] != 0) + if (state->indexInfo->ii_IndexAttrNumbers[0] != 0) stup->datum1 = heap_getattr(tuple, - state->indexInfo->ii_KeyAttrNumbers[0], + state->indexInfo->ii_IndexAttrNumbers[0], state->tupDesc, &stup->isnull1); } |