Commit6b4769d

a.pervushina

committed

Fix merge conflict

1 parente6d56e5 commit6b4769dCopy full SHA for 6b4769d

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1791,13 +1791,9 @@ _aqo_data_clean(uint64 fs)`
`1791`	`1791`	`* We found element in Neibours hash table and made change:`
`1792`	`1792`	`* either delete element of table or replace its value.`
`1793`	`1793`	`*/`
	`1794`	`+aqo_state->neighbours_changed= true;`
`1794`	`1795`	`}`
`1795`		`-aqo_state->neighbours_changed= true;`
`1796`	`1796`	`LWLockRelease(&aqo_state->neighbours_lock);`
`1797`		`-<<<<<<<HEAD`
`1798`		`-=======`
`1799`		`-`
`1800`		`->>>>>>>c4dbd74 (Fixafterreview)`
`1801`	`1797`
`1802`	`1798`	`if (!hash_search(data_htab,&entry->key,HASH_REMOVE,NULL))`
`1803`	`1799`	`elog(ERROR,"[AQO] hash table corrupted");`
`@@ -2365,8 +2361,8 @@ cleanup_aqo_database(bool gentle, int fs_num, int fss_num)`
`2365`	`2361`	`* We found element in Neibours hash table and made change:`
`2366`	`2362`	`* either delete element of table or replace its value.`
`2367`	`2363`	`*/`
	`2364`	`+aqo_state->neighbours_changed= true;`
`2368`	`2365`	`}`
`2369`		`-aqo_state->neighbours_changed= true;`
`2370`	`2366`	`LWLockRelease(&aqo_state->neighbours_lock);`
`2371`	`2367`	`}`
`2372`	`2368`

Comments

(0)