[Maria-developers] Patch to fix compiler Warnings and build failure in pbxt
Hi! I have now merged and pushed the xtstat patch into MariaDB 5.1-release. Here is a patch that fixes some compiler warnings and a build failure when building in another directory. Paul, hope you can fix these also on your side. (The patch is already in 5.1-release). Regards, Monty === modified file 'storage/pbxt/bin/Makefile.am' --- storage/pbxt/bin/Makefile.am 2010-05-11 13:45:45 +0000 +++ storage/pbxt/bin/Makefile.am 2010-05-14 11:53:01 +0000 @@ -5,10 +5,10 @@ INCLUDES = -I$(top_srcdir)/include -I$(t -I$(top_srcdir)/storage/innobase/include \ -I$(top_srcdir)/sql \ -I$(srcdir) \ - -I../src + -I$(srcdir)/../src bin_PROGRAMS = xtstat xtstat_SOURCES = xtstat_xt.cc ../src/strutil_xt.cc -xtstat_LDADD = $(top_srcdir)/libmysql/libmysqlclient.la +xtstat_LDADD = $(top_builddir)/libmysql/libmysqlclient.la === modified file 'storage/pbxt/bin/xtstat_xt.cc' --- storage/pbxt/bin/xtstat_xt.cc 2010-05-11 13:45:45 +0000 +++ storage/pbxt/bin/xtstat_xt.cc 2010-05-14 10:59:41 +0000 @@ -93,7 +93,7 @@ struct Options { "Connection protocol to use: default/tcp/socket/pipe/memory", "default", MYSQL_PROTOCOL_DEFAULT, false }, { OPT_DISPLAY, 0, "display", OPT_HAS_VALUE, "Columns to display: use short names separated by |, partial match allowed", "time-msec,commt,row-ins,rec,ind,ilog,xlog,data,to,dirty", 0, false }, - { OPT_NONE, 0, NULL, 0, NULL, 0, false } + { OPT_NONE, 0, NULL, 0, NULL, NULL, 0, false } }; #ifdef XT_WIN === modified file 'storage/pbxt/src/datalog_xt.cc' --- storage/pbxt/src/datalog_xt.cc 2010-05-05 10:59:57 +0000 +++ storage/pbxt/src/datalog_xt.cc 2010-05-14 10:55:32 +0000 @@ -1249,7 +1249,7 @@ xtBool XTDataLogBuffer::dlb_write_thru_l */ dlb_data_log->dlf_log_eof += size; #ifdef DEBUG - if (log_offset + size > dlb_max_write_offset) + if ((ulonglong) (log_offset + size) > (ulonglong) dlb_max_write_offset) dlb_max_write_offset = log_offset + size; #endif dlb_flush_required = TRUE; @@ -1291,7 +1291,7 @@ xtBool XTDataLogBuffer::dlb_append_log(x if (!xt_pwrite_file(dlb_data_log->dlf_log_file, log_offset, size, data, &thread->st_statistics.st_data, thread)) return FAILED; #ifdef DEBUG - if (log_offset + size > dlb_max_write_offset) + if ((ulonglong) (log_offset + size) > (ulonglong) dlb_max_write_offset) dlb_max_write_offset = log_offset + size; #endif dlb_flush_required = TRUE; @@ -1734,8 +1734,8 @@ static xtBool dl_collect_garbage(XTThrea xtLogOffset src_log_offset; xtLogID curr_log_id; xtLogOffset curr_log_offset; - xtLogID dest_log_id; - xtLogOffset dest_log_offset; + xtLogID dest_log_id= 0; + xtLogOffset dest_log_offset= 0; off_t garbage_count = 0; memset(&cs, 0, sizeof(XTCompactorStateRec)); === modified file 'storage/pbxt/src/ha_pbxt.cc' --- storage/pbxt/src/ha_pbxt.cc 2010-05-12 14:27:18 +0000 +++ storage/pbxt/src/ha_pbxt.cc 2010-05-14 10:54:13 +0000 @@ -1609,7 +1609,7 @@ static int pbxt_prepare(handlerton *hton return err; } -static XTThreadPtr ha_temp_open_global_database(handlerton *hton, THD **ret_thd, int *temp_thread, char *thread_name, int *err) +static XTThreadPtr ha_temp_open_global_database(handlerton *hton, THD **ret_thd, int *temp_thread, const char *thread_name, int *err) { THD *thd; XTThreadPtr self = NULL; === modified file 'storage/pbxt/src/table_xt.cc' --- storage/pbxt/src/table_xt.cc 2010-05-06 12:42:28 +0000 +++ storage/pbxt/src/table_xt.cc 2010-05-14 10:57:14 +0000 @@ -1793,10 +1793,12 @@ xtPublic void xt_check_table(XTThreadPtr XTTableHPtr tab = ot->ot_table; xtRecordID prec_id; XTTabRecExtDPtr rec_buf = (XTTabRecExtDPtr) ot->ot_row_rbuffer; +#ifdef CHECK_TABLE_READ_DATA_LOG XTactExtRecEntryDRec ext_rec; size_t log_size; xtLogID log_id; xtLogOffset log_offset; +#endif xtRecordID rec_id; xtRecordID prev_rec_id; xtXactID xn_id;
Thanks Monty, On May 14, 2010, at 2:05 PM, Michael Widenius wrote:
I have now merged and pushed the xtstat patch into MariaDB 5.1-release.
Great! I'm very happy about getting xtstat into MariaDB!
Here is a patch that fixes some compiler warnings and a build failure when building in another directory.
Paul, hope you can fix these also on your side. (The patch is already in 5.1-release).
Yes, it is easier and faster if you send me a patch. But, I always make sure I do not stomp over any changes to PBXT that are made in MariaDB. All changes make it back into the PBXT trunk.
Regards, Monty
=== modified file 'storage/pbxt/bin/Makefile.am' --- storage/pbxt/bin/Makefile.am 2010-05-11 13:45:45 +0000 +++ storage/pbxt/bin/Makefile.am 2010-05-14 11:53:01 +0000 @@ -5,10 +5,10 @@ INCLUDES = -I$(top_srcdir)/include -I$(t -I$(top_srcdir)/storage/innobase/include \ -I$(top_srcdir)/sql \ -I$(srcdir) \ - -I../src + -I$(srcdir)/../src
bin_PROGRAMS = xtstat
xtstat_SOURCES = xtstat_xt.cc ../src/strutil_xt.cc
-xtstat_LDADD = $(top_srcdir)/libmysql/libmysqlclient.la +xtstat_LDADD = $(top_builddir)/libmysql/libmysqlclient.la
=== modified file 'storage/pbxt/bin/xtstat_xt.cc' --- storage/pbxt/bin/xtstat_xt.cc 2010-05-11 13:45:45 +0000 +++ storage/pbxt/bin/xtstat_xt.cc 2010-05-14 10:59:41 +0000 @@ -93,7 +93,7 @@ struct Options { "Connection protocol to use: default/tcp/socket/pipe/memory", "default", MYSQL_PROTOCOL_DEFAULT, false }, { OPT_DISPLAY, 0, "display", OPT_HAS_VALUE, "Columns to display: use short names separated by |, partial match allowed", "time-msec,commt,row-ins,rec,ind,ilog,xlog,data,to,dirty", 0, false }, - { OPT_NONE, 0, NULL, 0, NULL, 0, false } + { OPT_NONE, 0, NULL, 0, NULL, NULL, 0, false } };
#ifdef XT_WIN
=== modified file 'storage/pbxt/src/datalog_xt.cc' --- storage/pbxt/src/datalog_xt.cc 2010-05-05 10:59:57 +0000 +++ storage/pbxt/src/datalog_xt.cc 2010-05-14 10:55:32 +0000 @@ -1249,7 +1249,7 @@ xtBool XTDataLogBuffer::dlb_write_thru_l */ dlb_data_log->dlf_log_eof += size; #ifdef DEBUG - if (log_offset + size > dlb_max_write_offset) + if ((ulonglong) (log_offset + size) > (ulonglong) dlb_max_write_offset) dlb_max_write_offset = log_offset + size; #endif dlb_flush_required = TRUE; @@ -1291,7 +1291,7 @@ xtBool XTDataLogBuffer::dlb_append_log(x if (!xt_pwrite_file(dlb_data_log->dlf_log_file, log_offset, size, data, &thread->st_statistics.st_data, thread)) return FAILED; #ifdef DEBUG - if (log_offset + size > dlb_max_write_offset) + if ((ulonglong) (log_offset + size) > (ulonglong) dlb_max_write_offset) dlb_max_write_offset = log_offset + size; #endif dlb_flush_required = TRUE; @@ -1734,8 +1734,8 @@ static xtBool dl_collect_garbage(XTThrea xtLogOffset src_log_offset; xtLogID curr_log_id; xtLogOffset curr_log_offset; - xtLogID dest_log_id; - xtLogOffset dest_log_offset; + xtLogID dest_log_id= 0; + xtLogOffset dest_log_offset= 0; off_t garbage_count = 0;
memset(&cs, 0, sizeof(XTCompactorStateRec));
=== modified file 'storage/pbxt/src/ha_pbxt.cc' --- storage/pbxt/src/ha_pbxt.cc 2010-05-12 14:27:18 +0000 +++ storage/pbxt/src/ha_pbxt.cc 2010-05-14 10:54:13 +0000 @@ -1609,7 +1609,7 @@ static int pbxt_prepare(handlerton *hton return err; }
-static XTThreadPtr ha_temp_open_global_database(handlerton *hton, THD **ret_thd, int *temp_thread, char *thread_name, int *err) +static XTThreadPtr ha_temp_open_global_database(handlerton *hton, THD **ret_thd, int *temp_thread, const char *thread_name, int *err) { THD *thd; XTThreadPtr self = NULL;
=== modified file 'storage/pbxt/src/table_xt.cc' --- storage/pbxt/src/table_xt.cc 2010-05-06 12:42:28 +0000 +++ storage/pbxt/src/table_xt.cc 2010-05-14 10:57:14 +0000 @@ -1793,10 +1793,12 @@ xtPublic void xt_check_table(XTThreadPtr XTTableHPtr tab = ot->ot_table; xtRecordID prec_id; XTTabRecExtDPtr rec_buf = (XTTabRecExtDPtr) ot->ot_row_rbuffer; +#ifdef CHECK_TABLE_READ_DATA_LOG XTactExtRecEntryDRec ext_rec; size_t log_size; xtLogID log_id; xtLogOffset log_offset; +#endif xtRecordID rec_id; xtRecordID prev_rec_id; xtXactID xn_id;
-- Paul McCullagh PrimeBase Technologies www.primebase.org www.blobstreaming.org pbxt.blogspot.com
participants (2)
-
Michael Widenius -
Paul McCullagh