gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dup'd code from merge

Browse Source 
Former-commit-id: 807f0201845a698514f1ce9382338bc74ba57e5e
This commit is contained in:
John Sully 2021-05-29 01:08:52 +00:00
parent bf77b1a03a
commit f6067d1664
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.cpp
View File

@ -2341,12 +2341,6 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
* the operation even if completely idle. */ * the operation even if completely idle. */
if (g_pserver->tracking_clients) trackingLimitUsedSlots(); if (g_pserver->tracking_clients) trackingLimitUsedSlots();
/* Resize tracking keys table if needed. This is also done at every
* command execution, but we want to be sure that if the last command
* executed changes the value via CONFIG SET, the server will perform
* the operation even if completely idle. */
if (g_pserver->tracking_clients) trackingLimitUsedSlots();
/* Start a scheduled BGSAVE if the corresponding flag is set. This is /* Start a scheduled BGSAVE if the corresponding flag is set. This is
* useful when we are forced to postpone a BGSAVE because an AOF * useful when we are forced to postpone a BGSAVE because an AOF
* rewrite is in progress. * rewrite is in progress.
@ -2928,10 +2922,6 @@ void initServerConfig(void) {
for (j = 0; j < CONFIG_OOM_COUNT; j++) for (j = 0; j < CONFIG_OOM_COUNT; j++)
g_pserver->oom_score_adj_values[j] = configOOMScoreAdjValuesDefaults[j]; g_pserver->oom_score_adj_values[j] = configOOMScoreAdjValuesDefaults[j];
/* Linux OOM Score config */
for (j = 0; j < CONFIG_OOM_COUNT; j++)
g_pserver->oom_score_adj_values[j] = configOOMScoreAdjValuesDefaults[j];
/* Double constants initialization */ /* Double constants initialization */
R_Zero = 0.0; R_Zero = 0.0;
R_PosInf = 1.0/R_Zero; R_PosInf = 1.0/R_Zero;