aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/executor')
-rw-r--r--src/backend/executor/execAmi.c4
-rw-r--r--src/backend/executor/execMain.c18
-rw-r--r--src/backend/executor/execProcnode.c4
-rw-r--r--src/backend/executor/execQual.c28
-rw-r--r--src/backend/executor/execTuples.c6
-rw-r--r--src/backend/executor/execUtils.c6
-rw-r--r--src/backend/executor/nodeAgg.c12
-rw-r--r--src/backend/executor/nodeHash.c10
-rw-r--r--src/backend/executor/nodeIndexscan.c10
-rw-r--r--src/backend/executor/nodeSort.c4
-rw-r--r--src/backend/executor/nodeTee.c4
11 files changed, 53 insertions, 53 deletions
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 1eefd2f43e5..4f76237b0b2 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.13 1998/01/05 03:31:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.14 1998/01/07 21:02:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -313,7 +313,7 @@ ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent)
break;
default:
- elog(ABORT, "ExecReScan: not a seqscan or indexscan node.");
+ elog(ERROR, "ExecReScan: not a seqscan or indexscan node.");
return;
}
}
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 646bed9ea62..5d22d5d6f61 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.36 1998/01/05 03:31:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.37 1998/01/07 21:02:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -328,7 +328,7 @@ ExecCheckPerms(CmdType operation,
ObjectIdGetDatum(relid),
0, 0, 0);
if (!HeapTupleIsValid(htp))
- elog(ABORT, "ExecCheckPerms: bogus RT relid: %d",
+ elog(ERROR, "ExecCheckPerms: bogus RT relid: %d",
relid);
StrNCpy(rname.data,
((Form_pg_class) GETSTRUCT(htp))->relname.data,
@@ -361,7 +361,7 @@ ExecCheckPerms(CmdType operation,
opstr = "write";
break;
default:
- elog(ABORT, "ExecCheckPerms: bogus operation %d",
+ elog(ERROR, "ExecCheckPerms: bogus operation %d",
operation);
}
}
@@ -377,7 +377,7 @@ ExecCheckPerms(CmdType operation,
}
if (!ok)
{
- elog(ABORT, "%s: %s", rname.data, aclcheck_error_strings[aclcheck_result]);
+ elog(ERROR, "%s: %s", rname.data, aclcheck_error_strings[aclcheck_result]);
}
}
@@ -447,7 +447,7 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
resultRelationDesc = heap_open(resultRelationOid);
if (resultRelationDesc->rd_rel->relkind == RELKIND_SEQUENCE)
- elog(ABORT, "You can't change sequence relation %s",
+ elog(ERROR, "You can't change sequence relation %s",
resultRelationDesc->rd_rel->relname.data);
/*
@@ -778,10 +778,10 @@ ExecutePlan(EState *estate,
"ctid",
&datum,
&isNull))
- elog(ABORT, "ExecutePlan: NO (junk) `ctid' was found!");
+ elog(ERROR, "ExecutePlan: NO (junk) `ctid' was found!");
if (isNull)
- elog(ABORT, "ExecutePlan: (junk) `ctid' is NULL!");
+ elog(ERROR, "ExecutePlan: (junk) `ctid' is NULL!");
tupleid = (ItemPointer) DatumGetPointer(datum);
tuple_ctid = *tupleid; /* make sure we don't free the
@@ -1376,7 +1376,7 @@ ExecConstraints(char *caller, Relation rel, HeapTuple tuple)
for (attrChk = 1; attrChk <= rel->rd_att->natts; attrChk++)
{
if (rel->rd_att->attrs[attrChk - 1]->attnotnull && heap_attisnull(tuple, attrChk))
- elog(ABORT, "%s: Fail to add null value in not null attribute %s",
+ elog(ERROR, "%s: Fail to add null value in not null attribute %s",
caller, rel->rd_att->attrs[attrChk - 1]->attname.data);
}
}
@@ -1386,7 +1386,7 @@ ExecConstraints(char *caller, Relation rel, HeapTuple tuple)
char *failed;
if ((failed = ExecRelCheck(rel, tuple)) != NULL)
- elog(ABORT, "%s: rejected due to CHECK constraint %s", caller, failed);
+ elog(ERROR, "%s: rejected due to CHECK constraint %s", caller, failed);
}
return (newtuple);
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index 38c159534e9..a2bd3e6ca6d 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.6 1998/01/05 03:31:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.7 1998/01/07 21:02:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -368,7 +368,7 @@ ExecCountSlotsNode(Plan *node)
return ExecCountSlotsTee((Tee *) node);
default:
- elog(ABORT, "ExecCountSlotsNode: node not yet supported: %d",
+ elog(ERROR, "ExecCountSlotsNode: node not yet supported: %d",
nodeTag(node));
break;
}
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 99f460a785c..2634fb63d99 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.21 1998/01/05 03:31:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.22 1998/01/07 21:02:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -148,7 +148,7 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
return (Datum) NULL;
}
if (i != j)
- elog(ABORT,
+ elog(ERROR,
"ExecEvalArrayRef: upper and lower indices mismatch");
lIndex = lower.indx;
}
@@ -429,7 +429,7 @@ ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull)
*/
if (strcmp(paramList->name, thisParameterName) != 0)
{
- elog(ABORT,
+ elog(ERROR,
"ExecEvalParam: new/old params with same id & diff names");
}
}
@@ -439,7 +439,7 @@ ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull)
/*
* oops! this is not supposed to happen!
*/
- elog(ABORT, "ExecEvalParam: invalid paramkind %d",
+ elog(ERROR, "ExecEvalParam: invalid paramkind %d",
thisParameterKind);
}
if (!matchFound)
@@ -456,7 +456,7 @@ ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull)
* ooops! we couldn't find this parameter in the parameter list.
* Signal an error
*/
- elog(ABORT, "ExecEvalParam: Unknown value for parameter %s",
+ elog(ERROR, "ExecEvalParam: Unknown value for parameter %s",
thisParameterName);
}
@@ -510,13 +510,13 @@ GetAttributeByNum(TupleTableSlot *slot,
Datum retval;
if (!AttributeNumberIsValid(attrno))
- elog(ABORT, "GetAttributeByNum: Invalid attribute number");
+ elog(ERROR, "GetAttributeByNum: Invalid attribute number");
if (!AttrNumberIsForUserDefinedAttr(attrno))
- elog(ABORT, "GetAttributeByNum: cannot access system attributes here");
+ elog(ERROR, "GetAttributeByNum: cannot access system attributes here");
if (isNull == (bool *) NULL)
- elog(ABORT, "GetAttributeByNum: a NULL isNull flag was passed");
+ elog(ERROR, "GetAttributeByNum: a NULL isNull flag was passed");
if (TupIsNull(slot))
{
@@ -557,10 +557,10 @@ GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull)
int i;
if (attname == NULL)
- elog(ABORT, "GetAttributeByName: Invalid attribute name");
+ elog(ERROR, "GetAttributeByName: Invalid attribute name");
if (isNull == (bool *) NULL)
- elog(ABORT, "GetAttributeByName: a NULL isNull flag was passed");
+ elog(ERROR, "GetAttributeByName: a NULL isNull flag was passed");
if (TupIsNull(slot))
{
@@ -584,7 +584,7 @@ GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull)
}
if (attrno == InvalidAttrNumber)
- elog(ABORT, "GetAttributeByName: attribute %s not found", attname);
+ elog(ERROR, "GetAttributeByName: attribute %s not found", attname);
retval = heap_getattr(slot->val,
slot->ttc_buffer,
@@ -696,7 +696,7 @@ ExecMakeFunctionResult(Node *node,
bool argDone;
if (fcache->nargs > MAXFMGRARGS)
- elog(ABORT, "ExecMakeFunctionResult: too many arguments");
+ elog(ERROR, "ExecMakeFunctionResult: too many arguments");
/*
* If the setArg in the fcache is set we have an argument
@@ -1232,13 +1232,13 @@ ExecEvalExpr(Node *expression,
retDatum = (Datum) ExecEvalNot(expr, econtext, isNull);
break;
default:
- elog(ABORT, "ExecEvalExpr: unknown expression type");
+ elog(ERROR, "ExecEvalExpr: unknown expression type");
break;
}
break;
}
default:
- elog(ABORT, "ExecEvalExpr: unknown expression type");
+ elog(ERROR, "ExecEvalExpr: unknown expression type");
break;
}
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 40be0b3d5de..e8787efd6ce 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.14 1998/01/05 03:31:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.15 1998/01/07 21:02:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -315,7 +315,7 @@ ExecAllocTableSlot(TupleTable table)
* table->size = newsize;
*/
elog(NOTICE, "Plan requires more slots than are available");
- elog(ABORT, "send mail to your local executor guru to fix this");
+ elog(ERROR, "send mail to your local executor guru to fix this");
}
/* ----------------
@@ -859,7 +859,7 @@ NodeGetResultTupleSlot(Plan *node)
* should never get here
* ----------------
*/
- elog(ABORT, "NodeGetResultTupleSlot: node not yet supported: %d ",
+ elog(ERROR, "NodeGetResultTupleSlot: node not yet supported: %d ",
nodeTag(node));
return NULL;
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index cecd2897781..75f44e865ea 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.22 1998/01/05 03:31:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.23 1998/01/07 21:02:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -499,7 +499,7 @@ ExecSetTypeInfo(int index,
*/
att = typeInfo[index];
if (att == NULL)
- elog(ABORT, "ExecSetTypeInfo: trying to assign through NULL");
+ elog(ERROR, "ExecSetTypeInfo: trying to assign through NULL");
/* ----------------
* assign values to the tuple descriptor, being careful not
@@ -1219,7 +1219,7 @@ setVarAttrLenForCreateTable(TupleDesc tupType, List *targetList,
heap_close(rd);
}
else
- elog(ABORT, "setVarAttrLenForCreateTable: can't get length for variable-length field");
+ elog(ERROR, "setVarAttrLenForCreateTable: can't get length for variable-length field");
}
tl = lnext(tl);
}
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index eb9a4b6bebc..e268bf3423f 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -170,7 +170,7 @@ ExecAgg(Agg *node)
ObjectIdGetDatum(agg->basetype),
0, 0);
if (!HeapTupleIsValid(aggTuple))
- elog(ABORT, "ExecAgg: cache lookup failed for aggregate \"%s\"(%s)",
+ elog(ERROR, "ExecAgg: cache lookup failed for aggregate \"%s\"(%s)",
aggname,
typeidTypeName(agg->basetype));
aggp = (Form_pg_aggregate) GETSTRUCT(aggTuple);
@@ -204,7 +204,7 @@ ExecAgg(Agg *node)
* ------------------------------------------
*/
if (isNull2)
- elog(ABORT, "ExecAgg: agginitval2 is null");
+ elog(ERROR, "ExecAgg: agginitval2 is null");
}
if (OidIsValid(xfn1_oid))
@@ -305,7 +305,7 @@ ExecAgg(Agg *node)
&isNull, &isDone);
break;
default:
- elog(ABORT, "ExecAgg: Bad Agg->Target for Agg %d", i);
+ elog(ERROR, "ExecAgg: Bad Agg->Target for Agg %d", i);
}
if (isNull && !aggregates[i]->usenulls)
@@ -355,7 +355,7 @@ ExecAgg(Agg *node)
break;
default:
- elog(ABORT, "ExecAgg: Bad Agg->Target for Agg %d", i);
+ elog(ERROR, "ExecAgg: Bad Agg->Target for Agg %d", i);
}
if (attlen == -1)
{
@@ -443,7 +443,7 @@ ExecAgg(Agg *node)
args[0] = (char *) value2[i];
}
else
- elog(ABORT, "ExecAgg: no valid transition functions??");
+ elog(ERROR, "ExecAgg: no valid transition functions??");
value1[i] =
(Datum) fmgr_c(aggfns->finalfn, aggfns->finalfn_oid,
aggfns->finalfn_nargs, (FmgrValues *) args,
@@ -462,7 +462,7 @@ ExecAgg(Agg *node)
value1[i] = value2[i];
}
else
- elog(ABORT, "ExecAgg: no valid transition functions??");
+ elog(ERROR, "ExecAgg: no valid transition functions??");
}
/*
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 0d06ac5ac97..8914b9d4873 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.14 1998/01/05 03:31:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.15 1998/01/07 21:02:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -90,7 +90,7 @@ ExecHash(Hash *node)
hashtable = node->hashtable;
if (hashtable == NULL)
- elog(ABORT, "ExecHash: hash table is NULL.");
+ elog(ERROR, "ExecHash: hash table is NULL.");
nbatch = hashtable->nbatch;
@@ -359,7 +359,7 @@ ExecHashTableCreate(Hash *node)
if (hashtable == NULL)
{
- elog(ABORT, "not enough memory for hashjoin.");
+ elog(ERROR, "not enough memory for hashjoin.");
}
/* ----------------
* initialize the hash table header
@@ -635,7 +635,7 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
if (hashtable == NULL)
{
perror("repalloc");
- elog(ABORT, "can't expand hashtable.");
+ elog(ERROR, "can't expand hashtable.");
}
#else
/* ------------------
@@ -644,7 +644,7 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
* - Chris Dunlop, <chris@onthe.net.au>
* ------------------
*/
- elog(ABORT, "hash table out of memory. Use -B parameter to increase buffers.");
+ elog(ERROR, "hash table out of memory. Use -B parameter to increase buffers.");
#endif
}
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 507117bd9ab..6e220800f2e 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.12 1998/01/05 03:31:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.13 1998/01/07 21:02:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -641,7 +641,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
op = (Oper *) clause->oper;
if (!IsA(op, Oper))
- elog(ABORT, "ExecInitIndexScan: op not an Oper!");
+ elog(ERROR, "ExecInitIndexScan: op not an Oper!");
opid = op->opid;
@@ -757,7 +757,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
* ----------------
*/
if (scanvar == LEFT_OP)
- elog(ABORT, "ExecInitIndexScan: %s",
+ elog(ERROR, "ExecInitIndexScan: %s",
"both left and right op's are rel-vars");
/* ----------------
@@ -810,7 +810,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
* ----------------
*/
if (scanvar == LEFT_OP)
- elog(ABORT, "ExecInitIndexScan: %s",
+ elog(ERROR, "ExecInitIndexScan: %s",
"both left and right ops are rel-vars");
varattno = 1;
@@ -836,7 +836,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
* ----------------
*/
if (scanvar == NO_OP)
- elog(ABORT, "ExecInitIndexScan: %s",
+ elog(ERROR, "ExecInitIndexScan: %s",
"neither leftop nor rightop refer to scan relation");
/* ----------------
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 0c0f265ea11..e570a9dda3f 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.11 1998/01/05 03:31:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.12 1998/01/07 21:02:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -56,7 +56,7 @@ FormSortKeys(Sort *sortnode)
* ----------------
*/
if (keycount <= 0)
- elog(ABORT, "FormSortKeys: keycount <= 0");
+ elog(ERROR, "FormSortKeys: keycount <= 0");
sortkeys = (ScanKey) palloc(keycount * sizeof(ScanKeyData));
/* ----------------
diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c
index 719d8eaed1a..f059ef8d6e3 100644
--- a/src/backend/executor/nodeTee.c
+++ b/src/backend/executor/nodeTee.c
@@ -15,7 +15,7 @@
* ExecEndTee
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.14 1998/01/05 03:31:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.15 1998/01/07 21:02:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -329,7 +329,7 @@ ExecTee(Tee *node, Plan *parent)
}
else
{
- elog(ABORT, "A Tee node can only be executed from its left or right parent\n");
+ elog(ERROR, "A Tee node can only be executed from its left or right parent\n");
return NULL;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 09:10:33 +0000