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

Merge pull request #2701 from citusdata/fix_warnings 

Fix mixed declarations and code warnings
pull/2706/head
Hadi Moshayedi 2019-05-08 11:56:10 -08:00 committed by GitHub
parent f7081f3119 e584961267
commit 39e806c276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2355,9 +2355,10 @@ AssignQueuedTasks(TaskTracker *taskTracker)
foreach(taskCell, tasksToAssignList) foreach(taskCell, tasksToAssignList)
{ {
taskState = (TrackerTaskState *) lfirst(taskCell);
BatchQueryStatus queryStatus = CLIENT_INVALID_BATCH_QUERY; BatchQueryStatus queryStatus = CLIENT_INVALID_BATCH_QUERY;
taskState = (TrackerTaskState *) lfirst(taskCell);
if (!batchSuccess) if (!batchSuccess)
{ {
taskState->status = TASK_CLIENT_SIDE_ASSIGN_FAILED; taskState->status = TASK_CLIENT_SIDE_ASSIGN_FAILED;
@ -2904,12 +2905,17 @@ TrackerHashCleanupJob(HTAB *taskTrackerHash, Task *jobCleanupTask)
foreach(activeTaskTrackerCell, activeTackTrackerList) foreach(activeTaskTrackerCell, activeTackTrackerList)
{ {
taskTracker = (TaskTracker *) lfirst(activeTaskTrackerCell); int32 connectionId = 0;
int32 connectionId = taskTracker->connectionId; char *nodeName = NULL;
const char *nodeName = taskTracker->workerName; uint32 nodePort = 0;
uint32 nodePort = taskTracker->workerPort; ResultStatus resultStatus = CLIENT_INVALID_RESULT_STATUS;
ResultStatus resultStatus = MultiClientResultStatus(connectionId); taskTracker = (TaskTracker *) lfirst(activeTaskTrackerCell);
connectionId = taskTracker->connectionId;
nodeName = taskTracker->workerName;
nodePort = taskTracker->workerPort;
resultStatus = MultiClientResultStatus(connectionId);
if (resultStatus == CLIENT_RESULT_READY) if (resultStatus == CLIENT_RESULT_READY)
{ {
QueryStatus queryStatus = MultiClientQueryStatus(connectionId); QueryStatus queryStatus = MultiClientQueryStatus(connectionId);