external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

aggregate_utils: remove elog debugging

fix_120_custom_aggregates_distribute_multiarg
Philip Dubé 2019-09-02 19:29:58 +00:00
parent d1aefe240b
commit 9d19f2d810
2 changed files with 5 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/distributed/planner/multi_logical_optimizer.c
View File

@ -1541,9 +1541,6 @@ MasterAggregateExpression(Aggref *originalAggregate,
int32 workerReturnTypeMod = -1; int32 workerReturnTypeMod = -1;
Oid workerCollationId = InvalidOid; Oid workerCollationId = InvalidOid;
elog(WARNING, "coord_combine_agg %d %d", coordCombineId,
originalAggregate->aggfnoid);
aggparam = makeConst(OIDOID, -1, InvalidOid, sizeof(Oid), ObjectIdGetDatum( aggparam = makeConst(OIDOID, -1, InvalidOid, sizeof(Oid), ObjectIdGetDatum(
originalAggregate->aggfnoid), false, true); originalAggregate->aggfnoid), false, true);
column = makeVar(masterTableId, walkerContext->columnId, workerReturnType, column = makeVar(masterTableId, walkerContext->columnId, workerReturnType,
@ -2828,8 +2825,6 @@ WorkerAggregateExpressionList(Aggref *originalAggregate,
Oid workerPartialId = AggregateFunctionOidWithoutInput( Oid workerPartialId = AggregateFunctionOidWithoutInput(
WORKER_PARTIAL_AGGREGATE_NAME); WORKER_PARTIAL_AGGREGATE_NAME);
elog(WARNING, "worker_partial_agg %d %d", workerPartialId,
originalAggregate->aggfnoid);
aggparam = makeConst(OIDOID, -1, InvalidOid, sizeof(Oid), ObjectIdGetDatum( aggparam = makeConst(OIDOID, -1, InvalidOid, sizeof(Oid), ObjectIdGetDatum(
originalAggregate->aggfnoid), false, true); originalAggregate->aggfnoid), false, true);
aggArguments = list_make1(makeTargetEntry((Expr *) aggparam, 1, NULL, false)); aggArguments = list_make1(makeTargetEntry((Expr *) aggparam, 1, NULL, false));

67
src/backend/distributed/utils/aggregate_utils.c
View File

@ -124,10 +124,9 @@ InitializeStypeBox(FunctionCallInfo fcinfo, StypeBox *box, HeapTuple aggTuple, O
MemoryContext aggregateContext; MemoryContext aggregateContext;
MemoryContext oldContext; MemoryContext oldContext;
elog(WARNING, "\tworker sfunc seed");
if (!AggCheckCallContext(fcinfo, &aggregateContext)) if (!AggCheckCallContext(fcinfo, &aggregateContext))
{ {
elog(WARNING, "worker_partiail_agg_sfunc called from non aggregate context"); elog(ERROR, "worker_partiail_agg_sfunc called from non aggregate context");
} }
oldContext = MemoryContextSwitchTo(aggregateContext); oldContext = MemoryContextSwitchTo(aggregateContext);
@ -164,19 +163,15 @@ citus_stype_serialize(PG_FUNCTION_ARGS)
Size realbyteslen; Size realbyteslen;
Datum result; Datum result;
elog(WARNING, "citus_stype_serialize");
elog(WARNING, "\t%d", box->agg);
aggtuple = get_aggform(box->agg, &aggform); aggtuple = get_aggform(box->agg, &aggform);
serial = aggform->aggserialfn; serial = aggform->aggserialfn;
ReleaseSysCache(aggtuple); ReleaseSysCache(aggtuple);
if (serial == InvalidOid) if (serial == InvalidOid)
{ {
elog(WARNING, "\tnoserial, load %d", box->transtype);
/* TODO do we have to fallback to output/receive if not set? */ /* TODO do we have to fallback to output/receive if not set? */
/* ie is it possible for send/recv to be unset? */ /* ie is it possible for send/recv to be unset? */
/* Answer: yes, but extremely rare */
transtypetuple = get_typeform(box->transtype, &transtypeform); transtypetuple = get_typeform(box->transtype, &transtypeform);
serial = transtypeform->typsend; serial = transtypeform->typsend;
ReleaseSysCache(transtypetuple); ReleaseSysCache(transtypetuple);
@ -252,8 +247,6 @@ citus_stype_deserialize(PG_FUNCTION_ARGS)
memcpy(&agg, VARDATA(bytes), sizeof(Oid)); memcpy(&agg, VARDATA(bytes), sizeof(Oid));
memcpy(&value_null, VARDATA(bytes) + sizeof(Oid), sizeof(bool)); memcpy(&value_null, VARDATA(bytes) + sizeof(Oid), sizeof(bool));
elog(WARNING, "citus_stype_deserialize %d %d", agg, value_null);
box = pallocInAggContext(fcinfo, sizeof(StypeBox)); box = pallocInAggContext(fcinfo, sizeof(StypeBox));
box->agg = agg; box->agg = agg;
@ -280,7 +273,6 @@ citus_stype_deserialize(PG_FUNCTION_ARGS)
inner_bytes = PG_GETARG_BYTEA_P_SLICE(0, sizeof(Oid), VARSIZE(bytes) - inner_bytes = PG_GETARG_BYTEA_P_SLICE(0, sizeof(Oid), VARSIZE(bytes) -
sizeof(Oid)); sizeof(Oid));
elog(WARNING, "deserial %d", VARSIZE(inner_bytes));
fmgr_info(deserial, &fdeserialinfo); fmgr_info(deserial, &fdeserialinfo);
InitFunctionCallInfoData(*fdeserial_callinfo, &fdeserialinfo, 2, InitFunctionCallInfoData(*fdeserial_callinfo, &fdeserialinfo, 2,
fcinfo->fncollation, fcinfo->context, fcinfo->fncollation, fcinfo->context,
@ -331,8 +323,6 @@ citus_stype_combine(PG_FUNCTION_ARGS)
HeapTuple aggtuple; HeapTuple aggtuple;
Form_pg_aggregate aggform; Form_pg_aggregate aggform;
elog(WARNING, "citus_stype_combine");
if (!PG_ARGISNULL(0)) if (!PG_ARGISNULL(0))
{ {
box1 = (StypeBox *) PG_GETARG_POINTER(0); box1 = (StypeBox *) PG_GETARG_POINTER(0);
@ -410,8 +400,6 @@ worker_partial_agg_sfunc(PG_FUNCTION_ARGS)
bool is_initial_call = PG_ARGISNULL(0); bool is_initial_call = PG_ARGISNULL(0);
Datum newVal; Datum newVal;
elog(WARNING, "worker_partial_agg_sfunc");
if (is_initial_call) if (is_initial_call)
{ {
box = pallocInAggContext(fcinfo, sizeof(StypeBox)); box = pallocInAggContext(fcinfo, sizeof(StypeBox));
@ -423,8 +411,6 @@ worker_partial_agg_sfunc(PG_FUNCTION_ARGS)
Assert(box->agg == PG_GETARG_OID(1)); Assert(box->agg == PG_GETARG_OID(1));
} }
elog(WARNING, "\tbox: %p", box);
elog(WARNING, "\tagg: %d", box->agg);
aggtuple = get_aggform(box->agg, &aggform); aggtuple = get_aggform(box->agg, &aggform);
aggsfunc = aggform->aggtransfn; aggsfunc = aggform->aggtransfn;
if (is_initial_call) if (is_initial_call)
@ -448,7 +434,6 @@ worker_partial_agg_sfunc(PG_FUNCTION_ARGS)
{ {
if (PG_ARGISNULL(i)) if (PG_ARGISNULL(i))
{ {
elog(WARNING, "\tworker sfunc retnull %i", i);
PG_RETURN_POINTER(box); PG_RETURN_POINTER(box);
} }
} }
@ -456,10 +441,9 @@ worker_partial_agg_sfunc(PG_FUNCTION_ARGS)
{ {
MemoryContext aggregateContext; MemoryContext aggregateContext;
MemoryContext oldContext; MemoryContext oldContext;
elog(WARNING, "\tworker sfunc seed");
if (!AggCheckCallContext(fcinfo, &aggregateContext)) if (!AggCheckCallContext(fcinfo, &aggregateContext))
{ {
elog(WARNING, elog(ERROR,
"worker_partiail_agg_sfunc called from non aggregate context"); "worker_partiail_agg_sfunc called from non aggregate context");
} }
oldContext = MemoryContextSwitchTo(aggregateContext); oldContext = MemoryContextSwitchTo(aggregateContext);
@ -483,7 +467,6 @@ worker_partial_agg_sfunc(PG_FUNCTION_ARGS)
fcSetArgExt(inner_fcinfo, i, fcGetArgValue(fcinfo, i + 1), fcGetArgNull(fcinfo, fcSetArgExt(inner_fcinfo, i, fcGetArgValue(fcinfo, i + 1), fcGetArgNull(fcinfo,
i + 1)); i + 1));
} }
elog(WARNING, "invoke sfunc");
newVal = FunctionCallInvoke(inner_fcinfo); newVal = FunctionCallInvoke(inner_fcinfo);
box->value_null = inner_fcinfo->isnull; box->value_null = inner_fcinfo->isnull;
@ -493,7 +476,7 @@ worker_partial_agg_sfunc(PG_FUNCTION_ARGS)
MemoryContext oldContext; MemoryContext oldContext;
if (!AggCheckCallContext(fcinfo, &aggregateContext)) if (!AggCheckCallContext(fcinfo, &aggregateContext))
{ {
elog(WARNING, "worker_partial_agg_sfunc called from non aggregate context"); elog(ERROR, "worker_partial_agg_sfunc called from non aggregate context");
} }
oldContext = MemoryContextSwitchTo(aggregateContext); oldContext = MemoryContextSwitchTo(aggregateContext);
@ -510,12 +493,6 @@ worker_partial_agg_sfunc(PG_FUNCTION_ARGS)
box->value = newVal; box->value = newVal;
elog(WARNING, "\tworker sfunc ret: %ld", box->value);
elog(WARNING, "\tworker sfunc ret type: %d", AARR_ELEMTYPE(DatumGetAnyArrayP(
box->value)));
elog(WARNING, "\tworker sfunc agg: %d", box->agg);
elog(WARNING, "\tworker sfunc null: %d", box->value_null);
PG_RETURN_POINTER(box); PG_RETURN_POINTER(box);
} }
@ -538,15 +515,11 @@ worker_partial_agg_ffunc(PG_FUNCTION_ARGS)
Oid transtype; Oid transtype;
Datum result; Datum result;
elog(WARNING, "worker_partial_agg_ffunc %p", box);
if (box == NULL) if (box == NULL)
{ {
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
elog(WARNING, "\tagg: %d", box->agg);
aggtuple = get_aggform(box->agg, &aggform); aggtuple = get_aggform(box->agg, &aggform);
serial = aggform->aggserialfn; serial = aggform->aggserialfn;
transtype = aggform->aggtranstype; transtype = aggform->aggtranstype;
@ -554,10 +527,9 @@ worker_partial_agg_ffunc(PG_FUNCTION_ARGS)
if (serial == InvalidOid) if (serial == InvalidOid)
{ {
elog(WARNING, "\tload typeform %d", box->transtype);
/* TODO do we have to fallback to output/receive if not set? */ /* TODO do we have to fallback to output/receive if not set? */
/* ie is it possible for send/recv to be unset? */ /* ie is it possible for send/recv to be unset? */
/* Answer: yes, but extremely rarely */
transtypetuple = get_typeform(transtype, &transtypeform); transtypetuple = get_typeform(transtype, &transtypeform);
serial = transtypeform->typsend; serial = transtypeform->typsend;
ReleaseSysCache(transtypetuple); ReleaseSysCache(transtypetuple);
@ -565,28 +537,17 @@ worker_partial_agg_ffunc(PG_FUNCTION_ARGS)
Assert(serial != InvalidOid); Assert(serial != InvalidOid);
elog(WARNING, "\tcalling serial %d", serial);
fmgr_info(serial, &info); fmgr_info(serial, &info);
if (info.fn_strict && box->value_null) if (info.fn_strict && box->value_null)
{ {
elog(WARNING, "\t\t& strict NULL");
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
elog(WARNING, "\t\tinit inner_fcinfo %ld %d", box->value, box->value_null);
InitFunctionCallInfoData(*inner_fcinfo, &info, 1, fcinfo->fncollation, InitFunctionCallInfoData(*inner_fcinfo, &info, 1, fcinfo->fncollation,
fcinfo->context, fcinfo->resultinfo); fcinfo->context, fcinfo->resultinfo);
fcSetArgExt(inner_fcinfo, 0, box->value, box->value_null); fcSetArgExt(inner_fcinfo, 0, box->value, box->value_null);
elog(WARNING, "\t\tinvoke inner_fcinfo %p %p", info.fn_addr, array_send);
result = FunctionCallInvoke(inner_fcinfo); result = FunctionCallInvoke(inner_fcinfo);
elog(WARNING, "\t\t& done %ld %d", result, VARSIZE(DatumGetByteaPP(result)) -
VARHDRSZ);
for (int i = 0; i < VARSIZE(DatumGetByteaPP(result)) - VARHDRSZ; i++)
{
elog(WARNING, "\t\t%d\t%d", i, VARDATA(DatumGetByteaPP(result))[i]);
}
if (inner_fcinfo->isnull) if (inner_fcinfo->isnull)
{ {
PG_RETURN_NULL(); PG_RETURN_NULL();
@ -617,23 +578,17 @@ coord_combine_agg_sfunc(PG_FUNCTION_ARGS)
bool value_null; bool value_null;
StypeBox *box; StypeBox *box;
elog(WARNING, "coord_combine_agg_sfunc");
if (PG_ARGISNULL(0)) if (PG_ARGISNULL(0))
{ {
box = pallocInAggContext(fcinfo, sizeof(StypeBox)); box = pallocInAggContext(fcinfo, sizeof(StypeBox));
box->agg = PG_GETARG_OID(1); box->agg = PG_GETARG_OID(1);
elog(WARNING, "\tinit");
} }
else else
{ {
box = (StypeBox *) PG_GETARG_POINTER(0); box = (StypeBox *) PG_GETARG_POINTER(0);
Assert(box->agg == PG_GETARG_OID(1)); Assert(box->agg == PG_GETARG_OID(1));
elog(WARNING, "\talready %d", box->value_null);
} }
elog(WARNING, "\tbox->agg = %u", box->agg);
aggtuple = get_aggform(box->agg, &aggform); aggtuple = get_aggform(box->agg, &aggform);
if (PG_ARGISNULL(0)) if (PG_ARGISNULL(0))
{ {
@ -686,11 +641,6 @@ coord_combine_agg_sfunc(PG_FUNCTION_ARGS)
initStringInfo(&buf); initStringInfo(&buf);
appendBinaryStringInfo(&buf, (char *) VARDATA_ANY(data), appendBinaryStringInfo(&buf, (char *) VARDATA_ANY(data),
VARSIZE_ANY_EXHDR(data)); VARSIZE_ANY_EXHDR(data));
elog(WARNING, "\treceive %ld %d", PG_GETARG_DATUM(2), buf.len);
for (int i = 0; i < buf.len; i++)
{
elog(WARNING, "\t%d\t%d", i, buf.data[i]);
}
} }
InitFunctionCallInfoData(*inner_fcinfo, &info, 3, fcinfo->fncollation, InitFunctionCallInfoData(*inner_fcinfo, &info, 3, fcinfo->fncollation,
@ -715,7 +665,6 @@ coord_combine_agg_sfunc(PG_FUNCTION_ARGS)
{ {
if (box->value_null) if (box->value_null)
{ {
elog(WARNING, "\tbox null");
if (value_null) if (value_null)
{ {
PG_RETURN_NULL(); PG_RETURN_NULL();
@ -726,14 +675,10 @@ coord_combine_agg_sfunc(PG_FUNCTION_ARGS)
} }
if (value_null) if (value_null)
{ {
elog(WARNING, "\tvalue null");
PG_RETURN_POINTER(box); PG_RETURN_POINTER(box);
} }
} }
elog(WARNING, "\tcombine %u", box->agg);
elog(WARNING, "\t\t %d", *AARR_DIMS(DatumGetAnyArrayP(value)));
elog(WARNING, "\t\t %d", *AARR_DIMS(DatumGetAnyArrayP(box->value)));
InitFunctionCallInfoData(*inner_fcinfo, &info, 2, fcinfo->fncollation, InitFunctionCallInfoData(*inner_fcinfo, &info, 2, fcinfo->fncollation,
fcinfo->context, fcinfo->resultinfo); fcinfo->context, fcinfo->resultinfo);
fcSetArgExt(inner_fcinfo, 0, box->value, box->value_null); fcSetArgExt(inner_fcinfo, 0, box->value, box->value_null);
@ -766,8 +711,6 @@ coord_combine_agg_ffunc(PG_FUNCTION_ARGS)
bool final_strict; bool final_strict;
int i; int i;
elog(WARNING, "coord_combine_agg_ffunc %p", box);
if (box == NULL) if (box == NULL)
{ {
PG_RETURN_NULL(); PG_RETURN_NULL();