NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit789ba50

committed

Remove dead code from pop_next_work_item().

The pref_non_data heuristic has been dead code for nearly ten years,and as far as I can tell was dead code even when it was first committed.I'm tired of silencing Coverity complaints about it, so get rid of it.If anyone is ever interested in pursuing the concept, they can get thecode out of our git history.

1 parentdb37ab2 commit789ba50Copy full SHA for 789ba50

File tree

1 file changed

-41

lines changed

src/bin/pg_dump
- pg_backup_archiver.c

1 file changed

-41

lines changed

`‎src/bin/pg_dump/pg_backup_archiver.c`

Lines changed: 0 additions & 41 deletions

Original file line number	Diff line number	Diff line change
`@@ -4434,37 +4434,11 @@ move_to_ready_list(TocEntry *pending_list,`
`4434`	`4434`	`* and no requirements for locks that are incompatible with`
`4435`	`4435`	`* items currently running. Items in the ready_list are known to have`
`4436`	`4436`	`* no remaining dependencies, but we have to check for lock conflicts.`
`4437`		`- *`
`4438`		`- * pref_non_data is for an alternative selection algorithm that gives`
`4439`		`- * preference to non-data items if there is already a data load running.`
`4440`		`- * It is currently disabled.`
`4441`	`4437`	`*/`
`4442`	`4438`	`staticTocEntry*`
`4443`	`4439`	`pop_next_work_item(ArchiveHandleAH,ParallelReadyListready_list,`
`4444`	`4440`	`ParallelState*pstate)`
`4445`	`4441`	`{`
`4446`		`-boolpref_non_data= false;/* or get from AH->ropt */`
`4447`		`-intdata_te_index=-1;`
`4448`		`-`
`4449`		`-/*`
`4450`		`- * Bogus heuristics for pref_non_data`
`4451`		`- */`
`4452`		`-if (pref_non_data)`
`4453`		`-{`
`4454`		`-intcount=0;`
`4455`		`-`
`4456`		`-for (intk=0;k<pstate->numWorkers;k++)`
`4457`		`-{`
`4458`		`-TocEntry*running_te=pstate->te[k];`
`4459`		`-`
`4460`		`-if (running_te!=NULL&&`
`4461`		`-running_te->section==SECTION_DATA)`
`4462`		`-count++;`
`4463`		`-}`
`4464`		`-if (pstate->numWorkers==0\|\|count*4<pstate->numWorkers)`
`4465`		`-pref_non_data= false;`
`4466`		`-}`
`4467`		`-`
`4468`	`4442`	`/*`
`4469`	`4443`	`* Sort the ready_list so that we'll tackle larger jobs first.`
`4470`	`4444`	`*/`
`@@ -4500,26 +4474,11 @@ pop_next_work_item(ArchiveHandle AH, ParallelReadyList ready_list,`
`4500`	`4474`	`if (conflicts)`
`4501`	`4475`	`continue;`
`4502`	`4476`
`4503`		`-if (pref_non_data&&te->section==SECTION_DATA)`
`4504`		`-{`
`4505`		`-if (data_te_index<0)`
`4506`		`-data_te_index=i;`
`4507`		`-continue;`
`4508`		`-}`
`4509`		`-`
`4510`	`4477`	`/* passed all tests, so this item can run */`
`4511`	`4478`	`ready_list_remove(ready_list,i);`
`4512`	`4479`	`returnte;`
`4513`	`4480`	`}`
`4514`	`4481`
`4515`		`-if (data_te_index >=0)`
`4516`		`-{`
`4517`		`-TocEntry*data_te=ready_list->tes[data_te_index];`
`4518`		`-`
`4519`		`-ready_list_remove(ready_list,data_te_index);`
`4520`		`-returndata_te;`
`4521`		`-}`
`4522`		`-`
`4523`	`4482`	`ahlog(AH,2,"no item ready\n");`
`4524`	`4483`	`returnNULL;`
`4525`	`4484`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit789ba50

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_backup_archiver.c`

0 commit comments