mirror of https://github.com/citusdata/citus.git
Improve dependeny check for object to not have separate definition on different nodes
parent
313104ab9b
commit
3ec1b9be2b
|
@ -70,11 +70,8 @@ PostprocessDefineAggregateStmt(Node *node, const char *queryString)
|
|||
EnsureSequentialMode(OBJECT_AGGREGATE);
|
||||
|
||||
/* If the aggregate has any unsupported dependency, create it locally */
|
||||
DeferredErrorMessage *depError = DeferErrorIfHasUnsupportedDependency(&address);
|
||||
|
||||
if (depError != NULL)
|
||||
if (ErrorOrWarnIfObjectHasUnsupportedDependency(&address))
|
||||
{
|
||||
RaiseDeferredError(depError, WARNING);
|
||||
return NIL;
|
||||
}
|
||||
|
||||
|
|
|
@ -612,11 +612,8 @@ PostprocessDefineCollationStmt(Node *node, const char *queryString)
|
|||
ObjectAddress collationAddress =
|
||||
DefineCollationStmtObjectAddress(node, false);
|
||||
|
||||
DeferredErrorMessage *errMsg = DeferErrorIfHasUnsupportedDependency(
|
||||
&collationAddress);
|
||||
if (errMsg != NULL)
|
||||
if (ErrorOrWarnIfObjectHasUnsupportedDependency(&collationAddress))
|
||||
{
|
||||
RaiseDeferredError(errMsg, WARNING);
|
||||
return NIL;
|
||||
}
|
||||
|
||||
|
|
|
@ -1369,11 +1369,8 @@ PostprocessCreateFunctionStmt(Node *node, const char *queryString)
|
|||
}
|
||||
|
||||
/* If the function has any unsupported dependency, create it locally */
|
||||
DeferredErrorMessage *errMsg = DeferErrorIfHasUnsupportedDependency(&functionAddress);
|
||||
|
||||
if (errMsg != NULL)
|
||||
if (ErrorOrWarnIfObjectHasUnsupportedDependency(&functionAddress))
|
||||
{
|
||||
RaiseDeferredError(errMsg, WARNING);
|
||||
return NIL;
|
||||
}
|
||||
|
||||
|
|
|
@ -93,10 +93,8 @@ PostprocessCreateTextSearchConfigurationStmt(Node *node, const char *queryString
|
|||
|
||||
ObjectAddress address = GetObjectAddressFromParseTree((Node *) stmt, false);
|
||||
|
||||
DeferredErrorMessage *errMsg = DeferErrorIfHasUnsupportedDependency(&address);
|
||||
if (errMsg != NULL)
|
||||
if (ErrorOrWarnIfObjectHasUnsupportedDependency(&address))
|
||||
{
|
||||
RaiseDeferredError(errMsg, WARNING);
|
||||
return NIL;
|
||||
}
|
||||
|
||||
|
@ -142,10 +140,8 @@ PostprocessCreateTextSearchDictionaryStmt(Node *node, const char *queryString)
|
|||
|
||||
ObjectAddress address = GetObjectAddressFromParseTree((Node *) stmt, false);
|
||||
|
||||
DeferredErrorMessage *errMsg = DeferErrorIfHasUnsupportedDependency(&address);
|
||||
if (errMsg != NULL)
|
||||
if (ErrorOrWarnIfObjectHasUnsupportedDependency(&address))
|
||||
{
|
||||
RaiseDeferredError(errMsg, WARNING);
|
||||
return NIL;
|
||||
}
|
||||
|
||||
|
|
|
@ -161,10 +161,8 @@ PostprocessCompositeTypeStmt(Node *node, const char *queryString)
|
|||
ObjectAddress typeAddress = GetObjectAddressFromParseTree(node, false);
|
||||
|
||||
/* If the type has any unsupported dependency, create it locally */
|
||||
DeferredErrorMessage *errMsg = DeferErrorIfHasUnsupportedDependency(&typeAddress);
|
||||
if (errMsg != NULL)
|
||||
if (ErrorOrWarnIfObjectHasUnsupportedDependency(&typeAddress))
|
||||
{
|
||||
RaiseDeferredError(errMsg, WARNING);
|
||||
return NIL;
|
||||
}
|
||||
|
||||
|
@ -283,10 +281,8 @@ PostprocessCreateEnumStmt(Node *node, const char *queryString)
|
|||
/* lookup type address of just created type */
|
||||
ObjectAddress typeAddress = GetObjectAddressFromParseTree(node, false);
|
||||
|
||||
DeferredErrorMessage *errMsg = DeferErrorIfHasUnsupportedDependency(&typeAddress);
|
||||
if (errMsg != NULL)
|
||||
if (ErrorOrWarnIfObjectHasUnsupportedDependency(&typeAddress))
|
||||
{
|
||||
RaiseDeferredError(errMsg, WARNING);
|
||||
return NIL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue