INTERNAL: Move a cmdlog_in_use variable

naver · May 2, 2024 · d99d920 · d99d920
1 parent 780f610
commit d99d920
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 4 deletions.
diff --git a/cmdlog.c b/cmdlog.c
@@ -48,6 +48,7 @@
 
 static int mc_port;
 static EXTENSION_LOGGER_DESCRIPTOR *mc_logger;
+bool cmdlog_in_use = false;
 
 /* command log buffer structure */
 struct cmd_log_buffer {

diff --git a/cmdlog.h b/cmdlog.h
@@ -22,6 +22,8 @@
 #define COMMAND_LOGGING
 #define CMDLOG_DIRPATH_LENGTH 128 /* directory path's length */
 
+extern bool cmdlog_in_use;
+
 void cmdlog_init(int port, EXTENSION_LOGGER_DESCRIPTOR *logger);
 void cmdlog_final(void);
 int cmdlog_start(char *file_path, bool *already_started);

diff --git a/log.log b/log.log
@@ -0,0 +1,63 @@
+1..70
+ok 1 - get bkey1:
+ok 2 - get bkey2:
+ok 3 - get kvkey:
+ok 4 - set kvkey 0 0 6:datumx
+ok 5 - bop insert bkey1 0x0090 6 create 11 0 0:datum9
+ok 6 - bop insert bkey1 0x0070 6:datum7
+ok 7 - bop insert bkey1 0x0050 6:datum5
+ok 8 - bop insert bkey1 0x0030 6:datum3
+ok 9 - bop insert bkey1 0x0010 6:datum1
+ok 10 - bop get bkey1 0x00..0x1000:
+ok 11 - bop insert bkey2 0x0100 7 create 12 0 0:datum10
+ok 12 - bop insert bkey2 0x0080 6:datum8
+ok 13 - bop insert bkey2 0x0060 6:datum6
+ok 14 - bop insert bkey2 0x0040 6:datum4
+ok 15 - bop insert bkey2 0x0020 6:datum2
+ok 16 - bop get bkey2 0x0000..0xFFFFFFFF:
+ok 17 - bop mget 11 2 0x0000..0x0100 5:bkey1 bkey2
+ok 18 - bop mget 23 4 0x0000..0x0100 2 6:bkey2 bkey3 bkey1 bkey4
+ok 19 - bop mget 23 4 0x0090..0x0030 2 9:bkey2 bkey3 bkey1 bkey4
+ok 20 - bop mget 23 4 0x0200..0x0300 2 6:bkey2 bkey3 bkey1 bkey4
+ok 21 - bop mget 29 5 0x0000..0x0100 1 6:bkey2 bkey3 bkey1 bkey4 bkey3
+ok 22 - bop mget 29 5 0x0000..0x0100 2 6:bkey2 bkey3 bkey1 bkey4 krkey
+ok 23 - bop mget 29 5 0x0000..0x0100 2 6:bkey2 bkey3 bkey1 bkey4 bkey1
+ok 24 - bop mget 23 2 0x0000..0x0100 2 6:bkey2 bkey3 bkey1 bkey4
+ok 25 - delete bkey1:
+ok 26 - delete bkey2:
+ok 27 - bop insert bkey1 0x0090 6 create 11 0 0:datum9
+ok 28 - bop insert bkey1 0x00000070 6:datum7
+ok 29 - bop insert bkey1 0x000000000050 6:datum5
+ok 30 - bop insert bkey1 0x0000000000000030 6:datum3
+ok 31 - bop insert bkey1 0x00000000000000000010 6:datum1
+ok 32 - bop get bkey1 0x00..0xFF:
+ok 33 - bop insert bkey2 0x01 7 create 12 0 0:datum10
+ok 34 - bop insert bkey2 0x000080 6:datum8
+ok 35 - bop insert bkey2 0x0000000060 6:datum6
+ok 36 - bop insert bkey2 0x00000000000040 6:datum4
+ok 37 - bop insert bkey2 0x000000000000000020 6:datum2
+ok 38 - bop get bkey2 0x00..0xFFFFFFFFFFFFFFFFFF:
+ok 39 - bop mget 11 2 0x00..0xFF 5:bkey1,bkey2
+ok 40 - bop mget 23 4 0x00..0xFFFF 2 6:bkey2,bkey3,bkey1,bkey4
+ok 41 - bop mget 23 4 0x0090..0x0000000000000030 2 9:bkey2,bkey3,bkey1,bkey4
+ok 42 - bop mget 23 4 0x0200..0x0300 2 6:bkey2,bkey3,bkey1,bkey4
+ok 43 - bop mget 29 5 0x0000..0x0100 1 6:bkey2,bkey3,bkey1,bkey4,bkey3
+ok 44 - bop mget 29 5 0x0000..0x0100 2 6:bkey2,bkey3,bkey1,bkey4,kvkey
+ok 45 - bop mget 29 5 0x0000..0x0100 2 6:bkey2,bkey3,bkey1,bkey4,bkey1
+ok 46 - bop mget 23 2 0x0000..0x0100 2 6:bkey2,bkey3,bkey1,bkey4
+ok 47 - delete bkey1:
+ok 48 - delete bkey2:
+ok 49 - delete kvkey:
+ok 50 - bop mget 600291 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 51 - bop mget 600291 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 52 - bop mget 600291 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 53 - bop mget 66001 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 54 - bop mget 66001 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 55 - bop mget 66001 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 56 - bop mget 30001 3 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 57 - bop mget 30001 3 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 58 - bop mget 30001 3 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 59 - bop mget 30001 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 60 - bop mget 30001 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 61 - bop mget 30001 2 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+not ok 62 - bop mget 40949 5 0..1000 2:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/memcached.c b/memcached.c
@@ -121,10 +121,6 @@ topkeys_t *default_topkeys = NULL;
 static char *arcus_zk_cfg = NULL;
 #endif
 
-#ifdef COMMAND_LOGGING
-static bool cmdlog_in_use = false;
-#endif
-
 #ifdef DETECT_LONG_QUERY
 static bool lqdetect_in_use = false;
 #endif