From e1f9f37206207a1ea9b55d16eb1b55347d3b7acf Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 7 Feb 2020 01:29:11 +0100 Subject: [PATCH] extract policy DistributeObjectOps --- .../commands/distribute_object_ops.c | 27 -------------- src/backend/distributed/commands/policy.c | 36 +++++++++++++++++-- src/include/distributed/commands.h | 3 -- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/backend/distributed/commands/distribute_object_ops.c b/src/backend/distributed/commands/distribute_object_ops.c index eaf3b2142..33ac9492e 100644 --- a/src/backend/distributed/commands/distribute_object_ops.c +++ b/src/backend/distributed/commands/distribute_object_ops.c @@ -23,15 +23,6 @@ static DistributeObjectOps NoDistributeOps = { .address = NULL, }; -static DistributeObjectOps Any_AlterPolicy = { - .deparse = NULL, - .qualify = NULL, - .preprocess = PreprocessAlterPolicyStmt, - .postprocess = NULL, - .address = NULL, -}; -REGISTER_DISTRIBUTED_OPERATION(AlterPolicyStmt, Any_AlterPolicy); - static DistributeObjectOps Any_AlterRole = { .deparse = DeparseAlterRoleStmt, .qualify = NULL, @@ -59,15 +50,6 @@ static DistributeObjectOps Any_Cluster = { }; REGISTER_DISTRIBUTED_OPERATION(ClusterStmt, Any_Cluster); -static DistributeObjectOps Any_CreatePolicy = { - .deparse = NULL, - .qualify = NULL, - .preprocess = PreprocessCreatePolicyStmt, - .postprocess = NULL, - .address = NULL, -}; -REGISTER_DISTRIBUTED_OPERATION(CreatePolicyStmt, Any_CreatePolicy); - static DistributeObjectOps Any_Index = { .deparse = NULL, .qualify = NULL, @@ -191,15 +173,6 @@ static DistributeObjectOps Index_Drop = { }; REGISTER_DISTRIBUTED_OPERATION_NESTED(DropStmt, removeType, OBJECT_INDEX, Index_Drop); -static DistributeObjectOps Policy_Drop = { - .deparse = NULL, - .qualify = NULL, - .preprocess = PreprocessDropPolicyStmt, - .postprocess = NULL, - .address = NULL, -}; -REGISTER_DISTRIBUTED_OPERATION_NESTED(DropStmt, removeType, OBJECT_POLICY, Policy_Drop); - static DistributeObjectOps Schema_Drop = { .deparse = NULL, .qualify = NULL, diff --git a/src/backend/distributed/commands/policy.c b/src/backend/distributed/commands/policy.c index c51bac841..4cf76e1ee 100644 --- a/src/backend/distributed/commands/policy.c +++ b/src/backend/distributed/commands/policy.c @@ -16,6 +16,36 @@ #include "distributed/metadata_cache.h" #include "utils/builtins.h" +/* DistributeObjectOps */ +static List * PreprocessCreatePolicyStmt(Node *node, const char *queryString); +static DistributeObjectOps Any_CreatePolicy = { + .deparse = NULL, + .qualify = NULL, + .preprocess = PreprocessCreatePolicyStmt, + .postprocess = NULL, + .address = NULL, +}; +REGISTER_DISTRIBUTED_OPERATION(CreatePolicyStmt, Any_CreatePolicy); + +static List * PreprocessAlterPolicyStmt(Node *node, const char *queryString); +static DistributeObjectOps Any_AlterPolicy = { + .deparse = NULL, + .qualify = NULL, + .preprocess = PreprocessAlterPolicyStmt, + .postprocess = NULL, + .address = NULL, +}; +REGISTER_DISTRIBUTED_OPERATION(AlterPolicyStmt, Any_AlterPolicy); + +static List * PreprocessDropPolicyStmt(Node *node, const char *queryString); +static DistributeObjectOps Policy_Drop = { + .deparse = NULL, + .qualify = NULL, + .preprocess = PreprocessDropPolicyStmt, + .postprocess = NULL, + .address = NULL, +}; +REGISTER_DISTRIBUTED_OPERATION_NESTED(DropStmt, removeType, OBJECT_POLICY, Policy_Drop); /* placeholder for CreatePolicyCommands */ List * @@ -27,7 +57,7 @@ CreatePolicyCommands(Oid relationId) /* placeholder for PreprocessCreatePolicyStmt */ -List * +static List * PreprocessCreatePolicyStmt(Node *node, const char *queryString) { CreatePolicyStmt *stmt = castNode(CreatePolicyStmt, node); @@ -47,7 +77,7 @@ PreprocessCreatePolicyStmt(Node *node, const char *queryString) /* placeholder for PreprocessAlterPolicyStmt */ -List * +static List * PreprocessAlterPolicyStmt(Node *node, const char *queryString) { /* placeholder for future implementation */ @@ -78,7 +108,7 @@ ErrorIfUnsupportedPolicyExpr(Node *expr) /* placeholder for PreprocessDropPolicyStmt */ -List * +static List * PreprocessDropPolicyStmt(Node *node, const char *queryString) { /* placeholder for future implementation */ diff --git a/src/include/distributed/commands.h b/src/include/distributed/commands.h index 56a152b26..d54893fbb 100644 --- a/src/include/distributed/commands.h +++ b/src/include/distributed/commands.h @@ -187,9 +187,6 @@ extern ObjectAddress AlterExtensionStmtObjectAddress(Node *stmt, bool missing_ok extern List * CreatePolicyCommands(Oid relationId); extern void ErrorIfUnsupportedPolicy(Relation relation); extern void ErrorIfUnsupportedPolicyExpr(Node *expr); -extern List * PreprocessCreatePolicyStmt(Node *node, const char *queryString); -extern List * PreprocessAlterPolicyStmt(Node *node, const char *queryString); -extern List * PreprocessDropPolicyStmt(Node *stmt, const char *queryString); extern bool IsPolicyRenameStmt(RenameStmt *stmt); extern void CreatePolicyEventExtendNames(CreatePolicyStmt *stmt, const char *schemaName, uint64 shardId);