database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Revert CREATE INDEX ... INCLUDING ...

Browse Source 
It's not ready yet, revert two commits
690c543550 - unstable test output
386e3d7609 - patch itself
This commit is contained in:
Teodor Sigaev
2016-04-08 21:52:13 +03:00
parent 35e2e357cb
commit 8b99edefca
68 changed files with 256 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/access/nbtree/nbtutils.c
View File

@ -63,26 +63,17 @@ _bt_mkscankey(Relation rel, IndexTuple itup)
{
ScanKey skey;
TupleDesc itupdesc;
int indnatts,
indnkeyatts;
int natts;
int16 *indoption;
int i;
itupdesc = RelationGetDescr(rel);
indnatts = IndexRelationGetNumberOfAttributes(rel);
indnkeyatts = IndexRelationGetNumberOfKeyAttributes(rel);
natts = RelationGetNumberOfAttributes(rel);
indoption = rel->rd_indoption;
Assert(indnkeyatts != 0);
Assert(indnkeyatts <= indnatts);
skey = (ScanKey) palloc(natts * sizeof(ScanKeyData));
/*
* We'll execute search using ScanKey constructed on key columns.
* Non key (included) columns must be omitted.
*/
skey = (ScanKey) palloc(indnkeyatts * sizeof(ScanKeyData));
for (i = 0; i < indnkeyatts; i++)
for (i = 0; i < natts; i++)
{
FmgrInfo *procinfo;
Datum arg;
@ -124,16 +115,16 @@ ScanKey
_bt_mkscankey_nodata(Relation rel)
{
ScanKey skey;
int indnkeyatts;
int natts;
int16 *indoption;
int i;
indnkeyatts = IndexRelationGetNumberOfKeyAttributes(rel);
natts = RelationGetNumberOfAttributes(rel);
indoption = rel->rd_indoption;
skey = (ScanKey) palloc(indnkeyatts * sizeof(ScanKeyData));
skey = (ScanKey) palloc(natts * sizeof(ScanKeyData));
for (i = 0; i < indnkeyatts; i++)
for (i = 0; i < natts; i++)
{
FmgrInfo *procinfo;
int flags;