Remove debug print

Alexandra Pervushina · a.pervushina · commit bcd1092153f9 · 2023-01-12T14:45:21.000+03:00
diff --git a/storage.c b/storage.c
@@ -1394,7 +1394,6 @@ aqo_data_store(uint64 fs, int fss, OkNNrdata *data, List *reloids)
 	if (!found) {
 		LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);
 
-		elog(NOTICE, "Entering neighbours %d", fss);
 		prev = (NeighboursEntry *) hash_search(fss_neighbours, &key.fss, HASH_ENTER, &found);
 		if (!found)
 		{
@@ -1408,9 +1407,6 @@ aqo_data_store(uint64 fs, int fss, OkNNrdata *data, List *reloids)
 			entry->list.prev = prev->data;
 		}
 		prev->data = entry;
-		elog(NOTICE, "Entered neighbours %ld, found %s", prev->fss, found ? "true" : "false");
-		prev = (NeighboursEntry *) hash_search(fss_neighbours, &key.fss, HASH_FIND, &found);
-		elog(NOTICE, "Entered neighbours check 2 key %ld found %s number of entries %ld", prev->fss, found ? "true" : "false", hash_get_num_entries(fss_neighbours));
 
 		LWLockRelease(&aqo_state->neighbours_lock);
 	}
@@ -1593,7 +1589,6 @@ load_aqo_data(uint64 fs, int fss, OkNNrdata *data, List **reloids,
 		LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);
 		neighbour_entry = (NeighboursEntry *) hash_search(fss_neighbours, &fss, HASH_FIND, &found);
 		entry = found ? neighbour_entry->data : NULL;
-		elog(NOTICE, "load_aqo_data, find %d, found %d", fss, found ? 1 : 0);
 
 		while (entry != NULL)
 		{
@@ -1776,18 +1771,15 @@ _aqo_data_clean(uint64 fs)
 		/* Fix or remove neighbours htab entry*/
 		LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);
 		fss_htab_entry = (NeighboursEntry *) hash_search(fss_neighbours, &entry->key.fss, HASH_FIND, &found);
-		elog(NOTICE,"_aqo_data_clean %ld", fss_htab_entry->fss);
 		if (found && fss_htab_entry->data->key.fs == fs)
 		{
 			if (has_prev)
 			{
 				fss_htab_entry->data = entry->list.prev;
-				elog(NOTICE, "_aqo_data_clean, change  %ld", entry->key.fss);
 			}
 			else
 			{
 				hash_search(fss_neighbours, &entry->key.fss, HASH_REMOVE, NULL);
-				elog(NOTICE, "_aqo_data_clean, find  %ld", entry->key.fss);
 			}
 		}
 		LWLockRelease(&aqo_state->neighbours_lock);
@@ -2113,7 +2105,6 @@ _deform_neighbours_record_cb(void *data, size_t size)
 void
 aqo_neighbours_load(void)
 {
-	elog(NOTICE, "Loading aqo_neighbours");
 	Assert(!LWLockHeldByMe(&aqo_state->neighbours_lock));
 
 	LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);
@@ -2154,8 +2145,6 @@ aqo_neighbours_flush(void)
 	int				ret;
 	long			entries;
 
-	elog(NOTICE, "Flushing aqo_neighbours");
-
 	LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);
 
 	if (!aqo_state->neighbours_changed)
@@ -2187,11 +2176,8 @@ aqo_neighbours_reset(void)
 	LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);
 	num_entries = hash_get_num_entries(fss_neighbours);
 	hash_seq_init(&hash_seq, fss_neighbours);
-	elog(NOTICE, "fss_neighbours num entries: %ld", num_entries);
 	while ((entry = hash_seq_search(&hash_seq)) != NULL)
 	{
-		elog(NOTICE, "delete %ld", entry->fss);
-
 		if (hash_search(fss_neighbours, &entry->fss, HASH_REMOVE, NULL) == NULL)
 			elog(ERROR, "[AQO] hash table corrupted");
 		num_remove++;
@@ -2350,18 +2336,15 @@ cleanup_aqo_database(bool gentle, int *fs_num, int *fss_num)
 				/* Fix or remove neighbours htab entry*/
 				LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);
 				fss_htab_entry = (NeighboursEntry *) hash_search(fss_neighbours, &key.fss, HASH_FIND, &found);
-				elog(NOTICE, "aqo_cleanup, find  %ld", key.fss);
 				if (found && fss_htab_entry->data->key.fs == key.fs)
 				{
 					if (has_prev)
 					{
 						fss_htab_entry->data = entry->list.prev;
-						elog(NOTICE, "aqo_cleanup, change  %ld", key.fss);
 					}
 					else
 					{
 						hash_search(fss_neighbours, &key.fss, HASH_REMOVE, NULL);
-						elog(NOTICE, "aqo_cleanup, remove  %ld", key.fss);
 					}
 				}
 				LWLockRelease(&aqo_state->neighbours_lock);

Original file line number	Diff line number	Diff line change
`@@ -1394,7 +1394,6 @@ aqo_data_store(uint64 fs, int fss, OkNNrdata data, List reloids)`
`1394`	`1394`	`if (!found) {`
`1395`	`1395`	`LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);`
`1396`	`1396`
`1397`		`- elog(NOTICE, "Entering neighbours %d", fss);`
`1398`	`1397`	`prev = (NeighboursEntry *) hash_search(fss_neighbours, &key.fss, HASH_ENTER, &found);`
`1399`	`1398`	`if (!found)`
`1400`	`1399`	`{`
`@@ -1408,9 +1407,6 @@ aqo_data_store(uint64 fs, int fss, OkNNrdata data, List reloids)`
`1408`	`1407`	`entry->list.prev = prev->data;`
`1409`	`1408`	`}`
`1410`	`1409`	`prev->data = entry;`
`1411`		`- elog(NOTICE, "Entered neighbours %ld, found %s", prev->fss, found ? "true" : "false");`
`1412`		`- prev = (NeighboursEntry *) hash_search(fss_neighbours, &key.fss, HASH_FIND, &found);`
`1413`		`- elog(NOTICE, "Entered neighbours check 2 key %ld found %s number of entries %ld", prev->fss, found ? "true" : "false", hash_get_num_entries(fss_neighbours));`
`1414`	`1410`
`1415`	`1411`	`LWLockRelease(&aqo_state->neighbours_lock);`
`1416`	`1412`	`}`
`@@ -1593,7 +1589,6 @@ load_aqo_data(uint64 fs, int fss, OkNNrdata data, List *reloids,`
`1593`	`1589`	`LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);`
`1594`	`1590`	`neighbour_entry = (NeighboursEntry *) hash_search(fss_neighbours, &fss, HASH_FIND, &found);`
`1595`	`1591`	`entry = found ? neighbour_entry->data : NULL;`
`1596`		`- elog(NOTICE, "load_aqo_data, find %d, found %d", fss, found ? 1 : 0);`
`1597`	`1592`
`1598`	`1593`	`while (entry != NULL)`
`1599`	`1594`	`{`
`@@ -1776,18 +1771,15 @@ _aqo_data_clean(uint64 fs)`
`1776`	`1771`	`/* Fix or remove neighbours htab entry*/`
`1777`	`1772`	`LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);`
`1778`	`1773`	`fss_htab_entry = (NeighboursEntry *) hash_search(fss_neighbours, &entry->key.fss, HASH_FIND, &found);`
`1779`		`- elog(NOTICE,"_aqo_data_clean %ld", fss_htab_entry->fss);`
`1780`	`1774`	`if (found && fss_htab_entry->data->key.fs == fs)`
`1781`	`1775`	`{`
`1782`	`1776`	`if (has_prev)`
`1783`	`1777`	`{`
`1784`	`1778`	`fss_htab_entry->data = entry->list.prev;`
`1785`		`- elog(NOTICE, "_aqo_data_clean, change %ld", entry->key.fss);`
`1786`	`1779`	`}`
`1787`	`1780`	`else`
`1788`	`1781`	`{`
`1789`	`1782`	`hash_search(fss_neighbours, &entry->key.fss, HASH_REMOVE, NULL);`
`1790`		`- elog(NOTICE, "_aqo_data_clean, find %ld", entry->key.fss);`
`1791`	`1783`	`}`
`1792`	`1784`	`}`
`1793`	`1785`	`LWLockRelease(&aqo_state->neighbours_lock);`
`@@ -2113,7 +2105,6 @@ _deform_neighbours_record_cb(void *data, size_t size)`
`2113`	`2105`	`void`
`2114`	`2106`	`aqo_neighbours_load(void)`
`2115`	`2107`	`{`
`2116`		`- elog(NOTICE, "Loading aqo_neighbours");`
`2117`	`2108`	`Assert(!LWLockHeldByMe(&aqo_state->neighbours_lock));`
`2118`	`2109`
`2119`	`2110`	`LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);`
`@@ -2154,8 +2145,6 @@ aqo_neighbours_flush(void)`
`2154`	`2145`	`int ret;`
`2155`	`2146`	`long entries;`
`2156`	`2147`
`2157`		`- elog(NOTICE, "Flushing aqo_neighbours");`
`2158`		`-`
`2159`	`2148`	`LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);`
`2160`	`2149`
`2161`	`2150`	`if (!aqo_state->neighbours_changed)`
`@@ -2187,11 +2176,8 @@ aqo_neighbours_reset(void)`
`2187`	`2176`	`LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);`
`2188`	`2177`	`num_entries = hash_get_num_entries(fss_neighbours);`
`2189`	`2178`	`hash_seq_init(&hash_seq, fss_neighbours);`
`2190`		`- elog(NOTICE, "fss_neighbours num entries: %ld", num_entries);`
`2191`	`2179`	`while ((entry = hash_seq_search(&hash_seq)) != NULL)`
`2192`	`2180`	`{`
`2193`		`- elog(NOTICE, "delete %ld", entry->fss);`
`2194`		`-`
`2195`	`2181`	`if (hash_search(fss_neighbours, &entry->fss, HASH_REMOVE, NULL) == NULL)`
`2196`	`2182`	`elog(ERROR, "[AQO] hash table corrupted");`
`2197`	`2183`	`num_remove++;`
`@@ -2350,18 +2336,15 @@ cleanup_aqo_database(bool gentle, int fs_num, int fss_num)`
`2350`	`2336`	`/* Fix or remove neighbours htab entry*/`
`2351`	`2337`	`LWLockAcquire(&aqo_state->neighbours_lock, LW_EXCLUSIVE);`
`2352`	`2338`	`fss_htab_entry = (NeighboursEntry *) hash_search(fss_neighbours, &key.fss, HASH_FIND, &found);`
`2353`		`- elog(NOTICE, "aqo_cleanup, find %ld", key.fss);`
`2354`	`2339`	`if (found && fss_htab_entry->data->key.fs == key.fs)`
`2355`	`2340`	`{`
`2356`	`2341`	`if (has_prev)`
`2357`	`2342`	`{`
`2358`	`2343`	`fss_htab_entry->data = entry->list.prev;`
`2359`		`- elog(NOTICE, "aqo_cleanup, change %ld", key.fss);`
`2360`	`2344`	`}`
`2361`	`2345`	`else`
`2362`	`2346`	`{`
`2363`	`2347`	`hash_search(fss_neighbours, &key.fss, HASH_REMOVE, NULL);`
`2364`		`- elog(NOTICE, "aqo_cleanup, remove %ld", key.fss);`
`2365`	`2348`	`}`
`2366`	`2349`	`}`
`2367`	`2350`	`LWLockRelease(&aqo_state->neighbours_lock);`