• unknown's avatar
    WL#3072 - Maria Recovery · c9a82581
    unknown authored
    Recovery of R-tree and fulltext indices.
    Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using
    repair-with-keycache method".
    Fix for bug (see ma_rt_index.c) where we could have a wrong
    page_link pointer causing wrong memory access during some R-tree
    index insert/delete.
    Making ma_rt_test work again (it had been neglected over time) and
    adding options (record type etc) to prepare it for integration into
    ma_test_all-t (but there is BUG#36321 about "ma_rt_test -M" crash)
    
    
    mysql-test/r/maria.result:
      correct result
    mysql-test/t/maria.test:
      now we get no error
    storage/maria/ma_blockrec.c:
      delete_dir_entry() and delete_head_or_tail() don't use info->keyread_buff.
      ma_get_length() does not change **packet, marking it with 'const' to
      remove some casts in callers of this function. The
      (const uchar**)&header casts will be removed when Monty changes 'header'
      to const uchar*.
      _ma_apply_redo_purge_row_head_or_tail() sets 'buff' from pagecache_read()
      so its initialization was superfluous.
    storage/maria/ma_check.c:
      Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using repair-with-keycache method"
      (see comment in code)
    storage/maria/ma_create.c:
      FULLTEXT and SPATIAL indices have logging now, they are recoverable.
    storage/maria/ma_delete.c:
      Logging done by _ma_ck_delete() is moved to a function
      (_ma_write_undo_key_delete()), for reusal by R-tree logging.
      _ma_log_delete() is made non-static for same
      reason, and some of its parameters are made pointers to const.
      Removed wrong comment ("Note that for delete key" etc, contradicted by
      code and comment "Log also position to row" a few lines above)
    storage/maria/ma_ft_update.c:
      unneeded cast, comment for future
    storage/maria/ma_key_recover.c:
      Comment about possible deadlock.
      Write bad page to DBUG trace if KEY_OP_CHECK founds bad CRC.
      Support operation KEY_OP_MULTI_COPY.
      When we execute, in UNDO phase, UNDO_KEY_DELETE|INSERT, we must call
      the proper key insertion|deletion depending on if this is R-tree
      or B-tree.
      Explanation of of _ma_[un]lock_key_del() work, maybe useful for
      mortals like me.
    storage/maria/ma_key_recover.h:
      change of prototypes
    storage/maria/ma_loghandler.h:
      New operation which can be stored in REDO_INDEX log records: KEY_OP_MULTI_COPY
    storage/maria/ma_page.c:
      Comments
    storage/maria/ma_pagecache.c:
      typo
    storage/maria/ma_rt_index.c:
      Fix for bug: the page_link pointer in maria_rtree_insert_req()
      could be wrong when we set its 'changed' member; for the solution
      see ma_key_recover.h. It is needed only in cases when we manipulate
      several pages.
      Logging of changes done to pages by key insert/delete.
      maria_rtree_delete()'s main work is moved to a new function
      maria_rtree_real_delete(), which is used by maria_rtree_delete()
      and by applying of UNDO_KEY_INSERT.
    storage/maria/ma_rt_index.h:
      new prototypes and macros for ma_rt_index.c
    storage/maria/ma_rt_key.c:
      Logging of maria_rtree_add_key() and maria_rtree_delete_key().
      When inserting, split is necessary if there is not enough room for key:
      take checksum's occupied space in this calculation.
    storage/maria/ma_rt_key.h:
      new prototypes (those functions need to know the page's id
      because they do logging)
    storage/maria/ma_rt_mbr.c:
      Comments about what the functions change.
    storage/maria/ma_rt_split.c:
      maria_rtree_split_page() needs to know the page's id, because
      it does logging.
      Logging of what a split operation does to the split page (see
      comment of _ma_log_rt_split(): moves of keys inside the page,
      sometimes insertion of the new key, and shrinking of the page)
      and to the new page (receives some keys from split page, and
      sometimes the new key).
    storage/maria/ma_rt_test.c:
      ma_rt_test had been forgotten when maria_rkey() was changed some months ago
      (0->HA_WHOLE_KEY change), and when calls to maria_rnd(,,HA_OFFSET_ERROR)
      were rewritten to maria_scan() calls (which implies maria_scan_init()).
      The 'max_i' change is to adapt to the fact that maria_scan() does
      not return deleted records for BLOCK_RECORD but does so for other formats;
      the initial code assumed a certain number of deleted records would be
      returned, we change it to rather count only non-deleted ones.
      We also add more features to this test, like ma_test1 (the plan
      is to run ma_rt_test in ma_test_all-t):
      options to choose records' format, table checksum, transactions,
      checkpoints, end at specific stages, abort without committing,
      and debug trace.
    storage/maria/ma_test1.c:
      MY_INIT() does my_init().
    storage/maria/ma_write.c:
      Logging done by _ma_ck_write_btree_with_log() is moved to a function
      (_ma_write_undo_key_insert()), for reusal by R-tree logging.
      _ma_log_new() and _ma_log_change() are made non-static for same
      reason. Some parameters of logging functions are made pointers to const.
      If EXTRA_DEBUG_KEY_CHANGES, we now log CRC in _ma_log_change() too
      (better checks, bigger record).
    storage/maria/maria_read_log.c:
      Program takes no arguments, bail out if any, instead of silently discarding them
    storage/myisam/rt_test.c:
      rt_test had been forgotten when mi_rkey() was changed some months ago
      (0->HA_WHOLE_KEY change).
      The 'max_i' change is to make it symmetric with ma_rt_test.c
    mysql-test/r/maria-gis-rtree-dynamic.result:
      correct result
    mysql-test/r/maria-gis-rtree-trans.result:
      correct result
    mysql-test/r/maria-recovery-rtree-ft.result:
      almost correct result (hitting BUG# in the end)
    mysql-test/t/maria-gis-rtree-dynamic.test:
      test R-tree & dynamic row format
    mysql-test/t/maria-gis-rtree-trans.test:
      Test R-tree and page row format and transactional
    mysql-test/t/maria-recovery-rtree-ft-master.opt:
      usual options for recovery testing
    mysql-test/t/maria-recovery-rtree-ft.test:
      test of recovery of R-tree and fulltext indices.
    c9a82581
maria-gis-rtree-dynamic.test 41.7 KB