From aa2ab023a217adc0d4e6b3513d22b0d996783655 Mon Sep 17 00:00:00 2001 From: Brian Cloutier Date: Tue, 24 Oct 2017 15:11:43 -0700 Subject: [PATCH] Rename RemoveDirectory -> CitusRemoveDirectory --- .../distributed/executor/multi_server_executor.c | 2 +- src/backend/distributed/worker/task_tracker.c | 2 +- src/backend/distributed/worker/task_tracker_protocol.c | 2 +- .../distributed/worker/worker_partition_protocol.c | 10 +++++----- src/include/distributed/worker_protocol.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backend/distributed/executor/multi_server_executor.c b/src/backend/distributed/executor/multi_server_executor.c index 3afc6cec7..2b77ef195 100644 --- a/src/backend/distributed/executor/multi_server_executor.c +++ b/src/backend/distributed/executor/multi_server_executor.c @@ -145,7 +145,7 @@ void RemoveJobDirectory(uint64 jobId) { StringInfo jobDirectoryName = MasterJobDirectoryName(jobId); - RemoveDirectory(jobDirectoryName); + CitusRemoveDirectory(jobDirectoryName); ResourceOwnerForgetJobDirectory(CurrentResourceOwner, jobId); } diff --git a/src/backend/distributed/worker/task_tracker.c b/src/backend/distributed/worker/task_tracker.c index d88d82eaf..8571e1216 100644 --- a/src/backend/distributed/worker/task_tracker.c +++ b/src/backend/distributed/worker/task_tracker.c @@ -340,7 +340,7 @@ TrackerCleanupJobDirectories(void) StringInfo jobCacheDirectory = makeStringInfo(); appendStringInfo(jobCacheDirectory, "base/%s", PG_JOB_CACHE_DIR); - RemoveDirectory(jobCacheDirectory); + CitusRemoveDirectory(jobCacheDirectory); CreateDirectory(jobCacheDirectory); FreeStringInfo(jobCacheDirectory); diff --git a/src/backend/distributed/worker/task_tracker_protocol.c b/src/backend/distributed/worker/task_tracker_protocol.c index 2d4daf686..987944303 100644 --- a/src/backend/distributed/worker/task_tracker_protocol.c +++ b/src/backend/distributed/worker/task_tracker_protocol.c @@ -211,7 +211,7 @@ task_tracker_cleanup_job(PG_FUNCTION_ARGS) * writing to a table within the schema. */ jobDirectoryName = JobDirectoryName(jobId); - RemoveDirectory(jobDirectoryName); + CitusRemoveDirectory(jobDirectoryName); LockJobResource(jobId, AccessExclusiveLock); jobSchemaName = JobSchemaName(jobId); diff --git a/src/backend/distributed/worker/worker_partition_protocol.c b/src/backend/distributed/worker/worker_partition_protocol.c index bc8e29da2..40d9d71e8 100644 --- a/src/backend/distributed/worker/worker_partition_protocol.c +++ b/src/backend/distributed/worker/worker_partition_protocol.c @@ -152,7 +152,7 @@ worker_range_partition_table(PG_FUNCTION_ARGS) /* close partition files and atomically rename (commit) them */ ClosePartitionFiles(partitionFileArray, fileCount); - RemoveDirectory(taskDirectory); + CitusRemoveDirectory(taskDirectory); RenameDirectory(taskAttemptDirectory, taskDirectory); PG_RETURN_VOID(); @@ -213,7 +213,7 @@ worker_hash_partition_table(PG_FUNCTION_ARGS) /* close partition files and atomically rename (commit) them */ ClosePartitionFiles(partitionFileArray, fileCount); - RemoveDirectory(taskDirectory); + CitusRemoveDirectory(taskDirectory); RenameDirectory(taskAttemptDirectory, taskDirectory); PG_RETURN_VOID(); @@ -615,13 +615,13 @@ CreateDirectory(StringInfo directoryName) /* - * RemoveDirectory first checks if the given directory exists. If it does, the + * CitusRemoveDirectory first checks if the given directory exists. If it does, the * function recursively deletes the contents of the given directory, and then * deletes the directory itself. This function is modeled on the Boost file * system library's remove_all() method. */ void -RemoveDirectory(StringInfo filename) +CitusRemoveDirectory(StringInfo filename) { struct stat fileStat; int removed = 0; @@ -674,7 +674,7 @@ RemoveDirectory(StringInfo filename) fullFilename = makeStringInfo(); appendStringInfo(fullFilename, "%s/%s", directoryName, baseFilename); - RemoveDirectory(fullFilename); + CitusRemoveDirectory(fullFilename); FreeStringInfo(fullFilename); } diff --git a/src/include/distributed/worker_protocol.h b/src/include/distributed/worker_protocol.h index 6fb8efa94..c1d51f063 100644 --- a/src/include/distributed/worker_protocol.h +++ b/src/include/distributed/worker_protocol.h @@ -115,7 +115,7 @@ extern bool CacheDirectoryElement(const char *filename); extern bool JobDirectoryElement(const char *filename); extern bool DirectoryExists(StringInfo directoryName); extern void CreateDirectory(StringInfo directoryName); -extern void RemoveDirectory(StringInfo filename); +extern void CitusRemoveDirectory(StringInfo filename); extern StringInfo InitTaskDirectory(uint64 jobId, uint32 taskId); extern void RemoveJobSchema(StringInfo schemaName); extern Datum * DeconstructArrayObject(ArrayType *arrayObject);