Skip to content

Commit 2a8d3d8

Browse files
tglsfdctglsfdc
committed
R-tree is dead ... long live GiST.
1 parent 645adf5 commit 2a8d3d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+212
-2953
lines changed

‎contrib/cube/cube.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <math.h>
1111

1212
#include "access/gist.h"
13-
#include "access/rtree.h"
13+
#include "access/skey.h"
1414
#include "lib/stringinfo.h"
1515
#include "utils/builtins.h"
1616

‎contrib/intarray/_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "access/gist.h"
66
#include "access/itup.h"
7-
#include "access/rtree.h"
7+
#include "access/skey.h"
88
#include "catalog/pg_type.h"
99
#include "utils/array.h"
1010
#include "utils/builtins.h"

‎contrib/ltree/_ltree_gist.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
#include "ltree.h"
77
#include "access/gist.h"
8-
#include "access/rtree.h"
9-
#include "access/nbtree.h"
8+
#include "access/skey.h"
109
#include "utils/array.h"
1110

1211
#include "crc32.h"

‎contrib/ltree/ltree_gist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include "ltree.h"
77
#include "access/gist.h"
8-
#include "access/rtree.h"
98
#include "access/nbtree.h"
9+
#include "access/skey.h"
1010
#include "utils/array.h"
1111
#include "crc32.h"
1212

‎contrib/pg_trgm/trgm_gist.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
#include "access/gist.h"
44
#include "access/itup.h"
5-
#include "access/rtree.h"
6-
#include "utils/elog.h"
7-
#include "utils/palloc.h"
5+
#include "access/tuptoaster.h"
6+
#include "storage/bufpage.h"
87
#include "utils/array.h"
98
#include "utils/builtins.h"
10-
#include "storage/bufpage.h"
11-
#include "access/tuptoaster.h"
129

1310
PG_FUNCTION_INFO_V1(gtrgm_in);
1411
Datum gtrgm_in(PG_FUNCTION_ARGS);

‎contrib/seg/seg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <float.h>
1010

1111
#include "access/gist.h"
12-
#include "access/rtree.h"
12+
#include "access/skey.h"
1313
#include "utils/builtins.h"
1414

1515
#include "segdata.h"
@@ -53,7 +53,7 @@ bool *gseg_same(SEG * b1, SEG * b2, bool *result);
5353

5454

5555
/*
56-
** R-tree suport functions
56+
** R-tree support functions
5757
*/
5858
bool seg_same(SEG * a, SEG * b);
5959
bool seg_contains_int(SEG * a, int *b);

‎contrib/tsearch2/gistidx.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
#include "access/gist.h"
66
#include "access/itup.h"
7-
#include "access/rtree.h"
7+
#include "access/tuptoaster.h"
8+
#include "storage/bufpage.h"
89
#include "utils/array.h"
910
#include "utils/builtins.h"
10-
#include "storage/bufpage.h"
11-
#include "access/tuptoaster.h"
1211

1312
#include "tsvector.h"
1413
#include "query.h"

‎contrib/tsearch2/query.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515

1616
#include "access/gist.h"
1717
#include "access/itup.h"
18-
#include "access/rtree.h"
18+
#include "storage/bufpage.h"
1919
#include "utils/array.h"
2020
#include "utils/builtins.h"
21-
#include "storage/bufpage.h"
2221

2322
#include "ts_cfg.h"
2423
#include "tsvector.h"

‎contrib/tsearch2/rewrite.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include "access/gist.h"
1111
#include "access/itup.h"
12-
#include "access/rtree.h"
1312
#include "storage/bufpage.h"
1413
#include "utils/array.h"
1514
#include "utils/builtins.h"

‎doc/src/sgml/backup.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.75 2005/11/04 23:13:59 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.76 2005/11/07 17:36:44 tgl Exp $
33
-->
44
<chapter id="backup">
55
<title>Backup and Restore</title>
@@ -1129,8 +1129,8 @@ restore_command = 'copy /mnt/server/archivedir/%f "%p"' # Windows
11291129
<itemizedlist>
11301130
<listitem>
11311131
<para>
1132-
Operations on hash and R-tree indexes are
1133-
not presently WAL-logged, so replay will not update these index types.
1132+
Operations on hash indexes are
1133+
not presently WAL-logged, so replay will not update these indexes.
11341134
The recommended workaround is to manually <command>REINDEX</> each
11351135
such index after completing a recovery operation.
11361136
</para>

0 commit comments

Comments
 (0)