From 30a2365d816b8d1dde3246fed778a2d98684f1b3 Mon Sep 17 00:00:00 2001
From: Brian Cloutier <github@briancloutier.com>
Date: Tue, 24 Oct 2017 15:09:54 -0700
Subject: [PATCH] Rename CreateDirectory to CitusCreateDirectory

---
 src/backend/distributed/executor/multi_executor.c         | 2 +-
 src/backend/distributed/worker/task_tracker.c             | 4 ++--
 .../distributed/worker/worker_partition_protocol.c        | 8 ++++----
 src/include/distributed/worker_protocol.h                 | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/backend/distributed/executor/multi_executor.c b/src/backend/distributed/executor/multi_executor.c
index be9053ce6..db45c9c8e 100644
--- a/src/backend/distributed/executor/multi_executor.c
+++ b/src/backend/distributed/executor/multi_executor.c
@@ -293,7 +293,7 @@ static void
 PrepareMasterJobDirectory(Job *workerJob)
 {
 	StringInfo jobDirectoryName = MasterJobDirectoryName(workerJob->jobId);
-	CreateDirectory(jobDirectoryName);
+	CitusCreateDirectory(jobDirectoryName);
 
 	ResourceOwnerEnlargeJobDirectories(CurrentResourceOwner);
 	ResourceOwnerRememberJobDirectory(CurrentResourceOwner, workerJob->jobId);
diff --git a/src/backend/distributed/worker/task_tracker.c b/src/backend/distributed/worker/task_tracker.c
index 8571e1216..56ea1b31f 100644
--- a/src/backend/distributed/worker/task_tracker.c
+++ b/src/backend/distributed/worker/task_tracker.c
@@ -341,7 +341,7 @@ TrackerCleanupJobDirectories(void)
 	appendStringInfo(jobCacheDirectory, "base/%s", PG_JOB_CACHE_DIR);
 
 	CitusRemoveDirectory(jobCacheDirectory);
-	CreateDirectory(jobCacheDirectory);
+	CitusCreateDirectory(jobCacheDirectory);
 
 	FreeStringInfo(jobCacheDirectory);
 }
@@ -1086,7 +1086,7 @@ CreateJobDirectoryIfNotExists(uint64 jobId)
 	bool jobDirectoryExists = DirectoryExists(jobDirectoryName);
 	if (!jobDirectoryExists)
 	{
-		CreateDirectory(jobDirectoryName);
+		CitusCreateDirectory(jobDirectoryName);
 	}
 
 	FreeStringInfo(jobDirectoryName);
diff --git a/src/backend/distributed/worker/worker_partition_protocol.c b/src/backend/distributed/worker/worker_partition_protocol.c
index 40d9d71e8..834fa6763 100644
--- a/src/backend/distributed/worker/worker_partition_protocol.c
+++ b/src/backend/distributed/worker/worker_partition_protocol.c
@@ -333,13 +333,13 @@ InitTaskDirectory(uint64 jobId, uint32 taskId)
 	jobDirectoryExists = DirectoryExists(jobDirectoryName);
 	if (!jobDirectoryExists)
 	{
-		CreateDirectory(jobDirectoryName);
+		CitusCreateDirectory(jobDirectoryName);
 	}
 
 	taskDirectoryExists = DirectoryExists(taskDirectoryName);
 	if (!taskDirectoryExists)
 	{
-		CreateDirectory(taskDirectoryName);
+		CitusCreateDirectory(taskDirectoryName);
 	}
 
 	UnlockJobResource(jobId, AccessExclusiveLock);
@@ -371,7 +371,7 @@ InitTaskAttemptDirectory(uint64 jobId, uint32 taskId)
 	 * If this task previously failed, and gets re-executed and improbably draws
 	 * the same randomId, the task will fail to create the directory.
 	 */
-	CreateDirectory(taskAttemptDirectoryName);
+	CitusCreateDirectory(taskAttemptDirectoryName);
 
 	return taskAttemptDirectoryName;
 }
@@ -602,7 +602,7 @@ DirectoryExists(StringInfo directoryName)
 
 /* Creates a new directory with the given directory name. */
 void
-CreateDirectory(StringInfo directoryName)
+CitusCreateDirectory(StringInfo directoryName)
 {
 	int makeOK = mkdir(directoryName->data, S_IRWXU);
 	if (makeOK != 0)
diff --git a/src/include/distributed/worker_protocol.h b/src/include/distributed/worker_protocol.h
index c1d51f063..5d91486db 100644
--- a/src/include/distributed/worker_protocol.h
+++ b/src/include/distributed/worker_protocol.h
@@ -114,7 +114,7 @@ extern StringInfo PartitionFilename(StringInfo directoryName, uint32 partitionId
 extern bool CacheDirectoryElement(const char *filename);
 extern bool JobDirectoryElement(const char *filename);
 extern bool DirectoryExists(StringInfo directoryName);
-extern void CreateDirectory(StringInfo directoryName);
+extern void CitusCreateDirectory(StringInfo directoryName);
 extern void CitusRemoveDirectory(StringInfo filename);
 extern StringInfo InitTaskDirectory(uint64 jobId, uint32 taskId);
 extern void RemoveJobSchema(StringInfo schemaName);