database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-13 16:22:44 +03:00
Code Activity

D'Arcy's recent cleanups

Browse Source
This commit is contained in:
Marc G. Fournier
1996-11-08 00:46:14 +00:00
parent b8003d098b
commit b38d565fc3
11 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/catalog/index.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.7 1996/11/06 07:31:21 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.8 1996/11/08 00:44:30 scrappy Exp $
*
*
* INTERFACE ROUTINES
@@ -1514,6 +1514,12 @@ DefaultBuild(Relation heapRelation,
econtext = makeNode(ExprContext);
FillDummyExprContext(econtext, slot, heapDescriptor, buffer);
}
else
{
econtext = NULL;
tupleTable = 0;
slot = NULL;
}
#endif /* OMIT_PARTIAL_INDEX */
/* ----------------

4
src/backend/catalog/pg_aggregate.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.3 1996/11/06 07:31:23 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.4 1996/11/08 00:44:32 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -286,7 +286,7 @@ AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull)
transtype = ((Form_pg_aggregate) GETSTRUCT(tup))->aggtranstype1;
initValAttno = Anum_pg_aggregate_agginitval1;
}
else if (xfuncno == 2) {
else /* can only be 1 or 2 */ {
transtype = ((Form_pg_aggregate) GETSTRUCT(tup))->aggtranstype2;
initValAttno = Anum_pg_aggregate_agginitval2;
}

8
src/backend/catalog/pg_operator.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.5 1996/11/06 07:31:24 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.6 1996/11/08 00:44:33 scrappy Exp $
*
* NOTES
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -452,7 +452,7 @@ OperatorDef(char *operatorName,
char nulls[ Natts_pg_operator ];
char replaces[ Natts_pg_operator ];
Datum values[ Natts_pg_operator ];
Oid other_oid;
Oid other_oid = 0;
Oid operatorObjectId;
Oid leftTypeId = InvalidOid;
Oid rightTypeId = InvalidOid;
@@ -958,21 +958,25 @@ OperatorCreate(char *operatorName,
commObjectId = OperatorGet(commutatorName, /* commute type order */
rightTypeName,
leftTypeName);
else commObjectId = 0;
if (negatorName)
negObjectId = OperatorGet(negatorName,
leftTypeName,
rightTypeName);
else negObjectId = 0;
if (leftSortName)
leftSortObjectId = OperatorGet(leftSortName,
leftTypeName,
rightTypeName);
else leftSortObjectId = 0;
if (rightSortName)
rightSortObjectId = OperatorGet(rightSortName,
rightTypeName,
leftTypeName);
else rightSortObjectId = 0;
/* ----------------
* Use OperatorDef() to define the specified operator and

4
src/backend/catalog/pg_proc.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.4 1996/11/06 07:31:25 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.5 1996/11/08 00:44:34 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -92,7 +92,6 @@ ProcedureCreate(char *procedureName,
if (strcmp(languageName, "sql") == 0) {
elog(WARN, "ProcedureDefine: sql functions cannot take type \"opaque\"");
}
else
toid = 0;
} else {
toid = TypeGet(strVal(t), &defined);
@@ -151,7 +150,6 @@ ProcedureCreate(char *procedureName,
if (strcmp(languageName, "sql") == 0) {
elog(WARN, "ProcedureCreate: sql functions cannot return type \"opaque\"");
}
else
typeObjectId = 0;
}