clean code 2

Author: trdtnguyen

Diff for: build_mysql.sh

@@ -13,6 +13,8 @@ IS_DEBUG=0
 BUILD_NAME="-DUNIV_PMEMOBJ_PPL_STAT -DUNIV_PMEMOBJ_PAGE_LOG -DUNIV_PMEMOBJ_PART_PL -DUNIV_PMEMOBJ_PL -DUNIV_TRACE_RECOVERY_TIME"
 #BUILD_NAME="-DUNIV_PMEMOBJ_PPL_STAT -DUNIV_PMEMOBJ_PAGE_LOG -DUNIV_PMEMOBJ_PART_PL -DUNIV_PMEMOBJ_PART_PL_DEBUG -DUNIV_PMEMOBJ_PL -DUNIV_TRACE_FLUSH_TIME"
 
+####debug with valid mtr
+#BUILD_NAME="-DUNIV_PMEMOBJ_VALID_MTR -DUNIV_PMEMOBJ_PPL_STAT -DUNIV_PMEMOBJ_PAGE_LOG -DUNIV_PMEMOBJ_PART_PL -DUNIV_PMEMOBJ_PL -DUNIV_TRACE_RECOVERY_TIME"
 
 ## Standalone PL-NVM
 ## Standard version

Diff for: storage/innobase/buf/buf0flu.cc

@@ -1134,7 +1134,8 @@ buf_flush_write_block_low(
 #endif /*UNIV_PMEMOBJ_BUF*/
 
 #if defined (UNIV_PMEMOBJ_PART_PL)
-		pm_ppl_set_flush_state(gb_pmw->pop, gb_pmw->ppl, bpage);
+		/*We don't set state anymore*/
+		//pm_ppl_set_flush_state(gb_pmw->pop, gb_pmw->ppl, bpage);
 #endif /*UNIV_PMEMOBJ_PART_PL*/
 
 	/* Disable use of double-write buffer for temporary tablespace.

Diff for: storage/innobase/include/log0recv.h

@@ -289,6 +289,10 @@ typedef std::vector<recv_encryption_t, ut_allocator<recv_encryption_t> >
 
 /** Recovery system data structure */
 struct recv_sys_t{
+#if defined (UNIV_TRACE_RECOVERY_TIME)
+	ulint		redo1_time;
+#endif //UNIV_TRACE_RECOVERY_TIME
+
 #ifndef UNIV_HOTBACKUP
 	ib_mutex_t		mutex;	/*!< mutex protecting the fields apply_log_recs,
 				n_addrs, and the state field in each recv_addr

Diff for: storage/innobase/include/mtr0log.h

@@ -250,7 +250,12 @@ mlog_parse_index(
 #ifndef UNIV_HOTBACKUP
 /** Insert, update, and maybe other functions may use this value to define an
 extra mlog buffer size for variable size data */
+#if defined (UNIV_PMEMOBJ_PART_PL)
+/*we need to increase this value for Linkbench*/
+#define MLOG_BUF_MARGIN	512
+#else //original
 #define MLOG_BUF_MARGIN	256
+#endif //UNIV_PMEMOBJ_PART_PL
 #endif /* !UNIV_HOTBACKUP */
 
 #ifndef UNIV_NONINL

Diff for: storage/innobase/include/mtr0mtr.h

@@ -643,8 +643,6 @@ struct mtr_t {
 
 		cur_max_size = m_impl.max_buf_size;
 		if (m_impl.cur_off + size > cur_max_size){
-			//since reallocate cause some bugs (e.g. b-tree split) we report bug here
-			//assert(0);
 
 			new_size = ((size / cur_max_size) + 2) * cur_max_size;
 			new_ptr = (byte*) realloc(m_impl.buf, new_size);

Diff for: storage/innobase/include/my_pmemobj.h

@@ -1147,14 +1147,31 @@ pm_ppl_hash_get(
 		PMEM_PAGE_LOG_HASHED_LINE* pline,
 		uint64_t			key	);
 
-plog_hash_t*
+/*
+ * Add a plogblock's key on the pline hashtable
+ * @param[in] pop
+ * @param[in] ppl
+ * @param[in] pline pointer to the line that has hashtable to add on
+ * @param[in] plog_block pointer to the logblock
+ * @param[in] idx index of the block on the line
+ * @return: the hash item added
+ * */
+static inline void
 pm_ppl_hash_add(
-		PMEMobjpool*		pop,
-		PMEM_PAGE_PART_LOG*		ppl,
 		PMEM_PAGE_LOG_HASHED_LINE* pline,
 		PMEM_PAGE_LOG_BLOCK*	plog_block,
 		uint32_t				idx
-		);
+		)
+{
+
+	plog_hash_t* item;
+
+	item = (plog_hash_t*) malloc(sizeof(plog_hash_t));
+	item->key = plog_block->key;
+	item->block_off = idx;
+	HASH_INSERT(plog_hash_t, addr_hash, pline->addr_hash, plog_block->key, item);
+	
+}
 
 plog_hash_t*
 pm_ppl_hash_check_and_add(
@@ -1302,6 +1319,35 @@ __pm_write_log_buf(
 			PMEM_PAGE_LOG_BLOCK*		plog_block,
 			bool						is_first_write);
 
+static inline void
+pm_write_log_rec_low(
+			PMEMobjpool*			pop,
+			byte*					log_des,
+			byte*					log_src,
+			uint64_t				size)
+{
+	pmemobj_memcpy_persist(
+			pop, 
+			log_des,
+			log_src,
+			size);
+	//if (size <= CACHELINE_SIZE){
+	//	//We need persistent copy, Do not need a transaction for atomicity
+	//		pmemobj_memcpy_persist(
+	//			pop, 
+	//			log_des,
+	//			log_src,
+	//			size);
+
+	//}
+	//else{
+	//	TX_BEGIN(pop) {
+	//		TX_MEMCPY(log_des, log_src, size);
+	//	}TX_ONABORT {
+	//	}TX_END
+	//}
+}
+
 void
 __pm_write_log_rec_low(
 			PMEMobjpool*			pop,

Diff for: storage/innobase/log/log0log.cc

@@ -585,7 +585,9 @@ log_close(void)
 
 			log_has_printed_chkp_warning = true;
 			log_last_warning_time = time(NULL);
-
+#if defined (UNIV_SKIPLOG)
+			printf("===> SKIPLOG ERROR lsn %zu last_checkpoint_lsn %zu age %zu \n", lsn, log->last_checkpoint_lsn, checkpoint_age );
+#endif
 			ib::error() << "The age of the last checkpoint is "
 				<< checkpoint_age << ", which exceeds the log"
 				" group capacity " << log->log_group_capacity
@@ -1948,8 +1950,8 @@ log_checkpoint(
 	}
 #endif /* !_WIN32 */
 
-//#if defined (UNIV_PMEMOBJ_PL) || defined (UNIV_SKIPLOG)
-#if defined (UNIV_PMEMOBJ_PL)
+#if defined (UNIV_PMEMOBJ_PL) || defined (UNIV_SKIPLOG)
+//#if defined (UNIV_PMEMOBJ_PL)
 	//printf("PL DEBUG ====> log_checkpoint()\n");
 	//hot fix bug: when start server recv_recovery_rollback_active() ->
 	// row_merge_drop_temp_indexes() -> que_eval_sql() -> que_run_threads()
@@ -2015,6 +2017,9 @@ log_checkpoint(
 #if defined (UNIV_PMEMOBJ_WAL)
 	//no flush log at checkpoint
 #else //original
+	//tdnguyen test
+//	ulint t = ut_time_us(NULL);
+//	printf("===> ckpt_trace LOGWRITE time %zu log_write_up_to flush_lsn %zu sync %zu\n", t, flush_lsn, sync);
 	log_write_up_to(flush_lsn, true);
 #endif
 	DBUG_EXECUTE_IF(
@@ -2087,31 +2092,20 @@ pm_ppl_checkpoint(
 
 	new_oldest = ppl->max_oldest_lsn;
 
-	printf("PMEM_INFO: call pm_ppl_checkpoint new_oldest %zu ppl->ckpt_lsn %zu\n",
-		   	new_oldest, ppl->ckpt_lsn);
+	float delta = (ppl->max_oldest_lsn - ppl->ckpt_lsn) * 1.0 / 1000000;
+
+	printf("PMEM_INFO: call pm_ppl_checkpoint new_oldest %zu ppl->ckpt_lsn %zu delta %f seconds \n",
+		   	new_oldest, ppl->ckpt_lsn, delta);
 
 	/*(2) simulate fil_names_clear()*/
 	pm_ppl_fil_names_clear(new_oldest);
 
 	/*(3) Write pages in buffer pool upto the ckpt_lsn*/
-	//success = log_preflush_pool_modified_pages(new_oldest);
-	
 	/*simulate buf_flush_request_force() without call buf_flush_wait_flushed() as in log_preflush_pool_modified_pages() */
 	pm_ppl_buf_flush_request_force(new_oldest);
 
 	buf_flush_wait_flushed(new_oldest);
 
-	///*(4) reset the ckpt_lsn */
-	//for (i = 0; i < n; i++){
-	//	pline = D_RW(D_RW(ppl->buckets)[i]);
-
-	//	pmemobj_rwlock_wrlock(pop, &pline->lock);
-	//	if (pline->ckpt_lsn > 0){
-	//		pline->ckpt_lsn = 0;
-	//	}
-	//	pmemobj_rwlock_unlock(pop, &pline->lock);
-	//}
-
 	/* (5) update the global ckpt_lsn*/
 	pmemobj_rwlock_wrlock(pop, &ppl->ckpt_lock);
 	ppl->ckpt_lsn = new_oldest;
@@ -2130,7 +2124,8 @@ log_make_checkpoint_at(
 	bool			write_always)
 {
 	//tdnguyen test
-	//printf("=========== \nCKPT: call log_checkpoint() from log_make_checkpoint_at()\n===========\n");
+	ulint t = ut_time_ms();
+	printf("=========== \n%zu CKPT: call log_checkpoint() from log_make_checkpoint_at()\n===========\n", t);
 	/* Preflush pages synchronously */
 
 	while (!log_preflush_pool_modified_pages(lsn)) {
@@ -2203,7 +2198,6 @@ log_checkpoint_margin(void)
 
 	if (advance) {
 		lsn_t	new_oldest = oldest_lsn + advance;
-
 		success = log_preflush_pool_modified_pages(new_oldest);
 
 		/* If the flush succeeded, this thread has done its part