Rename CreateDirectory to CitusCreateDirectory

pull/1811/head
Brian Cloutier 2017-10-24 15:09:54 -07:00 committed by Brian Cloutier
parent aa2ab023a2
commit 30a2365d81
4 changed files with 8 additions and 8 deletions

View File

@ -293,7 +293,7 @@ static void
PrepareMasterJobDirectory(Job *workerJob)
{
StringInfo jobDirectoryName = MasterJobDirectoryName(workerJob->jobId);
CreateDirectory(jobDirectoryName);
CitusCreateDirectory(jobDirectoryName);
ResourceOwnerEnlargeJobDirectories(CurrentResourceOwner);
ResourceOwnerRememberJobDirectory(CurrentResourceOwner, workerJob->jobId);

View File

@ -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);

View File

@ -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)

View File

@ -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);