Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit500ce42

Browse files
committed
Almost done access...
1 parent4fa90e3 commit500ce42

File tree

10 files changed

+70
-135
lines changed

10 files changed

+70
-135
lines changed

‎src/backend/access/nbtree/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for access/nbtree
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.2 1996/11/03 09:06:55 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.3 1996/11/05 10:35:27 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../../port/$(PORTNAME)\
14+
INCLUDE_OPT = -I../..\
15+
-I../../port/$(PORTNAME)\
1516
-I../../../include
1617

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/access/nbtree/nbtcompare.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.4 1996/11/03 22:57:48 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.5 1996/11/05 10:35:28 scrappy Exp $
1111
*
1212
* NOTES
1313
*These functions are stored in pg_amproc. For each operator class
@@ -22,8 +22,9 @@
2222

2323
#include<string.h>
2424

25-
#include"postgres.h"
26-
#include"utils/nabstime.h"
25+
#include<postgres.h>
26+
27+
#include<utils/nabstime.h>
2728

2829
int32
2930
btint2cmp(int16a,int16b)

‎src/backend/access/nbtree/nbtinsert.c

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,20 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.5 1996/11/03 12:35:11 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.6 1996/11/05 10:35:29 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include<stdio.h>
16-
#include<time.h>
15+
#include<postgres.h>
1716

18-
#include"postgres.h"
19-
20-
#include"utils/rel.h"
21-
22-
#include"storage/buf.h"
23-
24-
#include"storage/block.h"
25-
#include"storage/off.h"
26-
#include"storage/itemptr.h"
27-
#include"access/itup.h"
28-
#include"access/funcindex.h"
29-
#include"storage/itemid.h"
30-
#include"storage/item.h"
31-
#include"storage/bufpage.h"
32-
#include"utils/nabstime.h"
33-
#include"utils/palloc.h"
34-
#include"access/htup.h"
35-
#include"utils/tqual.h"
36-
#include"access/relscan.h"
37-
#include"access/sdir.h"
38-
#include"access/nbtree.h"
39-
40-
#include"storage/ipc.h"
41-
#include"storage/bufmgr.h"
17+
#include<utils/memutils.h>
18+
#include<storage/bufpage.h>
19+
#include<access/nbtree.h>
20+
#include<storage/bufmgr.h>
4221

4322
#ifndefHAVE_MEMMOVE
44-
# include"regex/utils.h"
23+
# include<regex/utils.h>
4524
#else
4625
# include<string.h>
4726
#endif

‎src/backend/access/nbtree/nbtpage.c

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.5 1996/11/03 22:57:52 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.6 1996/11/05 10:35:30 scrappy Exp $
1212
*
1313
* NOTES
1414
* Postgres btree pages look like ordinary relation pages. The opaque
@@ -22,30 +22,20 @@
2222
#include<stdio.h>
2323
#include<time.h>
2424

25-
#include"postgres.h"
25+
#include<postgres.h>
2626

27-
#include"utils/rel.h"
28-
29-
#include"access/itup.h"
30-
#include"access/funcindex.h"
31-
#include"storage/bufpage.h"
32-
#include"access/htup.h"
33-
#include"access/relscan.h"
34-
#include"access/sdir.h"
35-
#include"access/nbtree.h"
36-
37-
#include"storage/lmgr.h"
27+
#include<storage/bufpage.h>
28+
#include<access/nbtree.h>
29+
#include<miscadmin.h>
30+
#include<storage/bufmgr.h>
31+
#include<storage/lmgr.h>
3832

3933
#ifndefHAVE_MEMMOVE
40-
# include"regex/utils.h"
34+
# include<regex/utils.h>
4135
#else
4236
# include<string.h>
4337
#endif
4438

45-
#include"miscadmin.h"
46-
47-
#include"storage/bufmgr.h"
48-
4939
#defineBTREE_METAPAGE0
5040
#defineBTREE_MAGIC0x053162
5141
#defineBTREE_VERSION0

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

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,30 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.8 1996/11/03 22:57:54 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.9 1996/11/05 10:35:32 scrappy Exp $
1212
*
1313
* NOTES
1414
* This file contains only the public interface routines.
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
18-
#include<stdio.h>
19-
#include<time.h>
2018

21-
#include"postgres.h"
19+
#include<postgres.h>
2220

23-
#include"utils/rel.h"
24-
#include"access/genam.h"
21+
#include<access/genam.h>
22+
#include<storage/bufpage.h>
23+
#include<storage/bufmgr.h>
24+
#include<access/nbtree.h>
25+
#include<executor/executor.h>
26+
#include<access/heapam.h>
27+
#include<catalog/index.h>
28+
#include<miscadmin.h>
2529

26-
#include"storage/bufpage.h"
27-
#include"storage/bufmgr.h"
28-
#include"access/htup.h"
29-
#include"utils/palloc.h"
30-
#include"access/nbtree.h"
31-
32-
#include"executor/executor.h"
33-
34-
#include"access/heapam.h"
35-
36-
#include"catalog/index.h"
37-
38-
#include"miscadmin.h"
30+
#ifndefHAVE_MEMMOVE
31+
# include<regex/utils.h>
32+
#else
33+
# include<string.h>
34+
#endif
3935

4036
boolBuildingBtree= false;
4137
boolFastBuild= false;/* turn this on to make bulk builds work*/

‎src/backend/access/nbtree/nbtscan.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.4 1996/11/03 22:57:55 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.5 1996/11/05 10:35:33 scrappy Exp $
1111
*
1212
*
1313
* NOTES
@@ -27,19 +27,10 @@
2727
*-------------------------------------------------------------------------
2828
*/
2929

30-
#include"postgres.h"
31-
32-
#include"utils/rel.h"
33-
34-
#include"access/itup.h"
35-
#include"access/funcindex.h"
36-
#include"storage/bufpage.h"
37-
#include"access/htup.h"
38-
#include"utils/palloc.h"
39-
#include"access/relscan.h"
40-
#include"access/sdir.h"
41-
#include"access/nbtree.h"
30+
#include<postgres.h>
4231

32+
#include<storage/bufpage.h>
33+
#include<access/nbtree.h>
4334

4435
typedefstructBTScanListData {
4536
IndexScanDescbtsl_scan;

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,25 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.7 1996/11/03 22:57:56 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.8 1996/11/05 10:35:34 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include"postgres.h"
15+
#include<postgres.h>
1616

17-
#include"utils/rel.h"
18-
#include"access/genam.h"
19-
20-
#include"storage/bufpage.h"
21-
#include"storage/bufmgr.h"
22-
#include"access/htup.h"
23-
#include"utils/palloc.h"
24-
#include"access/nbtree.h"
17+
#include<access/genam.h>
18+
#include<fmgr.h>
19+
#include<storage/bufpage.h>
20+
#include<storage/bufmgr.h>
21+
#include<access/nbtree.h>
2522

2623
#ifndefHAVE_MEMMOVE
27-
# include"regex/utils.h"
24+
# include<regex/utils.h>
2825
#else
2926
# include<string.h>
3027
#endif
3128

32-
#include"fmgr.h"
3329

3430
staticBTStack_bt_searchr(Relationrel,intkeysz,ScanKeyscankey,Buffer*bufP,BTStackstack_in);
3531
staticOffsetNumber_bt_firsteq(Relationrel,TupleDescitupdesc,Pagepage,Sizekeysz,ScanKeyscankey,OffsetNumberoffnum);

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*
77
* IDENTIFICATION
8-
* $Id: nbtsort.c,v 1.7 1996/11/03 22:57:57 scrappy Exp $
8+
* $Id: nbtsort.c,v 1.8 1996/11/05 10:35:35 scrappy Exp $
99
*
1010
* NOTES
1111
*
@@ -47,30 +47,22 @@
4747
*-------------------------------------------------------------------------
4848
*/
4949

50-
#include<stdio.h>
5150
#include<fcntl.h>
5251

53-
#include"postgres.h"
52+
#include<postgres.h>
5453

55-
#include"utils/rel.h"
54+
#include<utils/memutils.h>
55+
#include<storage/bufpage.h>
56+
#include<access/nbtree.h>
57+
#include<storage/bufmgr.h>
5658

57-
#include"access/itup.h"
58-
#include"access/funcindex.h"
59-
#include"storage/bufpage.h"
60-
#include"access/htup.h"
61-
#include"utils/palloc.h"
62-
#include"access/relscan.h"
63-
#include"access/sdir.h"
64-
#include"access/nbtree.h"
6559

6660
#ifndefHAVE_MEMMOVE
67-
# include"regex/utils.h"
61+
# include<regex/utils.h>
6862
#else
6963
# include<string.h>
7064
#endif
7165

72-
#include"storage/bufmgr.h"
73-
7466
#ifdefFASTBUILD
7567

7668
#defineMAXTAPES(7)

‎src/backend/access/nbtree/nbtstrat.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,16 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.3 1996/11/03 22:57:59 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.4 1996/11/05 10:35:37 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include"postgres.h"
15+
#include<postgres.h>
1616

17-
#include"utils/rel.h"
18-
19-
#include"access/itup.h"
20-
#include"access/funcindex.h"
21-
#include"storage/bufpage.h"
22-
#include"access/htup.h"
23-
#include"access/relscan.h"
24-
#include"access/sdir.h"
25-
#include"access/nbtree.h"
17+
#include<access/istrat.h>
18+
#include<storage/bufpage.h>
19+
#include<access/nbtree.h>
2620

2721
/*
2822
* Note:

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,25 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.6 1996/11/03 22:57:59 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.7 1996/11/05 10:35:38 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include<time.h>
15+
#include<postgres.h>
1616

17-
#include"postgres.h"
17+
#include<access/genam.h>
18+
#include<fmgr.h>
19+
#include<storage/bufpage.h>
20+
#include<access/nbtree.h>
21+
#include<access/istrat.h>
22+
#include<access/iqual.h>
1823

19-
#include"utils/rel.h"
20-
#include"access/genam.h"
21-
22-
#include"storage/bufpage.h"
23-
#include"access/htup.h"
24-
#include"utils/palloc.h"
25-
#include"access/nbtree.h"
26-
#include"access/istrat.h"
27-
#include"access/iqual.h"
2824
#ifndefHAVE_MEMMOVE
29-
# include"regex/utils.h"
25+
# include<regex/utils.h>
3026
#else
3127
# include<string.h>
3228
#endif
33-
#include"fmgr.h"
3429

3530
ScanKey
3631
_bt_mkscankey(Relationrel,IndexTupleitup)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp