Skip to content

Commit 24d7cbe

Browse files
cvicentiucvicentiu
committed
Ensure TokuDB compiles both on Linux and OS X
On OS X, (u)int64_t is defined as (unsigned) long long int while on 74 bit Linux it is defined as (unsigned) long int. Ensure the type matches when doing printf on all systems.
1 parent e5a3d24 commit 24d7cbe

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎storage/tokudb/PerconaFT/ft/serialize/ft-serialize.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -663,13 +663,13 @@ int deserialize_ft_from_fd_into_rbuf(int fd,
663663
__LINE__, \
664664
fn, \
665665
r, \
666-
max_acceptable_lsn.lsn, \
666+
(ulonglong)max_acceptable_lsn.lsn, \
667667
r0, \
668-
checkpoint_lsn_0.lsn, \
669-
checkpoint_count_0, \
668+
(ulonglong)checkpoint_lsn_0.lsn, \
669+
(ulonglong)checkpoint_count_0, \
670670
r1, \
671-
checkpoint_lsn_1.lsn, \
672-
checkpoint_count_1);
671+
(ulonglong)checkpoint_lsn_1.lsn, \
672+
(ulonglong)checkpoint_count_1);
673673

674674
int toku_deserialize_ft_from(int fd,
675675
const char *fn,

‎storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ int verify_ftnode_sub_block(struct sub_block *sb,
11741174
__FILE__,
11751175
__LINE__,
11761176
fname ? fname : "unknown",
1177-
blocknum.b,
1177+
(longlong)blocknum.b,
11781178
stored_xsum,
11791179
actual_xsum);
11801180
dump_bad_block((Bytef *) sb->uncompressed_ptr, sb->uncompressed_size);
@@ -1201,7 +1201,7 @@ static int deserialize_ftnode_info(struct sub_block *sb, FTNODE node) {
12011201
__FILE__,
12021202
__LINE__,
12031203
fname ? fname : "unknown",
1204-
node->blocknum.b,
1204+
(longlong)node->blocknum.b,
12051205
r);
12061206
dump_bad_block(static_cast<unsigned char *>(sb->uncompressed_ptr),
12071207
sb->uncompressed_size);
@@ -1257,7 +1257,7 @@ static int deserialize_ftnode_info(struct sub_block *sb, FTNODE node) {
12571257
__FILE__,
12581258
__LINE__,
12591259
fname ? fname : "unknown",
1260-
node->blocknum.b,
1260+
(longlong)node->blocknum.b,
12611261
data_size,
12621262
rb.ndone);
12631263
dump_bad_block(rb.buf, rb.size);
@@ -1393,7 +1393,7 @@ static int deserialize_ftnode_partition(
13931393
__FILE__,
13941394
__LINE__,
13951395
fname ? fname : "unknown",
1396-
node->blocknum.b,
1396+
(longlong)node->blocknum.b,
13971397
r);
13981398
goto exit;
13991399
}
@@ -1415,7 +1415,7 @@ static int deserialize_ftnode_partition(
14151415
__FILE__,
14161416
__LINE__,
14171417
fname ? fname : "unknown",
1418-
node->blocknum.b,
1418+
(longlong)node->blocknum.b,
14191419
ch,
14201420
FTNODE_PARTITION_MSG_BUFFER);
14211421
dump_bad_block(rb.buf, rb.size);
@@ -1438,7 +1438,7 @@ static int deserialize_ftnode_partition(
14381438
__FILE__,
14391439
__LINE__,
14401440
fname ? fname : "unknown",
1441-
node->blocknum.b,
1441+
(longlong)node->blocknum.b,
14421442
ch,
14431443
FTNODE_PARTITION_DMT_LEAVES);
14441444
dump_bad_block(rb.buf, rb.size);
@@ -1461,7 +1461,7 @@ static int deserialize_ftnode_partition(
14611461
__FILE__,
14621462
__LINE__,
14631463
fname ? fname : "unknown",
1464-
node->blocknum.b,
1464+
(longlong)node->blocknum.b,
14651465
rb.ndone,
14661466
rb.size);
14671467
dump_bad_block(rb.buf, rb.size);
@@ -1490,7 +1490,7 @@ static int decompress_and_deserialize_worker(struct rbuf curr_rbuf,
14901490
__FILE__,
14911491
__LINE__,
14921492
fname ? fname : "unknown",
1493-
node->blocknum.b,
1493+
(longlong)node->blocknum.b,
14941494
r);
14951495
dump_bad_block(curr_rbuf.buf, curr_rbuf.size);
14961496
goto exit;
@@ -1507,7 +1507,7 @@ static int decompress_and_deserialize_worker(struct rbuf curr_rbuf,
15071507
__FILE__,
15081508
__LINE__,
15091509
fname ? fname : "unknown",
1510-
node->blocknum.b,
1510+
(longlong)node->blocknum.b,
15111511
r);
15121512
dump_bad_block(curr_rbuf.buf, curr_rbuf.size);
15131513
goto exit;
@@ -1586,7 +1586,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
15861586
__FILE__,
15871587
__LINE__,
15881588
fname ? fname : "unknown",
1589-
blocknum.b,
1589+
(longlong)blocknum.b,
15901590
rb->size);
15911591
dump_bad_block(rb->buf, rb->size);
15921592
// TODO: What error do we return here?
@@ -1607,7 +1607,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
16071607
__FILE__,
16081608
__LINE__,
16091609
fname ? fname : "unknown",
1610-
blocknum.b,
1610+
(longlong)blocknum.b,
16111611
static_cast<const uint8_t*>(magic)[0],
16121612
static_cast<const uint8_t*>(magic)[1],
16131613
static_cast<const uint8_t*>(magic)[2],
@@ -1632,7 +1632,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
16321632
__FILE__,
16331633
__LINE__,
16341634
fname ? fname : "unknown",
1635-
blocknum.b,
1635+
(longlong)blocknum.b,
16361636
node->layout_version_read_from_disk,
16371637
FT_FIRST_LAYOUT_VERSION_WITH_BASEMENT_NODES);
16381638
dump_bad_block(rb->buf, rb->size);
@@ -1671,7 +1671,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
16711671
__FILE__,
16721672
__LINE__,
16731673
fname ? fname : "unknown",
1674-
blocknum.b,
1674+
(longlong)blocknum.b,
16751675
needed_size,
16761676
rb->size);
16771677
dump_bad_block(rb->buf, rb->size);
@@ -1699,7 +1699,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
16991699
__FILE__,
17001700
__LINE__,
17011701
fname ? fname : "unknown",
1702-
blocknum.b,
1702+
(longlong)blocknum.b,
17031703
stored_checksum,
17041704
checksum);
17051705
dump_bad_block(rb->buf, rb->size);
@@ -1722,7 +1722,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
17221722
__FILE__,
17231723
__LINE__,
17241724
fname ? fname : "unknown",
1725-
blocknum.b,
1725+
(longlong)blocknum.b,
17261726
rb->size,
17271727
rb->ndone,
17281728
sb_node_info.compressed_size);
@@ -1748,7 +1748,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
17481748
__FILE__,
17491749
__LINE__,
17501750
fname ? fname : "unknown",
1751-
blocknum.b,
1751+
(longlong)blocknum.b,
17521752
sb_node_info.xsum,
17531753
actual_xsum);
17541754
dump_bad_block(rb->buf, rb->size);
@@ -1779,7 +1779,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
17791779
__FILE__,
17801780
__LINE__,
17811781
fname ? fname : "unknown",
1782-
blocknum.b,
1782+
(longlong)blocknum.b,
17831783
r);
17841784
dump_bad_block(
17851785
static_cast<unsigned char *>(sb_node_info.uncompressed_ptr),
@@ -1817,7 +1817,7 @@ static int deserialize_ftnode_header_from_rbuf_if_small_enough(
18171817
__FILE__,
18181818
__LINE__,
18191819
fname ? fname : "unknown",
1820-
blocknum.b,
1820+
(longlong)blocknum.b,
18211821
r);
18221822
dump_bad_block(rb->buf, rb->size);
18231823
goto cleanup;
@@ -2169,7 +2169,7 @@ static int deserialize_and_upgrade_ftnode(FTNODE node,
21692169
__FILE__,
21702170
__LINE__,
21712171
fname ? fname : "unknown",
2172-
blocknum.b,
2172+
(longlong)blocknum.b,
21732173
r);
21742174
goto exit;
21752175
}
@@ -2195,7 +2195,7 @@ static int deserialize_and_upgrade_ftnode(FTNODE node,
21952195
__FILE__,
21962196
__LINE__,
21972197
fname ? fname : "unknown",
2198-
blocknum.b,
2198+
(longlong)blocknum.b,
21992199
version,
22002200
FT_LAYOUT_VERSION_14);
22012201
dump_bad_block(rb.buf, rb.size);
@@ -2283,7 +2283,7 @@ static int deserialize_ftnode_from_rbuf(FTNODE *ftnode,
22832283
__FILE__,
22842284
__LINE__,
22852285
fname ? fname : "unknown",
2286-
blocknum.b,
2286+
(longlong)blocknum.b,
22872287
static_cast<const uint8_t *>(magic)[0],
22882288
static_cast<const uint8_t *>(magic)[1],
22892289
static_cast<const uint8_t *>(magic)[2],
@@ -2314,7 +2314,7 @@ static int deserialize_ftnode_from_rbuf(FTNODE *ftnode,
23142314
__FILE__,
23152315
__LINE__,
23162316
fname ? fname : "unknown",
2317-
blocknum.b,
2317+
(longlong)blocknum.b,
23182318
r);
23192319
dump_bad_block(rb->buf, rb->size);
23202320
goto cleanup;
@@ -2359,7 +2359,7 @@ static int deserialize_ftnode_from_rbuf(FTNODE *ftnode,
23592359
__FILE__,
23602360
__LINE__,
23612361
fname ? fname : "unknown",
2362-
blocknum.b,
2362+
(longlong)blocknum.b,
23632363
stored_checksum,
23642364
checksum);
23652365
dump_bad_block(rb->buf, rb->size);
@@ -2382,7 +2382,7 @@ static int deserialize_ftnode_from_rbuf(FTNODE *ftnode,
23822382
__FILE__,
23832383
__LINE__,
23842384
fname ? fname : "unknown",
2385-
blocknum.b,
2385+
(longlong)blocknum.b,
23862386
r);
23872387
dump_bad_block(
23882388
static_cast<unsigned char *>(sb_node_info.uncompressed_ptr),
@@ -2403,7 +2403,7 @@ static int deserialize_ftnode_from_rbuf(FTNODE *ftnode,
24032403
__FILE__,
24042404
__LINE__,
24052405
fname ? fname : "unknown",
2406-
blocknum.b,
2406+
(longlong)blocknum.b,
24072407
r);
24082408
dump_bad_block(rb->buf, rb->size);
24092409
goto cleanup;
@@ -2475,7 +2475,7 @@ static int deserialize_ftnode_from_rbuf(FTNODE *ftnode,
24752475
__FILE__,
24762476
__LINE__,
24772477
fname ? fname : "unknown",
2478-
blocknum.b,
2478+
(longlong)blocknum.b,
24792479
i,
24802480
r);
24812481
dump_bad_block(rb->buf, rb->size);
@@ -2496,7 +2496,7 @@ static int deserialize_ftnode_from_rbuf(FTNODE *ftnode,
24962496
__FILE__,
24972497
__LINE__,
24982498
fname ? fname : "unknown",
2499-
blocknum.b,
2499+
(longlong)blocknum.b,
25002500
i,
25012501
r);
25022502
dump_bad_block(rb->buf, rb->size);
@@ -2646,7 +2646,7 @@ int toku_deserialize_bp_from_compressed(FTNODE node,
26462646
__FILE__,
26472647
__LINE__,
26482648
fname ? fname : "unknown",
2649-
node->blocknum.b,
2649+
(longlong)node->blocknum.b,
26502650
r);
26512651
dump_bad_block(static_cast<unsigned char *>(curr_sb->compressed_ptr),
26522652
curr_sb->compressed_size);
@@ -2694,7 +2694,7 @@ static int deserialize_ftnode_from_fd(int fd,
26942694
__FILE__,
26952695
__LINE__,
26962696
fname ? fname : "unknown",
2697-
blocknum.b,
2697+
(longlong)blocknum.b,
26982698
r);
26992699
dump_bad_block(rb.buf, rb.size);
27002700
}

0 commit comments

Comments
 (0)