implement persistent Redo log file with libpmemobj

Author: trdtnguyen

CMakeLists.txt

@@ -15,7 +15,8 @@
 
 #tdnguyen added
 #SET (NVM_LIBS mytest)
-SET (NVM_LIBS pmem)
+SET (NVM_LIB_PMEM pmem)
+SET (NVM_LIB_PMEMOBJ pmemobj)
 #end tdnguyen added
 
 IF(WIN32)

client/dump/CMakeLists.txt

@@ -141,6 +141,7 @@ SET(MYSQLPUMP_LIB_SOURCES
   ../../sql-common/my_user.c)
 ADD_CONVENIENCE_LIBRARY(mysqlpump_lib ${MYSQLPUMP_LIB_SOURCES})
 TARGET_LINK_LIBRARIES(mysqlpump_lib
+	#	client_base ${LZ4_LIBRARY} ${NVM_LIB_PMEM} ${NVM_LIB_PMEMOBJ})
    client_base ${LZ4_LIBRARY})
 
 ADD_COMPILE_FLAGS(

include/my_global.h

@@ -25,10 +25,14 @@
   differences are mitigated.
 */
 
-#ifdef UNIV_NVM_LOG
+#if defined(UNIV_NVM_LOG) || defined(UNIV_PMEMOBJ_LOG)
 //tdnguyen
 #include <libpmem.h>
 #endif
+#ifdef UNIV_PMEMOBJ_LOG
+#include <libpmemobj.h>
+#include <libpmem.h>
+#endif
 
 #include "my_config.h"
 

libmysqld/examples/CMakeLists.txt

@@ -28,7 +28,8 @@ MYSQL_ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc
                ../../client/mysql.cc ../../client/readline.cc)
 #tdnguyen added
 #TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver)
-TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver ${NVM_LIBS})
+TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver ${NVM_LIB_PMEMOBJ} ${NVM_LIB_PMEM} )
+#TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver ${NVM_LIB_PMEM})
 #end tdnguyen added
 
 IF(UNIX)
@@ -50,7 +51,8 @@ ENDIF()
 MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc)
 #tdnguyen added
 #TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver)
-TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver ${NVM_LIBS})
+TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver ${NVM_LIB_PMEMOBJ} ${NVM_LIB_PMEM} )
+#TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver ${NVM_LIB_PMEM})
 
 
 IF(CMAKE_GENERATOR MATCHES "Xcode")
@@ -78,7 +80,8 @@ ENDIF()
 IF(NOT INSTALL_LAYOUT MATCHES "SVR4")
 	#tdnguyen added
 	#TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver)
-	TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver ${NVM_LIBS})
+		TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver ${NVM_LIB_PMEMOBJ} ${NVM_LIB_PMEM} )
+	#TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver ${NVM_LIB_PMEM})
 ENDIF()
 
 IF(UNIX)

rapid/plugin/x/CMakeLists.txt

@@ -145,7 +145,8 @@ ELSE()
     MODULE_ONLY MODULE_OUTPUT_NAME "mysqlx")
 
   IF(WITH_PROTOBUF STREQUAL "system")
-    TARGET_LINK_LIBRARIES(mysqlx "${PROTOBUF_LIBRARY}")
+	      TARGET_LINK_LIBRARIES(mysqlx "${PROTOBUF_LIBRARY}")
+	  #	  TARGET_LINK_LIBRARIES(mysqlx "${PROTOBUF_LIBRARY}" ${NVM_LIB_PMEM} ${NVM_LIB_PMEMOBJ})
   ENDIF()
 
   ADD_DEPENDENCIES(mysqlx GenError)
@@ -216,6 +217,7 @@ ELSE()
 
   TARGET_LINK_LIBRARIES(mysqlxtest mysys strings mysqlclient)
   TARGET_LINK_LIBRARIES(mysqlxtest ${PROTOBUF_LIBRARY})
+  #  TARGET_LINK_LIBRARIES(mysqlxtest ${PROTOBUF_LIBRARY} ${NVM_LIB_PMEM} ${NVM_LIB_PMEMOBJ})
 
   IF( WIN32 )
     ADD_DEFINITIONS(-DMYSQLXTEST_EXPORTS)

sql/CMakeLists.txt

@@ -388,10 +388,12 @@ DTRACE_INSTRUMENT(sql)
 #  ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
 #  ${SSL_LIBRARIES})
 
+#tdnguyen
 TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS} 
   mysys mysys_ssl dbug strings vio regex binlogevents_static
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
-  ${SSL_LIBRARIES} ${NVM_LIBS})
+  #${SSL_LIBRARIES} ${NVM_LIB_PMEM})
+  ${SSL_LIBRARIES} ${NVM_LIB_PMEMOBJ} ${NVM_LIB_PMEM} )
 
 #
 # On Windows platform we compile in the clinet-side Windows Native Authentication

storage/innobase/fil/fil0fil.cc

@@ -61,6 +61,10 @@ Created 10/25/1995 Heikki Tuuri
 //declare it at storage/innobase/srv/srv0start.cc
 extern PMEM_FILE_COLL* gb_pfc;
 #endif
+#ifdef UNIV_PMEMOBJ_LOG
+#include "my_pmemobj.h"
+extern PMEM_WRAPPER* gb_pmw;
+#endif
 
 /** Tries to close a file in the LRU list. The caller must hold the fil_sys
 mutex.
@@ -5784,15 +5788,15 @@ fil_io(
 		? false : srv_read_only_mode,
 		node, message);
 
-#ifdef UNIV_NVM_LOG
+#if defined (UNIV_NVM_LOG) || defined(UNIV_PMEMOBJ_LOG)
 		if (req_type.is_log() && mode == OS_AIO_LOG){
 			//In NVM_LOG, we don't use aio, so we need to do the post-processing here
 			mutex_enter(&fil_system->mutex);
 			fil_node_complete_io(node, fil_system, req_type);
 			mutex_exit(&fil_system->mutex);
 			// log_io_complete() is called in the upper layer
 		}
-#endif /*UNIV_NVM_LOG */
+#endif /*UNIV_NVM_LOG || NVM_PMEMOBJ_LOG*/
 
 #endif /* UNIV_HOTBACKUP */
 
@@ -6019,7 +6023,7 @@ fil_flush(
 		node->n_pending_flushes++;
 
 		mutex_exit(&fil_system->mutex);
-#ifdef UNIV_NVM_LOG
+#if defined (UNIV_NVM_LOG) || defined(UNIV_PMEMOBJ_LOG)
 		if ( space->purpose == FIL_TYPE_LOG ){
 			//we skip_flush, do nothing
 		}

storage/innobase/handler/ha_innodb.cc

@@ -4382,8 +4382,16 @@ innobase_commit(
 		innobase_commit_low(trx);
 
 		if (!read_only) {
+#if defined(UNIV_NVM_LOG_BUFFER) || defined(UNIV_PMEMOBJ_LOG_BUFFER)
+			/*Set this flag to true make the trx_commit_complete_for_mysql() do nothing
+			//Since the log buffer now is in NVDIMM, we can safely skip writting
+			//and flushing log records when the transaction commit
+			//the background thread will do the work
+			*/
+			trx->flush_log_later = true;
+#else //original
 			trx->flush_log_later = false;
-
+#endif /*UNIV_NVM_LOG_BUFFER */
 			if (innobase_commit_concurrency > 0) {
 
 				mysql_mutex_lock(&commit_cond_m);