mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
d74d95961a
ALTER TABLE IMPORT doesn't properly handle instant alter metadata.
This patch makes IMPORT read, parse and apply instant alter metadata at the
very beginning of operation. So, cases when source table has some metadata
and destination table doesn't have it now works fine.
DISCARD already removes instant metadata so importing normal table into
instant table worked fine before this patch.
decrypt_decompress(): decrypts and decompresses page if needed
handle_instant_metadata(): this should be the first thing to read source
table. Basically, it applies instant metadata to a destination
dict_table_t object. This is the first thing to read FSP flags so
all possible checks of it were moved to this function.
PageConverter::update_index_page(): it doesn't now read instant metadata.
This logic were moved into handle_instant_metadata()
row_import::match_flags(): this is a first part row_import::match_schema().
As a separate function it's used by handle_instant_metadata().
fil_space_t::is_full_crc32_compressed(): added convenient function
ha_innobase::discard_or_import_tablespace(): do not reload table definition
to read instant metadata because handle_instant_metadata() does it better.
The reverted code was originally added in
4e7ee166a9
ANONYMOUS_VAR: this is a handy thing to use along with make_scope_exit()
full_crc32_import.test shows different results, because no
dict_table_close() and dict_table_open_on_id() happens.
Thus, SHOW CREATE TABLE shows a little bit older table definition.
74 lines
1.8 KiB
C++
74 lines
1.8 KiB
C++
/*
|
|
Copyright (c) 2020, MariaDB
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; version 2 of
|
|
the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <type_traits>
|
|
#include <utility>
|
|
|
|
namespace detail
|
|
{
|
|
|
|
template <typename Callable> class scope_exit
|
|
{
|
|
public:
|
|
template <typename F>
|
|
explicit scope_exit(F &&f) : function_(std::forward<F>(f))
|
|
{
|
|
}
|
|
|
|
scope_exit(scope_exit &&rhs)
|
|
: function_(std::move(rhs.function_)), engaged_(rhs.engaged_)
|
|
{
|
|
rhs.release();
|
|
}
|
|
|
|
scope_exit(const scope_exit &)= delete;
|
|
scope_exit &operator=(scope_exit &&)= delete;
|
|
scope_exit &operator=(const scope_exit &)= delete;
|
|
|
|
void release() { engaged_= false; }
|
|
|
|
~scope_exit()
|
|
{
|
|
if (engaged_)
|
|
function_();
|
|
}
|
|
|
|
private:
|
|
Callable function_;
|
|
bool engaged_= true;
|
|
};
|
|
|
|
} // end namespace detail
|
|
|
|
template <typename Callable>
|
|
detail::scope_exit<typename std::decay<Callable>::type>
|
|
make_scope_exit(Callable &&f)
|
|
{
|
|
return detail::scope_exit<typename std::decay<Callable>::type>(
|
|
std::forward<Callable>(f));
|
|
}
|
|
|
|
#define CONCAT_IMPL(x, y) x##y
|
|
|
|
#define CONCAT(x, y) CONCAT_IMPL(x, y)
|
|
|
|
#define ANONYMOUS_VARIABLE CONCAT(_anonymous_variable, __LINE__)
|
|
|
|
#define SCOPE_EXIT auto ANONYMOUS_VARIABLE= make_scope_exit
|