external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3422 from citusdata/return-const-when-borrowing 

CurrentDatabaseName: return const char* as we're borrowing from cache
pull/3411/head
Philip Dubé 2020-01-23 23:06:39 +00:00 committed by GitHub
parent cc1c398d87 50c5e814c8
commit 87e6352d5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/executor/multi_task_tracker_executor.c
View File

@ -846,7 +846,7 @@ TrackerConnectPoll(TaskTracker *taskTracker)
{ {
char *nodeName = taskTracker->workerName; char *nodeName = taskTracker->workerName;
uint32 nodePort = taskTracker->workerPort; uint32 nodePort = taskTracker->workerPort;
char *nodeDatabase = CurrentDatabaseName(); const char *nodeDatabase = CurrentDatabaseName();
char *nodeUser = taskTracker->userName; char *nodeUser = taskTracker->userName;
int32 connectionId = MultiClientConnectStart(nodeName, nodePort, int32 connectionId = MultiClientConnectStart(nodeName, nodePort,

2
src/backend/distributed/metadata/metadata_cache.c
View File

@ -2281,7 +2281,7 @@ CitusTableVisibleFuncId(void)
* one session connected to it, we do not need to implement any invalidation * one session connected to it, we do not need to implement any invalidation
* mechanism. * mechanism.
*/ */
char * const char *
CurrentDatabaseName(void) CurrentDatabaseName(void)
{ {
if (!MetadataCache.databaseNameValid) if (!MetadataCache.databaseNameValid)

2
src/backend/distributed/planner/multi_explain.c
View File

@ -517,7 +517,7 @@ ExplainTaskPlacement(ShardPlacement *taskPlacement, List *explainOutputList,
StringInfo nodeAddress = makeStringInfo(); StringInfo nodeAddress = makeStringInfo();
char *nodeName = taskPlacement->nodeName; char *nodeName = taskPlacement->nodeName;
uint32 nodePort = taskPlacement->nodePort; uint32 nodePort = taskPlacement->nodePort;
char *nodeDatabase = CurrentDatabaseName(); const char *nodeDatabase = CurrentDatabaseName();
ListCell *explainOutputCell = NULL; ListCell *explainOutputCell = NULL;
int rowIndex = 0; int rowIndex = 0;

2
src/backend/distributed/worker/task_tracker_protocol.c
View File

@ -354,7 +354,7 @@ CreateJobSchema(StringInfo schemaName)
static void static void
CreateTask(uint64 jobId, uint32 taskId, char *taskCallString) CreateTask(uint64 jobId, uint32 taskId, char *taskCallString)
{ {
char *databaseName = CurrentDatabaseName(); const char *databaseName = CurrentDatabaseName();
char *userName = CurrentUserName(); char *userName = CurrentUserName();
/* increase task priority for cleanup tasks */ /* increase task priority for cleanup tasks */

2
src/backend/distributed/worker/worker_data_fetch_protocol.c
View File

@ -238,7 +238,7 @@ ReceiveRegularFile(const char *nodeName, uint32 nodePort, const char *nodeUser,
} }
/* we use the same database name on the master and worker nodes */ /* we use the same database name on the master and worker nodes */
char *nodeDatabase = CurrentDatabaseName(); const char *nodeDatabase = CurrentDatabaseName();
/* connect to remote node */ /* connect to remote node */
int32 connectionId = MultiClientConnect(nodeName, nodePort, nodeDatabase, nodeUser); int32 connectionId = MultiClientConnect(nodeName, nodePort, nodeDatabase, nodeUser);

2
src/include/distributed/metadata_cache.h
View File

@ -216,7 +216,7 @@ extern Oid BinaryCopyFormatId(void);
extern Oid CitusExtensionOwner(void); extern Oid CitusExtensionOwner(void);
extern char * CitusExtensionOwnerName(void); extern char * CitusExtensionOwnerName(void);
extern char * CurrentUserName(void); extern char * CurrentUserName(void);
extern char * CurrentDatabaseName(void); extern const char * CurrentDatabaseName(void);
#endif /* METADATA_CACHE_H */ #endif /* METADATA_CACHE_H */