Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
4853495e
Commit
4853495e
authored
May 10, 1999
by
Bruce Momjian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change error messages to oids come out as %u and not %d. Change has no
real affect now.
parent
b7332c92
Changes
66
Show whitespace changes
Inline
Side-by-side
Showing
66 changed files
with
241 additions
and
269 deletions
+241
-269
src/backend/access/common/printtup.c
src/backend/access/common/printtup.c
+2
-2
src/backend/access/gist/gist.c
src/backend/access/gist/gist.c
+2
-2
src/backend/bootstrap/bootparse.y
src/backend/bootstrap/bootparse.y
+2
-2
src/backend/bootstrap/bootstrap.c
src/backend/bootstrap/bootstrap.c
+5
-5
src/backend/catalog/aclchk.c
src/backend/catalog/aclchk.c
+2
-3
src/backend/catalog/heap.c
src/backend/catalog/heap.c
+7
-7
src/backend/catalog/index.c
src/backend/catalog/index.c
+4
-4
src/backend/catalog/indexing.c
src/backend/catalog/indexing.c
+2
-2
src/backend/catalog/pg_operator.c
src/backend/catalog/pg_operator.c
+2
-2
src/backend/commands/command.c
src/backend/commands/command.c
+2
-2
src/backend/commands/copy.c
src/backend/commands/copy.c
+4
-4
src/backend/commands/dbcommands.c
src/backend/commands/dbcommands.c
+2
-2
src/backend/commands/indexcmds.c
src/backend/commands/indexcmds.c
+3
-4
src/backend/commands/rename.c
src/backend/commands/rename.c
+2
-2
src/backend/commands/vacuum.c
src/backend/commands/vacuum.c
+2
-2
src/backend/executor/execAmi.c
src/backend/executor/execAmi.c
+2
-2
src/backend/executor/execMain.c
src/backend/executor/execMain.c
+3
-5
src/backend/executor/nodeIndexscan.c
src/backend/executor/nodeIndexscan.c
+2
-3
src/backend/executor/nodeMergejoin.c
src/backend/executor/nodeMergejoin.c
+3
-3
src/backend/libpq/be-dumpdata.c
src/backend/libpq/be-dumpdata.c
+2
-2
src/backend/libpq/be-fsstubs.c
src/backend/libpq/be-fsstubs.c
+4
-5
src/backend/nodes/outfuncs.c
src/backend/nodes/outfuncs.c
+8
-8
src/backend/nodes/print.c
src/backend/nodes/print.c
+2
-2
src/backend/optimizer/path/_deadcode/xfunc.c
src/backend/optimizer/path/_deadcode/xfunc.c
+6
-6
src/backend/optimizer/plan/createplan.c
src/backend/optimizer/plan/createplan.c
+2
-3
src/backend/optimizer/plan/planner.c
src/backend/optimizer/plan/planner.c
+4
-4
src/backend/optimizer/plan/subselect.c
src/backend/optimizer/plan/subselect.c
+2
-4
src/backend/optimizer/util/clauses.c
src/backend/optimizer/util/clauses.c
+2
-2
src/backend/optimizer/util/plancat.c
src/backend/optimizer/util/plancat.c
+7
-7
src/backend/parser/parse_coerce.c
src/backend/parser/parse_coerce.c
+9
-9
src/backend/parser/parse_func.c
src/backend/parser/parse_func.c
+3
-3
src/backend/parser/parse_node.c
src/backend/parser/parse_node.c
+5
-5
src/backend/parser/parse_oper.c
src/backend/parser/parse_oper.c
+3
-3
src/backend/parser/parse_type.c
src/backend/parser/parse_type.c
+2
-2
src/backend/rewrite/rewriteDefine.c
src/backend/rewrite/rewriteDefine.c
+2
-2
src/backend/rewrite/rewriteRemove.c
src/backend/rewrite/rewriteRemove.c
+3
-3
src/backend/storage/buffer/bufmgr.c
src/backend/storage/buffer/bufmgr.c
+3
-3
src/backend/storage/buffer/localbuf.c
src/backend/storage/buffer/localbuf.c
+3
-3
src/backend/storage/ipc/sinvaladt.c
src/backend/storage/ipc/sinvaladt.c
+4
-10
src/backend/storage/large_object/inv_api.c
src/backend/storage/large_object/inv_api.c
+3
-3
src/backend/storage/lmgr/lock.c
src/backend/storage/lmgr/lock.c
+2
-2
src/backend/tcop/fastpath.c
src/backend/tcop/fastpath.c
+4
-4
src/backend/tioga/tgRecipe.c
src/backend/tioga/tgRecipe.c
+2
-2
src/backend/utils/adt/arrayfuncs.c
src/backend/utils/adt/arrayfuncs.c
+3
-3
src/backend/utils/adt/oid.c
src/backend/utils/adt/oid.c
+2
-2
src/backend/utils/adt/regproc.c
src/backend/utils/adt/regproc.c
+2
-2
src/backend/utils/adt/ruleutils.c
src/backend/utils/adt/ruleutils.c
+13
-13
src/backend/utils/adt/selfuncs.c
src/backend/utils/adt/selfuncs.c
+6
-6
src/backend/utils/cache/catcache.c
src/backend/utils/cache/catcache.c
+3
-3
src/backend/utils/cache/fcache.c
src/backend/utils/cache/fcache.c
+3
-3
src/backend/utils/cache/inval.c
src/backend/utils/cache/inval.c
+4
-4
src/backend/utils/cache/lsyscache.c
src/backend/utils/cache/lsyscache.c
+3
-3
src/backend/utils/cache/relcache.c
src/backend/utils/cache/relcache.c
+3
-3
src/backend/utils/error/elog.c
src/backend/utils/error/elog.c
+2
-3
src/backend/utils/fmgr/dfmgr.c
src/backend/utils/fmgr/dfmgr.c
+3
-3
src/backend/utils/fmgr/fmgr.c
src/backend/utils/fmgr/fmgr.c
+10
-10
src/bin/pg_dump/pg_dump.c
src/bin/pg_dump/pg_dump.c
+6
-6
src/include/catalog/pg_type.h
src/include/catalog/pg_type.h
+2
-2
src/interfaces/libpgtcl/pgtclCmds.c
src/interfaces/libpgtcl/pgtclCmds.c
+3
-3
src/interfaces/libpq/fe-auth.c
src/interfaces/libpq/fe-auth.c
+8
-14
src/interfaces/libpq/fe-lobj.c
src/interfaces/libpq/fe-lobj.c
+3
-3
src/pl/plpgsql/src/pl_comp.c
src/pl/plpgsql/src/pl_comp.c
+6
-6
src/pl/plpgsql/src/pl_exec.c
src/pl/plpgsql/src/pl_exec.c
+4
-4
src/pl/plpgsql/src/pl_funcs.c
src/pl/plpgsql/src/pl_funcs.c
+2
-2
src/test/examples/testlo.c
src/test/examples/testlo.c
+5
-8
src/test/examples/testlo2.c
src/test/examples/testlo2.c
+5
-8
No files found.
src/backend/access/common/printtup.c
View file @
4853495e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.4
4 1999/04/25 19:27:43 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.4
5 1999/05/10 00:44:50 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -59,7 +59,7 @@ getTypeOutAndElem(Oid type, Oid* typOutput, Oid* typElem)
...
@@ -59,7 +59,7 @@ getTypeOutAndElem(Oid type, Oid* typOutput, Oid* typElem)
return
OidIsValid
(
*
typOutput
);
return
OidIsValid
(
*
typOutput
);
}
}
elog
(
ERROR
,
"getTypeOutAndElem: Cache lookup of type %
d
failed"
,
type
);
elog
(
ERROR
,
"getTypeOutAndElem: Cache lookup of type %
u
failed"
,
type
);
*
typOutput
=
InvalidOid
;
*
typOutput
=
InvalidOid
;
*
typElem
=
InvalidOid
;
*
typElem
=
InvalidOid
;
...
...
src/backend/access/gist/gist.c
View file @
4853495e
...
@@ -1162,7 +1162,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
...
@@ -1162,7 +1162,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
0
,
0
,
0
);
0
,
0
,
0
);
itupform
=
(
Form_pg_index
)
GETSTRUCT
(
htup
);
itupform
=
(
Form_pg_index
)
GETSTRUCT
(
htup
);
if
(
!
HeapTupleIsValid
(
htup
))
if
(
!
HeapTupleIsValid
(
htup
))
elog
(
ERROR
,
"initGISTstate: index %
d
not found"
,
elog
(
ERROR
,
"initGISTstate: index %
u
not found"
,
RelationGetRelid
(
index
));
RelationGetRelid
(
index
));
giststate
->
haskeytype
=
itupform
->
indhaskeytype
;
giststate
->
haskeytype
=
itupform
->
indhaskeytype
;
if
(
giststate
->
haskeytype
)
if
(
giststate
->
haskeytype
)
...
@@ -1174,7 +1174,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
...
@@ -1174,7 +1174,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
0
,
0
);
0
,
0
);
if
(
!
HeapTupleIsValid
(
htup
))
if
(
!
HeapTupleIsValid
(
htup
))
{
{
elog
(
ERROR
,
"initGISTstate: no attribute tuple %
d
%d"
,
elog
(
ERROR
,
"initGISTstate: no attribute tuple %
u
%d"
,
itupform
->
indexrelid
,
FirstOffsetNumber
);
itupform
->
indexrelid
,
FirstOffsetNumber
);
return
;
return
;
}
}
...
...
src/backend/bootstrap/bootparse.y
View file @
4853495e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.2
4 1999/02/13 23:1
4:51 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.2
5 1999/05/10 00:4
4:51 momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -178,7 +178,7 @@ Boot_CreateStmt:
...
@@ -178,7 +178,7 @@ Boot_CreateStmt:
id = heap_create_with_catalog(LexIDStr($3),
id = heap_create_with_catalog(LexIDStr($3),
tupdesc, RELKIND_RELATION, false);
tupdesc, RELKIND_RELATION, false);
if (!Quiet)
if (!Quiet)
printf("CREATED relation %s with OID %
d
\n",
printf("CREATED relation %s with OID %
u
\n",
LexIDStr($3), id);
LexIDStr($3), id);
}
}
DO_END;
DO_END;
...
...
src/backend/bootstrap/bootstrap.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California
* Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.5
8 1999/04/20 02:19:53 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.5
9 1999/05/10 00:44:52 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -630,7 +630,7 @@ InsertOneTuple(Oid objectid)
...
@@ -630,7 +630,7 @@ InsertOneTuple(Oid objectid)
if
(
DebugMode
)
if
(
DebugMode
)
{
{
printf
(
"InsertOneTuple oid %
d
, %d attrs
\n
"
,
objectid
,
numattr
);
printf
(
"InsertOneTuple oid %
u
, %d attrs
\n
"
,
objectid
,
numattr
);
fflush
(
stdout
);
fflush
(
stdout
);
}
}
...
@@ -644,7 +644,7 @@ InsertOneTuple(Oid objectid)
...
@@ -644,7 +644,7 @@ InsertOneTuple(Oid objectid)
pfree
(
tuple
);
pfree
(
tuple
);
if
(
DebugMode
)
if
(
DebugMode
)
{
{
printf
(
"End InsertOneTuple, objectid=%
d
\n
"
,
objectid
);
printf
(
"End InsertOneTuple, objectid=%
u
\n
"
,
objectid
);
fflush
(
stdout
);
fflush
(
stdout
);
}
}
...
@@ -686,7 +686,7 @@ InsertOneValue(Oid objectid, char *value, int i)
...
@@ -686,7 +686,7 @@ InsertOneValue(Oid objectid, char *value, int i)
ap
=
*
app
;
ap
=
*
app
;
if
(
ap
==
NULL
)
if
(
ap
==
NULL
)
{
{
printf
(
"Unable to find atttypid in Typ list! %
d
\n
"
,
printf
(
"Unable to find atttypid in Typ list! %
u
\n
"
,
reldesc
->
rd_att
->
attrs
[
i
]
->
atttypid
reldesc
->
rd_att
->
attrs
[
i
]
->
atttypid
);
);
Assert
(
0
);
Assert
(
0
);
...
@@ -707,7 +707,7 @@ InsertOneValue(Oid objectid, char *value, int i)
...
@@ -707,7 +707,7 @@ InsertOneValue(Oid objectid, char *value, int i)
{
{
typeindex
=
attrtypes
[
i
]
->
atttypid
-
FIRST_TYPE_OID
;
typeindex
=
attrtypes
[
i
]
->
atttypid
-
FIRST_TYPE_OID
;
if
(
DebugMode
)
if
(
DebugMode
)
printf
(
"Typ == NULL, typeindex = %
d
idx = %d
\n
"
,
typeindex
,
i
);
printf
(
"Typ == NULL, typeindex = %
u
idx = %d
\n
"
,
typeindex
,
i
);
values
[
i
]
=
fmgr
(
Procid
[
typeindex
].
inproc
,
value
,
values
[
i
]
=
fmgr
(
Procid
[
typeindex
].
inproc
,
value
,
Procid
[
typeindex
].
elem
,
-
1
);
Procid
[
typeindex
].
elem
,
-
1
);
prt
=
fmgr
(
Procid
[
typeindex
].
outproc
,
values
[
i
],
prt
=
fmgr
(
Procid
[
typeindex
].
outproc
,
values
[
i
],
...
...
src/backend/catalog/aclchk.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.2
0 1999/03/17 22:52:47
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.2
1 1999/05/10 00:44:53
momjian Exp $
*
*
* NOTES
* NOTES
* See acl.h.
* See acl.h.
...
@@ -549,8 +549,7 @@ pg_ownercheck(char *usename,
...
@@ -549,8 +549,7 @@ pg_ownercheck(char *usename,
owner_id
=
((
Form_pg_type
)
GETSTRUCT
(
tuple
))
->
typowner
;
owner_id
=
((
Form_pg_type
)
GETSTRUCT
(
tuple
))
->
typowner
;
break
;
break
;
default:
default:
elog
(
ERROR
,
"pg_ownercheck: invalid cache id: %d"
,
elog
(
ERROR
,
"pg_ownercheck: invalid cache id: %d"
,
cacheid
);
cacheid
);
break
;
break
;
}
}
...
...
src/backend/catalog/heap.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.7
7 1999/04/15 04:08:07 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.7
8 1999/05/10 00:44:54 momjian
Exp $
*
*
*
*
* INTERFACE ROUTINES
* INTERFACE ROUTINES
...
@@ -761,10 +761,10 @@ AddNewRelationType(char *typeName, Oid new_rel_oid)
...
@@ -761,10 +761,10 @@ AddNewRelationType(char *typeName, Oid new_rel_oid)
typeLen
(
typeidType
(
OIDOID
)),
/* external size */
typeLen
(
typeidType
(
OIDOID
)),
/* external size */
'c'
,
/* type-type (catalog) */
'c'
,
/* type-type (catalog) */
','
,
/* default array delimiter */
','
,
/* default array delimiter */
"
int4
in"
,
/* input procedure */
"
oid
in"
,
/* input procedure */
"
int4
out"
,
/* output procedure */
"
oid
out"
,
/* output procedure */
"
int4
in"
,
/* receive procedure */
"
oid
in"
,
/* receive procedure */
"
int4
out"
,
/* send procedure */
"
oid
out"
,
/* send procedure */
NULL
,
/* array element type - irrelevent */
NULL
,
/* array element type - irrelevent */
"-"
,
/* default type value */
"-"
,
/* default type value */
(
bool
)
1
,
/* passed by value */
(
bool
)
1
,
/* passed by value */
...
@@ -973,7 +973,7 @@ RelationRemoveInheritance(Relation relation)
...
@@ -973,7 +973,7 @@ RelationRemoveInheritance(Relation relation)
heap_endscan
(
scan
);
heap_endscan
(
scan
);
heap_close
(
catalogRelation
);
heap_close
(
catalogRelation
);
elog
(
ERROR
,
"Relation '%
d
' inherits '%s'"
,
elog
(
ERROR
,
"Relation '%
u
' inherits '%s'"
,
((
Form_pg_inherits
)
GETSTRUCT
(
tuple
))
->
inhrel
,
((
Form_pg_inherits
)
GETSTRUCT
(
tuple
))
->
inhrel
,
RelationGetRelationName
(
relation
));
RelationGetRelationName
(
relation
));
}
}
...
@@ -1235,7 +1235,7 @@ DeleteTypeTuple(Relation rel)
...
@@ -1235,7 +1235,7 @@ DeleteTypeTuple(Relation rel)
heap_endscan
(
pg_attribute_scan
);
heap_endscan
(
pg_attribute_scan
);
heap_close
(
pg_attribute_desc
);
heap_close
(
pg_attribute_desc
);
elog
(
ERROR
,
"DeleteTypeTuple: att of type %s exists in relation %
d
"
,
elog
(
ERROR
,
"DeleteTypeTuple: att of type %s exists in relation %
u
"
,
&
rel
->
rd_rel
->
relname
,
relid
);
&
rel
->
rd_rel
->
relname
,
relid
);
}
}
heap_endscan
(
pg_attribute_scan
);
heap_endscan
(
pg_attribute_scan
);
...
...
src/backend/catalog/index.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.7
0 1999/02/13 23:14:56
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.7
1 1999/05/10 00:44:55
momjian Exp $
*
*
*
*
* INTERFACE ROUTINES
* INTERFACE ROUTINES
...
@@ -1279,7 +1279,7 @@ UpdateStats(Oid relid, long reltuples, bool hasindex)
...
@@ -1279,7 +1279,7 @@ UpdateStats(Oid relid, long reltuples, bool hasindex)
whichRel
=
RelationIdGetRelation
(
relid
);
whichRel
=
RelationIdGetRelation
(
relid
);
if
(
!
RelationIsValid
(
whichRel
))
if
(
!
RelationIsValid
(
whichRel
))
elog
(
ERROR
,
"UpdateStats: cannot open relation id %
d
"
,
relid
);
elog
(
ERROR
,
"UpdateStats: cannot open relation id %
u
"
,
relid
);
/* ----------------
/* ----------------
* Find the RELATION relation tuple for the given relation.
* Find the RELATION relation tuple for the given relation.
...
@@ -1679,7 +1679,7 @@ IndexIsUnique(Oid indexId)
...
@@ -1679,7 +1679,7 @@ IndexIsUnique(Oid indexId)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
tuple
))
if
(
!
HeapTupleIsValid
(
tuple
))
{
{
elog
(
ERROR
,
"IndexIsUnique: can't find index id %
d
"
,
elog
(
ERROR
,
"IndexIsUnique: can't find index id %
u
"
,
indexId
);
indexId
);
}
}
index
=
(
Form_pg_index
)
GETSTRUCT
(
tuple
);
index
=
(
Form_pg_index
)
GETSTRUCT
(
tuple
);
...
@@ -1722,7 +1722,7 @@ IndexIsUniqueNoCache(Oid indexId)
...
@@ -1722,7 +1722,7 @@ IndexIsUniqueNoCache(Oid indexId)
/* NO CACHE */
/* NO CACHE */
tuple
=
heap_getnext
(
scandesc
,
0
);
tuple
=
heap_getnext
(
scandesc
,
0
);
if
(
!
HeapTupleIsValid
(
tuple
))
if
(
!
HeapTupleIsValid
(
tuple
))
elog
(
ERROR
,
"IndexIsUniqueNoCache: can't find index id %
d
"
,
indexId
);
elog
(
ERROR
,
"IndexIsUniqueNoCache: can't find index id %
u
"
,
indexId
);
index
=
(
Form_pg_index
)
GETSTRUCT
(
tuple
);
index
=
(
Form_pg_index
)
GETSTRUCT
(
tuple
);
Assert
(
index
->
indexrelid
==
indexId
);
Assert
(
index
->
indexrelid
==
indexId
);
...
...
src/backend/catalog/indexing.c
View file @
4853495e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.3
6 1999/02/13 23:14:57
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.3
7 1999/05/10 00:44:55
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -206,7 +206,7 @@ CatalogHasIndex(char *catName, Oid catId)
...
@@ -206,7 +206,7 @@ CatalogHasIndex(char *catName, Oid catId)
if
(
!
HeapTupleIsValid
(
htup
))
if
(
!
HeapTupleIsValid
(
htup
))
{
{
elog
(
NOTICE
,
"CatalogHasIndex: no relation with oid %
d
"
,
catId
);
elog
(
NOTICE
,
"CatalogHasIndex: no relation with oid %
u
"
,
catId
);
return
false
;
return
false
;
}
}
...
...
src/backend/catalog/pg_operator.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.3
5 1999/04/23 00:50:57 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.3
6 1999/05/10 00:44:56 momjian
Exp $
*
*
* NOTES
* NOTES
* these routines moved here from commands/define.c and somewhat cleaned up.
* these routines moved here from commands/define.c and somewhat cleaned up.
...
@@ -787,7 +787,7 @@ OperatorDef(char *operatorName,
...
@@ -787,7 +787,7 @@ OperatorDef(char *operatorName,
setheapoverride
(
false
);
setheapoverride
(
false
);
}
}
else
else
elog
(
ERROR
,
"OperatorDef: no operator %
d
"
,
operatorObjectId
);
elog
(
ERROR
,
"OperatorDef: no operator %
u
"
,
operatorObjectId
);
heap_endscan
(
pg_operator_scan
);
heap_endscan
(
pg_operator_scan
);
}
}
...
...
src/backend/commands/command.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.4
3 1999/04/13 19:04:33
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.4
4 1999/05/10 00:44:56
momjian Exp $
*
*
* NOTES
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
* The PortalExecutorHeapMemory crap needs to be eliminated
...
@@ -368,7 +368,7 @@ PerformAddAttribute(char *relationName,
...
@@ -368,7 +368,7 @@ PerformAddAttribute(char *relationName,
rel
=
heap_open
(
childrelid
);
rel
=
heap_open
(
childrelid
);
if
(
!
RelationIsValid
(
rel
))
if
(
!
RelationIsValid
(
rel
))
{
{
elog
(
ERROR
,
"PerformAddAttribute: can't find catalog entry for inheriting class with oid %
d
"
,
elog
(
ERROR
,
"PerformAddAttribute: can't find catalog entry for inheriting class with oid %
u
"
,
childrelid
);
childrelid
);
}
}
PerformAddAttribute
((
rel
->
rd_rel
->
relname
).
data
,
PerformAddAttribute
((
rel
->
rd_rel
->
relname
).
data
,
...
...
src/backend/commands/copy.c
View file @
4853495e
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.7
5 1999/05/03 19:09:3
8 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.7
6 1999/05/10 00:44:5
8 momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -926,7 +926,7 @@ GetOutputFunction(Oid type)
...
@@ -926,7 +926,7 @@ GetOutputFunction(Oid type)
if
(
HeapTupleIsValid
(
typeTuple
))
if
(
HeapTupleIsValid
(
typeTuple
))
return
(
int
)
((
Form_pg_type
)
GETSTRUCT
(
typeTuple
))
->
typoutput
;
return
(
int
)
((
Form_pg_type
)
GETSTRUCT
(
typeTuple
))
->
typoutput
;
elog
(
ERROR
,
"GetOutputFunction: Cache lookup of type %
d
failed"
,
type
);
elog
(
ERROR
,
"GetOutputFunction: Cache lookup of type %
u
failed"
,
type
);
return
InvalidOid
;
return
InvalidOid
;
}
}
...
@@ -958,7 +958,7 @@ GetInputFunction(Oid type)
...
@@ -958,7 +958,7 @@ GetInputFunction(Oid type)
if
(
HeapTupleIsValid
(
typeTuple
))
if
(
HeapTupleIsValid
(
typeTuple
))
return
(
int
)
((
Form_pg_type
)
GETSTRUCT
(
typeTuple
))
->
typinput
;
return
(
int
)
((
Form_pg_type
)
GETSTRUCT
(
typeTuple
))
->
typinput
;
elog
(
ERROR
,
"GetInputFunction: Cache lookup of type %
d
failed"
,
type
);
elog
(
ERROR
,
"GetInputFunction: Cache lookup of type %
u
failed"
,
type
);
return
InvalidOid
;
return
InvalidOid
;
}
}
...
@@ -974,7 +974,7 @@ IsTypeByVal(Oid type)
...
@@ -974,7 +974,7 @@ IsTypeByVal(Oid type)
if
(
HeapTupleIsValid
(
typeTuple
))
if
(
HeapTupleIsValid
(
typeTuple
))
return
(
int
)
((
Form_pg_type
)
GETSTRUCT
(
typeTuple
))
->
typbyval
;
return
(
int
)
((
Form_pg_type
)
GETSTRUCT
(
typeTuple
))
->
typbyval
;
elog
(
ERROR
,
"GetInputFunction: Cache lookup of type %
d
failed"
,
type
);
elog
(
ERROR
,
"GetInputFunction: Cache lookup of type %
u
failed"
,
type
);
return
InvalidOid
;
return
InvalidOid
;
}
}
...
...
src/backend/commands/dbcommands.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.3
3 1999/03/16 04:25:45
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.3
4 1999/05/10 00:44:59
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -123,7 +123,7 @@ destroydb(char *dbname, CommandDest dest)
...
@@ -123,7 +123,7 @@ destroydb(char *dbname, CommandDest dest)
* permissions problems
* permissions problems
*/
*/
snprintf
(
buf
,
512
,
snprintf
(
buf
,
512
,
"delete from pg_database where pg_database.oid =
\'
%
d
\'
::oid"
,
db_id
);
"delete from pg_database where pg_database.oid =
\'
%
u
\'
::oid"
,
db_id
);
pg_exec_query_dest
(
buf
,
dest
,
false
);
pg_exec_query_dest
(
buf
,
dest
,
false
);
/* drop pages for this database that are in the shared buffer cache */
/* drop pages for this database that are in the shared buffer cache */
...
...
src/backend/commands/indexcmds.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.
2 1999/03/14 05:23:12
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.
3 1999/05/10 00:44:59
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -164,8 +164,7 @@ DefineIndex(char *heapRelationName,
...
@@ -164,8 +164,7 @@ DefineIndex(char *heapRelationName,
if
(
nargs
>
INDEX_MAX_KEYS
)
if
(
nargs
>
INDEX_MAX_KEYS
)
{
{
elog
(
ERROR
,
elog
(
ERROR
,
"Too many args to function, limit of %d"
,
"Too many args to function, limit of %d"
,
INDEX_MAX_KEYS
);
INDEX_MAX_KEYS
);
}
}
FIsetnArgs
(
&
fInfo
,
nargs
);
FIsetnArgs
(
&
fInfo
,
nargs
);
...
@@ -514,7 +513,7 @@ NormIndexAttrs(List *attList, /* list of IndexElem's */
...
@@ -514,7 +513,7 @@ NormIndexAttrs(List *attList, /* list of IndexElem's */
if
(
attribute
->
class
==
NULL
)
if
(
attribute
->
class
==
NULL
)
{
{
elog
(
ERROR
,
elog
(
ERROR
,
"Can't find a default operator class for type %
d
."
,
"Can't find a default operator class for type %
u
."
,
attform
->
atttypid
);
attform
->
atttypid
);
}
}
}
}
...
...
src/backend/commands/rename.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.2
2 1999/03/17 22:52:52
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.2
3 1999/05/10 00:44:59
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -130,7 +130,7 @@ renameatt(char *relname,
...
@@ -130,7 +130,7 @@ renameatt(char *relname,
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
reltup
))
if
(
!
HeapTupleIsValid
(
reltup
))
{
{
elog
(
ERROR
,
"renameatt: can't find catalog entry for inheriting class with oid %
d
"
,
elog
(
ERROR
,
"renameatt: can't find catalog entry for inheriting class with oid %
u
"
,
childrelid
);
childrelid
);
}
}
/* make copy of cache value, could disappear in call */
/* make copy of cache value, could disappear in call */
...
...
src/backend/commands/vacuum.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.10
1 1999/05/09 14:00:29 vadim
Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.10
2 1999/05/10 00:44:59 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -2140,7 +2140,7 @@ vc_updstats(Oid relid, int num_pages, int num_tuples, bool hasindex, VRelStats *
...
@@ -2140,7 +2140,7 @@ vc_updstats(Oid relid, int num_pages, int num_tuples, bool hasindex, VRelStats *
ObjectIdGetDatum
(
relid
),
ObjectIdGetDatum
(
relid
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
ctup
))
if
(
!
HeapTupleIsValid
(
ctup
))
elog
(
ERROR
,
"pg_class entry for relid %
d
vanished during vacuuming"
,
elog
(
ERROR
,
"pg_class entry for relid %
u
vanished during vacuuming"
,
relid
);
relid
);
rd
=
heap_openr
(
RelationRelationName
);
rd
=
heap_openr
(
RelationRelationName
);
...
...
src/backend/executor/execAmi.c
View file @
4853495e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
*
*
* Copyright (c) 1994, Regents of the University of California
* Copyright (c) 1994, Regents of the University of California
*
*
* $Id: execAmi.c,v 1.3
3 1999/03/23 16:50:47
momjian Exp $
* $Id: execAmi.c,v 1.3
4 1999/05/10 00:45:05
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -496,7 +496,7 @@ ExecCreatR(TupleDesc tupType,
...
@@ -496,7 +496,7 @@ ExecCreatR(TupleDesc tupType,
{
{
Relation
relDesc
;
Relation
relDesc
;
EU3_printf
(
"ExecCreatR: %s type=%d oid=%
d
\n
"
,
EU3_printf
(
"ExecCreatR: %s type=%d oid=%
u
\n
"
,
"entering: "
,
tupType
,
relationOid
);
"entering: "
,
tupType
,
relationOid
);
CXT1_printf
(
"ExecCreatR: context is %d
\n
"
,
CurrentMemoryContext
);
CXT1_printf
(
"ExecCreatR: context is %d
\n
"
,
CurrentMemoryContext
);
...
...
src/backend/executor/execMain.c
View file @
4853495e
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.8
2 1999/03/23 16:50:47
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.8
3 1999/05/10 00:45:06
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -459,8 +459,7 @@ ExecCheckPerms(CmdType operation,
...
@@ -459,8 +459,7 @@ ExecCheckPerms(CmdType operation,
ObjectIdGetDatum
(
relid
),
ObjectIdGetDatum
(
relid
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
htup
))
if
(
!
HeapTupleIsValid
(
htup
))
elog
(
ERROR
,
"ExecCheckPerms: bogus RT relid: %d"
,
elog
(
ERROR
,
"ExecCheckPerms: bogus RT relid: %u"
,
relid
);
relid
);
StrNCpy
(
rname
.
data
,
StrNCpy
(
rname
.
data
,
((
Form_pg_class
)
GETSTRUCT
(
htup
))
->
relname
.
data
,
((
Form_pg_class
)
GETSTRUCT
(
htup
))
->
relname
.
data
,
NAMEDATALEN
);
NAMEDATALEN
);
...
@@ -520,8 +519,7 @@ ExecCheckPerms(CmdType operation,
...
@@ -520,8 +519,7 @@ ExecCheckPerms(CmdType operation,
ObjectIdGetDatum
(
relid
),
ObjectIdGetDatum
(
relid
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
htup
))
if
(
!
HeapTupleIsValid
(
htup
))
elog
(
ERROR
,
"ExecCheckPerms: bogus RT relid: %d"
,
elog
(
ERROR
,
"ExecCheckPerms: bogus RT relid: %u"
,
relid
);
relid
);
StrNCpy
(
rname
.
data
,
StrNCpy
(
rname
.
data
,
((
Form_pg_class
)
GETSTRUCT
(
htup
))
->
relname
.
data
,
((
Form_pg_class
)
GETSTRUCT
(
htup
))
->
relname
.
data
,
NAMEDATALEN
);
NAMEDATALEN
);
...
...
src/backend/executor/nodeIndexscan.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.3
4 1999/04/13 17:18:29
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.3
5 1999/05/10 00:45:06
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -703,8 +703,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
...
@@ -703,8 +703,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
run_keys
=
(
n_keys
<=
0
)
?
NULL
:
run_keys
=
(
n_keys
<=
0
)
?
NULL
:
(
int
*
)
palloc
(
n_keys
*
sizeof
(
int
));
(
int
*
)
palloc
(
n_keys
*
sizeof
(
int
));
CXT1_printf
(
"ExecInitIndexScan: context is %d
\n
"
,
CXT1_printf
(
"ExecInitIndexScan: context is %d
\n
"
,
CurrentMemoryContext
);
CurrentMemoryContext
);
/* ----------------
/* ----------------
* for each opclause in the given qual,
* for each opclause in the given qual,
...
...
src/backend/executor/nodeMergejoin.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.2
5 1999/02/28 00:36:05 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.2
6 1999/05/10 00:45:07 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -149,7 +149,7 @@ MJFormSkipQual(List *qualList, char * replaceopname)
...
@@ -149,7 +149,7 @@ MJFormSkipQual(List *qualList, char * replaceopname)
*/
*/
optup
=
get_operator_tuple
(
op
->
opno
);
optup
=
get_operator_tuple
(
op
->
opno
);
if
(
!
HeapTupleIsValid
(
optup
))
/* shouldn't happen */
if
(
!
HeapTupleIsValid
(
optup
))
/* shouldn't happen */
elog
(
ERROR
,
"MJFormSkipQual: operator %
d
not found"
,
op
->
opno
);
elog
(
ERROR
,
"MJFormSkipQual: operator %
u
not found"
,
op
->
opno
);
opform
=
(
Form_pg_operator
)
GETSTRUCT
(
optup
);
opform
=
(
Form_pg_operator
)
GETSTRUCT
(
optup
);
oprleft
=
opform
->
oprleft
;
oprleft
=
opform
->
oprleft
;
oprright
=
opform
->
oprright
;
oprright
=
opform
->
oprright
;
...
@@ -166,7 +166,7 @@ MJFormSkipQual(List *qualList, char * replaceopname)
...
@@ -166,7 +166,7 @@ MJFormSkipQual(List *qualList, char * replaceopname)
CharGetDatum
(
'b'
));
CharGetDatum
(
'b'
));
if
(
!
HeapTupleIsValid
(
optup
))
if
(
!
HeapTupleIsValid
(
optup
))
elog
(
ERROR
,
elog
(
ERROR
,
"MJFormSkipQual: mergejoin operator %
d
has no matching %s op"
,
"MJFormSkipQual: mergejoin operator %
u
has no matching %s op"
,
op
->
opno
,
replaceopname
);
op
->
opno
,
replaceopname
);
opform
=
(
Form_pg_operator
)
GETSTRUCT
(
optup
);
opform
=
(
Form_pg_operator
)
GETSTRUCT
(
optup
);
...
...
src/backend/libpq/be-dumpdata.c
View file @
4853495e
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
*
*
* Copyright (c) 1994, Regents of the University of California
* Copyright (c) 1994, Regents of the University of California
*
*
* $Id: be-dumpdata.c,v 1.2
2 1999/02/13 23:15:39
momjian Exp $
* $Id: be-dumpdata.c,v 1.2
3 1999/05/10 00:45:08
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -140,7 +140,7 @@ be_newportal(void)
...
@@ -140,7 +140,7 @@ be_newportal(void)
if
(
be_portalcnt
==
0
)
if
(
be_portalcnt
==
0
)
be_portaloid
=
newoid
();
be_portaloid
=
newoid
();
be_portalcnt
++
;
be_portalcnt
++
;
snprintf
(
buf
,
PortalNameLength
,
"be_%
d
_%d"
,
be_portaloid
,
be_portalcnt
);
snprintf
(
buf
,
PortalNameLength
,
"be_%
u
_%d"
,
be_portaloid
,
be_portalcnt
);
/* ----------------
/* ----------------
* initialize the new portal entry and keep track
* initialize the new portal entry and keep track
...
...
src/backend/libpq/be-fsstubs.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.3
1 1999/05/09 15:00:18 ishii
Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.3
2 1999/05/10 00:45:09 momjian
Exp $
*
*
* NOTES
* NOTES
* This should be moved to a more appropriate place. It is here
* This should be moved to a more appropriate place. It is here
...
@@ -68,7 +68,7 @@ lo_open(Oid lobjId, int mode)
...
@@ -68,7 +68,7 @@ lo_open(Oid lobjId, int mode)
MemoryContext
currentContext
;
MemoryContext
currentContext
;
#if FSDB
#if FSDB
elog
(
NOTICE
,
"LOopen(%
d
,%d)"
,
lobjId
,
mode
);
elog
(
NOTICE
,
"LOopen(%
u
,%d)"
,
lobjId
,
mode
);
#endif
#endif
if
(
fscxt
==
NULL
)
if
(
fscxt
==
NULL
)
...
@@ -81,7 +81,7 @@ lo_open(Oid lobjId, int mode)
...
@@ -81,7 +81,7 @@ lo_open(Oid lobjId, int mode)
{
/* lookup failed */
{
/* lookup failed */
MemoryContextSwitchTo
(
currentContext
);
MemoryContextSwitchTo
(
currentContext
);
#if FSDB
#if FSDB
elog
(
NOTICE
,
"cannot open large object %
d
"
,
lobjId
);
elog
(
NOTICE
,
"cannot open large object %
u
"
,
lobjId
);
#endif
#endif
return
-
1
;
return
-
1
;
}
}
...
@@ -375,8 +375,7 @@ lo_export(Oid lobjId, text *filename)
...
@@ -375,8 +375,7 @@ lo_export(Oid lobjId, text *filename)
lobj
=
inv_open
(
lobjId
,
INV_READ
);
lobj
=
inv_open
(
lobjId
,
INV_READ
);
if
(
lobj
==
NULL
)
if
(
lobj
==
NULL
)
{
{
elog
(
ERROR
,
"lo_export: can't open inv object %d"
,
elog
(
ERROR
,
"lo_export: can't open inv object %u"
,
lobjId
);
lobjId
);
}
}
/*
/*
...
...
src/backend/nodes/outfuncs.c
View file @
4853495e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
*
*
* Copyright (c) 1994, Regents of the University of California
* Copyright (c) 1994, Regents of the University of California
*
*
* $Id: outfuncs.c,v 1.
79 1999/04/25 03:19:15 tgl
Exp $
* $Id: outfuncs.c,v 1.
80 1999/05/10 00:45:10 momjian
Exp $
*
*
* NOTES
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
* Every (plan) node in POSTGRES has an associated "out" routine which
...
@@ -197,7 +197,7 @@ _outQuery(StringInfo str, Query *node)
...
@@ -197,7 +197,7 @@ _outQuery(StringInfo str, Query *node)
}
}
appendStringInfo
(
str
,
appendStringInfo
(
str
,
" :resultRelation %
d
:into %s :isPortal %s :isBinary %s :isTemp %s :unionall %s "
,
" :resultRelation %
u
:into %s :isPortal %s :isBinary %s :isTemp %s :unionall %s "
,
node
->
resultRelation
,
node
->
resultRelation
,
stringStringInfo
(
node
->
into
),
stringStringInfo
(
node
->
into
),
node
->
isPortal
?
"true"
:
"false"
,
node
->
isPortal
?
"true"
:
"false"
,
...
@@ -333,7 +333,7 @@ _outAppend(StringInfo str, Append *node)
...
@@ -333,7 +333,7 @@ _outAppend(StringInfo str, Append *node)
_outNode
(
str
,
node
->
unionrtables
);
_outNode
(
str
,
node
->
unionrtables
);
appendStringInfo
(
str
,
appendStringInfo
(
str
,
" :inheritrelid %
d
:inheritrtable "
,
" :inheritrelid %
u
:inheritrtable "
,
node
->
inheritrelid
);
node
->
inheritrelid
);
_outNode
(
str
,
node
->
inheritrtable
);
_outNode
(
str
,
node
->
inheritrtable
);
...
@@ -425,7 +425,7 @@ _outScan(StringInfo str, Scan *node)
...
@@ -425,7 +425,7 @@ _outScan(StringInfo str, Scan *node)
appendStringInfo
(
str
,
" SCAN "
);
appendStringInfo
(
str
,
" SCAN "
);
_outPlanInfo
(
str
,
(
Plan
*
)
node
);
_outPlanInfo
(
str
,
(
Plan
*
)
node
);
appendStringInfo
(
str
,
" :scanrelid %
d
"
,
node
->
scanrelid
);
appendStringInfo
(
str
,
" :scanrelid %
u
"
,
node
->
scanrelid
);
}
}
/*
/*
...
@@ -437,7 +437,7 @@ _outSeqScan(StringInfo str, SeqScan *node)
...
@@ -437,7 +437,7 @@ _outSeqScan(StringInfo str, SeqScan *node)
appendStringInfo
(
str
,
" SEQSCAN "
);
appendStringInfo
(
str
,
" SEQSCAN "
);
_outPlanInfo
(
str
,
(
Plan
*
)
node
);
_outPlanInfo
(
str
,
(
Plan
*
)
node
);
appendStringInfo
(
str
,
" :scanrelid %
d
"
,
node
->
scanrelid
);
appendStringInfo
(
str
,
" :scanrelid %
u
"
,
node
->
scanrelid
);
}
}
/*
/*
...
@@ -449,7 +449,7 @@ _outIndexScan(StringInfo str, IndexScan *node)
...
@@ -449,7 +449,7 @@ _outIndexScan(StringInfo str, IndexScan *node)
appendStringInfo
(
str
,
" INDEXSCAN "
);
appendStringInfo
(
str
,
" INDEXSCAN "
);
_outPlanInfo
(
str
,
(
Plan
*
)
node
);
_outPlanInfo
(
str
,
(
Plan
*
)
node
);
appendStringInfo
(
str
,
" :scanrelid %
d
:indxid "
,
node
->
scan
.
scanrelid
);
appendStringInfo
(
str
,
" :scanrelid %
u
:indxid "
,
node
->
scan
.
scanrelid
);
_outIntList
(
str
,
node
->
indxid
);
_outIntList
(
str
,
node
->
indxid
);
appendStringInfo
(
str
,
" :indxqual "
);
appendStringInfo
(
str
,
" :indxqual "
);
...
@@ -1108,13 +1108,13 @@ static void
...
@@ -1108,13 +1108,13 @@ static void
_outMergeOrder
(
StringInfo
str
,
MergeOrder
*
node
)
_outMergeOrder
(
StringInfo
str
,
MergeOrder
*
node
)
{
{
appendStringInfo
(
str
,
appendStringInfo
(
str
,
" MERGEORDER :join_operator %
d :left_operator %d :right_operator %d
"
,
" MERGEORDER :join_operator %
u :left_operator %u :right_operator %u
"
,
node
->
join_operator
,
node
->
join_operator
,
node
->
left_operator
,
node
->
left_operator
,
node
->
right_operator
);
node
->
right_operator
);
appendStringInfo
(
str
,
appendStringInfo
(
str
,
" :left_type %
d :right_type %d
"
,
" :left_type %
u :right_type %u
"
,
node
->
left_type
,
node
->
left_type
,
node
->
right_type
);
node
->
right_type
);
}
}
...
...
src/backend/nodes/print.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.2
6 1999/03/23 16:50:54
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.2
7 1999/05/10 00:45:13
momjian Exp $
*
*
* HISTORY
* HISTORY
* AUTHOR DATE MAJOR EVENT
* AUTHOR DATE MAJOR EVENT
...
@@ -140,7 +140,7 @@ print_rt(List *rtable)
...
@@ -140,7 +140,7 @@ print_rt(List *rtable)
{
{
RangeTblEntry
*
rte
=
lfirst
(
l
);
RangeTblEntry
*
rte
=
lfirst
(
l
);
printf
(
"%d
\t
%s(%s)
\t
%
d
\t
%d
\t
%s
\n
"
,
printf
(
"%d
\t
%s(%s)
\t
%
u
\t
%d
\t
%s
\n
"
,
i
,
rte
->
relname
,
rte
->
refname
,
rte
->
relid
,
i
,
rte
->
relname
,
rte
->
refname
,
rte
->
relid
,
rte
->
inFromCl
,
rte
->
inFromCl
,
(
rte
->
inh
?
"inh"
:
""
));
(
rte
->
inh
?
"inh"
:
""
));
...
...
src/backend/optimizer/path/_deadcode/xfunc.c
View file @
4853495e
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.
1 1999/02/18 00:49:2
4 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.
2 1999/05/10 00:45:1
4 momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -497,7 +497,7 @@ xfunc_func_expense(LispValue node, LispValue args)
...
@@ -497,7 +497,7 @@ xfunc_func_expense(LispValue node, LispValue args)
ObjectIdGetDatum
(
funcid
),
ObjectIdGetDatum
(
funcid
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
tupl
))
if
(
!
HeapTupleIsValid
(
tupl
))
elog
(
ERROR
,
"Cache lookup failed for procedure %
d
"
,
funcid
);
elog
(
ERROR
,
"Cache lookup failed for procedure %
u
"
,
funcid
);
proc
=
(
Form_pg_proc
)
GETSTRUCT
(
tupl
);
proc
=
(
Form_pg_proc
)
GETSTRUCT
(
tupl
);
/*
/*
...
@@ -612,7 +612,7 @@ xfunc_width(LispValue clause)
...
@@ -612,7 +612,7 @@ xfunc_width(LispValue clause)
ObjectIdGetDatum
(
get_vartype
((
Var
)
clause
)),
ObjectIdGetDatum
(
get_vartype
((
Var
)
clause
)),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
tupl
))
if
(
!
HeapTupleIsValid
(
tupl
))
elog
(
ERROR
,
"Cache lookup failed for type %
d
"
,
elog
(
ERROR
,
"Cache lookup failed for type %
u
"
,
get_vartype
((
Var
)
clause
));
get_vartype
((
Var
)
clause
));
type
=
(
Form_pg_type
)
GETSTRUCT
(
tupl
);
type
=
(
Form_pg_type
)
GETSTRUCT
(
tupl
);
if
(
get_varattno
((
Var
)
clause
)
==
0
)
if
(
get_varattno
((
Var
)
clause
)
==
0
)
...
@@ -675,7 +675,7 @@ xfunc_width(LispValue clause)
...
@@ -675,7 +675,7 @@ xfunc_width(LispValue clause)
ObjectIdGetDatum
(
get_opno
((
Oper
)
get_op
(
clause
))),
ObjectIdGetDatum
(
get_opno
((
Oper
)
get_op
(
clause
))),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
tupl
))
if
(
!
HeapTupleIsValid
(
tupl
))
elog
(
ERROR
,
"Cache lookup failed for procedure %
d
"
,
elog
(
ERROR
,
"Cache lookup failed for procedure %
u
"
,
get_opno
((
Oper
)
get_op
(
clause
)));
get_opno
((
Oper
)
get_op
(
clause
)));
return
(
xfunc_func_width
return
(
xfunc_func_width
((
RegProcedure
)
(((
Form_pg_operator
)
(
GETSTRUCT
(
tupl
)))
->
oprcode
),
((
RegProcedure
)
(((
Form_pg_operator
)
(
GETSTRUCT
(
tupl
)))
->
oprcode
),
...
@@ -1306,7 +1306,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args)
...
@@ -1306,7 +1306,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args)
ObjectIdGetDatum
(
funcid
),
ObjectIdGetDatum
(
funcid
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
tupl
))
if
(
!
HeapTupleIsValid
(
tupl
))
elog
(
ERROR
,
"Cache lookup failed for procedure %
d
"
,
funcid
);
elog
(
ERROR
,
"Cache lookup failed for procedure %
u
"
,
funcid
);
proc
=
(
Form_pg_proc
)
GETSTRUCT
(
tupl
);
proc
=
(
Form_pg_proc
)
GETSTRUCT
(
tupl
);
/* if function returns a tuple, get the width of that */
/* if function returns a tuple, get the width of that */
...
@@ -1324,7 +1324,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args)
...
@@ -1324,7 +1324,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args)
ObjectIdGetDatum
(
proc
->
prorettype
),
ObjectIdGetDatum
(
proc
->
prorettype
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
tupl
))
if
(
!
HeapTupleIsValid
(
tupl
))
elog
(
ERROR
,
"Cache lookup failed for type %
d
"
,
proc
->
prorettype
);
elog
(
ERROR
,
"Cache lookup failed for type %
u
"
,
proc
->
prorettype
);
type
=
(
Form_pg_type
)
GETSTRUCT
(
tupl
);
type
=
(
Form_pg_type
)
GETSTRUCT
(
tupl
);
/* if the type length is known, return that */
/* if the type length is known, return that */
if
(
type
->
typlen
!=
-
1
)
if
(
type
->
typlen
!=
-
1
)
...
...
src/backend/optimizer/plan/createplan.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.5
3 1999/05/06 01:30:58 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.5
4 1999/05/10 00:45:19 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -367,8 +367,7 @@ create_indexscan_node(IndexPath *best_path,
...
@@ -367,8 +367,7 @@ create_indexscan_node(IndexPath *best_path,
ObjectIdGetDatum
(
lfirsti
(
ixid
)),
ObjectIdGetDatum
(
lfirsti
(
ixid
)),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
indexTuple
))
if
(
!
HeapTupleIsValid
(
indexTuple
))
elog
(
ERROR
,
"create_plan: index %d not found"
,
elog
(
ERROR
,
"create_plan: index %u not found"
,
lfirsti
(
ixid
));
lfirsti
(
ixid
));
index
=
(
Form_pg_index
)
GETSTRUCT
(
indexTuple
);
index
=
(
Form_pg_index
)
GETSTRUCT
(
indexTuple
);
if
(
index
->
indislossy
)
if
(
index
->
indislossy
)
lossy
=
TRUE
;
lossy
=
TRUE
;
...
...
src/backend/optimizer/plan/planner.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.
49 1999/05/04 00:00:20 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.
50 1999/05/10 00:45:20 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -720,7 +720,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
...
@@ -720,7 +720,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
/* by here, the function is declared to return some type */
/* by here, the function is declared to return some type */
if
((
typ
=
typeidType
(
rettype
))
==
NULL
)
if
((
typ
=
typeidType
(
rettype
))
==
NULL
)
elog
(
ERROR
,
"can't find return type %
d
for function
\n
"
,
rettype
);
elog
(
ERROR
,
"can't find return type %
u
for function
\n
"
,
rettype
);
/*
/*
* test 3: if the function is declared to return a value, then the
* test 3: if the function is declared to return a value, then the
...
@@ -770,7 +770,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
...
@@ -770,7 +770,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
reln
=
heap_open
(
typeTypeRelid
(
typ
));
reln
=
heap_open
(
typeTypeRelid
(
typ
));
if
(
!
RelationIsValid
(
reln
))
if
(
!
RelationIsValid
(
reln
))
elog
(
ERROR
,
"cannot open relation relid %
d
"
,
typeTypeRelid
(
typ
));
elog
(
ERROR
,
"cannot open relation relid %
u
"
,
typeTypeRelid
(
typ
));
relid
=
reln
->
rd_id
;
relid
=
reln
->
rd_id
;
relnatts
=
reln
->
rd_rel
->
relnatts
;
relnatts
=
reln
->
rd_rel
->
relnatts
;
...
@@ -918,7 +918,7 @@ need_sortplan(List *sortcls, Plan *plan)
...
@@ -918,7 +918,7 @@ need_sortplan(List *sortcls, Plan *plan)
htup
=
SearchSysCacheTuple
(
INDEXRELID
,
htup
=
SearchSysCacheTuple
(
INDEXRELID
,
ObjectIdGetDatum
(
indexId
),
0
,
0
,
0
);
ObjectIdGetDatum
(
indexId
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
htup
))
{
if
(
!
HeapTupleIsValid
(
htup
))
{
elog
(
ERROR
,
"cache lookup for index %
d
failed"
,
indexId
);
elog
(
ERROR
,
"cache lookup for index %
u
failed"
,
indexId
);
}
}
index_tup
=
(
Form_pg_index
)
GETSTRUCT
(
htup
);
index_tup
=
(
Form_pg_index
)
GETSTRUCT
(
htup
);
...
...
src/backend/optimizer/plan/subselect.c
View file @
4853495e
...
@@ -311,8 +311,7 @@ _finalize_primnode(void *expr, List **subplan)
...
@@ -311,8 +311,7 @@ _finalize_primnode(void *expr, List **subplan)
}
}
}
}
else
else
elog
(
ERROR
,
"_finalize_primnode: can't handle node %d"
,
elog
(
ERROR
,
"_finalize_primnode: can't handle node %d"
,
nodeTag
(
expr
));
nodeTag
(
expr
));
return
result
;
return
result
;
}
}
...
@@ -543,8 +542,7 @@ SS_pull_subplan(Node *expr)
...
@@ -543,8 +542,7 @@ SS_pull_subplan(Node *expr)
else
if
(
is_subplan
(
expr
))
else
if
(
is_subplan
(
expr
))
return
lcons
(((
Expr
*
)
expr
)
->
oper
,
NULL
);
return
lcons
(((
Expr
*
)
expr
)
->
oper
,
NULL
);
else
else
elog
(
ERROR
,
"SS_pull_subplan: can't handle node %d"
,
elog
(
ERROR
,
"SS_pull_subplan: can't handle node %d"
,
nodeTag
(
expr
));
nodeTag
(
expr
));
return
result
;
return
result
;
}
}
src/backend/optimizer/util/clauses.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.3
2 1999/03/01 00:10:35 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.3
3 1999/05/10 00:45:24 momjian
Exp $
*
*
* HISTORY
* HISTORY
* AUTHOR DATE MAJOR EVENT
* AUTHOR DATE MAJOR EVENT
...
@@ -786,7 +786,7 @@ CommuteClause(Node *clause)
...
@@ -786,7 +786,7 @@ CommuteClause(Node *clause)
get_operator_tuple
(
get_commutator
(((
Oper
*
)
((
Expr
*
)
clause
)
->
oper
)
->
opno
));
get_operator_tuple
(
get_commutator
(((
Oper
*
)
((
Expr
*
)
clause
)
->
oper
)
->
opno
));
if
(
heapTup
==
(
HeapTuple
)
NULL
)
if
(
heapTup
==
(
HeapTuple
)
NULL
)
elog
(
ERROR
,
"CommuteClause: no commutator for operator %
d
"
,
elog
(
ERROR
,
"CommuteClause: no commutator for operator %
u
"
,
((
Oper
*
)
((
Expr
*
)
clause
)
->
oper
)
->
opno
);
((
Oper
*
)
((
Expr
*
)
clause
)
->
oper
)
->
opno
);
commuTup
=
(
Form_pg_operator
)
GETSTRUCT
(
heapTup
);
commuTup
=
(
Form_pg_operator
)
GETSTRUCT
(
heapTup
);
...
...
src/backend/optimizer/util/plancat.c
View file @
4853495e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.2
8 1999/03/18 19:59:54
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.2
9 1999/05/10 00:45:25
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -76,7 +76,7 @@ relation_info(Query *root, Index relid,
...
@@ -76,7 +76,7 @@ relation_info(Query *root, Index relid,
}
}
else
else
{
{
elog
(
ERROR
,
"RelationCatalogInformation: Relation %
d
not found"
,
elog
(
ERROR
,
"RelationCatalogInformation: Relation %
u
not found"
,
relationObjectId
);
relationObjectId
);
}
}
...
@@ -217,7 +217,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
...
@@ -217,7 +217,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
UInt16GetDatum
(
amstrategy
),
UInt16GetDatum
(
amstrategy
),
0
);
0
);
if
(
!
HeapTupleIsValid
(
amopTuple
))
if
(
!
HeapTupleIsValid
(
amopTuple
))
elog
(
ERROR
,
"index_info: no amop %
d %d
%d"
,
elog
(
ERROR
,
"index_info: no amop %
u %u
%d"
,
relam
,
index
->
indclass
[
i
],
amstrategy
);
relam
,
index
->
indclass
[
i
],
amstrategy
);
info
->
orderOprs
[
i
]
=
((
Form_pg_amop
)
GETSTRUCT
(
amopTuple
))
->
amopopr
;
info
->
orderOprs
[
i
]
=
((
Form_pg_amop
)
GETSTRUCT
(
amopTuple
))
->
amopopr
;
}
}
...
@@ -521,7 +521,7 @@ IndexSelectivity(Oid indexrelid,
...
@@ -521,7 +521,7 @@ IndexSelectivity(Oid indexrelid,
ObjectIdGetDatum
(
indexrelid
),
ObjectIdGetDatum
(
indexrelid
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
indRel
))
if
(
!
HeapTupleIsValid
(
indRel
))
elog
(
ERROR
,
"IndexSelectivity: index %
d
not found"
,
elog
(
ERROR
,
"IndexSelectivity: index %
u
not found"
,
indexrelid
);
indexrelid
);
relam
=
((
Form_pg_class
)
GETSTRUCT
(
indRel
))
->
relam
;
relam
=
((
Form_pg_class
)
GETSTRUCT
(
indRel
))
->
relam
;
...
@@ -529,7 +529,7 @@ IndexSelectivity(Oid indexrelid,
...
@@ -529,7 +529,7 @@ IndexSelectivity(Oid indexrelid,
ObjectIdGetDatum
(
indexrelid
),
ObjectIdGetDatum
(
indexrelid
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
indexTuple
))
if
(
!
HeapTupleIsValid
(
indexTuple
))
elog
(
ERROR
,
"IndexSelectivity: index %
d
not found"
,
elog
(
ERROR
,
"IndexSelectivity: index %
u
not found"
,
indexrelid
);
indexrelid
);
index
=
(
Form_pg_index
)
GETSTRUCT
(
indexTuple
);
index
=
(
Form_pg_index
)
GETSTRUCT
(
indexTuple
);
...
@@ -572,7 +572,7 @@ IndexSelectivity(Oid indexrelid,
...
@@ -572,7 +572,7 @@ IndexSelectivity(Oid indexrelid,
* clause and so had no variable to match to the index key ...
* clause and so had no variable to match to the index key ...
* if not we are in trouble.
* if not we are in trouble.
*/
*/
elog
(
NOTICE
,
"IndexSelectivity: no key %d in index %
d
"
,
elog
(
NOTICE
,
"IndexSelectivity: no key %d in index %
u
"
,
varAttributeNumbers
[
n
],
indexrelid
);
varAttributeNumbers
[
n
],
indexrelid
);
continue
;
continue
;
}
}
...
@@ -583,7 +583,7 @@ IndexSelectivity(Oid indexrelid,
...
@@ -583,7 +583,7 @@ IndexSelectivity(Oid indexrelid,
ObjectIdGetDatum
(
relam
),
ObjectIdGetDatum
(
relam
),
0
);
0
);
if
(
!
HeapTupleIsValid
(
amopTuple
))
if
(
!
HeapTupleIsValid
(
amopTuple
))
elog
(
ERROR
,
"IndexSelectivity: no amop %
d %d
"
,
elog
(
ERROR
,
"IndexSelectivity: no amop %
u %u
"
,
indclass
,
operatorObjectIds
[
n
]);
indclass
,
operatorObjectIds
[
n
]);
amop
=
(
Form_pg_amop
)
GETSTRUCT
(
amopTuple
);
amop
=
(
Form_pg_amop
)
GETSTRUCT
(
amopTuple
);
...
...
src/backend/parser/parse_coerce.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.1
1 1999/02/21 03:49:03 scrappy
Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.1
2 1999/05/10 00:45:26 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -42,7 +42,7 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId)
...
@@ -42,7 +42,7 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId)
Datum
val
;
Datum
val
;
#ifdef PARSEDEBUG
#ifdef PARSEDEBUG
printf
(
"coerce_type: argument types are %d -> %
d
\n
"
,
printf
(
"coerce_type: argument types are %d -> %
u
\n
"
,
inputTypeId
,
targetTypeId
);
inputTypeId
,
targetTypeId
);
#endif
#endif
...
@@ -129,7 +129,7 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId)
...
@@ -129,7 +129,7 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId)
else
else
{
{
#ifdef PARSEDEBUG
#ifdef PARSEDEBUG
printf
(
"coerce_type: argument type IDs %
d
match
\n
"
,
inputTypeId
);
printf
(
"coerce_type: argument type IDs %
u
match
\n
"
,
inputTypeId
);
#endif
#endif
result
=
node
;
result
=
node
;
...
@@ -165,7 +165,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
...
@@ -165,7 +165,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
for
(
i
=
0
;
i
<
nargs
;
i
++
)
for
(
i
=
0
;
i
<
nargs
;
i
++
)
{
{
#ifdef PARSEDEBUG
#ifdef PARSEDEBUG
printf
(
"can_coerce_type: argument #%d types are %
d -> %d
\n
"
,
printf
(
"can_coerce_type: argument #%d types are %
u -> %u
\n
"
,
i
,
input_typeids
[
i
],
func_typeids
[
i
]);
i
,
input_typeids
[
i
],
func_typeids
[
i
]);
#endif
#endif
if
(
input_typeids
[
i
]
!=
func_typeids
[
i
])
if
(
input_typeids
[
i
]
!=
func_typeids
[
i
])
...
@@ -187,7 +187,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
...
@@ -187,7 +187,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
else
if
(
func_typeids
[
i
]
==
InvalidOid
)
else
if
(
func_typeids
[
i
]
==
InvalidOid
)
{
{
#ifdef PARSEDEBUG
#ifdef PARSEDEBUG
printf
(
"can_coerce_type: output OID func_typeids[%
d
] is zero
\n
"
,
i
);
printf
(
"can_coerce_type: output OID func_typeids[%
u
] is zero
\n
"
,
i
);
#endif
#endif
return
false
;
return
false
;
}
}
...
@@ -196,7 +196,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
...
@@ -196,7 +196,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
else
if
(
input_typeids
[
i
]
==
InvalidOid
)
else
if
(
input_typeids
[
i
]
==
InvalidOid
)
{
{
#ifdef PARSEDEBUG
#ifdef PARSEDEBUG
printf
(
"can_coerce_type: input OID input_typeids[%
d
] is zero
\n
"
,
i
);
printf
(
"can_coerce_type: input OID input_typeids[%
u
] is zero
\n
"
,
i
);
#endif
#endif
return
false
;
return
false
;
}
}
...
@@ -243,7 +243,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
...
@@ -243,7 +243,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
else
else
{
{
#ifdef PARSEDEBUG
#ifdef PARSEDEBUG
printf
(
"can_coerce_type: argument #%d type is %
d
(UNKNOWN)
\n
"
,
printf
(
"can_coerce_type: argument #%d type is %
u
(UNKNOWN)
\n
"
,
i
,
input_typeids
[
i
]);
i
,
input_typeids
[
i
]);
#endif
#endif
}
}
...
@@ -266,7 +266,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
...
@@ -266,7 +266,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
else
else
{
{
#ifdef PARSEDEBUG
#ifdef PARSEDEBUG
printf
(
"can_coerce_type: argument #%d type IDs %
d
match
\n
"
,
printf
(
"can_coerce_type: argument #%d type IDs %
u
match
\n
"
,
i
,
input_typeids
[
i
]);
i
,
input_typeids
[
i
]);
#endif
#endif
}
}
...
...
src/backend/parser/parse_func.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.4
2 1999/03/16 20:15:06
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.4
3 1999/05/10 00:45:27
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -651,7 +651,7 @@ funcid_get_rettype(Oid funcid)
...
@@ -651,7 +651,7 @@ funcid_get_rettype(Oid funcid)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
func_tuple
))
if
(
!
HeapTupleIsValid
(
func_tuple
))
elog
(
ERROR
,
"Function OID %
d
does not exist"
,
funcid
);
elog
(
ERROR
,
"Function OID %
u
does not exist"
,
funcid
);
funcrettype
=
(
Oid
)
funcrettype
=
(
Oid
)
((
Form_pg_proc
)
GETSTRUCT
(
func_tuple
))
->
prorettype
;
((
Form_pg_proc
)
GETSTRUCT
(
func_tuple
))
->
prorettype
;
...
@@ -1183,7 +1183,7 @@ find_inheritors(Oid relid, Oid **supervec)
...
@@ -1183,7 +1183,7 @@ find_inheritors(Oid relid, Oid **supervec)
/* save the type id, rather than the relation id */
/* save the type id, rather than the relation id */
if
((
rd
=
heap_open
(
qentry
->
sqe_relid
))
==
(
Relation
)
NULL
)
if
((
rd
=
heap_open
(
qentry
->
sqe_relid
))
==
(
Relation
)
NULL
)
elog
(
ERROR
,
"Relid %
d
does not exist"
,
qentry
->
sqe_relid
);
elog
(
ERROR
,
"Relid %
u
does not exist"
,
qentry
->
sqe_relid
);
qentry
->
sqe_relid
=
typeTypeId
(
typenameType
(
RelationGetRelationName
(
rd
)
->
data
));
qentry
->
sqe_relid
=
typeTypeId
(
typenameType
(
RelationGetRelationName
(
rd
)
->
data
));
heap_close
(
rd
);
heap_close
(
rd
);
...
...
src/backend/parser/parse_node.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.2
4 1999/02/13 23:17:09
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.2
5 1999/05/10 00:45:28
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -256,7 +256,7 @@ make_array_ref(Node *expr,
...
@@ -256,7 +256,7 @@ make_array_ref(Node *expr,
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
type_tuple
))
if
(
!
HeapTupleIsValid
(
type_tuple
))
elog
(
ERROR
,
"make_array_ref: Cache lookup failed for type %
d
\n
"
,
elog
(
ERROR
,
"make_array_ref: Cache lookup failed for type %
u
\n
"
,
typearray
);
typearray
);
/* get the array type struct from the type tuple */
/* get the array type struct from the type tuple */
...
@@ -271,7 +271,7 @@ make_array_ref(Node *expr,
...
@@ -271,7 +271,7 @@ make_array_ref(Node *expr,
ObjectIdGetDatum
(
type_struct_array
->
typelem
),
ObjectIdGetDatum
(
type_struct_array
->
typelem
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
type_tuple
))
if
(
!
HeapTupleIsValid
(
type_tuple
))
elog
(
ERROR
,
"make_array_ref: Cache lookup failed for type %
d
\n
"
,
elog
(
ERROR
,
"make_array_ref: Cache lookup failed for type %
u
\n
"
,
typearray
);
typearray
);
type_struct_element
=
(
Form_pg_type
)
GETSTRUCT
(
type_tuple
);
type_struct_element
=
(
Form_pg_type
)
GETSTRUCT
(
type_tuple
);
...
@@ -338,7 +338,7 @@ make_array_set(Expr *target_expr,
...
@@ -338,7 +338,7 @@ make_array_set(Expr *target_expr,
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
type_tuple
))
if
(
!
HeapTupleIsValid
(
type_tuple
))
elog
(
ERROR
,
"make_array_ref: Cache lookup failed for type %
d
\n
"
,
elog
(
ERROR
,
"make_array_ref: Cache lookup failed for type %
u
\n
"
,
typearray
);
typearray
);
/* get the array type struct from the type tuple */
/* get the array type struct from the type tuple */
...
@@ -353,7 +353,7 @@ make_array_set(Expr *target_expr,
...
@@ -353,7 +353,7 @@ make_array_set(Expr *target_expr,
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
type_tuple
))
if
(
!
HeapTupleIsValid
(
type_tuple
))
elog
(
ERROR
,
"make_array_ref: Cache lookup failed for type %
d
\n
"
,
elog
(
ERROR
,
"make_array_ref: Cache lookup failed for type %
u
\n
"
,
typearray
);
typearray
);
type_struct_element
=
(
Form_pg_type
)
GETSTRUCT
(
type_tuple
);
type_struct_element
=
(
Form_pg_type
)
GETSTRUCT
(
type_tuple
);
...
...
src/backend/parser/parse_oper.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.2
3 1998/12/13 23:54:40 thomas
Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.2
4 1999/05/10 00:45:29 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -631,7 +631,7 @@ right_oper(char *op, Oid arg)
...
@@ -631,7 +631,7 @@ right_oper(char *op, Oid arg)
ncandidates
=
unary_oper_get_candidates
(
op
,
arg
,
&
candidates
,
'r'
);
ncandidates
=
unary_oper_get_candidates
(
op
,
arg
,
&
candidates
,
'r'
);
if
(
ncandidates
==
0
)
if
(
ncandidates
==
0
)
{
{
elog
(
ERROR
,
"Can't find right op '%s' for type %
d
"
,
op
,
arg
);
elog
(
ERROR
,
"Can't find right op '%s' for type %
u
"
,
op
,
arg
);
return
NULL
;
return
NULL
;
}
}
else
if
(
ncandidates
==
1
)
else
if
(
ncandidates
==
1
)
...
@@ -693,7 +693,7 @@ left_oper(char *op, Oid arg)
...
@@ -693,7 +693,7 @@ left_oper(char *op, Oid arg)
ncandidates
=
unary_oper_get_candidates
(
op
,
arg
,
&
candidates
,
'l'
);
ncandidates
=
unary_oper_get_candidates
(
op
,
arg
,
&
candidates
,
'l'
);
if
(
ncandidates
==
0
)
if
(
ncandidates
==
0
)
{
{
elog
(
ERROR
,
"Can't find left op '%s' for type %
d
"
,
op
,
arg
);
elog
(
ERROR
,
"Can't find left op '%s' for type %
u
"
,
op
,
arg
);
return
NULL
;
return
NULL
;
}
}
else
if
(
ncandidates
==
1
)
else
if
(
ncandidates
==
1
)
...
...
src/backend/parser/parse_type.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.
19 1999/02/23 07:53:01 thomas
Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.
20 1999/05/10 00:45:29 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -231,7 +231,7 @@ GetArrayElementType(Oid typearray)
...
@@ -231,7 +231,7 @@ GetArrayElementType(Oid typearray)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
type_tuple
))
if
(
!
HeapTupleIsValid
(
type_tuple
))
elog
(
ERROR
,
"GetArrayElementType: Cache lookup failed for type %
d
"
,
elog
(
ERROR
,
"GetArrayElementType: Cache lookup failed for type %
u
"
,
typearray
);
typearray
);
/* get the array type struct from the type tuple */
/* get the array type struct from the type tuple */
...
...
src/backend/rewrite/rewriteDefine.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.2
6 1999/02/21 03:49:17 scrappy
Exp $
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.2
7 1999/05/10 00:45:30 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -122,7 +122,7 @@ InsertRule(char *rulname,
...
@@ -122,7 +122,7 @@ InsertRule(char *rulname,
template
=
"INSERT INTO pg_rewrite \
template
=
"INSERT INTO pg_rewrite \
(rulename, ev_type, ev_class, ev_attr, ev_action, ev_qual, is_instead) VALUES \
(rulename, ev_type, ev_class, ev_attr, ev_action, ev_qual, is_instead) VALUES \
('%s', %d::char, %
d
::oid, %d::int2, '%s'::text, '%s'::text, \
('%s', %d::char, %
u
::oid, %d::int2, '%s'::text, '%s'::text, \
'%s'::bool);"
;
'%s'::bool);"
;
if
(
strlen
(
template
)
+
strlen
(
rulname
)
+
strlen
(
actionbuf
)
+
if
(
strlen
(
template
)
+
strlen
(
rulname
)
+
strlen
(
actionbuf
)
+
strlen
(
qualbuf
)
+
20
/* fudge fac */
>
RULE_PLAN_SIZE
)
strlen
(
qualbuf
)
+
20
/* fudge fac */
>
RULE_PLAN_SIZE
)
...
...
src/backend/rewrite/rewriteRemove.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.2
2 1999/02/13 23:17:50
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.2
3 1999/05/10 00:45:32
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -48,8 +48,8 @@ RewriteGetRuleEventRel(char *rulename)
...
@@ -48,8 +48,8 @@ RewriteGetRuleEventRel(char *rulename)
PointerGetDatum
(
eventrel
),
PointerGetDatum
(
eventrel
),
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
htup
))
if
(
!
HeapTupleIsValid
(
htup
))
elog
(
ERROR
,
"Class '%
d' not found"
,
elog
(
ERROR
,
"Class '%
u' not found"
,
eventrel
);
eventrel
);
return
((
Form_pg_class
)
GETSTRUCT
(
htup
))
->
relname
.
data
;
return
((
Form_pg_class
)
GETSTRUCT
(
htup
))
->
relname
.
data
;
}
}
...
...
src/backend/storage/buffer/bufmgr.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.5
0 1999/03/28 20:32:17 vadim
Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.5
1 1999/05/10 00:45:35 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -1828,7 +1828,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
...
@@ -1828,7 +1828,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
tb
=
&
TraceBuf
[
i
];
tb
=
&
TraceBuf
[
i
];
if
(
tb
->
bmt_op
!=
BMT_NOTUSED
)
if
(
tb
->
bmt_op
!=
BMT_NOTUSED
)
{
{
fprintf
(
fp
,
" [%3d]%spid %d buf %2d for <%d,%
d
,%d> "
,
fprintf
(
fp
,
" [%3d]%spid %d buf %2d for <%d,%
u
,%d> "
,
i
,
(
i
==
cur
?
" ---> "
:
"
\t
"
),
i
,
(
i
==
cur
?
" ---> "
:
"
\t
"
),
tb
->
bmt_pid
,
tb
->
bmt_buf
,
tb
->
bmt_pid
,
tb
->
bmt_buf
,
tb
->
bmt_dbid
,
tb
->
bmt_relid
,
tb
->
bmt_blkno
);
tb
->
bmt_dbid
,
tb
->
bmt_relid
,
tb
->
bmt_blkno
);
...
@@ -1859,7 +1859,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
...
@@ -1859,7 +1859,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
}
}
fprintf
(
fp
,
"
\n
operation causing error:
\n
"
);
fprintf
(
fp
,
"
\n
operation causing error:
\n
"
);
fprintf
(
fp
,
"
\t
pid %d buf %d for <%d,%
d
,%d> "
,
fprintf
(
fp
,
"
\t
pid %d buf %d for <%d,%
u
,%d> "
,
getpid
(),
bufNo
,
dbId
,
relId
,
blkNo
);
getpid
(),
bufNo
,
dbId
,
relId
,
blkNo
);
switch
(
allocType
)
switch
(
allocType
)
...
...
src/backend/storage/buffer/localbuf.c
View file @
4853495e
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.2
1 1999/02/13 23:18:00
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.2
2 1999/05/10 00:45:36
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -81,7 +81,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
...
@@ -81,7 +81,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
{
{
#ifdef LBDEBUG
#ifdef LBDEBUG
fprintf
(
stderr
,
"LB ALLOC (%
d
,%d) %d
\n
"
,
fprintf
(
stderr
,
"LB ALLOC (%
u
,%d) %d
\n
"
,
RelationGetRelid
(
reln
),
blockNum
,
-
i
-
1
);
RelationGetRelid
(
reln
),
blockNum
,
-
i
-
1
);
#endif
#endif
LocalRefCount
[
i
]
++
;
LocalRefCount
[
i
]
++
;
...
@@ -91,7 +91,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
...
@@ -91,7 +91,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
}
}
#ifdef LBDEBUG
#ifdef LBDEBUG
fprintf
(
stderr
,
"LB ALLOC (%
d
,%d) %d
\n
"
,
fprintf
(
stderr
,
"LB ALLOC (%
u
,%d) %d
\n
"
,
RelationGetRelid
(
reln
),
blockNum
,
-
nextFreeLocalBuf
-
1
);
RelationGetRelid
(
reln
),
blockNum
,
-
nextFreeLocalBuf
-
1
);
#endif
#endif
...
...
src/backend/storage/ipc/sinvaladt.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.1
7 1999/02/19 06:06:03 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.1
8 1999/05/10 00:45:37 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -145,8 +145,7 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
...
@@ -145,8 +145,7 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
{
{
if
(
segInOutP
->
procState
[
index
].
tag
==
backendTag
)
if
(
segInOutP
->
procState
[
index
].
tag
==
backendTag
)
{
{
elog
(
FATAL
,
"SIAssignBackendId: tag %d found twice"
,
elog
(
FATAL
,
"SIAssignBackendId: tag %d found twice"
,
backendTag
);
backendTag
);
}
}
}
}
...
@@ -155,15 +154,10 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
...
@@ -155,15 +154,10 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
if
(
stateP
->
tag
!=
InvalidBackendTag
)
if
(
stateP
->
tag
!=
InvalidBackendTag
)
{
{
if
(
stateP
->
tag
==
backendTag
)
if
(
stateP
->
tag
==
backendTag
)
{
elog
(
NOTICE
,
"SIAssignBackendId: reusing tag %d"
,
backendTag
);
elog
(
NOTICE
,
"SIAssignBackendId: reusing tag %d"
,
backendTag
);
}
else
else
{
{
elog
(
NOTICE
,
elog
(
NOTICE
,
"SIAssignBackendId: discarding tag %d"
,
stateP
->
tag
);
"SIAssignBackendId: discarding tag %d"
,
stateP
->
tag
);
return
InvalidBackendTag
;
return
InvalidBackendTag
;
}
}
}
}
...
...
src/backend/storage/large_object/inv_api.c
View file @
4853495e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.5
1 1999/03/14 16:08:17
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.5
2 1999/05/10 00:45:41
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -119,8 +119,8 @@ inv_create(int flags)
...
@@ -119,8 +119,8 @@ inv_create(int flags)
file_oid
=
newoid
()
+
1
;
file_oid
=
newoid
()
+
1
;
/* come up with some table names */
/* come up with some table names */
sprintf
(
objname
,
"xinv%
d
"
,
file_oid
);
sprintf
(
objname
,
"xinv%
u
"
,
file_oid
);
sprintf
(
indname
,
"xinx%
d
"
,
file_oid
);
sprintf
(
indname
,
"xinx%
u
"
,
file_oid
);
if
(
RelnameFindRelid
(
objname
)
!=
InvalidOid
)
if
(
RelnameFindRelid
(
objname
)
!=
InvalidOid
)
{
{
...
...
src/backend/storage/lmgr/lock.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.5
0 1999/05/07 01:23:03 vadim
Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.5
1 1999/05/10 00:45:43 momjian
Exp $
*
*
* NOTES
* NOTES
* Outside modules can create a lock table and acquire/release
* Outside modules can create a lock table and acquire/release
...
@@ -83,7 +83,7 @@ static int WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode);
...
@@ -83,7 +83,7 @@ static int WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode);
#define LOCK_PRINT_AUX(where,lock,type) \
#define LOCK_PRINT_AUX(where,lock,type) \
TPRINTF(TRACE_ALL, \
TPRINTF(TRACE_ALL, \
"%s: lock(%x) tbl(%d) rel(%
d
) db(%d) obj(%u) mask(%x) " \
"%s: lock(%x) tbl(%d) rel(%
u
) db(%d) obj(%u) mask(%x) " \
"hold(%d,%d,%d,%d,%d)=%d " \
"hold(%d,%d,%d,%d,%d)=%d " \
"act(%d,%d,%d,%d,%d)=%d wait(%d) type(%s)", \
"act(%d,%d,%d,%d,%d)=%d wait(%d) type(%s)", \
where, \
where, \
...
...
src/backend/tcop/fastpath.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.2
3 1999/04/25 03:19:10 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.2
4 1999/05/10 00:45:46 momjian
Exp $
*
*
* NOTES
* NOTES
* This cruft is the server side of PQfn.
* This cruft is the server side of PQfn.
...
@@ -214,7 +214,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
...
@@ -214,7 +214,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
func_htp
))
if
(
!
HeapTupleIsValid
(
func_htp
))
{
{
elog
(
ERROR
,
"update_fp_info: cache lookup for function %
d
failed"
,
elog
(
ERROR
,
"update_fp_info: cache lookup for function %
u
failed"
,
func_id
);
func_id
);
}
}
pp
=
(
Form_pg_proc
)
GETSTRUCT
(
func_htp
);
pp
=
(
Form_pg_proc
)
GETSTRUCT
(
func_htp
);
...
@@ -231,7 +231,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
...
@@ -231,7 +231,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
type_htp
))
if
(
!
HeapTupleIsValid
(
type_htp
))
{
{
elog
(
ERROR
,
"update_fp_info: bad argument type %
d for %d
"
,
elog
(
ERROR
,
"update_fp_info: bad argument type %
u for %u
"
,
argtypes
[
i
],
func_id
);
argtypes
[
i
],
func_id
);
}
}
tp
=
(
Form_pg_type
)
GETSTRUCT
(
type_htp
);
tp
=
(
Form_pg_type
)
GETSTRUCT
(
type_htp
);
...
@@ -247,7 +247,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
...
@@ -247,7 +247,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
type_htp
))
if
(
!
HeapTupleIsValid
(
type_htp
))
{
{
elog
(
ERROR
,
"update_fp_info: bad return type %
d for %d
"
,
elog
(
ERROR
,
"update_fp_info: bad return type %
u for %u
"
,
rettype
,
func_id
);
rettype
,
func_id
);
}
}
tp
=
(
Form_pg_type
)
GETSTRUCT
(
type_htp
);
tp
=
(
Form_pg_type
)
GETSTRUCT
(
type_htp
);
...
...
src/backend/tioga/tgRecipe.c
View file @
4853495e
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.1
1 1999/02/13 23:18:53
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.1
2 1999/05/10 00:45:49
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -486,7 +486,7 @@ connectTee(TgRecipe * r, TgNodePtr fromNode, TgNodePtr toNode,
...
@@ -486,7 +486,7 @@ connectTee(TgRecipe * r, TgNodePtr fromNode, TgNodePtr toNode,
tn
=
malloc
(
sizeof
(
TgNode
));
tn
=
malloc
(
sizeof
(
TgNode
));
/* generate a name for the tee node table */
/* generate a name for the tee node table */
tn
->
nodeName
=
malloc
(
50
);
tn
->
nodeName
=
malloc
(
50
);
sprintf
(
tn
->
nodeName
,
"tee_%
d
"
,
newoid
());
sprintf
(
tn
->
nodeName
,
"tee_%
u
"
,
newoid
());
/* tn->nodeName = NULL; */
/* tn->nodeName = NULL; */
tn
->
nodeType
=
TG_TEE_NODE
;
tn
->
nodeType
=
TG_TEE_NODE
;
...
...
src/backend/utils/adt/arrayfuncs.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.4
1 1999/05/05 21:38:37
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.4
2 1999/05/10 00:45:58
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -1475,7 +1475,7 @@ system_cache_lookup(Oid element_type,
...
@@ -1475,7 +1475,7 @@ system_cache_lookup(Oid element_type,
if
(
!
HeapTupleIsValid
(
typeTuple
))
if
(
!
HeapTupleIsValid
(
typeTuple
))
{
{
elog
(
ERROR
,
"array_out: Cache lookup failed for type %
d
\n
"
,
elog
(
ERROR
,
"array_out: Cache lookup failed for type %
u
\n
"
,
element_type
);
element_type
);
return
;
return
;
}
}
...
@@ -1882,7 +1882,7 @@ _array_newLO(int *fd, int flag)
...
@@ -1882,7 +1882,7 @@ _array_newLO(int *fd, int flag)
char
saveName
[
NAME_LEN
];
char
saveName
[
NAME_LEN
];
p
=
(
char
*
)
palloc
(
NAME_LEN
);
p
=
(
char
*
)
palloc
(
NAME_LEN
);
sprintf
(
p
,
"/Arry.%
d
"
,
newoid
());
sprintf
(
p
,
"/Arry.%
u
"
,
newoid
());
strcpy
(
saveName
,
p
);
strcpy
(
saveName
,
p
);
#ifdef LOARRAY
#ifdef LOARRAY
if
((
*
fd
=
LOcreat
(
saveName
,
0600
,
flag
))
<
0
)
if
((
*
fd
=
LOcreat
(
saveName
,
0600
,
flag
))
<
0
)
...
...
src/backend/utils/adt/oid.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.2
2 1999/02/13 23:19:2
9 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.2
3 1999/05/10 00:45:5
9 momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -38,7 +38,7 @@ oid8in(char *oidString)
...
@@ -38,7 +38,7 @@ oid8in(char *oidString)
return
NULL
;
return
NULL
;
result
=
(
Oid
*
)
palloc
(
sizeof
(
Oid
[
8
]));
result
=
(
Oid
*
)
palloc
(
sizeof
(
Oid
[
8
]));
if
((
nums
=
sscanf
(
oidString
,
"%
d%d%d%d%d%d%d%d
"
,
if
((
nums
=
sscanf
(
oidString
,
"%
u%u%u%u%u%u%u%u
"
,
&
result
[
0
],
&
result
[
0
],
&
result
[
1
],
&
result
[
1
],
&
result
[
2
],
&
result
[
2
],
...
...
src/backend/utils/adt/regproc.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.3
5 1999/02/15 16:29:32 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.3
6 1999/05/10 00:45:59 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -229,7 +229,7 @@ regprocout(RegProcedure proid)
...
@@ -229,7 +229,7 @@ regprocout(RegProcedure proid)
if
(
!
isnull
)
if
(
!
isnull
)
StrNCpy
(
result
,
s
,
NAMEDATALEN
);
StrNCpy
(
result
,
s
,
NAMEDATALEN
);
else
else
elog
(
FATAL
,
"regprocout: null procedure %
d
"
,
proid
);
elog
(
FATAL
,
"regprocout: null procedure %
u
"
,
proid
);
}
}
else
else
{
{
...
...
src/backend/utils/adt/ruleutils.c
View file @
4853495e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* out of it's tuple
* out of it's tuple
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.1
0 1999/05/03 19:10:01
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.1
1 1999/05/10 00:45:59
momjian Exp $
*
*
* This software is copyrighted by Jan Wieck - Hamburg.
* This software is copyrighted by Jan Wieck - Hamburg.
*
*
...
@@ -373,7 +373,7 @@ pg_get_indexdef(Oid indexrelid)
...
@@ -373,7 +373,7 @@ pg_get_indexdef(Oid indexrelid)
ht_idx
=
SearchSysCacheTuple
(
INDEXRELID
,
ht_idx
=
SearchSysCacheTuple
(
INDEXRELID
,
ObjectIdGetDatum
(
indexrelid
),
0
,
0
,
0
);
ObjectIdGetDatum
(
indexrelid
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
ht_idx
))
if
(
!
HeapTupleIsValid
(
ht_idx
))
elog
(
ERROR
,
"syscache lookup for index %
d
failed"
,
indexrelid
);
elog
(
ERROR
,
"syscache lookup for index %
u
failed"
,
indexrelid
);
idxrec
=
(
Form_pg_index
)
GETSTRUCT
(
ht_idx
);
idxrec
=
(
Form_pg_index
)
GETSTRUCT
(
ht_idx
);
/* ----------
/* ----------
...
@@ -383,7 +383,7 @@ pg_get_indexdef(Oid indexrelid)
...
@@ -383,7 +383,7 @@ pg_get_indexdef(Oid indexrelid)
ht_idxrel
=
SearchSysCacheTuple
(
RELOID
,
ht_idxrel
=
SearchSysCacheTuple
(
RELOID
,
ObjectIdGetDatum
(
idxrec
->
indexrelid
),
0
,
0
,
0
);
ObjectIdGetDatum
(
idxrec
->
indexrelid
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
ht_idxrel
))
if
(
!
HeapTupleIsValid
(
ht_idxrel
))
elog
(
ERROR
,
"syscache lookup for relid %
d
failed"
,
idxrec
->
indexrelid
);
elog
(
ERROR
,
"syscache lookup for relid %
u
failed"
,
idxrec
->
indexrelid
);
idxrelrec
=
(
Form_pg_class
)
GETSTRUCT
(
ht_idxrel
);
idxrelrec
=
(
Form_pg_class
)
GETSTRUCT
(
ht_idxrel
);
/* ----------
/* ----------
...
@@ -393,7 +393,7 @@ pg_get_indexdef(Oid indexrelid)
...
@@ -393,7 +393,7 @@ pg_get_indexdef(Oid indexrelid)
ht_indrel
=
SearchSysCacheTuple
(
RELOID
,
ht_indrel
=
SearchSysCacheTuple
(
RELOID
,
ObjectIdGetDatum
(
idxrec
->
indrelid
),
0
,
0
,
0
);
ObjectIdGetDatum
(
idxrec
->
indrelid
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
ht_indrel
))
if
(
!
HeapTupleIsValid
(
ht_indrel
))
elog
(
ERROR
,
"syscache lookup for relid %
d
failed"
,
idxrec
->
indrelid
);
elog
(
ERROR
,
"syscache lookup for relid %
u
failed"
,
idxrec
->
indrelid
);
indrelrec
=
(
Form_pg_class
)
GETSTRUCT
(
ht_indrel
);
indrelrec
=
(
Form_pg_class
)
GETSTRUCT
(
ht_indrel
);
/* ----------
/* ----------
...
@@ -459,9 +459,9 @@ pg_get_indexdef(Oid indexrelid)
...
@@ -459,9 +459,9 @@ pg_get_indexdef(Oid indexrelid)
spi_nulls
[
1
]
=
'\0'
;
spi_nulls
[
1
]
=
'\0'
;
spirc
=
SPI_execp
(
plan_getopclass
,
spi_args
,
spi_nulls
,
1
);
spirc
=
SPI_execp
(
plan_getopclass
,
spi_args
,
spi_nulls
,
1
);
if
(
spirc
!=
SPI_OK_SELECT
)
if
(
spirc
!=
SPI_OK_SELECT
)
elog
(
ERROR
,
"failed to get pg_opclass tuple %
d
"
,
idxrec
->
indclass
[
keyno
]);
elog
(
ERROR
,
"failed to get pg_opclass tuple %
u
"
,
idxrec
->
indclass
[
keyno
]);
if
(
SPI_processed
!=
1
)
if
(
SPI_processed
!=
1
)
elog
(
ERROR
,
"failed to get pg_opclass tuple %
d
"
,
idxrec
->
indclass
[
keyno
]);
elog
(
ERROR
,
"failed to get pg_opclass tuple %
u
"
,
idxrec
->
indclass
[
keyno
]);
spi_tup
=
SPI_tuptable
->
vals
[
0
];
spi_tup
=
SPI_tuptable
->
vals
[
0
];
spi_ttc
=
SPI_tuptable
->
tupdesc
;
spi_ttc
=
SPI_tuptable
->
tupdesc
;
spi_fno
=
SPI_fnumber
(
spi_ttc
,
"opcname"
);
spi_fno
=
SPI_fnumber
(
spi_ttc
,
"opcname"
);
...
@@ -483,7 +483,7 @@ pg_get_indexdef(Oid indexrelid)
...
@@ -483,7 +483,7 @@ pg_get_indexdef(Oid indexrelid)
proctup
=
SearchSysCacheTuple
(
PROOID
,
proctup
=
SearchSysCacheTuple
(
PROOID
,
ObjectIdGetDatum
(
idxrec
->
indproc
),
0
,
0
,
0
);
ObjectIdGetDatum
(
idxrec
->
indproc
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
proctup
))
if
(
!
HeapTupleIsValid
(
proctup
))
elog
(
ERROR
,
"cache lookup for proc %
d
failed"
,
idxrec
->
indproc
);
elog
(
ERROR
,
"cache lookup for proc %
u
failed"
,
idxrec
->
indproc
);
procStruct
=
(
Form_pg_proc
)
GETSTRUCT
(
proctup
);
procStruct
=
(
Form_pg_proc
)
GETSTRUCT
(
proctup
);
strcat
(
buf
,
"
\"
"
);
strcat
(
buf
,
"
\"
"
);
...
@@ -497,9 +497,9 @@ pg_get_indexdef(Oid indexrelid)
...
@@ -497,9 +497,9 @@ pg_get_indexdef(Oid indexrelid)
spi_nulls
[
1
]
=
'\0'
;
spi_nulls
[
1
]
=
'\0'
;
spirc
=
SPI_execp
(
plan_getopclass
,
spi_args
,
spi_nulls
,
1
);
spirc
=
SPI_execp
(
plan_getopclass
,
spi_args
,
spi_nulls
,
1
);
if
(
spirc
!=
SPI_OK_SELECT
)
if
(
spirc
!=
SPI_OK_SELECT
)
elog
(
ERROR
,
"failed to get pg_opclass tuple %
d
"
,
idxrec
->
indclass
[
0
]);
elog
(
ERROR
,
"failed to get pg_opclass tuple %
u
"
,
idxrec
->
indclass
[
0
]);
if
(
SPI_processed
!=
1
)
if
(
SPI_processed
!=
1
)
elog
(
ERROR
,
"failed to get pg_opclass tuple %
d
"
,
idxrec
->
indclass
[
0
]);
elog
(
ERROR
,
"failed to get pg_opclass tuple %
u
"
,
idxrec
->
indclass
[
0
]);
spi_tup
=
SPI_tuptable
->
vals
[
0
];
spi_tup
=
SPI_tuptable
->
vals
[
0
];
spi_ttc
=
SPI_tuptable
->
tupdesc
;
spi_ttc
=
SPI_tuptable
->
tupdesc
;
spi_fno
=
SPI_fnumber
(
spi_ttc
,
"opcname"
);
spi_fno
=
SPI_fnumber
(
spi_ttc
,
"opcname"
);
...
@@ -1424,7 +1424,7 @@ get_func_expr(QryHier *qh, int rt_index, Expr *expr, bool varprefix)
...
@@ -1424,7 +1424,7 @@ get_func_expr(QryHier *qh, int rt_index, Expr *expr, bool varprefix)
proctup
=
SearchSysCacheTuple
(
PROOID
,
proctup
=
SearchSysCacheTuple
(
PROOID
,
ObjectIdGetDatum
(
func
->
funcid
),
0
,
0
,
0
);
ObjectIdGetDatum
(
func
->
funcid
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
proctup
))
if
(
!
HeapTupleIsValid
(
proctup
))
elog
(
ERROR
,
"cache lookup for proc %
d
failed"
,
func
->
funcid
);
elog
(
ERROR
,
"cache lookup for proc %
u
failed"
,
func
->
funcid
);
procStruct
=
(
Form_pg_proc
)
GETSTRUCT
(
proctup
);
procStruct
=
(
Form_pg_proc
)
GETSTRUCT
(
proctup
);
proname
=
nameout
(
&
(
procStruct
->
proname
));
proname
=
nameout
(
&
(
procStruct
->
proname
));
...
@@ -1516,7 +1516,7 @@ get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix)
...
@@ -1516,7 +1516,7 @@ get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix)
proctup
=
SearchSysCacheTuple
(
PROOID
,
proctup
=
SearchSysCacheTuple
(
PROOID
,
ObjectIdGetDatum
(
func
->
funcid
),
0
,
0
,
0
);
ObjectIdGetDatum
(
func
->
funcid
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
proctup
))
if
(
!
HeapTupleIsValid
(
proctup
))
elog
(
ERROR
,
"cache lookup for proc %
d
failed"
,
func
->
funcid
);
elog
(
ERROR
,
"cache lookup for proc %
u
failed"
,
func
->
funcid
);
procStruct
=
(
Form_pg_proc
)
GETSTRUCT
(
proctup
);
procStruct
=
(
Form_pg_proc
)
GETSTRUCT
(
proctup
);
...
@@ -1676,7 +1676,7 @@ get_relation_name(Oid relid)
...
@@ -1676,7 +1676,7 @@ get_relation_name(Oid relid)
classtup
=
SearchSysCacheTuple
(
RELOID
,
classtup
=
SearchSysCacheTuple
(
RELOID
,
ObjectIdGetDatum
(
relid
),
0
,
0
,
0
);
ObjectIdGetDatum
(
relid
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
classtup
))
if
(
!
HeapTupleIsValid
(
classtup
))
elog
(
ERROR
,
"cache lookup of relation %
d
failed"
,
relid
);
elog
(
ERROR
,
"cache lookup of relation %
u
failed"
,
relid
);
classStruct
=
(
Form_pg_class
)
GETSTRUCT
(
classtup
);
classStruct
=
(
Form_pg_class
)
GETSTRUCT
(
classtup
);
return
nameout
(
&
(
classStruct
->
relname
));
return
nameout
(
&
(
classStruct
->
relname
));
...
@@ -1697,7 +1697,7 @@ get_attribute_name(Oid relid, int2 attnum)
...
@@ -1697,7 +1697,7 @@ get_attribute_name(Oid relid, int2 attnum)
atttup
=
SearchSysCacheTuple
(
ATTNUM
,
atttup
=
SearchSysCacheTuple
(
ATTNUM
,
ObjectIdGetDatum
(
relid
),
(
Datum
)
attnum
,
0
,
0
);
ObjectIdGetDatum
(
relid
),
(
Datum
)
attnum
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
atttup
))
if
(
!
HeapTupleIsValid
(
atttup
))
elog
(
ERROR
,
"cache lookup of attribute %d in relation %
d
failed"
,
elog
(
ERROR
,
"cache lookup of attribute %d in relation %
u
failed"
,
attnum
,
relid
);
attnum
,
relid
);
attStruct
=
(
Form_pg_attribute
)
GETSTRUCT
(
atttup
);
attStruct
=
(
Form_pg_attribute
)
GETSTRUCT
(
atttup
);
...
...
src/backend/utils/adt/selfuncs.c
View file @
4853495e
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.2
6 1999/03/18 19:59:55
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.2
7 1999/05/10 00:46:00
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -286,7 +286,7 @@ getattdisbursion(Oid relid, AttrNumber attnum)
...
@@ -286,7 +286,7 @@ getattdisbursion(Oid relid, AttrNumber attnum)
0
,
0
);
0
,
0
);
if
(
!
HeapTupleIsValid
(
atp
))
if
(
!
HeapTupleIsValid
(
atp
))
{
{
elog
(
ERROR
,
"getattdisbursion: no attribute tuple %
d
%d"
,
elog
(
ERROR
,
"getattdisbursion: no attribute tuple %
u
%d"
,
relid
,
attnum
);
relid
,
attnum
);
return
0
;
return
0
;
}
}
...
@@ -304,7 +304,7 @@ getattdisbursion(Oid relid, AttrNumber attnum)
...
@@ -304,7 +304,7 @@ getattdisbursion(Oid relid, AttrNumber attnum)
*/
*/
if
(
!
HeapTupleIsValid
(
atp
))
if
(
!
HeapTupleIsValid
(
atp
))
{
{
elog
(
ERROR
,
"getattdisbursion: no relation tuple %
d
"
,
relid
);
elog
(
ERROR
,
"getattdisbursion: no relation tuple %
u
"
,
relid
);
return
0
;
return
0
;
}
}
ntuples
=
((
Form_pg_class
)
GETSTRUCT
(
atp
))
->
reltuples
;
ntuples
=
((
Form_pg_class
)
GETSTRUCT
(
atp
))
->
reltuples
;
...
@@ -460,7 +460,7 @@ btreenpage(Oid operatorObjectId,
...
@@ -460,7 +460,7 @@ btreenpage(Oid operatorObjectId,
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
atp
))
if
(
!
HeapTupleIsValid
(
atp
))
{
{
elog
(
ERROR
,
"btreenpage: no index tuple %
d
"
,
indexrelid
);
elog
(
ERROR
,
"btreenpage: no index tuple %
u
"
,
indexrelid
);
return
0
;
return
0
;
}
}
...
@@ -499,7 +499,7 @@ hashsel(Oid operatorObjectId,
...
@@ -499,7 +499,7 @@ hashsel(Oid operatorObjectId,
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
atp
))
if
(
!
HeapTupleIsValid
(
atp
))
{
{
elog
(
ERROR
,
"hashsel: no index tuple %
d
"
,
indexrelid
);
elog
(
ERROR
,
"hashsel: no index tuple %
u
"
,
indexrelid
);
return
0
;
return
0
;
}
}
ntuples
=
((
Form_pg_class
)
GETSTRUCT
(
atp
))
->
reltuples
;
ntuples
=
((
Form_pg_class
)
GETSTRUCT
(
atp
))
->
reltuples
;
...
@@ -552,7 +552,7 @@ hashnpage(Oid operatorObjectId,
...
@@ -552,7 +552,7 @@ hashnpage(Oid operatorObjectId,
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
atp
))
if
(
!
HeapTupleIsValid
(
atp
))
{
{
elog
(
ERROR
,
"hashsel: no index tuple %
d
"
,
indexrelid
);
elog
(
ERROR
,
"hashsel: no index tuple %
u
"
,
indexrelid
);
return
0
;
return
0
;
}
}
...
...
src/backend/utils/cache/catcache.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.
39 1999/02/13 23:19:39
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.
40 1999/05/10 00:46:03
momjian Exp $
*
*
* Notes:
* Notes:
* XXX This needs to use exception.h to handle recovery when
* XXX This needs to use exception.h to handle recovery when
...
@@ -183,7 +183,7 @@ CatalogCacheInitializeCache(struct catcache * cache,
...
@@ -183,7 +183,7 @@ CatalogCacheInitializeCache(struct catcache * cache,
cache
->
relationId
=
RelationGetRelid
(
relation
);
cache
->
relationId
=
RelationGetRelid
(
relation
);
tupdesc
=
cache
->
cc_tupdesc
=
RelationGetDescr
(
relation
);
tupdesc
=
cache
->
cc_tupdesc
=
RelationGetDescr
(
relation
);
CACHE3_elog
(
DEBUG
,
"CatalogCacheInitializeCache: relid %
d
, %d keys"
,
CACHE3_elog
(
DEBUG
,
"CatalogCacheInitializeCache: relid %
u
, %d keys"
,
cache
->
relationId
,
cache
->
cc_nkeys
);
cache
->
relationId
,
cache
->
cc_nkeys
);
/* ----------------
/* ----------------
...
@@ -650,7 +650,7 @@ SystemCacheRelationFlushed(Oid relId)
...
@@ -650,7 +650,7 @@ SystemCacheRelationFlushed(Oid relId)
#ifdef CACHEDEBUG
#ifdef CACHEDEBUG
#define InitSysCache_DEBUG1 \
#define InitSysCache_DEBUG1 \
do { \
do { \
elog(DEBUG, "InitSysCache: rid=%
d
id=%d nkeys=%d size=%d\n", \
elog(DEBUG, "InitSysCache: rid=%
u
id=%d nkeys=%d size=%d\n", \
cp->relationId, cp->id, cp->cc_nkeys, cp->cc_size); \
cp->relationId, cp->id, cp->cc_nkeys, cp->cc_size); \
for (i = 0; i < nkeys; i += 1) \
for (i = 0; i < nkeys; i += 1) \
{ \
{ \
...
...
src/backend/utils/cache/fcache.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.2
1 1999/02/13 23:19:40
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.2
2 1999/05/10 00:46:06
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -109,7 +109,7 @@ init_fcache(Oid foid,
...
@@ -109,7 +109,7 @@ init_fcache(Oid foid,
if
(
!
HeapTupleIsValid
(
procedureTuple
))
if
(
!
HeapTupleIsValid
(
procedureTuple
))
elog
(
ERROR
,
elog
(
ERROR
,
"init_fcache: %s %
d
"
,
"init_fcache: %s %
u
"
,
"Cache lookup failed for procedure"
,
foid
);
"Cache lookup failed for procedure"
,
foid
);
/* ----------------
/* ----------------
...
@@ -130,7 +130,7 @@ init_fcache(Oid foid,
...
@@ -130,7 +130,7 @@ init_fcache(Oid foid,
if
(
!
HeapTupleIsValid
(
typeTuple
))
if
(
!
HeapTupleIsValid
(
typeTuple
))
elog
(
ERROR
,
elog
(
ERROR
,
"init_fcache: %s %
d
"
,
"init_fcache: %s %
u
"
,
"Cache lookup failed for type"
,
"Cache lookup failed for type"
,
(
procedureStruct
)
->
prorettype
);
(
procedureStruct
)
->
prorettype
);
...
...
src/backend/utils/cache/inval.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.2
1 1999/02/13 23:19:41
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.2
2 1999/05/10 00:46:07
momjian Exp $
*
*
* Note - this code is real crufty...
* Note - this code is real crufty...
*
*
...
@@ -215,7 +215,7 @@ RelationIdRegisterLocalInvalid(Oid relationId, Oid objectId)
...
@@ -215,7 +215,7 @@ RelationIdRegisterLocalInvalid(Oid relationId, Oid objectId)
* ----------------
* ----------------
*/
*/
#ifdef INVALIDDEBUG
#ifdef INVALIDDEBUG
elog
(
DEBUG
,
"RelationRegisterLocalInvalid(%
d, %d
)"
,
relationId
,
elog
(
DEBUG
,
"RelationRegisterLocalInvalid(%
u, %u
)"
,
relationId
,
objectId
);
objectId
);
#endif
/* defined(INVALIDDEBUG) */
#endif
/* defined(INVALIDDEBUG) */
...
@@ -359,7 +359,7 @@ elog(DEBUG,\
...
@@ -359,7 +359,7 @@ elog(DEBUG,\
ItemPointerGetOffsetNumber(&message->any.catalog.pointerData))
ItemPointerGetOffsetNumber(&message->any.catalog.pointerData))
#define InvalidationMessageRegisterSharedInvalid_DEBUG2 \
#define InvalidationMessageRegisterSharedInvalid_DEBUG2 \
elog(DEBUG, \
elog(DEBUG, \
"InvalidationMessageRegisterSharedInvalid(r, %
d, %d
)", \
"InvalidationMessageRegisterSharedInvalid(r, %
u, %u
)", \
message->any.relation.relationId, \
message->any.relation.relationId, \
message->any.relation.objectId)
message->any.relation.objectId)
#else
#else
...
@@ -409,7 +409,7 @@ elog(DEBUG, "InvalidationMessageCacheInvalidate(c, %d, %d, [%d, %d])",\
...
@@ -409,7 +409,7 @@ elog(DEBUG, "InvalidationMessageCacheInvalidate(c, %d, %d, [%d, %d])",\
ItemPointerGetBlockNumber(&message->any.catalog.pointerData),\
ItemPointerGetBlockNumber(&message->any.catalog.pointerData),\
ItemPointerGetOffsetNumber(&message->any.catalog.pointerData))
ItemPointerGetOffsetNumber(&message->any.catalog.pointerData))
#define InvalidationMessageCacheInvalidate_DEBUG2 \
#define InvalidationMessageCacheInvalidate_DEBUG2 \
elog(DEBUG, "InvalidationMessageCacheInvalidate(r, %
d, %d
)", \
elog(DEBUG, "InvalidationMessageCacheInvalidate(r, %
u, %u
)", \
message->any.relation.relationId, \
message->any.relation.relationId, \
message->any.relation.objectId)
message->any.relation.objectId)
#else
#else
...
...
src/backend/utils/cache/lsyscache.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.2
5 1999/02/21 03:49:33 scrappy
Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.2
6 1999/05/10 00:46:07 momjian
Exp $
*
*
* NOTES
* NOTES
* Eventually, the index information should go through here, too.
* Eventually, the index information should go through here, too.
...
@@ -140,7 +140,7 @@ get_attisset(Oid relid, char *attname)
...
@@ -140,7 +140,7 @@ get_attisset(Oid relid, char *attname)
PointerGetDatum
(
attname
),
PointerGetDatum
(
attname
),
0
,
0
);
0
,
0
);
if
(
!
HeapTupleIsValid
(
tuple
))
if
(
!
HeapTupleIsValid
(
tuple
))
elog
(
ERROR
,
"get_attisset: no attribute %s in relation %
d
"
,
elog
(
ERROR
,
"get_attisset: no attribute %s in relation %
u
"
,
attname
,
relid
);
attname
,
relid
);
if
(
heap_attisnull
(
tuple
,
attno
))
if
(
heap_attisnull
(
tuple
,
attno
))
return
false
;
return
false
;
...
@@ -218,7 +218,7 @@ get_opname(Oid opno)
...
@@ -218,7 +218,7 @@ get_opname(Oid opno)
{
{
/* don't throw an error anymore; we want to continue... */
/* don't throw an error anymore; we want to continue... */
#ifdef NOT_USED
#ifdef NOT_USED
elog
(
ERROR
,
"can't look up operator %
d
\n
"
,
opno
);
elog
(
ERROR
,
"can't look up operator %
u
\n
"
,
opno
);
#endif
#endif
return
NULL
;
return
NULL
;
}
}
...
...
src/backend/utils/cache/relcache.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.6
0 1999/05/01 19:09:44 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.6
1 1999/05/10 00:46:08 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -280,7 +280,7 @@ BuildDescInfoError(RelationBuildDescInfo buildinfo)
...
@@ -280,7 +280,7 @@ BuildDescInfoError(RelationBuildDescInfo buildinfo)
switch
(
buildinfo
.
infotype
)
switch
(
buildinfo
.
infotype
)
{
{
case
INFO_RELID
:
case
INFO_RELID
:
sprintf
(
errBuf
,
"(relation id %
d
)"
,
buildinfo
.
i
.
info_id
);
sprintf
(
errBuf
,
"(relation id %
u
)"
,
buildinfo
.
i
.
info_id
);
break
;
break
;
case
INFO_RELNAME
:
case
INFO_RELNAME
:
sprintf
(
errBuf
,
"(relation name %s)"
,
buildinfo
.
i
.
info_name
);
sprintf
(
errBuf
,
"(relation name %s)"
,
buildinfo
.
i
.
info_name
);
...
@@ -545,7 +545,7 @@ build_tupdesc_seq(RelationBuildDescInfo buildinfo,
...
@@ -545,7 +545,7 @@ build_tupdesc_seq(RelationBuildDescInfo buildinfo,
}
}
if
(
need
>
0
)
if
(
need
>
0
)
elog
(
ERROR
,
"catalog is missing %d attribute%s for relid %
d
"
,
elog
(
ERROR
,
"catalog is missing %d attribute%s for relid %
u
"
,
need
,
(
need
==
1
?
""
:
"s"
),
RelationGetRelid
(
relation
));
need
,
(
need
==
1
?
""
:
"s"
),
RelationGetRelid
(
relation
));
/* ----------------
/* ----------------
...
...
src/backend/utils/error/elog.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.4
3 1999/04/25 21:50:57 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.4
4 1999/05/10 00:46:11 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -302,8 +302,7 @@ DebugFileOpen(void)
...
@@ -302,8 +302,7 @@ DebugFileOpen(void)
fd
=
fileno
(
stderr
);
fd
=
fileno
(
stderr
);
if
(
fcntl
(
fd
,
F_GETFD
,
0
)
<
0
)
if
(
fcntl
(
fd
,
F_GETFD
,
0
)
<
0
)
{
{
sprintf
(
OutputFileName
,
"%s/pg.errors.%d"
,
sprintf
(
OutputFileName
,
"%s/pg.errors.%d"
,
DataDir
,
(
int
)
MyProcPid
);
DataDir
,
(
int
)
MyProcPid
);
fd
=
open
(
OutputFileName
,
O_CREAT
|
O_APPEND
|
O_WRONLY
,
0666
);
fd
=
open
(
OutputFileName
,
O_CREAT
|
O_APPEND
|
O_WRONLY
,
0666
);
}
}
if
(
fd
<
0
)
if
(
fd
<
0
)
...
...
src/backend/utils/fmgr/dfmgr.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.2
3 1999/02/13 23:19:51
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.2
4 1999/05/10 00:46:13
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -74,7 +74,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
...
@@ -74,7 +74,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
procedureTuple
))
if
(
!
HeapTupleIsValid
(
procedureTuple
))
{
{
elog
(
ERROR
,
"fmgr: Cache lookup failed for procedure %
d
\n
"
,
elog
(
ERROR
,
"fmgr: Cache lookup failed for procedure %
u
\n
"
,
procedureId
);
procedureId
);
return
(
func_ptr
)
NULL
;
return
(
func_ptr
)
NULL
;
}
}
...
@@ -104,7 +104,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
...
@@ -104,7 +104,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
if
(
!
PointerIsValid
(
probinattr
)
/* || isnull */
)
if
(
!
PointerIsValid
(
probinattr
)
/* || isnull */
)
{
{
heap_close
(
rel
);
heap_close
(
rel
);
elog
(
ERROR
,
"fmgr: Could not extract probin for %
d
from %s"
,
elog
(
ERROR
,
"fmgr: Could not extract probin for %
u
from %s"
,
procedureId
,
ProcedureRelationName
);
procedureId
,
ProcedureRelationName
);
return
(
func_ptr
)
NULL
;
return
(
func_ptr
)
NULL
;
}
}
...
...
src/backend/utils/fmgr/fmgr.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.2
5 1999/04/09 22:35:42 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.2
6 1999/05/10 00:46:14 momjian
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -57,7 +57,7 @@ fmgr_pl(char *arg0,...)
...
@@ -57,7 +57,7 @@ fmgr_pl(char *arg0,...)
if
(
n_arguments
>
1
)
if
(
n_arguments
>
1
)
{
{
if
(
n_arguments
>
MAXFMGRARGS
)
if
(
n_arguments
>
MAXFMGRARGS
)
elog
(
ERROR
,
"fmgr_pl: function %
d
: too many arguments (%d > %d)"
,
elog
(
ERROR
,
"fmgr_pl: function %
u
: too many arguments (%d > %d)"
,
fmgr_pl_finfo
->
fn_oid
,
n_arguments
,
MAXFMGRARGS
);
fmgr_pl_finfo
->
fn_oid
,
n_arguments
,
MAXFMGRARGS
);
va_start
(
pvar
,
arg0
);
va_start
(
pvar
,
arg0
);
for
(
i
=
1
;
i
<
n_arguments
;
i
++
)
for
(
i
=
1
;
i
<
n_arguments
;
i
++
)
...
@@ -187,7 +187,7 @@ fmgr_c(FmgrInfo *finfo,
...
@@ -187,7 +187,7 @@ fmgr_c(FmgrInfo *finfo,
values
->
data
[
8
]);
values
->
data
[
8
]);
break
;
break
;
default:
default:
elog
(
ERROR
,
"fmgr_c: function %
d
: too many arguments (%d > %d)"
,
elog
(
ERROR
,
"fmgr_c: function %
u
: too many arguments (%d > %d)"
,
finfo
->
fn_oid
,
n_arguments
,
MAXFMGRARGS
);
finfo
->
fn_oid
,
n_arguments
,
MAXFMGRARGS
);
break
;
break
;
}
}
...
@@ -226,7 +226,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
...
@@ -226,7 +226,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
procedureTuple
))
if
(
!
HeapTupleIsValid
(
procedureTuple
))
{
{
elog
(
ERROR
,
"fmgr_info: function %
d
: cache lookup failed"
,
elog
(
ERROR
,
"fmgr_info: function %
u
: cache lookup failed"
,
procedureId
);
procedureId
);
}
}
procedureStruct
=
(
FormData_pg_proc
*
)
GETSTRUCT
(
procedureTuple
);
procedureStruct
=
(
FormData_pg_proc
*
)
GETSTRUCT
(
procedureTuple
);
...
@@ -277,9 +277,9 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
...
@@ -277,9 +277,9 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
0
,
0
,
0
);
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
languageTuple
))
if
(
!
HeapTupleIsValid
(
languageTuple
))
{
{
elog
(
ERROR
,
"fmgr_info: %
s %ld
"
,
elog
(
ERROR
,
"fmgr_info: %
u
"
,
"Cache lookup for language
%d
failed"
,
"Cache lookup for language failed"
,
ObjectIdGetDatum
(
procedureStruct
->
prolang
));
DatumGetObjectId
(
procedureStruct
->
prolang
));
}
}
languageStruct
=
(
Form_pg_language
)
GETSTRUCT
(
languageTuple
);
languageStruct
=
(
Form_pg_language
)
GETSTRUCT
(
languageTuple
);
if
(
languageStruct
->
lanispl
)
if
(
languageStruct
->
lanispl
)
...
@@ -293,7 +293,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
...
@@ -293,7 +293,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
}
}
else
else
{
{
elog
(
ERROR
,
"fmgr_info: function %
d
: unknown language %d"
,
elog
(
ERROR
,
"fmgr_info: function %
u
: unknown language %d"
,
procedureId
,
language
);
procedureId
,
language
);
}
}
break
;
break
;
...
@@ -326,7 +326,7 @@ fmgr(Oid procedureId,...)
...
@@ -326,7 +326,7 @@ fmgr(Oid procedureId,...)
pronargs
=
finfo
.
fn_nargs
;
pronargs
=
finfo
.
fn_nargs
;
if
(
pronargs
>
MAXFMGRARGS
)
if
(
pronargs
>
MAXFMGRARGS
)
elog
(
ERROR
,
"fmgr: function %
d
: too many arguments (%d > %d)"
,
elog
(
ERROR
,
"fmgr: function %
u
: too many arguments (%d > %d)"
,
procedureId
,
pronargs
,
MAXFMGRARGS
);
procedureId
,
pronargs
,
MAXFMGRARGS
);
va_start
(
pvar
,
procedureId
);
va_start
(
pvar
,
procedureId
);
...
@@ -368,7 +368,7 @@ fmgr_ptr(FmgrInfo *finfo,...)
...
@@ -368,7 +368,7 @@ fmgr_ptr(FmgrInfo *finfo,...)
local_finfo
->
fn_nargs
=
n_arguments
;
local_finfo
->
fn_nargs
=
n_arguments
;
if
(
n_arguments
>
MAXFMGRARGS
)
if
(
n_arguments
>
MAXFMGRARGS
)
{
{
elog
(
ERROR
,
"fmgr_ptr: function %
d
: too many arguments (%d > %d)"
,
elog
(
ERROR
,
"fmgr_ptr: function %
u
: too many arguments (%d > %d)"
,
func_id
,
n_arguments
,
MAXFMGRARGS
);
func_id
,
n_arguments
,
MAXFMGRARGS
);
}
}
for
(
i
=
0
;
i
<
n_arguments
;
++
i
)
for
(
i
=
0
;
i
<
n_arguments
;
++
i
)
...
...
src/bin/pg_dump/pg_dump.c
View file @
4853495e
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.10
4 1999/05/04 15:47:35 thomas
Exp $
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.10
5 1999/05/10 00:46:18 momjian
Exp $
*
*
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
*
*
...
@@ -709,7 +709,7 @@ main(int argc, char **argv)
...
@@ -709,7 +709,7 @@ main(int argc, char **argv)
if
(
!
dataOnly
)
if
(
!
dataOnly
)
{
{
if
(
g_verbose
)
if
(
g_verbose
)
fprintf
(
stderr
,
"%s last builtin oid is %
d
%s
\n
"
,
fprintf
(
stderr
,
"%s last builtin oid is %
u
%s
\n
"
,
g_comment_start
,
g_last_builtin_oid
,
g_comment_end
);
g_comment_start
,
g_last_builtin_oid
,
g_comment_end
);
tblinfo
=
dumpSchema
(
g_fout
,
&
numTables
,
tablename
,
aclsOption
);
tblinfo
=
dumpSchema
(
g_fout
,
&
numTables
,
tablename
,
aclsOption
);
}
}
...
@@ -1343,7 +1343,7 @@ getFuncs(int *numFuncs)
...
@@ -1343,7 +1343,7 @@ getFuncs(int *numFuncs)
"SELECT pg_proc.oid, proname, prolang, pronargs, prorettype, "
"SELECT pg_proc.oid, proname, prolang, pronargs, prorettype, "
"proretset, proargtypes, prosrc, probin, usename "
"proretset, proargtypes, prosrc, probin, usename "
"from pg_proc, pg_user "
"from pg_proc, pg_user "
"where pg_proc.oid > '%
d
'::oid and proowner = usesysid"
,
"where pg_proc.oid > '%
u
'::oid and proowner = usesysid"
,
g_last_builtin_oid
);
g_last_builtin_oid
);
res
=
PQexec
(
g_conn
,
query
);
res
=
PQexec
(
g_conn
,
query
);
...
@@ -1969,7 +1969,7 @@ getIndices(int *numIndices)
...
@@ -1969,7 +1969,7 @@ getIndices(int *numIndices)
"a.amname as indamname, i.indisunique "
"a.amname as indamname, i.indisunique "
"from pg_index i, pg_class t1, pg_class t2, pg_am a "
"from pg_index i, pg_class t1, pg_class t2, pg_am a "
"where t1.oid = i.indexrelid and t2.oid = i.indrelid "
"where t1.oid = i.indexrelid and t2.oid = i.indrelid "
"and t1.relam = a.oid and i.indexrelid > '%
d
'::oid "
"and t1.relam = a.oid and i.indexrelid > '%
u
'::oid "
"and t2.relname !~ '^pg_' and t1.relkind != 'l'"
,
"and t2.relname !~ '^pg_' and t1.relkind != 'l'"
,
g_last_builtin_oid
);
g_last_builtin_oid
);
...
@@ -2249,7 +2249,7 @@ dumpOneFunc(FILE *fout, FuncInfo *finfo, int i,
...
@@ -2249,7 +2249,7 @@ dumpOneFunc(FILE *fout, FuncInfo *finfo, int i,
PQclear
(
res
);
PQclear
(
res
);
sprintf
(
query
,
"SELECT lanname FROM pg_language "
sprintf
(
query
,
"SELECT lanname FROM pg_language "
"WHERE oid = %
d
"
,
"WHERE oid = %
u
"
,
finfo
[
i
].
lang
);
finfo
[
i
].
lang
);
res
=
PQexec
(
g_conn
,
query
);
res
=
PQexec
(
g_conn
,
query
);
if
(
!
res
||
if
(
!
res
||
...
@@ -3070,7 +3070,7 @@ setMaxOid(FILE *fout)
...
@@ -3070,7 +3070,7 @@ setMaxOid(FILE *fout)
}
}
PQclear
(
res
);
PQclear
(
res
);
if
(
g_verbose
)
if
(
g_verbose
)
fprintf
(
stderr
,
"%s maximum system oid is %
d
%s
\n
"
,
fprintf
(
stderr
,
"%s maximum system oid is %
u
%s
\n
"
,
g_comment_start
,
max_oid
,
g_comment_end
);
g_comment_start
,
max_oid
,
g_comment_end
);
fprintf
(
fout
,
"CREATE TABLE pgdump_oid (dummy int4);
\n
"
);
fprintf
(
fout
,
"CREATE TABLE pgdump_oid (dummy int4);
\n
"
);
fprintf
(
fout
,
"COPY pgdump_oid WITH OIDS FROM stdin;
\n
"
);
fprintf
(
fout
,
"COPY pgdump_oid WITH OIDS FROM stdin;
\n
"
);
...
...
src/include/catalog/pg_type.h
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
* Copyright (c) 1994, Regents of the University of California
* Copyright (c) 1994, Regents of the University of California
*
*
* $Id: pg_type.h,v 1.
59 1999/05/03 19:10
:20 momjian Exp $
* $Id: pg_type.h,v 1.
60 1999/05/10 00:46
:20 momjian Exp $
*
*
* NOTES
* NOTES
* the genbki.sh script reads this file and generates .bki
* the genbki.sh script reads this file and generates .bki
...
@@ -198,7 +198,7 @@ DATA(insert OID = 25 ( text PGUID -1 -1 f b t \054 0 18 textin textout text
...
@@ -198,7 +198,7 @@ DATA(insert OID = 25 ( text PGUID -1 -1 f b t \054 0 18 textin textout text
DESCR
(
"native variable-length string"
);
DESCR
(
"native variable-length string"
);
#define TEXTOID 25
#define TEXTOID 25
DATA
(
insert
OID
=
26
(
oid
PGUID
4
10
t
b
t
\
054
0
0
int4in
int4out
int4in
int4
out
i
_null_
));
DATA
(
insert
OID
=
26
(
oid
PGUID
4
10
t
b
t
\
054
0
0
oidin
oidout
oidin
oid
out
i
_null_
));
DESCR
(
"object identifier type"
);
DESCR
(
"object identifier type"
);
#define OIDOID 26
#define OIDOID 26
...
...
src/interfaces/libpgtcl/pgtclCmds.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.4
1 1999/02/13 23:22:38
momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.4
2 1999/05/10 00:46:22
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -1190,7 +1190,7 @@ Pg_lo_import(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
...
@@ -1190,7 +1190,7 @@ Pg_lo_import(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
sprintf
(
interp
->
result
,
"Pg_lo_import of '%s' failed"
,
filename
);
sprintf
(
interp
->
result
,
"Pg_lo_import of '%s' failed"
,
filename
);
return
TCL_ERROR
;
return
TCL_ERROR
;
}
}
sprintf
(
interp
->
result
,
"%
d
"
,
lobjId
);
sprintf
(
interp
->
result
,
"%
u
"
,
lobjId
);
return
TCL_OK
;
return
TCL_OK
;
}
}
...
@@ -1228,7 +1228,7 @@ Pg_lo_export(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
...
@@ -1228,7 +1228,7 @@ Pg_lo_export(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
retval
=
lo_export
(
conn
,
lobjId
,
filename
);
retval
=
lo_export
(
conn
,
lobjId
,
filename
);
if
(
retval
==
-
1
)
if
(
retval
==
-
1
)
{
{
sprintf
(
interp
->
result
,
"Pg_lo_export %
d
%s failed"
,
lobjId
,
filename
);
sprintf
(
interp
->
result
,
"Pg_lo_export %
u
%s failed"
,
lobjId
,
filename
);
return
TCL_ERROR
;
return
TCL_ERROR
;
}
}
return
TCL_OK
;
return
TCL_OK
;
...
...
src/interfaces/libpq/fe-auth.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.2
7 1999/03/14 16:06:43
momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.2
8 1999/05/10 00:46:25
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -299,8 +299,7 @@ pg_krb5_init(void)
...
@@ -299,8 +299,7 @@ pg_krb5_init(void)
if
(
code
=
krb5_cc_resolve
(
tktbuf
,
&
ccache
))
if
(
code
=
krb5_cc_resolve
(
tktbuf
,
&
ccache
))
{
{
(
void
)
sprintf
(
PQerrormsg
,
(
void
)
sprintf
(
PQerrormsg
,
"pg_krb5_init: Kerberos error %d in krb5_cc_resolve
\n
"
,
"pg_krb5_init: Kerberos error %d in krb5_cc_resolve
\n
"
,
code
);
code
);
com_err
(
"pg_krb5_init"
,
code
,
"in krb5_cc_resolve"
);
com_err
(
"pg_krb5_init"
,
code
,
"in krb5_cc_resolve"
);
return
(
krb5_ccache
)
NULL
;
return
(
krb5_ccache
)
NULL
;
}
}
...
@@ -329,16 +328,14 @@ pg_krb5_authname(const char *PQerrormsg)
...
@@ -329,16 +328,14 @@ pg_krb5_authname(const char *PQerrormsg)
if
(
code
=
krb5_cc_get_principal
(
ccache
,
&
principal
))
if
(
code
=
krb5_cc_get_principal
(
ccache
,
&
principal
))
{
{
(
void
)
sprintf
(
PQerrormsg
,
(
void
)
sprintf
(
PQerrormsg
,
"pg_krb5_authname: Kerberos error %d in krb5_cc_get_principal
\n
"
,
"pg_krb5_authname: Kerberos error %d in krb5_cc_get_principal
\n
"
,
code
);
code
);
com_err
(
"pg_krb5_authname"
,
code
,
"in krb5_cc_get_principal"
);
com_err
(
"pg_krb5_authname"
,
code
,
"in krb5_cc_get_principal"
);
return
(
char
*
)
NULL
;
return
(
char
*
)
NULL
;
}
}
if
(
code
=
krb5_unparse_name
(
principal
,
&
authname
))
if
(
code
=
krb5_unparse_name
(
principal
,
&
authname
))
{
{
(
void
)
sprintf
(
PQerrormsg
,
(
void
)
sprintf
(
PQerrormsg
,
"pg_krb5_authname: Kerberos error %d in krb5_unparse_name
\n
"
,
"pg_krb5_authname: Kerberos error %d in krb5_unparse_name
\n
"
,
code
);
code
);
com_err
(
"pg_krb5_authname"
,
code
,
"in krb5_unparse_name"
);
com_err
(
"pg_krb5_authname"
,
code
,
"in krb5_unparse_name"
);
krb5_free_principal
(
principal
);
krb5_free_principal
(
principal
);
return
(
char
*
)
NULL
;
return
(
char
*
)
NULL
;
...
@@ -387,8 +384,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
...
@@ -387,8 +384,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
if
(
code
=
krb5_cc_get_principal
(
ccache
,
&
client
))
if
(
code
=
krb5_cc_get_principal
(
ccache
,
&
client
))
{
{
(
void
)
sprintf
(
PQerrormsg
,
(
void
)
sprintf
(
PQerrormsg
,
"pg_krb5_sendauth: Kerberos error %d in krb5_cc_get_principal
\n
"
,
"pg_krb5_sendauth: Kerberos error %d in krb5_cc_get_principal
\n
"
,
code
);
code
);
com_err
(
"pg_krb5_sendauth"
,
code
,
"in krb5_cc_get_principal"
);
com_err
(
"pg_krb5_sendauth"
,
code
,
"in krb5_cc_get_principal"
);
return
STATUS_ERROR
;
return
STATUS_ERROR
;
}
}
...
@@ -415,8 +411,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
...
@@ -415,8 +411,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
if
(
code
=
krb5_parse_name
(
servbuf
,
&
server
))
if
(
code
=
krb5_parse_name
(
servbuf
,
&
server
))
{
{
(
void
)
sprintf
(
PQerrormsg
,
(
void
)
sprintf
(
PQerrormsg
,
"pg_krb5_sendauth: Kerberos error %d in krb5_parse_name
\n
"
,
"pg_krb5_sendauth: Kerberos error %d in krb5_parse_name
\n
"
,
code
);
code
);
com_err
(
"pg_krb5_sendauth"
,
code
,
"in krb5_parse_name"
);
com_err
(
"pg_krb5_sendauth"
,
code
,
"in krb5_parse_name"
);
krb5_free_principal
(
client
);
krb5_free_principal
(
client
);
return
STATUS_ERROR
;
return
STATUS_ERROR
;
...
@@ -448,8 +443,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
...
@@ -448,8 +443,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
else
else
{
{
(
void
)
sprintf
(
PQerrormsg
,
(
void
)
sprintf
(
PQerrormsg
,
"pg_krb5_sendauth: Kerberos error %d in krb5_sendauth
\n
"
,
"pg_krb5_sendauth: Kerberos error %d in krb5_sendauth
\n
"
,
code
);
code
);
com_err
(
"pg_krb5_sendauth"
,
code
,
"in krb5_sendauth"
);
com_err
(
"pg_krb5_sendauth"
,
code
,
"in krb5_sendauth"
);
}
}
}
}
...
...
src/interfaces/libpq/fe-lobj.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.
19 1999/02/13 23:22:41
momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.
20 1999/05/10 00:46:26
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -419,7 +419,7 @@ lo_import(PGconn *conn, char *filename)
...
@@ -419,7 +419,7 @@ lo_import(PGconn *conn, char *filename)
if
(
lobj
==
-
1
)
if
(
lobj
==
-
1
)
{
{
sprintf
(
conn
->
errorMessage
,
sprintf
(
conn
->
errorMessage
,
"lo_import: could not open inv object oid %
d
"
,
lobjOid
);
"lo_import: could not open inv object oid %
u
"
,
lobjOid
);
return
InvalidOid
;
return
InvalidOid
;
}
}
...
@@ -464,7 +464,7 @@ lo_export(PGconn *conn, Oid lobjId, char *filename)
...
@@ -464,7 +464,7 @@ lo_export(PGconn *conn, Oid lobjId, char *filename)
if
(
lobj
==
-
1
)
if
(
lobj
==
-
1
)
{
{
sprintf
(
conn
->
errorMessage
,
sprintf
(
conn
->
errorMessage
,
"lo_export: can't open inv object %
d
"
,
lobjId
);
"lo_export: can't open inv object %
u
"
,
lobjId
);
return
-
1
;
return
-
1
;
}
}
...
...
src/pl/plpgsql/src/pl_comp.c
View file @
4853495e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* procedural language
* procedural language
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.
5 1999/01/28 11:48:31 wieck
Exp $
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.
6 1999/05/10 00:46:29 momjian
Exp $
*
*
* This software is copyrighted by Jan Wieck - Hamburg.
* This software is copyrighted by Jan Wieck - Hamburg.
*
*
...
@@ -182,7 +182,7 @@ plpgsql_compile(Oid fn_oid, int functype)
...
@@ -182,7 +182,7 @@ plpgsql_compile(Oid fn_oid, int functype)
if
(
!
HeapTupleIsValid
(
typeTup
))
if
(
!
HeapTupleIsValid
(
typeTup
))
{
{
plpgsql_comperrinfo
();
plpgsql_comperrinfo
();
elog
(
ERROR
,
"cache lookup for return type %
d
failed"
,
elog
(
ERROR
,
"cache lookup for return type %
u
failed"
,
procStruct
->
prorettype
);
procStruct
->
prorettype
);
}
}
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typeTup
);
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typeTup
);
...
@@ -213,7 +213,7 @@ plpgsql_compile(Oid fn_oid, int functype)
...
@@ -213,7 +213,7 @@ plpgsql_compile(Oid fn_oid, int functype)
if
(
!
HeapTupleIsValid
(
typeTup
))
if
(
!
HeapTupleIsValid
(
typeTup
))
{
{
plpgsql_comperrinfo
();
plpgsql_comperrinfo
();
elog
(
ERROR
,
"cache lookup for argument type %
d
failed"
,
elog
(
ERROR
,
"cache lookup for argument type %
u
failed"
,
procStruct
->
proargtypes
[
i
]);
procStruct
->
proargtypes
[
i
]);
}
}
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typeTup
);
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typeTup
);
...
@@ -451,7 +451,7 @@ plpgsql_compile(Oid fn_oid, int functype)
...
@@ -451,7 +451,7 @@ plpgsql_compile(Oid fn_oid, int functype)
break
;
break
;
default:
default:
elog
(
ERROR
,
"unknown function type %
d
in plpgsql_compile()"
,
elog
(
ERROR
,
"unknown function type %
u
in plpgsql_compile()"
,
functype
);
functype
);
break
;
break
;
}
}
...
@@ -1074,7 +1074,7 @@ plpgsql_parse_dblwordtype(char *string)
...
@@ -1074,7 +1074,7 @@ plpgsql_parse_dblwordtype(char *string)
if
(
!
HeapTupleIsValid
(
typetup
))
if
(
!
HeapTupleIsValid
(
typetup
))
{
{
plpgsql_comperrinfo
();
plpgsql_comperrinfo
();
elog
(
ERROR
,
"cache lookup for type %
d
of %s.%s failed"
,
elog
(
ERROR
,
"cache lookup for type %
u
of %s.%s failed"
,
attrStruct
->
atttypid
,
word1
,
word2
);
attrStruct
->
atttypid
,
word1
,
word2
);
}
}
...
@@ -1189,7 +1189,7 @@ plpgsql_parse_wordrowtype(char *string)
...
@@ -1189,7 +1189,7 @@ plpgsql_parse_wordrowtype(char *string)
if
(
!
HeapTupleIsValid
(
typetup
))
if
(
!
HeapTupleIsValid
(
typetup
))
{
{
plpgsql_comperrinfo
();
plpgsql_comperrinfo
();
elog
(
ERROR
,
"cache lookup for type %
d
of %s.%s failed"
,
elog
(
ERROR
,
"cache lookup for type %
u
of %s.%s failed"
,
attrStruct
->
atttypid
,
word1
,
attrStruct
->
atttypid
,
word1
,
nameout
(
&
(
attrStruct
->
attname
)));
nameout
(
&
(
attrStruct
->
attname
)));
}
}
...
...
src/pl/plpgsql/src/pl_exec.c
View file @
4853495e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* procedural language
* procedural language
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.
9 1999/04/20 02:19:57 tgl
Exp $
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.
10 1999/05/10 00:46:30 momjian
Exp $
*
*
* This software is copyrighted by Jan Wieck - Hamburg.
* This software is copyrighted by Jan Wieck - Hamburg.
*
*
...
@@ -1557,7 +1557,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt)
...
@@ -1557,7 +1557,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt)
typetup
=
SearchSysCacheTuple
(
TYPOID
,
typetup
=
SearchSysCacheTuple
(
TYPOID
,
ObjectIdGetDatum
(
var
->
datatype
->
typoid
),
0
,
0
,
0
);
ObjectIdGetDatum
(
var
->
datatype
->
typoid
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
typetup
))
if
(
!
HeapTupleIsValid
(
typetup
))
elog
(
ERROR
,
"cache lookup for type %
d
failed (1)"
,
var
->
datatype
->
typoid
);
elog
(
ERROR
,
"cache lookup for type %
u
failed (1)"
,
var
->
datatype
->
typoid
);
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typetup
);
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typetup
);
fmgr_info
(
typeStruct
->
typoutput
,
&
finfo_output
);
fmgr_info
(
typeStruct
->
typoutput
,
&
finfo_output
);
...
@@ -1962,7 +1962,7 @@ exec_assign_value(PLpgSQL_execstate * estate,
...
@@ -1962,7 +1962,7 @@ exec_assign_value(PLpgSQL_execstate * estate,
typetup
=
SearchSysCacheTuple
(
TYPOID
,
typetup
=
SearchSysCacheTuple
(
TYPOID
,
ObjectIdGetDatum
(
atttype
),
0
,
0
,
0
);
ObjectIdGetDatum
(
atttype
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
typetup
))
if
(
!
HeapTupleIsValid
(
typetup
))
elog
(
ERROR
,
"cache lookup for type %
d
failed"
,
atttype
);
elog
(
ERROR
,
"cache lookup for type %
u
failed"
,
atttype
);
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typetup
);
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typetup
);
fmgr_info
(
typeStruct
->
typinput
,
&
finfo_input
);
fmgr_info
(
typeStruct
->
typinput
,
&
finfo_input
);
...
@@ -2393,7 +2393,7 @@ exec_cast_value(Datum value, Oid valtype,
...
@@ -2393,7 +2393,7 @@ exec_cast_value(Datum value, Oid valtype,
typetup
=
SearchSysCacheTuple
(
TYPOID
,
typetup
=
SearchSysCacheTuple
(
TYPOID
,
ObjectIdGetDatum
(
valtype
),
0
,
0
,
0
);
ObjectIdGetDatum
(
valtype
),
0
,
0
,
0
);
if
(
!
HeapTupleIsValid
(
typetup
))
if
(
!
HeapTupleIsValid
(
typetup
))
elog
(
ERROR
,
"cache lookup for type %
d
failed"
,
valtype
);
elog
(
ERROR
,
"cache lookup for type %
u
failed"
,
valtype
);
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typetup
);
typeStruct
=
(
Form_pg_type
)
GETSTRUCT
(
typetup
);
fmgr_info
(
typeStruct
->
typoutput
,
&
finfo_output
);
fmgr_info
(
typeStruct
->
typoutput
,
&
finfo_output
);
...
...
src/pl/plpgsql/src/pl_funcs.c
View file @
4853495e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* procedural language
* procedural language
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.
3 1999/01/28 11:48:31 wieck
Exp $
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.
4 1999/05/10 00:46:31 momjian
Exp $
*
*
* This software is copyrighted by Jan Wieck - Hamburg.
* This software is copyrighted by Jan Wieck - Hamburg.
*
*
...
@@ -703,7 +703,7 @@ plpgsql_dumptree(PLpgSQL_function * func)
...
@@ -703,7 +703,7 @@ plpgsql_dumptree(PLpgSQL_function * func)
{
{
PLpgSQL_var
*
var
=
(
PLpgSQL_var
*
)
d
;
PLpgSQL_var
*
var
=
(
PLpgSQL_var
*
)
d
;
printf
(
"VAR %-16s type %s (typoid %
d
) atttypmod %d
\n
"
,
printf
(
"VAR %-16s type %s (typoid %
u
) atttypmod %d
\n
"
,
var
->
refname
,
var
->
datatype
->
typname
,
var
->
refname
,
var
->
datatype
->
typname
,
var
->
datatype
->
typoid
,
var
->
datatype
->
typoid
,
var
->
datatype
->
atttypmod
);
var
->
datatype
->
atttypmod
);
...
...
src/test/examples/testlo.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.1
0 1999/02/13 23:22:45
momjian Exp $
* $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.1
1 1999/05/10 00:46:31
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -84,8 +84,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
...
@@ -84,8 +84,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
if
(
lobj_fd
<
0
)
if
(
lobj_fd
<
0
)
{
{
fprintf
(
stderr
,
"can't open large object %d"
,
fprintf
(
stderr
,
"can't open large object %u"
,
lobjId
);
lobjId
);
}
}
lo_lseek
(
conn
,
lobj_fd
,
start
,
SEEK_SET
);
lo_lseek
(
conn
,
lobj_fd
,
start
,
SEEK_SET
);
...
@@ -115,8 +114,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
...
@@ -115,8 +114,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
if
(
lobj_fd
<
0
)
if
(
lobj_fd
<
0
)
{
{
fprintf
(
stderr
,
"can't open large object %d"
,
fprintf
(
stderr
,
"can't open large object %u"
,
lobjId
);
lobjId
);
}
}
lo_lseek
(
conn
,
lobj_fd
,
start
,
SEEK_SET
);
lo_lseek
(
conn
,
lobj_fd
,
start
,
SEEK_SET
);
...
@@ -157,8 +155,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
...
@@ -157,8 +155,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
if
(
lobj_fd
<
0
)
if
(
lobj_fd
<
0
)
{
{
fprintf
(
stderr
,
"can't open large object %d"
,
fprintf
(
stderr
,
"can't open large object %u"
,
lobjId
);
lobjId
);
}
}
/*
/*
...
@@ -239,7 +236,7 @@ main(int argc, char **argv)
...
@@ -239,7 +236,7 @@ main(int argc, char **argv)
if
(
lobjOid
==
0
)
if
(
lobjOid
==
0
)
fprintf
(
stderr
,
"%s
\n
"
,
PQerrorMessage
(
conn
));
fprintf
(
stderr
,
"%s
\n
"
,
PQerrorMessage
(
conn
));
/*
/*
printf("\tas large object %
d
.\n", lobjOid);
printf("\tas large object %
u
.\n", lobjOid);
printf("picking out bytes 1000-2000 of the large object\n");
printf("picking out bytes 1000-2000 of the large object\n");
pickout(conn, lobjOid, 1000, 1000);
pickout(conn, lobjOid, 1000, 1000);
...
...
src/test/examples/testlo2.c
View file @
4853495e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.
9 1999/02/13 23:22:46
momjian Exp $
* $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.
10 1999/05/10 00:46:32
momjian Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -80,8 +80,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
...
@@ -80,8 +80,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
if
(
lobj_fd
<
0
)
if
(
lobj_fd
<
0
)
{
{
fprintf
(
stderr
,
"can't open large object %d"
,
fprintf
(
stderr
,
"can't open large object %u"
,
lobjId
);
lobjId
);
}
}
lo_lseek
(
conn
,
lobj_fd
,
start
,
SEEK_SET
);
lo_lseek
(
conn
,
lobj_fd
,
start
,
SEEK_SET
);
...
@@ -111,8 +110,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
...
@@ -111,8 +110,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
if
(
lobj_fd
<
0
)
if
(
lobj_fd
<
0
)
{
{
fprintf
(
stderr
,
"can't open large object %d"
,
fprintf
(
stderr
,
"can't open large object %u"
,
lobjId
);
lobjId
);
}
}
lo_lseek
(
conn
,
lobj_fd
,
start
,
SEEK_SET
);
lo_lseek
(
conn
,
lobj_fd
,
start
,
SEEK_SET
);
...
@@ -153,8 +151,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
...
@@ -153,8 +151,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
lobj_fd
=
lo_open
(
conn
,
lobjId
,
INV_READ
);
if
(
lobj_fd
<
0
)
if
(
lobj_fd
<
0
)
{
{
fprintf
(
stderr
,
"can't open large object %d"
,
fprintf
(
stderr
,
"can't open large object %u"
,
lobjId
);
lobjId
);
}
}
/*
/*
...
@@ -234,7 +231,7 @@ main(int argc, char **argv)
...
@@ -234,7 +231,7 @@ main(int argc, char **argv)
/* lobjOid = importFile(conn, in_filename); */
/* lobjOid = importFile(conn, in_filename); */
lobjOid
=
lo_import
(
conn
,
in_filename
);
lobjOid
=
lo_import
(
conn
,
in_filename
);
/*
/*
printf("\tas large object %
d
.\n", lobjOid);
printf("\tas large object %
u
.\n", lobjOid);
printf("picking out bytes 1000-2000 of the large object\n");
printf("picking out bytes 1000-2000 of the large object\n");
pickout(conn, lobjOid, 1000, 1000);
pickout(conn, lobjOid, 1000, 1000);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment