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

Commitce77462

Browse files
committed
Cause inheritance patch to meet minimum coding standards (no gcc
warnings).
1 parent7fca3f0 commitce77462

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

‎src/backend/optimizer/plan/planner.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.81 2000/06/0901:44:14 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.82 2000/06/0903:17:13 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -23,6 +23,7 @@
2323
#include"optimizer/clauses.h"
2424
#include"optimizer/internal.h"
2525
#include"optimizer/paths.h"
26+
#include"optimizer/plancat.h"
2627
#include"optimizer/planmain.h"
2728
#include"optimizer/planner.h"
2829
#include"optimizer/prep.h"

‎src/backend/optimizer/util/plancat.c‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
*
1111
* IDENTIFICATION
1212
<<<<<<< plancat.c
13-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.54 2000/06/0901:44:16 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.55 2000/06/0903:17:12 tgl Exp $
1414
=======
15-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.54 2000/06/0901:44:16 momjian Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.55 2000/06/0903:17:12 tgl Exp $
1616
>>>>>>> 1.53
1717
*
1818
*-------------------------------------------------------------------------
@@ -292,13 +292,18 @@ find_inheritance_children(Oid inhparent)
292292
* Currently has_subclass is only used as an efficiency hack, so this
293293
* is ok.
294294
*/
295-
boolhas_subclass(OidrelationId)
295+
bool
296+
has_subclass(OidrelationId)
296297
{
297-
HeapTupletuple=
298-
SearchSysCacheTuple(RELOID,
299-
ObjectIdGetDatum(relationId),
300-
0,0,0);
301-
return ((Form_pg_class)GETSTRUCT(tuple))->relhassubclass;
298+
HeapTupletuple=
299+
SearchSysCacheTuple(RELOID,
300+
ObjectIdGetDatum(relationId),
301+
0,0,0);
302+
303+
if (!HeapTupleIsValid(tuple))
304+
elog(ERROR,"has_subclass: Relation %u not found",
305+
relationId);
306+
return ((Form_pg_class)GETSTRUCT(tuple))->relhassubclass;
302307
}
303308

304309
#ifdefNOT_USED

‎src/include/optimizer/plancat.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: plancat.h,v 1.18 2000/04/1217:16:42 momjian Exp $
10+
* $Id: plancat.h,v 1.19 2000/06/09 03:17:11 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -24,6 +24,8 @@ extern List *find_secondary_indexes(Query *root, Index relid);
2424

2525
externList*find_inheritance_children(Oidinhparent);
2626

27+
externboolhas_subclass(OidrelationId);
28+
2729
externSelectivityrestriction_selectivity(OidfunctionObjectId,
2830
OidoperatorObjectId,
2931
OidrelationObjectId,

0 commit comments

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