- developers - lists.mariadb.org

[Maria-developers] New (by Sanja): Backport key cache to 5.0 (52)
by worklog-noreply＠askmonty.org 27 Aug '09

27 Aug '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Backport key cache to 5.0 CREATION DATE..: Thu, 27 Aug 2009, 09:54 SUPERVISOR.....: Monty IMPLEMENTOR....: Monty COPIES TO......: Sanja CATEGORY.......: Server-Sprint TASK ID........: 52 (http://askmonty.org/worklog/?tid=52) VERSION........: Server-5.0 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 8 (hours remain) ORIG. ESTIMATE.: 8 PROGRESS NOTES: DESCRIPTION: Backport keycache to bring bugfixes made in 5.1. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Rev 2748: MWL#17: Table elimination: in file:///home/psergey/dev/maria-5.1-table-elim-r11-gcov/
by Sergey Petrunya 26 Aug '09

26 Aug '09

At file:///home/psergey/dev/maria-5.1-table-elim-r11-gcov/ ------------------------------------------------------------ revno: 2748 revision-id: psergey(a)askmonty.org-20090826210140-y2pba3ucdwnvr956 parent: psergey(a)askmonty.org-20090825150255-46i5gvl2ctd0jcm2 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-table-elim-r11-gcov timestamp: Thu 2009-08-27 01:01:40 +0400 message: MWL#17: Table elimination: - Fix a trivial problem when OR-merging two multi-equalities - Amend testsuite to provide full gcov coverage === modified file 'mysql-test/r/table_elim.result' --- a/mysql-test/r/table_elim.result 2009-08-25 10:38:22 +0000 +++ b/mysql-test/r/table_elim.result 2009-08-26 21:01:40 +0000 @@ -352,3 +352,69 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 4 drop table t1,t2,t3; +# +# Multi-equality tests +# +create table t1 (a int, b int, c int, d int); +insert into t1 values (0,0,0,0),(1,1,1,1),(2,2,2,2),(3,3,3,3); +create table t2 (pk int primary key, b int, c int); +insert into t2 select a,a,a from t1 where a in (1,2); +explain +select t1.* +from t1 left join t2 on t2.pk=t2.c and t2.b=t1.a and t1.a=t1.b and t2.c=t2.b +where t1.d=1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where +explain +select t1.* +from +t1 +left join +t2 +on (t2.pk=t2.c and t2.b=t1.a and t1.a=t1.b and t2.c=t2.b) or +(t2.pk=t2.c and t2.b=t1.a and t1.a=t1.b and t2.c=t2.b) +where t1.d=1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where +#This can't be eliminated: +explain +select t1.* +from +t1 +left join +t2 +on (t2.pk=t2.c and t2.b=t1.a and t2.c=t1.b) or +(t2.pk=t2.c and t1.a=t1.b and t2.c=t1.b) +where t1.d=1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where +1 SIMPLE t2 eq_ref PRIMARY PRIMARY 4 test.t1.b 1 +explain +select t1.* +from +t1 +left join +t2 +on (t2.pk=t2.c and t2.b=t1.a and t2.c=t1.b) or +(t2.pk=t2.c and t2.c=t1.b) +; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 +explain +select t1.* +from t1 left join t2 on t2.pk=3 or t2.pk= 4; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 +1 SIMPLE t2 index PRIMARY PRIMARY 4 NULL 2 Using index +explain +select t1.* +from t1 left join t2 on t2.pk=3 or t2.pk= 3; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 +explain +select t1.* +from t1 left join t2 on (t2.pk=3 and t2.b=3) or (t2.pk= 4 and t2.b=3); +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 +1 SIMPLE t2 range PRIMARY PRIMARY 4 NULL 2 Using where +drop table t1, t2; === modified file 'mysql-test/t/table_elim.test' --- a/mysql-test/t/table_elim.test 2009-08-25 10:38:22 +0000 +++ b/mysql-test/t/table_elim.test 2009-08-26 21:01:40 +0000 @@ -278,3 +278,61 @@ drop table t1,t2,t3; +--echo # +--echo # Multi-equality tests +--echo # +create table t1 (a int, b int, c int, d int); +insert into t1 values (0,0,0,0),(1,1,1,1),(2,2,2,2),(3,3,3,3); + +create table t2 (pk int primary key, b int, c int); +insert into t2 select a,a,a from t1 where a in (1,2); + +explain +select t1.* +from t1 left join t2 on t2.pk=t2.c and t2.b=t1.a and t1.a=t1.b and t2.c=t2.b +where t1.d=1; + +explain +select t1.* +from + t1 + left join + t2 + on (t2.pk=t2.c and t2.b=t1.a and t1.a=t1.b and t2.c=t2.b) or + (t2.pk=t2.c and t2.b=t1.a and t1.a=t1.b and t2.c=t2.b) +where t1.d=1; + +--echo #This can't be eliminated: +explain +select t1.* +from + t1 + left join + t2 + on (t2.pk=t2.c and t2.b=t1.a and t2.c=t1.b) or + (t2.pk=t2.c and t1.a=t1.b and t2.c=t1.b) +where t1.d=1; + +explain +select t1.* +from + t1 + left join + t2 + on (t2.pk=t2.c and t2.b=t1.a and t2.c=t1.b) or + (t2.pk=t2.c and t2.c=t1.b) +; + +explain +select t1.* +from t1 left join t2 on t2.pk=3 or t2.pk= 4; + +explain +select t1.* +from t1 left join t2 on t2.pk=3 or t2.pk= 3; + +explain +select t1.* +from t1 left join t2 on (t2.pk=3 and t2.b=3) or (t2.pk= 4 and t2.b=3); + +drop table t1, t2; === modified file 'sql/opt_table_elimination.cc' --- a/sql/opt_table_elimination.cc 2009-08-25 14:59:15 +0000 +++ b/sql/opt_table_elimination.cc 2009-08-26 21:01:40 +0000 @@ -654,7 +654,7 @@ List <Field_value> *fv; if (!(fv= new List<Field_value>)) - break; + break; /* purecov: inspected */ List_iterator<Field_value> it1(*old->mult_equal_fields); List_iterator<Field_value> it2(*new_fields->mult_equal_fields); @@ -664,7 +664,11 @@ while (lfield && rfield) { if (lfield == rfield) + { fv->push_back(lfield); + lfield=it1++; + rfield=it2++; + } else { uint left_ratio= lfield->field->table->tablenr*MAX_FIELDS +

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2721)
by knielsen＠knielsen-hq.org 26 Aug '09

26 Aug '09

#At lp:maria 2721 knielsen(a)knielsen-hq.org 2009-08-26 More compiler warnings fixed. modified: client/mysqlbinlog.cc config/ac-macros/misc.m4 extra/yassl/include/yassl_int.hpp extra/yassl/src/handshake.cpp extra/yassl/src/yassl_imp.cpp extra/yassl/src/yassl_int.cpp extra/yassl/taocrypt/include/modes.hpp extra/yassl/taocrypt/src/asn.cpp mysql-test/valgrind.supp sql/strfunc.cc storage/pbxt/src/datadic_xt.cc storage/pbxt/src/discover_xt.cc strings/decimal.c support-files/compiler_warnings.supp per-file messages: client/mysqlbinlog.cc Fix compiler warnings. config/ac-macros/misc.m4 Fix wrong naming, autoconfig requires _cv_ in cached names. extra/yassl/include/yassl_int.hpp Fix compiler warnings. extra/yassl/src/handshake.cpp Fix compiler warnings. extra/yassl/src/yassl_imp.cpp Fix compiler warnings. extra/yassl/src/yassl_int.cpp Fix compiler warnings. extra/yassl/taocrypt/include/modes.hpp Fix compiler warnings. extra/yassl/taocrypt/src/asn.cpp Fix compiler warnings. mysql-test/valgrind.supp Make dlclose() suppression catch also another possible call path, seen in new test case. sql/strfunc.cc Fix compiler warnings. storage/pbxt/src/datadic_xt.cc Fix compiler warnings. storage/pbxt/src/discover_xt.cc Fix compiler warnings. strings/decimal.c Fix compiler warnings. support-files/compiler_warnings.supp Suppress a few warnings that cannot be meaningfully fixed in source code. === modified file 'client/mysqlbinlog.cc' --- a/client/mysqlbinlog.cc 2009-02-13 16:41:47 +0000 +++ b/client/mysqlbinlog.cc 2009-08-26 12:07:38 +0000 @@ -689,8 +689,8 @@ Exit_status process_event(PRINT_EVENT_IN Format events are not concerned by --offset and such, we always need to read them to be able to process the wanted events. */ - if ((rec_count >= offset) && - ((my_time_t)(ev->when) >= start_datetime) || + if (((rec_count >= offset) && + ((my_time_t)(ev->when) >= start_datetime)) || (ev_type == FORMAT_DESCRIPTION_EVENT)) { if (ev_type != FORMAT_DESCRIPTION_EVENT) === modified file 'config/ac-macros/misc.m4' --- a/config/ac-macros/misc.m4 2008-02-26 17:38:43 +0000 +++ b/config/ac-macros/misc.m4 2009-08-26 12:07:38 +0000 @@ -594,15 +594,15 @@ dnl ------------------------------------ dnl MYSQL_NEEDS_MYSYS_NEW AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW], -[AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new, +[AC_CACHE_CHECK([needs mysys_new helpers], mysql_cv_use_mysys_new, [ AC_LANG_PUSH(C++) AC_TRY_LINK([], [ class A { public: int b; }; A *a=new A; a->b=10; delete a; -], mysql_use_mysys_new=no, mysql_use_mysys_new=yes) +], mysql_cv_use_mysys_new=no, mysql_cv_use_mysys_new=yes) AC_LANG_POP(C++) ]) -if test "$mysql_use_mysys_new" = "yes" +if test "$mysql_cv_use_mysys_new" = "yes" then AC_DEFINE([USE_MYSYS_NEW], [1], [Needs to use mysys_new helpers]) fi === modified file 'extra/yassl/include/yassl_int.hpp' --- a/extra/yassl/include/yassl_int.hpp 2008-11-18 16:45:44 +0000 +++ b/extra/yassl/include/yassl_int.hpp 2009-08-26 12:07:38 +0000 @@ -441,7 +441,7 @@ public: const Ciphers& GetCiphers() const; const DH_Parms& GetDH_Parms() const; const Stats& GetStats() const; - const VerifyCallback getVerifyCallback() const; + VerifyCallback getVerifyCallback() const; pem_password_cb GetPasswordCb() const; void* GetUserData() const; bool GetSessionCacheOff() const; === modified file 'extra/yassl/src/handshake.cpp' --- a/extra/yassl/src/handshake.cpp 2008-04-28 16:24:05 +0000 +++ b/extra/yassl/src/handshake.cpp 2009-08-26 12:07:38 +0000 @@ -789,7 +789,7 @@ void processReply(SSL& ssl) { if (ssl.GetError()) return; - if (DoProcessReply(ssl)) + if (DoProcessReply(ssl)) { // didn't complete process if (!ssl.getSocket().IsNonBlocking()) { // keep trying now, blocking ok @@ -799,6 +799,7 @@ void processReply(SSL& ssl) else // user will have try again later, non blocking ssl.SetError(YasslError(SSL_ERROR_WANT_READ)); + } } @@ -872,11 +873,12 @@ void sendServerKeyExchange(SSL& ssl, Buf // send change cipher void sendChangeCipher(SSL& ssl, BufferOutput buffer) { - if (ssl.getSecurity().get_parms().entity_ == server_end) + if (ssl.getSecurity().get_parms().entity_ == server_end) { if (ssl.getSecurity().get_resuming()) ssl.verifyState(clientKeyExchangeComplete); else ssl.verifyState(clientFinishedComplete); + } if (ssl.GetError()) return; ChangeCipherSpec ccs; === modified file 'extra/yassl/src/yassl_imp.cpp' --- a/extra/yassl/src/yassl_imp.cpp 2009-02-13 16:41:47 +0000 +++ b/extra/yassl/src/yassl_imp.cpp 2009-08-26 12:07:38 +0000 @@ -1304,7 +1304,7 @@ void ServerHello::Process(input_buffer&, else ssl.useSecurity().use_connection().sessionID_Set_ = false; - if (ssl.getSecurity().get_resuming()) + if (ssl.getSecurity().get_resuming()) { if (memcmp(session_id_, ssl.getSecurity().get_resume().GetID(), ID_LEN) == 0) { ssl.set_masterSecret(ssl.getSecurity().get_resume().GetSecret()); @@ -1319,6 +1319,7 @@ void ServerHello::Process(input_buffer&, ssl.useSecurity().set_resuming(false); ssl.useLog().Trace("server denied resumption"); } + } if (ssl.CompressionOn() && !compression_method_) ssl.UnSetCompression(); // server isn't supporting yaSSL zlib request === modified file 'extra/yassl/src/yassl_int.cpp' --- a/extra/yassl/src/yassl_int.cpp 2009-02-13 16:41:47 +0000 +++ b/extra/yassl/src/yassl_int.cpp 2009-08-26 12:07:38 +0000 @@ -1833,7 +1833,7 @@ SSL_CTX::GetCA_List() const } -const VerifyCallback SSL_CTX::getVerifyCallback() const +VerifyCallback SSL_CTX::getVerifyCallback() const { return verifyCallback_; } === modified file 'extra/yassl/taocrypt/include/modes.hpp' --- a/extra/yassl/taocrypt/include/modes.hpp 2007-03-23 12:43:09 +0000 +++ b/extra/yassl/taocrypt/include/modes.hpp 2009-08-26 12:07:38 +0000 @@ -95,11 +95,12 @@ inline void Mode_BASE::Process(byte* out { if (mode_ == ECB) ECB_Process(out, in, sz); - else if (mode_ == CBC) + else if (mode_ == CBC) { if (dir_ == ENCRYPTION) CBC_Encrypt(out, in, sz); else CBC_Decrypt(out, in, sz); + } } === modified file 'extra/yassl/taocrypt/src/asn.cpp' --- a/extra/yassl/taocrypt/src/asn.cpp 2009-02-13 16:41:47 +0000 +++ b/extra/yassl/taocrypt/src/asn.cpp 2009-08-26 12:07:38 +0000 @@ -780,11 +780,12 @@ void CertDecoder::GetDate(DateType dt) memcpy(date, source_.get_current(), length); source_.advance(length); - if (!ValidateDate(date, b, dt) && verify_) + if (!ValidateDate(date, b, dt) && verify_) { if (dt == BEFORE) source_.SetError(BEFORE_DATE_E); else source_.SetError(AFTER_DATE_E); + } // save for later use if (dt == BEFORE) { @@ -1061,7 +1062,7 @@ word32 DecodeDSA_Signature(byte* decoded return 0; } word32 rLen = GetLength(source); - if (rLen != 20) + if (rLen != 20) { if (rLen == 21) { // zero at front, eat source.next(); --rLen; @@ -1074,6 +1075,7 @@ word32 DecodeDSA_Signature(byte* decoded source.SetError(DSA_SZ_E); return 0; } + } memcpy(decoded, source.get_buffer() + source.get_index(), rLen); source.advance(rLen); @@ -1083,7 +1085,7 @@ word32 DecodeDSA_Signature(byte* decoded return 0; } word32 sLen = GetLength(source); - if (sLen != 20) + if (sLen != 20) { if (sLen == 21) { source.next(); // zero at front, eat --sLen; @@ -1096,6 +1098,7 @@ word32 DecodeDSA_Signature(byte* decoded source.SetError(DSA_SZ_E); return 0; } + } memcpy(decoded + rLen, source.get_buffer() + source.get_index(), sLen); source.advance(sLen); === modified file 'mysql-test/valgrind.supp' --- a/mysql-test/valgrind.supp 2009-08-05 07:21:37 +0000 +++ b/mysql-test/valgrind.supp 2009-08-26 12:07:38 +0000 @@ -387,6 +387,12 @@ fun:plugin_dl_del(st_mysql_lex_string const*) } +# +# Glibc _dl_close_worker() re-allocates a scope data structure, and frees the +# old one. This isn't a leak, but generates "still reachable" warnings, as +# there is no global destructor code to do a final free() at exit(). +# + { dlclose memory loss from plugin variant 2 Memcheck:Leak @@ -397,7 +403,6 @@ fun:_dlerror_run fun:dlclose fun:_Z15free_plugin_memP12st_plugin_dl - fun:_Z13plugin_dl_delPK19st_mysql_lex_string } { @@ -411,7 +416,6 @@ fun:_dlerror_run fun:dlclose fun:_Z15free_plugin_memP12st_plugin_dl - fun:_Z13plugin_dl_delPK19st_mysql_lex_string } { @@ -424,7 +428,6 @@ obj:/lib*/libdl-*.so fun:dlclose fun:_ZL15free_plugin_memP12st_plugin_dl - fun:_ZL13plugin_dl_delPK19st_mysql_lex_string } { @@ -452,7 +455,6 @@ fun:_dlerror_run fun:dlclose fun:_ZL15free_plugin_memP12st_plugin_dl - fun:_ZL13plugin_dl_delPK19st_mysql_lex_string } { @@ -466,7 +468,6 @@ fun:_dlerror_run fun:dlclose fun:_ZL15free_plugin_memP12st_plugin_dl - fun:_ZL13plugin_dl_delPK19st_mysql_lex_string } { === modified file 'sql/strfunc.cc' --- a/sql/strfunc.cc 2009-04-25 10:05:32 +0000 +++ b/sql/strfunc.cc 2009-08-26 12:07:38 +0000 @@ -148,7 +148,7 @@ static uint parse_name(TYPELIB *lib, con } } else - for (; pos != end && *pos != '=' && *pos !=',' ; pos++); + for (; pos != end && *pos != '=' && *pos !=',' ; pos++) { } uint var_len= (uint) (pos - start); /* Determine which flag it is */ === modified file 'storage/pbxt/src/datadic_xt.cc' --- a/storage/pbxt/src/datadic_xt.cc 2009-03-26 12:18:01 +0000 +++ b/storage/pbxt/src/datadic_xt.cc 2009-08-26 12:07:38 +0000 @@ -2871,5 +2871,5 @@ xtBool XTDDTable::checkCanDrop() { /* no refs or references only itself */ return (dt_trefs == NULL) || - (dt_trefs->tr_next == NULL) && (dt_trefs->tr_fkey->co_table == this); + ((dt_trefs->tr_next == NULL) && (dt_trefs->tr_fkey->co_table == this)); } === modified file 'storage/pbxt/src/discover_xt.cc' --- a/storage/pbxt/src/discover_xt.cc 2009-03-26 12:18:01 +0000 +++ b/storage/pbxt/src/discover_xt.cc 2009-08-26 12:07:38 +0000 @@ -493,8 +493,8 @@ mysql_prepare_create_table(THD *thd, HA_ } /* Don't pack rows in old tables if the user has requested this */ if ((sql_field->flags & BLOB_FLAG) || - sql_field->sql_type == MYSQL_TYPE_VARCHAR && - create_info->row_type != ROW_TYPE_FIXED) + (sql_field->sql_type == MYSQL_TYPE_VARCHAR && + create_info->row_type != ROW_TYPE_FIXED)) (*db_options)|= HA_OPTION_PACK_RECORD; it2.rewind(); } @@ -963,7 +963,7 @@ mysql_prepare_create_table(THD *thd, HA_ sql_field->sql_type == MYSQL_TYPE_VARCHAR || sql_field->pack_flag & FIELDFLAG_BLOB))) { - if (column_nr == 0 && (sql_field->pack_flag & FIELDFLAG_BLOB) || + if ((column_nr == 0 && (sql_field->pack_flag & FIELDFLAG_BLOB)) || sql_field->sql_type == MYSQL_TYPE_VARCHAR) key_info->flags|= HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY; else === modified file 'strings/decimal.c' --- a/strings/decimal.c 2009-05-06 12:03:24 +0000 +++ b/strings/decimal.c 2009-08-26 12:07:38 +0000 @@ -306,7 +306,7 @@ int decimal_actual_fraction(decimal_t *f { for (i= DIG_PER_DEC1 - ((frac - 1) % DIG_PER_DEC1); *buf0 % powers10[i++] == 0; - frac--); + frac--) { } } return frac; } @@ -500,7 +500,7 @@ static void digits_bounds(decimal_t *fro stop= (int) ((buf_end - from->buf + 1) * DIG_PER_DEC1); i= 1; } - for (; *buf_end % powers10[i++] == 0; stop--); + for (; *buf_end % powers10[i++] == 0; stop--) { } *end_result= stop; /* index of position after last decimal digit (from 0) */ } @@ -1011,7 +1011,7 @@ static int ull2dec(ulonglong from, decim sanity(to); - for (intg1=1; from >= DIG_BASE; intg1++, from/=DIG_BASE); + for (intg1=1; from >= DIG_BASE; intg1++, from/=DIG_BASE) { } if (unlikely(intg1 > to->len)) { intg1=to->len; === modified file 'support-files/compiler_warnings.supp' --- a/support-files/compiler_warnings.supp 2009-08-24 13:56:18 +0000 +++ b/support-files/compiler_warnings.supp 2009-08-26 12:07:38 +0000 @@ -84,6 +84,17 @@ db_vrfy.c : .*comparison is always false storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used # +# I think these are due to mix of C and C++. +# +storage/pbxt/ : typedef.*was ignored in this declaration + + +# +# Groff warnings on OpenSUSE. +# +.*/dbug/.*(groff|<standard input>) : .* + +# # Unexplanable (?) stuff # listener.cc : .*conversion from 'SOCKET' to 'int'.*

2 1

[Maria-developers] Buildbot confused by non-monotonicity of revision numbers in the tree
by Sergey Petrunya 26 Aug '09

26 Aug '09

Hi! Buildbot seems to have a wrong idea about the order of bazaar's revision numbers. It also shows only last five pushes, and these two issues together make it impossible to see the recent status. The problem can be observed in maria-5.1-table-elimination tree: https://internal.askmonty.org/internal/index.php/Image:Buildbot-confused-by… it's building but won't let you see the status. I got the tree into this state as follows: 1. branch off maria-5.1 2. make a number of sequential commits, so that the number of the tip revision grows to be much greater than that of mainline tree. 3. Meanwhile, a few csets were commited into the main maria-5.1 4. Do a maria-5.1 -> maria-5.1-table-elimination merge, using the recommended procedure - make a branch of main - bzr merge --pull from maria-5.1-table-elimination to there. As a result, tip revision in maria-5.1-table-elimination becomes a number which is less than it used to be (all csets made in #2 are collapsed into one Merge cset), and buildbot is confused - it assumes that the revision numbers are monotonically increasing, and that assumption puts my latest revision between some dated revisions. Besides the ordering problem, there might be an identity problem. At the moment the tree has a tip revision number #2723. The problem is that there already was a moment in the past when the tree was in a different state and had a tip revision number 2723. Does this mean that the new test results will overwrite the old ones? BR Sergey -- Sergey Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 3

[Maria-developers] Progress (by Knielsen): Extra replication tasks (48)
by worklog-noreply＠askmonty.org 26 Aug '09

26 Aug '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Extra replication tasks CREATION DATE..: Sun, 16 Aug 2009, 10:58 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 48 (http://askmonty.org/worklog/?tid=48) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 1 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Knielsen - Wed, 26 Aug 2009, 08:55)=-=- Architecture review, discussion. Worked 1 hour and estimate 0 hours remain (original estimate increased by 1 hour). -=-=(Psergey - Sun, 16 Aug 2009, 11:07)=-=- Dependency deleted: 48 no longer depends on 46 -=-=(Psergey - Sun, 16 Aug 2009, 10:59)=-=- Dependency created: 48 now depends on 46 DESCRIPTION: An umbrella task for replication tasks that are nice to do but are not direct responses for customer requests ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Progress (by Knielsen): Extra replication tasks (48)
by worklog-noreply＠askmonty.org 26 Aug '09

26 Aug '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Extra replication tasks CREATION DATE..: Sun, 16 Aug 2009, 10:58 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 48 (http://askmonty.org/worklog/?tid=48) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 1 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Knielsen - Wed, 26 Aug 2009, 08:55)=-=- Architecture review, discussion. Worked 1 hour and estimate 0 hours remain (original estimate increased by 1 hour). -=-=(Psergey - Sun, 16 Aug 2009, 11:07)=-=- Dependency deleted: 48 no longer depends on 46 -=-=(Psergey - Sun, 16 Aug 2009, 10:59)=-=- Dependency created: 48 now depends on 46 DESCRIPTION: An umbrella task for replication tasks that are nice to do but are not direct responses for customer requests ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Progress (by Knielsen): improving mysqlbinlog output and doing rename (39)
by worklog-noreply＠askmonty.org 26 Aug '09

26 Aug '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: improving mysqlbinlog output and doing rename CREATION DATE..: Sun, 09 Aug 2009, 12:24 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-RawIdeaBin TASK ID........: 39 (http://askmonty.org/worklog/?tid=39) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 33 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Knielsen - Wed, 26 Aug 2009, 08:55)=-=- Architecture review / discussion. Worked 4 hours and estimate 0 hours remain (original estimate increased by 4 hours). -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- Dependency created: 39 now depends on 50 -=-=(Guest - Mon, 17 Aug 2009, 11:17)=-=- Dependency created: 39 now depends on 45 -=-=(Guest - Mon, 17 Aug 2009, 11:17)=-=- Dependency deleted: 39 no longer depends on 45 -=-=(Knielsen - Mon, 17 Aug 2009, 11:13)=-=- Research and architecture review. Worked 12 hours and estimate 0 hours remain (original estimate increased by 12 hours). -=-=(Knielsen - Mon, 17 Aug 2009, 11:13)=-=- Reported zero hours worked. Estimate unchanged. -=-=(Psergey - Sun, 16 Aug 2009, 12:07)=-=- Dependency created: 39 now depends on 49 -=-=(Psergey - Sun, 16 Aug 2009, 11:07)=-=- Dependency created: 39 now depends on 46 -=-=(Psergey - Sun, 16 Aug 2009, 10:59)=-=- Dependency deleted: 39 no longer depends on 46 -=-=(Psergey - Sun, 16 Aug 2009, 00:02)=-=- Dependency created: 39 now depends on 47 ------------------------------------------------------------ -=-=(View All Progress Notes, 20 total)=-=- http://askmonty.org/worklog/index.pl?tid=39&nolimit=1 DESCRIPTION: A combine task for all replication tasks. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Progress (by Knielsen): improving mysqlbinlog output and doing rename (39)
by worklog-noreply＠askmonty.org 26 Aug '09

26 Aug '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: improving mysqlbinlog output and doing rename CREATION DATE..: Sun, 09 Aug 2009, 12:24 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-RawIdeaBin TASK ID........: 39 (http://askmonty.org/worklog/?tid=39) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 33 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Knielsen - Wed, 26 Aug 2009, 08:55)=-=- Architecture review / discussion. Worked 4 hours and estimate 0 hours remain (original estimate increased by 4 hours). -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- Dependency created: 39 now depends on 50 -=-=(Guest - Mon, 17 Aug 2009, 11:17)=-=- Dependency created: 39 now depends on 45 -=-=(Guest - Mon, 17 Aug 2009, 11:17)=-=- Dependency deleted: 39 no longer depends on 45 -=-=(Knielsen - Mon, 17 Aug 2009, 11:13)=-=- Research and architecture review. Worked 12 hours and estimate 0 hours remain (original estimate increased by 12 hours). -=-=(Knielsen - Mon, 17 Aug 2009, 11:13)=-=- Reported zero hours worked. Estimate unchanged. -=-=(Psergey - Sun, 16 Aug 2009, 12:07)=-=- Dependency created: 39 now depends on 49 -=-=(Psergey - Sun, 16 Aug 2009, 11:07)=-=- Dependency created: 39 now depends on 46 -=-=(Psergey - Sun, 16 Aug 2009, 10:59)=-=- Dependency deleted: 39 no longer depends on 46 -=-=(Psergey - Sun, 16 Aug 2009, 00:02)=-=- Dependency created: 39 now depends on 47 ------------------------------------------------------------ -=-=(View All Progress Notes, 20 total)=-=- http://askmonty.org/worklog/index.pl?tid=39&nolimit=1 DESCRIPTION: A combine task for all replication tasks. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Rev 2746: MWL#17: Table elimination in file:///home/psergey/dev/maria-5.1-table-elim-r11-gcov/
by Sergey Petrunya 25 Aug '09

25 Aug '09

At file:///home/psergey/dev/maria-5.1-table-elim-r11-gcov/ ------------------------------------------------------------ revno: 2746 revision-id: psergey(a)askmonty.org-20090825145915-rxwmfczgqe69r5ju parent: psergey(a)askmonty.org-20090825103822-ldmjinfdh7ymc35r committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-table-elim-r11-gcov timestamp: Tue 2009-08-25 17:59:15 +0300 message: MWL#17: Table elimination - Mark gcov deadcode === modified file 'sql/opt_table_elimination.cc' --- a/sql/opt_table_elimination.cc 2009-08-25 10:38:22 +0000 +++ b/sql/opt_table_elimination.cc 2009-08-25 14:59:15 +0000 @@ -197,7 +197,7 @@ public: Value_dep(): bound(FALSE), next(NULL) {} virtual void now_bound(Func_dep_analyzer *fda, Module_dep **bound_modules)=0; - virtual ~Value_dep() {} /* only to shut up compiler warnings */ + virtual ~Value_dep(){} /* purecov: inspected */ /* stop compiler warnings */ bool bound; Value_dep *next; @@ -264,7 +264,7 @@ { public: virtual bool now_bound(Func_dep_analyzer *fda, Value_dep **bound_modules)=0; - virtual ~Module_dep(){} + virtual ~Module_dep(){} /* purecov: inspected */ /* stop compiler warnings */ /* Used to make a linked list of elements that became bound and thus can make elements that depend on them bound, too. @@ -510,7 +510,7 @@ Item_equal *item_equal= (Item_equal*)cond; List<Field_value> *fvl; if (!(fvl= new List<Field_value>)) - break; + break; /* purecov: inspected */ Item_equal_iterator it(*item_equal); Item_field *item; @@ -802,6 +802,7 @@ We've filled the entire equality_mods array. Replace it with a bigger one. We do it somewhat inefficiently but it doesn't matter. */ + /* purecov: begin inspected */ Equality_module *new_arr; if (!(new_arr= new Equality_module[fda->n_equality_mods_alloced *2])) return; @@ -811,6 +812,7 @@ fda->equality_mods= new_arr; *eq_mod= new_arr + (*eq_mod - fda->equality_mods); + /* purecov: end */ } (*eq_mod)->field= field_val; @@ -828,7 +830,7 @@ { Table_value *tbl_dep; if (!(tbl_dep= new Table_value(table))) - return NULL; + return NULL; /* purecov: inspected */ Key_module **key_list= &(tbl_dep->keys); /* Add dependencies for unique keys */ @@ -972,7 +974,7 @@ if (!(buf= current_thd->alloc(bitmap_buffer_size(offset))) || bitmap_init(&fda->expr_deps, (my_bitmap_map*)buf, offset, FALSE)) { - DBUG_RETURN(TRUE); + DBUG_RETURN(TRUE); /* purecov: inspected */ } bitmap_clear_all(&fda->expr_deps); @@ -1077,7 +1079,7 @@ #ifndef DBUG_OFF if (!optimizer_flag(thd, OPTIMIZER_SWITCH_TABLE_ELIMINATION)) - DBUG_VOID_RETURN; + DBUG_VOID_RETURN; /* purecov: inspected */ #endif /* Find the tables that are referred to from WHERE/HAVING */ @@ -1256,7 +1258,7 @@ join->thd->lex->current_select->between_count; if (!(fda.equality_mods= new Equality_module[fda.n_equality_mods_alloced])) - return FALSE; + return FALSE; /* purecov: inspected */ Equality_module* last_eq_mod= fda.equality_mods; @@ -1264,7 +1266,7 @@ if (oj_tbl) { if (!get_table_value(&fda, oj_tbl->table)) - return FALSE; + return FALSE; /* purecov: inspected */ } else { @@ -1274,7 +1276,7 @@ if (tbl->table && (tbl->table->map & dep_tables)) { if (!get_table_value(&fda, tbl->table)) - return FALSE; + return FALSE; /* purecov: inspected */ } } } @@ -1292,7 +1294,7 @@ if (!(fda.outer_join_dep= new Outer_join_module(my_count_bits(dep_tables))) || setup_equality_modules_deps(&fda, &bound_modules)) { - return FALSE; /* OOM, default to non-dependent */ + return FALSE; /* OOM, default to non-dependent */ /* purecov: inspected */ } DBUG_EXECUTE("test", dbug_print_deps(&fda); );

1 0

[Maria-developers] Rev 2745: MWL#17: Table elimination in file:///home/psergey/dev/maria-5.1-table-elim-r11-gcov/
by Sergey Petrunya 25 Aug '09

25 Aug '09

At file:///home/psergey/dev/maria-5.1-table-elim-r11-gcov/ ------------------------------------------------------------ revno: 2745 revision-id: psergey(a)askmonty.org-20090825103822-ldmjinfdh7ymc35r parent: psergey(a)askmonty.org-20090825092750-mnmatimn7cxm4rl8 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-table-elim-r11-gcov timestamp: Tue 2009-08-25 13:38:22 +0300 message: MWL#17: Table elimination - More test coverage - Remove unused code === modified file 'mysql-test/r/table_elim.result' --- a/mysql-test/r/table_elim.result 2009-08-25 09:27:50 +0000 +++ b/mysql-test/r/table_elim.result 2009-08-25 10:38:22 +0000 @@ -314,8 +314,8 @@ insert into t1 values (0,0,0,0),(1,1,1,1),(2,2,2,2),(3,3,3,3); create table t2 (pk int primary key, b int) as select a as pk, a as b from t1 where a in (1,2); -create table t3 (pk int primary key, b int) -as select a as pk, a as b from t1 where a in (1,3); +create table t3 (pk1 int, pk2 int, b int, unique(pk1,pk2)); +insert into t3 select a as pk1, a as pk2, a as b from t1 where a in (1,3); explain select t1.a from t1 left join t2 on t2.pk=t1.a and t2.b<t1.b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 4 @@ -344,4 +344,11 @@ explain select t1.a from t1 left join t2 on t2.pk in (t1.a); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 4 +explain select t1.a from t1 left join t2 on TRUE; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 +1 SIMPLE t2 index NULL PRIMARY 4 NULL 2 Using index +explain select t1.a from t1 left join t3 on t3.pk1=t1.a and t3.pk2 IS NULL; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 drop table t1,t2,t3; === modified file 'mysql-test/t/table_elim.test' --- a/mysql-test/t/table_elim.test 2009-08-25 09:27:50 +0000 +++ b/mysql-test/t/table_elim.test 2009-08-25 10:38:22 +0000 @@ -274,5 +274,7 @@ explain select t1.a from t1 left join t2 on TRUE; +explain select t1.a from t1 left join t3 on t3.pk1=t1.a and t3.pk2 IS NULL; + drop table t1,t2,t3; === modified file 'sql/opt_table_elimination.cc' --- a/sql/opt_table_elimination.cc 2009-08-25 09:27:50 +0000 +++ b/sql/opt_table_elimination.cc 2009-08-25 10:38:22 +0000 @@ -490,7 +490,7 @@ { Item *tmp=new Item_null; if (tmp) - add_eq_mod(fda, eq_mod, *and_level, cond_func, args[0], args[1]); + add_eq_mod(fda, eq_mod, *and_level, cond_func, args[0], tmp); break; } case Item_func::MULT_EQUAL_FUNC: @@ -828,7 +828,7 @@ { Table_value *tbl_dep; if (!(tbl_dep= new Table_value(table))) - return NULL; /* purecov: inspected */ + return NULL; Key_module **key_list= &(tbl_dep->keys); /* Add dependencies for unique keys */ @@ -853,15 +853,8 @@ static Field_value *get_field_value(Func_dep_analyzer *fda, Field *field) { TABLE *table= field->table; - Table_value *tbl_dep; + Table_value *tbl_dep= fda->table_deps[table->tablenr]; - /* First, get the table*/ - if (!(tbl_dep= fda->table_deps[table->tablenr])) - { - if (!(tbl_dep= get_table_value(fda, table))) - return NULL; - } - /* Try finding the field in field list */ Field_value **pfield= &(tbl_dep->fields); while (*pfield && (*pfield)->field->field_index < field->field_index)

1 0