Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
ac011ebd
Unverified
Commit
ac011ebd
authored
Jan 25, 2022
by
chenyang8094
Committed by
GitHub
Jan 25, 2022
Browse files
Delete the residual code related to aof rewrite buf (#10176)
parent
823da543
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/aof.c
View file @
ac011ebd
...
@@ -2328,9 +2328,7 @@ int rewriteAppendOnlyFileBackground(void) {
...
@@ -2328,9 +2328,7 @@ int rewriteAppendOnlyFileBackground(void) {
}
}
/* We set aof_selected_db to -1 in order to force the next call to the
/* We set aof_selected_db to -1 in order to force the next call to the
* feedAppendOnlyFile() to issue a SELECT command, so the differences
* feedAppendOnlyFile() to issue a SELECT command. */
* accumulated by the parent into server.aof_rewrite_buf will start
* with a SELECT statement and it will be safe to merge. */
server
.
aof_selected_db
=
-
1
;
server
.
aof_selected_db
=
-
1
;
flushAppendOnlyFile
(
1
);
flushAppendOnlyFile
(
1
);
if
(
openNewIncrAofForAppend
()
!=
C_OK
)
return
C_ERR
;
if
(
openNewIncrAofForAppend
()
!=
C_OK
)
return
C_ERR
;
...
...
src/server.h
View file @
ac011ebd
...
@@ -1616,7 +1616,6 @@ struct redisServer {
...
@@ -1616,7 +1616,6 @@ struct redisServer {
off_t
aof_fsync_offset
;
/* AOF offset which is already synced to disk. */
off_t
aof_fsync_offset
;
/* AOF offset which is already synced to disk. */
int
aof_flush_sleep
;
/* Micros to sleep before flush. (used by tests) */
int
aof_flush_sleep
;
/* Micros to sleep before flush. (used by tests) */
int
aof_rewrite_scheduled
;
/* Rewrite once BGSAVE terminates. */
int
aof_rewrite_scheduled
;
/* Rewrite once BGSAVE terminates. */
list
*
aof_rewrite_buf_blocks
;
/* Hold changes during an AOF rewrite. */
sds
aof_buf
;
/* AOF buffer, written before entering the event loop */
sds
aof_buf
;
/* AOF buffer, written before entering the event loop */
int
aof_fd
;
/* File descriptor of currently selected AOF file */
int
aof_fd
;
/* File descriptor of currently selected AOF file */
int
aof_selected_db
;
/* Currently selected DB in AOF */
int
aof_selected_db
;
/* Currently selected DB in AOF */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment