Fix typo and some out of date comments (#8449)

Fix typo and some out of date comments
This commit is contained in:
Huang Zw 2021-02-09 01:29:32 +08:00 committed by GitHub
parent dbcc0a85d0
commit 8f9958dc24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 14 deletions

View File

@ -106,9 +106,8 @@ robj *lookupKeyReadWithFlags(redisDb *db, robj *key, int flags) {
robj *val; robj *val;
if (expireIfNeeded(db,key) == 1) { if (expireIfNeeded(db,key) == 1) {
/* Key expired. If we are in the context of a master, expireIfNeeded() /* If we are in the context of a master, expireIfNeeded() returns 1
* returns 0 only when the key does not exist at all, so it's safe * when the key is no longer valid, so we can return NULL ASAP. */
* to return NULL ASAP. */
if (server.masterhost == NULL) if (server.masterhost == NULL)
goto keymiss; goto keymiss;

View File

@ -638,7 +638,7 @@ int defragRaxNode(raxNode **noderef) {
} }
/* returns 0 if no more work needs to be been done, and 1 if time is up and more work is needed. */ /* returns 0 if no more work needs to be been done, and 1 if time is up and more work is needed. */
int scanLaterStraemListpacks(robj *ob, unsigned long *cursor, long long endtime, long long *defragged) { int scanLaterStreamListpacks(robj *ob, unsigned long *cursor, long long endtime, long long *defragged) {
static unsigned char last[sizeof(streamID)]; static unsigned char last[sizeof(streamID)];
raxIterator ri; raxIterator ri;
long iterations = 0; long iterations = 0;
@ -958,7 +958,7 @@ int defragLaterItem(dictEntry *de, unsigned long *cursor, long long endtime) {
} else if (ob->type == OBJ_HASH) { } else if (ob->type == OBJ_HASH) {
server.stat_active_defrag_hits += scanLaterHash(ob, cursor); server.stat_active_defrag_hits += scanLaterHash(ob, cursor);
} else if (ob->type == OBJ_STREAM) { } else if (ob->type == OBJ_STREAM) {
return scanLaterStraemListpacks(ob, cursor, endtime, &server.stat_active_defrag_hits); return scanLaterStreamListpacks(ob, cursor, endtime, &server.stat_active_defrag_hits);
} else if (ob->type == OBJ_MODULE) { } else if (ob->type == OBJ_MODULE) {
return moduleLateDefrag(dictGetKey(de), ob, cursor, endtime, &server.stat_active_defrag_hits); return moduleLateDefrag(dictGetKey(de), ob, cursor, endtime, &server.stat_active_defrag_hits);
} else { } else {

View File

@ -135,7 +135,7 @@ void evictionPoolAlloc(void) {
/* This is an helper function for performEvictions(), it is used in order /* This is an helper function for performEvictions(), it is used in order
* to populate the evictionPool with a few entries every time we want to * to populate the evictionPool with a few entries every time we want to
* expire a key. Keys with idle time smaller than one of the current * expire a key. Keys with idle time bigger than one of the current
* keys are added. Keys are always added if there are free entries. * keys are added. Keys are always added if there are free entries.
* *
* We insert keys on place in ascending order, so keys with the smaller * We insert keys on place in ascending order, so keys with the smaller

View File

@ -83,9 +83,8 @@ int activeExpireCycleTryExpire(redisDb *db, dictEntry *de, long long now) {
* keys that can be removed from the keyspace. * keys that can be removed from the keyspace.
* *
* Every expire cycle tests multiple databases: the next call will start * Every expire cycle tests multiple databases: the next call will start
* again from the next db, with the exception of exists for time limit: in that * again from the next db. No more than CRON_DBS_PER_CALL databases are
* case we restart again from the last database we were processing. Anyway * tested at every iteration.
* no more than CRON_DBS_PER_CALL databases are tested at every iteration.
* *
* The function can perform more or less work, depending on the "type" * The function can perform more or less work, depending on the "type"
* argument. It can execute a "fast cycle" or a "slow cycle". The slow * argument. It can execute a "fast cycle" or a "slow cycle". The slow
@ -141,7 +140,7 @@ void activeExpireCycle(int type) {
/* This function has some global state in order to continue the work /* This function has some global state in order to continue the work
* incrementally across calls. */ * incrementally across calls. */
static unsigned int current_db = 0; /* Last DB tested. */ static unsigned int current_db = 0; /* Next DB to test. */
static int timelimit_exit = 0; /* Time limit hit in previous call? */ static int timelimit_exit = 0; /* Time limit hit in previous call? */
static long long last_fast_cycle = 0; /* When last fast cycle ran. */ static long long last_fast_cycle = 0; /* When last fast cycle ran. */

View File

@ -1427,7 +1427,7 @@ void quicklistPush(quicklist *quicklist, void *value, const size_t sz,
* Returns 1 on success (creation of new bookmark or override of an existing one). * Returns 1 on success (creation of new bookmark or override of an existing one).
* Returns 0 on failure (reached the maximum supported number of bookmarks). * Returns 0 on failure (reached the maximum supported number of bookmarks).
* NOTE: use short simple names, so that string compare on find is quick. * NOTE: use short simple names, so that string compare on find is quick.
* NOTE: bookmakrk creation may re-allocate the quicklist, so the input pointer * NOTE: bookmark creation may re-allocate the quicklist, so the input pointer
may change and it's the caller responsibilty to update the reference. may change and it's the caller responsibilty to update the reference.
*/ */
int quicklistBookmarkCreate(quicklist **ql_ref, const char *name, quicklistNode *node) { int quicklistBookmarkCreate(quicklist **ql_ref, const char *name, quicklistNode *node) {

View File

@ -45,7 +45,7 @@
* the first byte to interpreter the length: * the first byte to interpreter the length:
* *
* 00|XXXXXX => if the two MSB are 00 the len is the 6 bits of this byte * 00|XXXXXX => if the two MSB are 00 the len is the 6 bits of this byte
* 01|XXXXXX XXXXXXXX => 01, the len is 14 byes, 6 bits + 8 bits of next byte * 01|XXXXXX XXXXXXXX => 01, the len is 14 bits, 6 bits + 8 bits of next byte
* 10|000000 [32 bit integer] => A full 32 bit len in net byte order will follow * 10|000000 [32 bit integer] => A full 32 bit len in net byte order will follow
* 10|000001 [64 bit integer] => A full 64 bit len in net byte order will follow * 10|000001 [64 bit integer] => A full 64 bit len in net byte order will follow
* 11|OBKIND this means: specially encoded object will follow. The six bits * 11|OBKIND this means: specially encoded object will follow. The six bits

View File

@ -764,7 +764,7 @@ void stralgoLCS(client *c) {
addReplyError(c, addReplyError(c,
"The specified keys must contain string values"); "The specified keys must contain string values");
/* Don't cleanup the objects, we need to do that /* Don't cleanup the objects, we need to do that
* only after callign getDecodedObject(). */ * only after calling getDecodedObject(). */
obja = NULL; obja = NULL;
objb = NULL; objb = NULL;
goto cleanup; goto cleanup;

View File

@ -350,7 +350,7 @@ ConnectionType CT_TLS;
* socket operation. * socket operation.
* *
* When this happens, we need to do two things: * When this happens, we need to do two things:
* 1. Make sure we register for the even. * 1. Make sure we register for the event.
* 2. Make sure we know which handler needs to execute when the * 2. Make sure we know which handler needs to execute when the
* event fires. That is, if we notify the caller of a write operation * event fires. That is, if we notify the caller of a write operation
* that it blocks, and SSL asks for a read, we need to trigger the * that it blocks, and SSL asks for a read, we need to trigger the