NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitbf7ced5

committed

Revert buggy optimization of index scans

606c012 attempted to reduce cost of index scans using > and <strategies, though got that completely wrong in a few complex cases.Revert whole patch until we find a safe optimization.

1 parentf8a7588 commitbf7ced5Copy full SHA for bf7ced5

File tree

3 files changed

-35

lines changed

src
- backend/access/nbtree
  - nbtsearch.c
  - nbtutils.c
- include/access
  - nbtree.h

3 files changed

-35

lines changed

`‎src/backend/access/nbtree/nbtsearch.c‎`

Lines changed: 0 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -1026,33 +1026,6 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)`
`1026`	`1026`	`if (goback)`
`1027`	`1027`	`offnum=OffsetNumberPrev(offnum);`
`1028`	`1028`
`1029`		`-/*`
`1030`		`- * By here the scan position is now set for the first key. If all further`
`1031`		`- * tuples are expected to match we set the SK_BT_MATCHED flag to avoid`
`1032`		`- * re-checking the scan key later. This is a big win for slow key matches`
`1033`		`- * though is still significant even for fast datatypes.`
`1034`		`- */`
`1035`		`-switch (startKeys[0]->sk_strategy)`
`1036`		`-{`
`1037`		`-caseBTEqualStrategyNumber:`
`1038`		`-break;`
`1039`		`-`
`1040`		`-caseBTGreaterEqualStrategyNumber:`
`1041`		`-caseBTGreaterStrategyNumber:`
`1042`		`-if (ScanDirectionIsForward(dir))`
`1043`		`-startKeys[0]->sk_flags \|=SK_BT_MATCHED;`
`1044`		`-break;`
`1045`		`-`
`1046`		`-caseBTLessEqualStrategyNumber:`
`1047`		`-caseBTLessStrategyNumber:`
`1048`		`-if (ScanDirectionIsBackward(dir))`
`1049`		`-startKeys[0]->sk_flags \|=SK_BT_MATCHED;`
`1050`		`-break;`
`1051`		`-`
`1052`		`-default:`
`1053`		`-break;`
`1054`		`-}`
`1055`		`-`
`1056`	`1029`	`/* remember which buffer we have pinned, if any */`
`1057`	`1030`	`Assert(!BTScanPosIsValid(so->currPos));`
`1058`	`1031`	`so->currPos.buf=buf;`

`‎src/backend/access/nbtree/nbtutils.c‎`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1429,13 +1429,6 @@ _bt_checkkeys(IndexScanDesc scan,`
`1429`	`1429`	`boolisNull;`
`1430`	`1430`	`Datumtest;`
`1431`	`1431`
`1432`		`-/*`
`1433`		`- * If the scan key has already matched we can skip this key, as long`
`1434`		`- * as the index tuple does not contain NULL values.`
`1435`		`- */`
`1436`		`-if (key->sk_flags&SK_BT_MATCHED&& !IndexTupleHasNulls(tuple))`
`1437`		`-continue;`
`1438`		`-`
`1439`	`1432`	`/* row-comparison keys need special processing */`
`1440`	`1433`	`if (key->sk_flags&SK_ROW_HEADER)`
`1441`	`1434`	`{`

`‎src/include/access/nbtree.h‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,6 @@ typedef BTScanOpaqueData *BTScanOpaque;`
`644`	`644`	`*/`
`645`	`645`	`#defineSK_BT_REQFWD0x00010000/* required to continue forward scan */`
`646`	`646`	`#defineSK_BT_REQBKWD0x00020000/* required to continue backward scan */`
`647`		`-#defineSK_BT_MATCHED0x00040000/* required to skip further key match */`
`648`	`647`	`#defineSK_BT_INDOPTION_SHIFT 24/* must clear the above bits */`
`649`	`648`	`#defineSK_BT_DESC(INDOPTION_DESC << SK_BT_INDOPTION_SHIFT)`
`650`	`649`	`#defineSK_BT_NULLS_FIRST(INDOPTION_NULLS_FIRST << SK_BT_INDOPTION_SHIFT)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbf7ced5

File tree

3 files changed

3 files changed

`‎src/backend/access/nbtree/nbtsearch.c‎`

`‎src/backend/access/nbtree/nbtutils.c‎`

`‎src/include/access/nbtree.h‎`

0 commit comments