Skip to content

Commit 709effa

Browse files
meeeejinmeeeejin
committed
Write UNDO
1 parent 1f30316 commit 709effa

File tree

9 files changed

+75
-111
lines changed

9 files changed

+75
-111
lines changed

‎storage/innobase/btr/btr0cur.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7544,11 +7544,6 @@ btr_rec_free_externally_stored_fields(
75447544
ulint n_fields;
75457545
ulint i;
75467546

7547-
// dbug
7548-
if (index->space == 28) {
7549-
fprintf(stderr, "[JONGQ] btr_rec_Free_externally_stored_fields\n");
7550-
}
7551-
75527547
ut_ad(rec_offs_validate(rec, index, offsets));
75537548
ut_ad(mtr_is_page_fix(mtr, rec, MTR_MEMO_PAGE_X_FIX, index->table));
75547549
/* Free possible externally stored fields in the record */

‎storage/innobase/buf/buf0buf.cc

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ buf_page_is_corrupted(
804804
return(TRUE);
805805
}
806806

807-
#if !defined(UNIV_HOTBACKUP) && !defined(UNIV_INNOCHECKSUM) &!defined(UNIV_NVDIMM_CACHE)
807+
#if !defined(UNIV_HOTBACKUP) && !defined(UNIV_INNOCHECKSUM) && !defined(UNIV_NVDIMM_CACHE)
808808
if (check_lsn && recv_lsn_checks_on) {
809809
lsn_t current_lsn;
810810
const lsn_t page_lsn
@@ -834,7 +834,7 @@ buf_page_is_corrupted(
834834

835835
}
836836
}
837-
#endif /* !UNIV_HOTBACKUP && !UNIV_INNOCHECKSUM */
837+
#endif /* !UNIV_HOTBACKUP && !UNIV_INNOCHECKSUM && !UNIV_NVDIMM_CACHE */
838838

839839
/* Check whether the checksum fields have correct values */
840840

@@ -1693,8 +1693,7 @@ buf_chunk_nvm_init(
16931693
#endif /* PFS_GROUP_BUFFER_SYNC */
16941694
return(chunk);
16951695
}
1696-
1697-
#endif
1696+
#endif /* UNIV_NVDIMM_CACHE */
16981697

16991698
#ifdef UNIV_DEBUG
17001699
/*********************************************************************//**
@@ -2211,7 +2210,7 @@ buf_pool_free_instance(
22112210
buf_block_t* block = chunk->blocks;
22122211

22132212
#ifdef UNIV_NVDIMM_CACHE
2214-
if (buf_pool->instance_no >= 8 && chunk == chunks) break;
2213+
if (buf_pool->instance_no >= srv_buf_pool_instances && chunk == chunks) break;
22152214
#endif /* UNIV_NVDIMM_CACHE */
22162215

22172216
for (ulint i = chunk->size; i--; block++) {
@@ -2221,7 +2220,7 @@ buf_pool_free_instance(
22212220
}
22222221

22232222
#ifdef UNIV_NVDIMM_CACHE
2224-
if (buf_pool->instance_no == 8) {
2223+
if (buf_pool->instance_no >= srv_buf_pool_instances) {
22252224
buf_pool->allocator.deallocate_large_nvm(
22262225
chunk->mem, &chunk->mem_pfx);
22272226
} else {
@@ -4592,7 +4591,7 @@ buf_page_get_gen(
45924591

45934592
#ifdef UNIV_NVDIMM_CACHE
45944593
/* Buffer Hit */
4595-
if (buf_pool->instance_no >= 8) {
4594+
if (buf_pool->instance_no >= srv_buf_pool_instances) {
45964595
if (page_id.space() == 30) {
45974596
srv_stats.nvdimm_pages_read_ol.inc();
45984597
} else if (page_id.space() == 28) {
@@ -6280,10 +6279,7 @@ buf_page_io_complete(
62806279
}
62816280

62826281
#ifdef UNIV_NVDIMM_CACHE
6283-
if (/*buf_pool->instance_no >= 8
6284-
&& !*/bpage->cached_in_nvdimm) {
6285-
//bpage->cached_in_nvdimm = true;
6286-
6282+
if (bpage->cached_in_nvdimm) {
62876283
if (bpage->id.space() == 30) {
62886284
srv_stats.nvdimm_pages_stored_ol.inc();
62896285
} else if (bpage->id.space() == 28) {

‎storage/innobase/buf/buf0flu.cc

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,15 +1052,13 @@ buf_flush_write_block_low(
10521052

10531053
/* Force the log to the disk before writing the modified block */
10541054
if (!srv_read_only_mode) {
1055-
#if defined(UNIV_NVDIMM_CACHE_NO) && defined(UNIV_NVDIMM_CACHE_OL)
1056-
if (bpage->id.space() != 28) {
1055+
#ifdef UNIV_NVDIMM_CACHE
1056+
if (bpage->buf_pool_index < srv_buf_pool_instances) {
10571057
log_write_up_to(bpage->newest_modification, true);
1058-
} else {
1059-
//fprintf(stderr, "avoid neworder page to flush REDO log file\n");
10601058
}
1061-
#else
1059+
#else
10621060
log_write_up_to(bpage->newest_modification, true);
1063-
#endif
1061+
#endif /* UNIV_NVDIMM_CACHE */
10641062
}
10651063

10661064
switch (buf_page_get_state(bpage)) {
@@ -2377,13 +2375,6 @@ buf_flush_single_page_from_LRU(
23772375

23782376
buf_page_t* prev = UT_LIST_GET_PREV(LRU, bpage);
23792377

2380-
#ifdef UNIV_NVDIMM_CACHE
2381-
if (!prev/* && buf_pool->instance_no == 8*/) {
2382-
ib::info() << UT_LIST_GET_LEN(buf_pool->LRU) << " error in " << buf_pool->instance_no;
2383-
break;
2384-
}
2385-
#endif /* UNIV_NVDIMM_CACHE */
2386-
23872378
buf_pool->single_scan_itr.set(prev);
23882379

23892380
BPageMutex* block_mutex;
@@ -4069,7 +4060,6 @@ buf_flush_nvdimm_LRU_list_batch(
40694060
buf_pool->lru_hp.set(prev);
40704061

40714062
//if (bpage->id.space() == 28) continue;
4072-
// if (bpage->id.space() != 30 && bpage->id.space() != 32) continue;
40734063

40744064
BPageMutex* block_mutex = buf_page_get_mutex(bpage);
40754065

@@ -4148,7 +4138,7 @@ buf_flush_do_nvdimm_batch(
41484138
}
41494139

41504140
if (!buf_flush_start(buf_pool, type)) {
4151-
ib::info() << "fail.." << buf_pool->n_flush[BUF_FLUSH_LRU] << " " << buf_pool->init_flush[BUF_FLUSH_LRU];
4141+
ib::info() << "fail.." << buf_pool->n_flush[BUF_FLUSH_LRU] << " " << buf_pool->init_flush[BUF_FLUSH_LRU] << " in " << buf_pool->instance_no;
41524142
return(false);
41534143
}
41544144

@@ -4295,7 +4285,7 @@ DECLARE_THREAD(buf_flush_nvdimm_page_cleaner_thread)(
42954285
if (!page_cleaner->is_running) {
42964286
break;
42974287
}
4298-
4288+
42994289
if (srv_check_activity(last_activity)) {
43004290
/* Flush pages from end of LRU */
43014291
buf_flush_do_nvdimm_batch(buf_pool, BUF_FLUSH_LRU, 1024, 0, &n_flushed);

‎storage/innobase/mtr/mtr0mtr.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,8 @@ void mtr_t::commit_nvm() {
740740

741741
// just release for row_purge_remove_clust_if_poss_low() function
742742
void mtr_t::commit_no_nvm() {
743-
ut_ad(is_active());
743+
commit();
744+
/* ut_ad(is_active());
744745
ut_ad(!is_inside_ibuf());
745746
ut_ad(m_impl.m_magic_n == MTR_MAGIC_N);
746747
m_impl.m_state = MTR_STATE_COMMITTING;
@@ -754,7 +755,7 @@ void mtr_t::commit_no_nvm() {
754755
cmd.release_all();
755756
cmd.release_resources();
756757
}
757-
758+
*/
758759
//cmd.release_all();
759760
//cmd.release_resources();
760761
}

‎storage/innobase/row/row0ins.cc

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2558,25 +2558,25 @@ row_ins_clust_index_entry_low(
25582558
err_exit:
25592559

25602560

2561-
#ifdef UNIV_NVDIMM_CACHE
2561+
/*#ifdef UNIV_NVDIMM_CACHE
25622562
if (index->space == 28) {
25632563
mtr_commit_no_nvm(&mtr);
25642564
goto func_exit;
25652565
}
2566-
#endif
2566+
#endif*/
25672567
mtr_commit(&mtr);
25682568
goto func_exit;
25692569
}
25702570
}
25712571

25722572
if (dup_chk_only) {
25732573

2574-
#ifdef UNIV_NVDIMM_CACHE
2574+
/*#ifdef UNIV_NVDIMM_CACHE
25752575
if (index->space == 28) {
25762576
mtr_commit_no_nvm(&mtr);
25772577
goto func_exit;
25782578
}
2579-
#endif
2579+
#endif*/
25802580

25812581
mtr_commit(&mtr);
25822582
goto func_exit;
@@ -2609,11 +2609,11 @@ row_ins_clust_index_entry_low(
26092609
}
26102610

26112611
#ifdef UNIV_NVDIMM_CACHE
2612-
if (index->space == 28) {
2612+
/* if (index->space == 28) {
26132613
mtr_commit_no_nvm(&mtr);
26142614
} else {
2615-
mtr_commit(&mtr);
2616-
}
2615+
*/ mtr_commit(&mtr);
2616+
//}
26172617
#else
26182618
mtr_commit(&mtr);
26192619
#endif
@@ -2657,11 +2657,11 @@ row_ins_clust_index_entry_low(
26572657
if (big_rec != NULL) {
26582658

26592659
#ifdef UNIV_NVDIMM_CACHE
2660-
if (index->space == 28) {
2660+
/* if (index->space == 28) {
26612661
mtr_commit_no_nvm(&mtr);
2662-
} else {
2662+
} else {*/
26632663
mtr_commit(&mtr);
2664-
}
2664+
//}
26652665
#else
26662666
mtr_commit(&mtr);
26672667
#endif
@@ -2691,11 +2691,11 @@ row_ins_clust_index_entry_low(
26912691
// mtr_commit(&mtr);
26922692

26932693
#ifdef UNIV_NVDIMM_CACHE
2694-
if (index->space == 28) {
2694+
/* if (index->space == 28) {
26952695
mtr_commit_no_nvm(&mtr);
2696-
} else {
2696+
} else {*/
26972697
mtr_commit(&mtr);
2698-
}
2698+
//}
26992699
#else
27002700
mtr_commit(&mtr);
27012701
#endif
@@ -2950,11 +2950,6 @@ row_ins_sec_index_entry_low(
29502950
ut_ad(thr_get_trx(thr)->id != 0
29512951
|| dict_table_is_intrinsic(index->table));
29522952

2953-
// debug
2954-
if (index->space == 28) {
2955-
fprintf(stderr, "[JONGQ] row_ins_sec_index_entry_low check!\n");
2956-
}
2957-
29582953
mtr_start(&mtr);
29592954
mtr.set_named_space(index->space);
29602955

‎storage/innobase/row/row0purge.cc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,19 +195,18 @@ row_purge_remove_clust_if_poss_low(
195195
// instead, persist NVDIMM region
196196

197197
#ifdef UNIV_NVDIMM_CACHE
198-
if (index->space == 28) {
199-
//fprintf(stderr, "[JONGQ] avoid to write REDO log !!!!\n");
200-
if (node->found_clust) {
201-
//btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
202-
ut_ad(node->pcur.pos_state == BTR_PCUR_IS_POSITIONED);
203-
node->pcur.latch_mode = BTR_NO_LATCHES;
204-
mtr_commit_no_nvm(&mtr);
205-
node->pcur.pos_state = BTR_PCUR_WAS_POSITIONED;
206-
} else {
207-
mtr_commit_no_nvm(&mtr);
208-
}
209-
return (success);
210-
}
198+
if (index->space == 28) {
199+
if (node->found_clust) {
200+
ut_ad(node->pcur.pos_state == BTR_PCUR_IS_POSITIONED);
201+
node->pcur.latch_mode = BTR_NO_LATCHES;
202+
mtr_commit(&mtr);
203+
//mtr_commit_no_nvm(&mtr);
204+
node->pcur.pos_state = BTR_PCUR_WAS_POSITIONED;
205+
} else {
206+
mtr_commit_no_nvm(&mtr);
207+
}
208+
return (success);
209+
}
211210
#endif
212211

213212
if (node->found_clust) {

‎storage/innobase/row/row0uins.cc

Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,15 @@ row_undo_ins_remove_clust_rec(
129129
btr_pcur_get_rec(&node->pcur), &(node->pcur), &mtr);
130130

131131
#ifdef UNIV_NVDIMM_CACHE
132-
if (index->space == 28) {
132+
/*if (index->space == 28) {
133133
mtr_commit_no_nvm(&mtr);
134134
} else {
135-
mtr_commit(&mtr);
136-
}
135+
*/ mtr_commit(&mtr);
136+
//}
137137
#else
138138
mtr_commit(&mtr);
139139
#endif
140140

141-
// mtr_commit(&mtr);
142-
143141
mtr_start(&mtr);
144142

145143
success = btr_pcur_restore_position(
@@ -153,21 +151,19 @@ row_undo_ins_remove_clust_rec(
153151
}
154152

155153
#ifdef UNIV_NVDIMM_CACHE
156-
if (index->space == 28) {
157-
//btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
158-
ut_ad(node->pcur.pos_state == BTR_PCUR_IS_POSITIONED);
159-
node->pcur.latch_mode = BTR_NO_LATCHES;
160-
mtr_commit_no_nvm(&mtr);
161-
node->pcur.pos_state = BTR_PCUR_WAS_POSITIONED;
162-
} else {
163-
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
164-
}
154+
if (index->space == 28) {
155+
ut_ad(node->pcur.pos_state == BTR_PCUR_IS_POSITIONED);
156+
node->pcur.latch_mode = BTR_NO_LATCHES;
157+
mtr_commit(&mtr);
158+
//mtr_commit_no_nvm(&mtr);
159+
node->pcur.pos_state = BTR_PCUR_WAS_POSITIONED;
160+
} else {
161+
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
162+
}
165163
#else
166-
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
164+
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
167165
#endif
168166

169-
// btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
170-
171167
retry:
172168
/* If did not succeed, try pessimistic descent to tree */
173169
mtr_start(&mtr);
@@ -188,19 +184,18 @@ row_undo_ins_remove_clust_rec(
188184
if (err == DB_OUT_OF_FILE_SPACE
189185
&& n_tries < BTR_CUR_RETRY_DELETE_N_TIMES) {
190186

191-
// btr_pcur_commit_specify_mtr(&(node->pcur), &mtr);
192187
#ifdef UNIV_NVDIMM_CACHE
193-
if (index->space == 28) {
194-
//btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
195-
ut_ad(node->pcur.pos_state == BTR_PCUR_IS_POSITIONED);
196-
node->pcur.latch_mode = BTR_NO_LATCHES;
197-
mtr_commit_no_nvm(&mtr);
198-
node->pcur.pos_state = BTR_PCUR_WAS_POSITIONED;
199-
} else {
200-
btr_pcur_commit_specify_mtr(&(node->pcur), &mtr);
201-
}
188+
if (index->space == 28) {
189+
ut_ad(node->pcur.pos_state == BTR_PCUR_IS_POSITIONED);
190+
node->pcur.latch_mode = BTR_NO_LATCHES;
191+
mtr_commit(&mtr);
192+
//mtr_commit_no_nvm(&mtr);
193+
node->pcur.pos_state = BTR_PCUR_WAS_POSITIONED;
194+
} else {
195+
btr_pcur_commit_specify_mtr(&(node->pcur), &mtr);
196+
}
202197
#else
203-
btr_pcur_commit_specify_mtr(&(node->pcur), &mtr);
198+
btr_pcur_commit_specify_mtr(&(node->pcur), &mtr);
204199
#endif
205200

206201
n_tries++;
@@ -211,20 +206,18 @@ row_undo_ins_remove_clust_rec(
211206
}
212207

213208
func_exit:
214-
// btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
215-
216209
#ifdef UNIV_NVDIMM_CACHE
217-
if (index->space == 28) {
218-
//btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
219-
ut_ad(node->pcur.pos_state == BTR_PCUR_IS_POSITIONED);
220-
node->pcur.latch_mode = BTR_NO_LATCHES;
221-
mtr_commit_no_nvm(&mtr);
222-
node->pcur.pos_state = BTR_PCUR_WAS_POSITIONED;
223-
} else {
224-
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
225-
}
210+
if (index->space == 28) {
211+
ut_ad(node->pcur.pos_state == BTR_PCUR_IS_POSITIONED);
212+
node->pcur.latch_mode = BTR_NO_LATCHES;
213+
mtr_commit(&mtr);
214+
//mtr_commit_no_nvm(&mtr);
215+
node->pcur.pos_state = BTR_PCUR_WAS_POSITIONED;
216+
} else {
217+
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
218+
}
226219
#else
227-
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
220+
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
228221
#endif
229222

230223
return(err);

0 commit comments

Comments
 (0)