Temporary fix

Author: bigbes

memcached/CMakeLists.txt

@@ -1,28 +1,28 @@
 add_custom_command(
-    OUTPUT ${CMAKE_SOURCE_DIR}/memcached/internal/proto_text_parser.c
+    OUTPUT ${CMAKE_SOURCE_DIR}/memcached/internal/proto_txt_parser.c
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${RAGEL} -LCe -G2 memcached/internal/proto_text_parser.rl
-                     -o memcached/internal/proto_text_parser.c
-    DEPENDS ${CMAKE_SOURCE_DIR}/memcached/internal/proto_text_parser.rl)
+    COMMAND ${RAGEL} -LCe -G2 memcached/internal/proto_txt_parser.rl
+                     -o memcached/internal/proto_txt_parser.c
+    DEPENDS ${CMAKE_SOURCE_DIR}/memcached/internal/proto_txt_parser.rl)
 
-add_custom_target(generate_proto_text_parser_c DEPENDS
-    ${CMAKE_SOURCE_DIR}/memcached/internal/proto_text_parser.c)
+add_custom_target(generate_proto_txt_parser_c DEPENDS
+    ${CMAKE_SOURCE_DIR}/memcached/internal/proto_txt_parser.c)
 
-# do not randomly try to re-generate proto_text_parser.c
+# do not randomly try to re-generate proto_txt_parser.c
 # after a fresh checkout/branch switch.
 execute_process(COMMAND ${CMAKE_COMMAND} -E touch_nocreate
-    ${CMAKE_SOURCE_DIR}/memcached/internal/proto_text_parser.c)
+    ${CMAKE_SOURCE_DIR}/memcached/internal/proto_txt_parser.c)
 
 # set_source_files_properties(
-#     ${CMAKE_SOURCE_DIR}/memcached/internal/proto_text_parser.c
+#     ${CMAKE_SOURCE_DIR}/memcached/internal/proto_txt_parser.c
 #     PROPERTIES HEADER_FILE_ONLY true)
 
 add_library(internalso SHARED
         "internal/constants.c"
         "internal/utils.c"
-        "internal/proto_binary.c"
-        "internal/proto_text_parser.c"
-        "internal/proto_text.c"
+        "internal/proto_bin.c"
+        "internal/proto_txt_parser.c"
+        "internal/proto_txt.c"
         "internal/network.c"
         "internal/memcached_layer.c"
         "internal/expiration.c"
@@ -31,7 +31,7 @@ add_library(internalso SHARED
 
 set_property(DIRECTORY PROPERTY CLEAN_NO_CUSTOM true)
 
-add_dependencies(internalso generate_proto_text_parser_c)
+add_dependencies(internalso generate_proto_txt_parser_c)
 
 if(NOT SMALL_FOUND)
     add_dependencies(internalso small)

memcached/internal/constants.c

@@ -6,91 +6,18 @@
 	.verbosity   = v,				\
 },
 
+#define MEMCACHED_COMMAND_MEMBER(s) #s,
+
 struct memcached_response_record memcached_response_record_table[] = {
 	RESPONSE_CODES(MEMCACHED_RESPONSE_RECORD_MEMBER)
 };
-const char *memcached_text_cmd_name[] = {
-	/* 0x00 */ "UNKNOWN",
-	/* 0x01 */ "SET",
-	/* 0x02 */ "ADD",
-	/* 0x03 */ "REPLACE",
-	/* 0x04 */ "APPEND",
-	/* 0x05 */ "PREPEND",
-	/* 0x06 */ "CAS",
-	/* 0x07 */ "GET",
-	/* 0x08 */ "GETS",
-	/* 0x09 */ "DELETE",
-	/* 0x0a */ "INCR",
-	/* 0x0b */ "DECR",
-	/* 0x0c */ "FLUSH",
-	/* 0x0d */ "STAT",
-	/* 0x0e */ "VERSION",
-	/* 0x0f */ "QUIT",
-	/* 0x10 */ "VERBOSITY",
+
+const char *memcached_txt_cmd_name[] = {
+	TEXT_COMMANDS(MEMCACHED_COMMAND_MEMBER)
 	NULL
 };
 
-const char *memcached_binary_cmd_name[] = {
-	/* 0x00 */ "GET",
-	/* 0x01 */ "SET",
-	/* 0x02 */ "ADD",
-	/* 0x03 */ "REPLACE",
-	/* 0x04 */ "DELETE",
-	/* 0x05 */ "INCR",
-	/* 0x06 */ "DECR",
-	/* 0x07 */ "QUIT",
-	/* 0x08 */ "FLUSH",
-	/* 0x09 */ "GETQ",
-	/* 0x0a */ "NOOP",
-	/* 0x0b */ "VERSION",
-	/* 0x0c */ "GETK",
-	/* 0x0d */ "GETKQ",
-	/* 0x0e */ "APPEND",
-	/* 0x0f */ "PREPEND",
-	/* 0x10 */ "STAT",
-	/* 0x11 */ "SETQ",
-	/* 0x12 */ "ADDQ",
-	/* 0x13 */ "REPLACEQ",
-	/* 0x14 */ "DELETEQ",
-	/* 0x15 */ "INCRQ",
-	/* 0x16 */ "DECRQ",
-	/* 0x17 */ "QUITQ",
-	/* 0x18 */ "FLUSHQ",
-	/* 0x19 */ "APPENDQ",
-	/* 0x1a */ "PREPENDQ",
-	/* 0x1b */ "VERBOSITY",
-	/* 0x1c */ "TOUCH",
-	/* 0x1d */ "GAT",
-	/* 0x1e */ "GATQ",
-	/* 0x1f */ "",
-	/* 0x20 */ "SASL_LIST_MECHS",
-	/* 0x21 */ "SASL_AUTH",
-	/* 0x22 */ "SASL_STEP",
-	/* 0x23 */ "GATK",
-	/* 0x24 */ "GATKQ",
-	/* 0x25 */ "",
-	/* 0x26 */ "",
-	/* 0x27 */ "",
-	/* 0x28 */ "",
-	/* 0x29 */ "",
-	/* 0x2a */ "",
-	/* 0x2b */ "",
-	/* 0x2c */ "",
-	/* 0x2d */ "",
-	/* 0x2e */ "",
-	/* 0x2f */ "",
-	/* 0x30 */ "RGET",
-	/* 0x31 */ "RSET",
-	/* 0x32 */ "RSETQ",
-	/* 0x33 */ "RAPPEND",
-	/* 0x34 */ "RAPPENDQ",
-	/* 0x35 */ "RPREPEND",
-	/* 0x36 */ "RPREPENDQ",
-	/* 0x37 */ "RDELETE",
-	/* 0x38 */ "RDELETEQ",
-	/* 0x39 */ "RINCR",
-	/* 0x3a */ "RINCRQ",
-	/* 0x3b */ "RDECR",
-	/* 0x3c */ "RDECRQ",
+const char *memcached_bin_cmd_name[] = {
+	BINARY_COMMANDS(MEMCACHED_COMMAND_MEMBER)
 	NULL
 };