- commits - lists.mariadb.org

[Commits] 917f636563e: MDEV-27203: Valgrind / MSAN errors in Histogram_json_hb::parse_bucket
by psergey 13 Dec '21

13 Dec '21

revision-id: 917f636563ea2e300c7f7f9ab0f240749525da51 (mariadb-10.6.1-329-g917f636563e) parent(s): da3231a86f90cdd1387b4d36f9b6a4b5df9ae5fc author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-13 22:54:33 +0300 message: MDEV-27203: Valgrind / MSAN errors in Histogram_json_hb::parse_bucket In read_bucket_endpoint(), handle all possible parser states. --- mysql-test/main/statistics_json.result | 2 +- sql/opt_histogram_json.cc | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mysql-test/main/statistics_json.result b/mysql-test/main/statistics_json.result index 50a79d8f834..7373da0570b 100644 --- a/mysql-test/main/statistics_json.result +++ b/mysql-test/main/statistics_json.result @@ -4688,7 +4688,7 @@ explain select * from t1_json limit 1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 Warnings: -Warning 4186 Failed to parse histogram for table test.t1_json: "size" element not present at offset 28. +Warning 4186 Failed to parse histogram for table test.t1_json: String or number expected at offset 27. UPDATE mysql.column_stats SET histogram='{"histogram_hb":[{"start":"aaa", "size":"not-an-integer"}]}' WHERE table_name='t1_json'; diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index 5d92c9535a4..d65bb225477 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -480,6 +480,13 @@ bool read_bucket_endpoint(json_engine_t *je, Field *field, String *out, if (json_read_value(je)) return true; + if (je->value_type != JSON_VALUE_STRING && + je->value_type != JSON_VALUE_NUMBER) + { + *err= "String or number expected"; + return true; + } + const char* je_value= (const char*)je->value; if (je->value_type == JSON_VALUE_STRING && je->value_escaped) {

1 0

[Commits] fa7a3d580: Range Locking: add support for escalation barriers
by psergey 13 Dec '21

13 Dec '21

revision-id: fa7a3d580fc0f3b8217f3d61b22554469527fbea (v6.26.0-142-gfa7a3d580) parent(s): eca85cdb6642c80ee1ac60eb758c7bd2627759f5 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-13 19:38:17 +0300 message: Range Locking: add support for escalation barriers Range Locking supports Lock Escalation. Lock Escalation is invoked when lock memory is nearly exhausted and it reduced the amount of memory used by joining adjacent locks. Bridging the gap between certain locks has adverse effects. For example, in MyRocks it is not a good idea to bridge the gap between locks in different indexes, as that get the lock to cover large portions of indexes, or even entire indexes. Resolve this by introducing Escalation Barrier. The escalation process will call the user-provided barrier callback function: bool(const Endpoint& a, const Endpoint& b) If the function returns true, there's a barrier between a and b and Lock Escalation will not try to bridge the gap between a and b. --- include/rocksdb/utilities/transaction_db.h | 6 +++ .../transactions/lock/range/range_locking_test.cc | 53 ++++++++++++++++++++++ .../lock/range/range_tree/lib/locktree/locktree.cc | 19 +++++++- .../lock/range/range_tree/lib/locktree/locktree.h | 14 ++++++ .../range/range_tree/range_tree_lock_manager.cc | 30 +++++++++++- .../range/range_tree/range_tree_lock_manager.h | 12 ++++- 6 files changed, 130 insertions(+), 4 deletions(-) diff --git a/include/rocksdb/utilities/transaction_db.h b/include/rocksdb/utilities/transaction_db.h index 265d4b79a..ca850cbdf 100644 --- a/include/rocksdb/utilities/transaction_db.h +++ b/include/rocksdb/utilities/transaction_db.h @@ -97,6 +97,12 @@ class RangeLockManagerHandle : public LockManagerHandle { using RangeLockStatus = std::unordered_multimap<ColumnFamilyId, RangeLockInfo>; + // Lock escalation barrier function. It returns true if lock escalation + // is not allowed to bridge the gap between the endpoints a and b. + using EscalationBarrierFunc = std::function<bool(const Endpoint& a, + const Endpoint& b)>; + virtual void SetEscalationBarrierFunc(EscalationBarrierFunc func) = 0; + virtual RangeLockStatus GetRangeLockStatusData() = 0; class Counters { diff --git a/utilities/transactions/lock/range/range_locking_test.cc b/utilities/transactions/lock/range/range_locking_test.cc index c881b68cb..be94623f9 100644 --- a/utilities/transactions/lock/range/range_locking_test.cc +++ b/utilities/transactions/lock/range/range_locking_test.cc @@ -286,6 +286,59 @@ TEST_F(RangeLockingTest, BasicLockEscalation) { delete txn; } + +/* + An escalation barrier function. Allow escalation iff the first two bytes are + identical. +*/ +static bool escalation_barrier(const Endpoint& a, const Endpoint& b) { + assert(a.slice.size()>2); + assert(b.slice.size()>2); + if (memcmp(a.slice.data(), b.slice.data(), 2)) + return true; // This is a barrier + else + return false; // No barrier +} + +TEST_F(RangeLockingTest, LockEscalationBarrier) { + auto cf = db->DefaultColumnFamily(); + + auto counters = range_lock_mgr->GetStatus(); + + // Initially not using any lock memory + ASSERT_EQ(counters.escalation_count, 0); + + range_lock_mgr->SetMaxLockMemory(8000); + range_lock_mgr->SetEscalationBarrierFunc(escalation_barrier); + + // Insert enough locks to cause lock escalations to happen + auto txn = NewTxn(); + const int N=2000; + for (int i = 0; i < N; i++) { + char buf[32]; + snprintf(buf, sizeof(buf) - 1, "%04d", i); + ASSERT_OK(txn->GetRangeLock(cf, Endpoint(buf), Endpoint(buf))); + } + counters = range_lock_mgr->GetStatus(); + ASSERT_GT(counters.escalation_count, 0); + + // Check that lock escalation was not performed across escalation barriers: + // Use another txn to acquire locks near the barriers. + auto txn2 = NewTxn(); + range_lock_mgr->SetMaxLockMemory(500000); + for (int i = 100; i < N; i+=100) { + char buf[32]; + snprintf(buf, sizeof(buf) - 1, "%04d-a", i-1); + // Check that we CAN get a lock near the escalation barrier + ASSERT_OK(txn2->GetRangeLock(cf, Endpoint(buf), Endpoint(buf))); + } + + txn->Rollback(); + txn2->Rollback(); + delete txn; + delete txn2; +} + #endif void PointLockManagerTestExternalSetup(PointLockManagerTest* self) { diff --git a/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc b/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc index c238b0204..0959beced 100644 --- a/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc +++ b/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc @@ -96,9 +96,19 @@ void locktree::create(locktree_manager *mgr, DICTIONARY_ID dict_id, m_sto_end_early_count = 0; m_sto_end_early_time = 0; + m_escalation_barrier = [](const DBT*, const DBT*, void *) -> bool { return false; }; + m_lock_request_info.init(mutex_factory); } +void +locktree::set_escalation_barrier_func(lt_escalation_barrier_check_func func, + void *extra) { + m_escalation_barrier= func; + m_escalation_barrier_arg= extra; +} + + void lt_lock_request_info::init(toku_external_mutex_factory_t mutex_factory) { pending_lock_requests.create(); pending_is_empty = true; @@ -863,14 +873,19 @@ void locktree::escalate(lt_escalate_cb after_escalate_callback, // - belongs to a different txnid, or // - belongs to several txnids, or // - is a shared lock (we could potentially merge those but - // currently we don't) + // currently we don't), or + // - is across a lock escalation barrier. int next_txnid_index = current_index + 1; while (next_txnid_index < num_extracted && (extracted_buf[current_index].txnid == extracted_buf[next_txnid_index].txnid) && !extracted_buf[next_txnid_index].is_shared && - !extracted_buf[next_txnid_index].owners) { + !extracted_buf[next_txnid_index].owners && + !m_escalation_barrier( + extracted_buf[current_index].range.get_right_key(), + extracted_buf[next_txnid_index].range.get_left_key(), + m_escalation_barrier_arg)) { next_txnid_index++; } diff --git a/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.h b/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.h index 3e438f502..e416ac5a3 100644 --- a/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.h +++ b/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.h @@ -85,6 +85,9 @@ typedef void (*lt_destroy_cb)(locktree *lt); typedef void (*lt_escalate_cb)(TXNID txnid, const locktree *lt, const range_buffer &buffer, void *extra); +typedef bool (*lt_escalation_barrier_check_func)(const DBT* a, const DBT *b, + void* extra); + struct lt_counters { uint64_t wait_count, wait_time; uint64_t long_wait_count, long_wait_time; @@ -343,6 +346,14 @@ class locktree { void set_comparator(const comparator &cmp); + // Escalation barrier prevents lock escalation. + // For two keys A and B, if escalation_barrier_check_func(A, B)==true, then + // there's a barrier between them, and lock escalation is not allowed to + // bridge the gap between A and B. + // This method sets the user-provided barrier check function. + void set_escalation_barrier_func(lt_escalation_barrier_check_func func, + void *extra); + int compare(const locktree *lt) const; DICTIONARY_ID get_dict_id() const; @@ -373,6 +384,9 @@ class locktree { // userdata pointer below. see locktree_manager::get_lt w/ on_create_extra comparator m_cmp; + lt_escalation_barrier_check_func m_escalation_barrier; + void *m_escalation_barrier_arg; + concurrent_tree *m_rangetree; void *m_userdata; diff --git a/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc b/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc index 6dfb78d3f..b1788b9b7 100644 --- a/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc +++ b/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc @@ -58,6 +58,16 @@ void deserialize_endpoint(const DBT* dbt, EndpointWithString* endp) { endp->slice.assign(dbt_data + 1, dbt->size - 1); } +// Same as above, but decode into Endpoint structure +void deserialize_endpoint(const DBT* dbt, Endpoint* endp) { + assert(dbt->size >= 1); + const char* dbt_data = (const char*)dbt->data; + char suffix = dbt_data[0]; + assert(suffix == SUFFIX_INFIMUM || suffix == SUFFIX_SUPREMUM); + endp->inf_suffix = (suffix == SUFFIX_SUPREMUM); + endp->slice= Slice(dbt_data + 1, dbt->size - 1); +} + // Get a range lock on [start_key; end_key] range Status RangeTreeLockManager::TryLock(PessimisticTransaction* txn, uint32_t column_family_id, @@ -262,6 +272,24 @@ RangeTreeLockManager::RangeTreeLockManager( ltm_.create(on_create, on_destroy, on_escalate, nullptr, mutex_factory_); } +int RangeTreeLockManager::on_create(locktree* lt, void *arg) +{ + // arg is a pointer to RangeTreeLockManager + lt->set_escalation_barrier_func(&OnEscalationBarrierCheck, arg); + return 0; +} + +bool RangeTreeLockManager::OnEscalationBarrierCheck(const DBT *a, + const DBT *b, + void *extra) +{ + Endpoint a_endp, b_endp; + deserialize_endpoint(a, &a_endp); + deserialize_endpoint(b, &b_endp); + auto self = (RangeTreeLockManager*) extra; + return self->barrier_func_(a_endp, b_endp); +} + void RangeTreeLockManager::SetRangeDeadlockInfoBufferSize( uint32_t target_size) { dlock_buffer_.Resize(target_size); @@ -351,7 +379,7 @@ void RangeTreeLockManager::AddColumnFamily(const ColumnFamilyHandle* cfh) { toku::comparator cmp; cmp.create(CompareDbtEndpoints, (void*)cfh->GetComparator()); toku::locktree* ltree = ltm_.get_lt(dict_id, cmp, - /* on_create_extra*/ nullptr); + /* on_create_extra*/ (void*)this); // This is ok to because get_lt has copied the comparator: cmp.destroy(); diff --git a/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.h b/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.h index 5d55ded02..3cbae850c 100644 --- a/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.h +++ b/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.h @@ -93,9 +93,16 @@ class RangeTreeLockManager : public RangeLockManagerBase, // Get the locktree which stores locks for the Column Family with given cf_id std::shared_ptr<locktree> GetLockTreeForCF(ColumnFamilyId cf_id); + void SetEscalationBarrierFunc(EscalationBarrierFunc func) override { + barrier_func_ = func; + } + private: toku::locktree_manager ltm_; + EscalationBarrierFunc barrier_func_ = + [](const Endpoint&, const Endpoint&)->bool { return false; }; + std::shared_ptr<TransactionDBMutexFactory> mutex_factory_; // Map from cf_id to locktree*. Can only be accessed while holding the @@ -116,10 +123,13 @@ class RangeTreeLockManager : public RangeLockManagerBase, static int CompareDbtEndpoints(void* arg, const DBT* a_key, const DBT* b_key); // Callbacks - static int on_create(locktree*, void*) { return 0; /* no error */ } + static int on_create(locktree*, void*); static void on_destroy(locktree*) {} static void on_escalate(TXNID txnid, const locktree* lt, const range_buffer& buffer, void* extra); + + static bool OnEscalationBarrierCheck(const DBT *a, const DBT *b, + void *extra); }; void serialize_endpoint(const Endpoint& endp, std::string* buf);

1 0

[Commits] 15e9afd84b9: Code cleanup: don't call subquery_types_allow_materialization() on prepare
by psergey 09 Dec '21

09 Dec '21

revision-id: 15e9afd84b94c00cbeea8ca2719799b4759cbb9c (mariadb-10.6.1-243-g15e9afd84b9) parent(s): c88e37ff857a83387c4d86829fbaf2e277e4cf9f author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-09 20:13:35 +0300 message: Code cleanup: don't call subquery_types_allow_materialization() on prepare For subqueries that are processed as semi-joins. --- sql/opt_subselect.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 596b5169659..f2d395a9ee2 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -703,7 +703,7 @@ int check_and_do_in_subquery_rewrites(JOIN *join) { DBUG_PRINT("info", ("Subquery is semi-join conversion candidate")); - (void)subquery_types_allow_materialization(thd, in_subs); + //(void)subquery_types_allow_materialization(thd, in_subs); in_subs->is_flattenable_semijoin= TRUE; @@ -1271,6 +1271,7 @@ bool convert_join_subqueries_to_semijoins(JOIN *join) while ((in_subq= li++)) { bool remove_item= TRUE; + subquery_types_allow_materialization(thd, in_subq); /* Stop processing if we've reached a subquery that's attached to the ON clause */ if (in_subq->do_not_convert_to_sj)

1 0

[Commits] da3231a86f9: MDEV-27204: [ERROR] Json_writer: a member name was expected, Assertion `got_name
by psergey 09 Dec '21

09 Dec '21

revision-id: da3231a86f90cdd1387b4d36f9b6a4b5df9ae5fc (mariadb-10.6.1-328-gda3231a86f9) parent(s): 98cb4351e141dcf65ea5a30f9f8c4bd352e374ea author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-09 20:06:54 +0300 message: MDEV-27204: [ERROR] Json_writer: a member name was expected, Assertion `got_name [Adjusting Sergei Krivonos's patch] "duplicates_removal" may contain multiple elements inside it and so should have a JSON array as a value (and not object). --- mysql-test/main/explain_json.result | 85 +++++++++++++++++++++++++++++++------ mysql-test/main/explain_json.test | 10 +++++ sql/sql_explain.cc | 4 ++ 3 files changed, 86 insertions(+), 13 deletions(-) diff --git a/mysql-test/main/explain_json.result b/mysql-test/main/explain_json.result index 35f2d11c8b6..810ececc65c 100644 --- a/mysql-test/main/explain_json.result +++ b/mysql-test/main/explain_json.result @@ -842,20 +842,22 @@ EXPLAIN } }, { - "duplicates_removal": { - "block-nl-join": { - "table": { - "table_name": "t1", - "access_type": "ALL", - "rows": 10, - "filtered": 100 - }, - "buffer_type": "flat", - "buffer_size": "206", - "join_type": "BNL", - "attached_condition": "t1.b = t2.b and t1.a = t2.a" + "duplicates_removal": [ + { + "block-nl-join": { + "table": { + "table_name": "t1", + "access_type": "ALL", + "rows": 10, + "filtered": 100 + }, + "buffer_type": "flat", + "buffer_size": "206", + "join_type": "BNL", + "attached_condition": "t1.b = t2.b and t1.a = t2.a" + } } - } + ] } ] } @@ -1941,3 +1943,60 @@ EXPLAIN } } drop table t1; +# +# MDEV-27204: [ERROR] Json_writer: a member name was expected, Assertion `got_name == named_item_expected()' failed +# +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1),(2); +explain FORMAT=JSON +SELECT * FROM t1 t0 +WHERE t0.a IN (SELECT t2.a FROM t1 t2 WHERE t0.a IN (SELECT t3.a FROM t1 t3)); +EXPLAIN +{ + "query_block": { + "select_id": 1, + "nested_loop": [ + { + "table": { + "table_name": "t0", + "access_type": "ALL", + "rows": 2, + "filtered": 100 + } + }, + { + "duplicates_removal": [ + { + "block-nl-join": { + "table": { + "table_name": "t2", + "access_type": "ALL", + "rows": 2, + "filtered": 100 + }, + "buffer_type": "flat", + "buffer_size": "152", + "join_type": "BNL", + "attached_condition": "t2.a = t0.a" + } + }, + { + "block-nl-join": { + "table": { + "table_name": "t3", + "access_type": "ALL", + "rows": 2, + "filtered": 100 + }, + "buffer_type": "incremental", + "buffer_size": "109", + "join_type": "BNL", + "attached_condition": "t3.a = t0.a" + } + } + ] + } + ] + } +} +DROP TABLE t1; diff --git a/mysql-test/main/explain_json.test b/mysql-test/main/explain_json.test index cfbc0cfa10c..3767939d3e3 100644 --- a/mysql-test/main/explain_json.test +++ b/mysql-test/main/explain_json.test @@ -419,3 +419,13 @@ explain format=json select * from t1 order by a desc, b desc; explain format=json select * from t1 order by a desc, b ; drop table t1; +--echo # +--echo # MDEV-27204: [ERROR] Json_writer: a member name was expected, Assertion `got_name == named_item_expected()' failed +--echo # + +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1),(2); +explain FORMAT=JSON +SELECT * FROM t1 t0 +WHERE t0.a IN (SELECT t2.a FROM t1 t2 WHERE t0.a IN (SELECT t3.a FROM t1 t3)); +DROP TABLE t1; diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc index 44654dc2e3d..4fd4e6d3b77 100644 --- a/sql/sql_explain.cc +++ b/sql/sql_explain.cc @@ -1100,12 +1100,16 @@ print_explain_json_interns(Explain_query *query, { writer->start_object(); writer->add_member("duplicates_removal"); + writer->start_array(); } join_tabs[i]->print_explain_json(query, writer, is_analyze); if (join_tabs[i]->end_dups_weedout) + { + writer->end_array(); writer->end_object(); + } } } // "nested_loop" print_explain_json_for_children(query, writer, is_analyze);

1 0

[Commits] c88e37ff857: MDEV-27204: [ERROR] Json_writer: a member name was expected, Assertion `got_name
by psergey 09 Dec '21

09 Dec '21

revision-id: c88e37ff857a83387c4d86829fbaf2e277e4cf9f (mariadb-10.6.1-242-gc88e37ff857) parent(s): 1e8bcbd0a0bfa07052e9458830672ea215c8664a author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-09 16:49:40 +0300 message: MDEV-27204: [ERROR] Json_writer: a member name was expected, Assertion `got_name [Adjusting Sergei Krivonos's patch] "duplicates_removal" may contain multiple elements inside it and so should have a JSON array as a value (and not object). --- mysql-test/main/explain_json.result | 85 +++++++++++++++++++++++++++++++------ mysql-test/main/explain_json.test | 10 +++++ sql/sql_explain.cc | 4 ++ 3 files changed, 86 insertions(+), 13 deletions(-) diff --git a/mysql-test/main/explain_json.result b/mysql-test/main/explain_json.result index 35f2d11c8b6..810ececc65c 100644 --- a/mysql-test/main/explain_json.result +++ b/mysql-test/main/explain_json.result @@ -842,20 +842,22 @@ EXPLAIN } }, { - "duplicates_removal": { - "block-nl-join": { - "table": { - "table_name": "t1", - "access_type": "ALL", - "rows": 10, - "filtered": 100 - }, - "buffer_type": "flat", - "buffer_size": "206", - "join_type": "BNL", - "attached_condition": "t1.b = t2.b and t1.a = t2.a" + "duplicates_removal": [ + { + "block-nl-join": { + "table": { + "table_name": "t1", + "access_type": "ALL", + "rows": 10, + "filtered": 100 + }, + "buffer_type": "flat", + "buffer_size": "206", + "join_type": "BNL", + "attached_condition": "t1.b = t2.b and t1.a = t2.a" + } } - } + ] } ] } @@ -1941,3 +1943,60 @@ EXPLAIN } } drop table t1; +# +# MDEV-27204: [ERROR] Json_writer: a member name was expected, Assertion `got_name == named_item_expected()' failed +# +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1),(2); +explain FORMAT=JSON +SELECT * FROM t1 t0 +WHERE t0.a IN (SELECT t2.a FROM t1 t2 WHERE t0.a IN (SELECT t3.a FROM t1 t3)); +EXPLAIN +{ + "query_block": { + "select_id": 1, + "nested_loop": [ + { + "table": { + "table_name": "t0", + "access_type": "ALL", + "rows": 2, + "filtered": 100 + } + }, + { + "duplicates_removal": [ + { + "block-nl-join": { + "table": { + "table_name": "t2", + "access_type": "ALL", + "rows": 2, + "filtered": 100 + }, + "buffer_type": "flat", + "buffer_size": "152", + "join_type": "BNL", + "attached_condition": "t2.a = t0.a" + } + }, + { + "block-nl-join": { + "table": { + "table_name": "t3", + "access_type": "ALL", + "rows": 2, + "filtered": 100 + }, + "buffer_type": "incremental", + "buffer_size": "109", + "join_type": "BNL", + "attached_condition": "t3.a = t0.a" + } + } + ] + } + ] + } +} +DROP TABLE t1; diff --git a/mysql-test/main/explain_json.test b/mysql-test/main/explain_json.test index cfbc0cfa10c..3767939d3e3 100644 --- a/mysql-test/main/explain_json.test +++ b/mysql-test/main/explain_json.test @@ -419,3 +419,13 @@ explain format=json select * from t1 order by a desc, b desc; explain format=json select * from t1 order by a desc, b ; drop table t1; +--echo # +--echo # MDEV-27204: [ERROR] Json_writer: a member name was expected, Assertion `got_name == named_item_expected()' failed +--echo # + +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1),(2); +explain FORMAT=JSON +SELECT * FROM t1 t0 +WHERE t0.a IN (SELECT t2.a FROM t1 t2 WHERE t0.a IN (SELECT t3.a FROM t1 t3)); +DROP TABLE t1; diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc index 44654dc2e3d..4fd4e6d3b77 100644 --- a/sql/sql_explain.cc +++ b/sql/sql_explain.cc @@ -1100,12 +1100,16 @@ print_explain_json_interns(Explain_query *query, { writer->start_object(); writer->add_member("duplicates_removal"); + writer->start_array(); } join_tabs[i]->print_explain_json(query, writer, is_analyze); if (join_tabs[i]->end_dups_weedout) + { + writer->end_array(); writer->end_object(); + } } } // "nested_loop" print_explain_json_for_children(query, writer, is_analyze);

1 0

[Commits] aa9b8132f37: MDEV-27149: Add rocksdb_ignore_datadic_errors
by psergey 08 Dec '21

08 Dec '21

revision-id: aa9b8132f374e508246499d3ae4338241a08049d (mariadb-10.4.13-181-gaa9b8132f37) parent(s): caa727fd7134e23bf2244e734434014e70c95e27 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-08 23:44:09 +0300 message: MDEV-27149: Add rocksdb_ignore_datadic_errors Add a --rocksdb_ignore_datadic_errors plugin option for MyRocks. The default is 0, and this means MyRocks will call abort() if it detects a DDL mismatch. Setting rocksdb_ignore_datadic_errors=1 makes MyRocks to try to ignore the errors and allow to start the server for repairs. --- storage/rocksdb/ha_rocksdb.cc | 35 +++++++++++++++++++++- storage/rocksdb/ha_rocksdb.h | 2 ++ .../rocksdb/mysql-test/rocksdb/r/rocksdb.result | 1 + .../r/rocksdb_ignore_datadic_errors.result | 7 +++++ .../t/rocksdb_ignore_datadic_errors.test | 6 ++++ storage/rocksdb/rdb_datadic.cc | 6 ++++ 6 files changed, 56 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 938be7030bb..452b670883a 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -638,6 +638,8 @@ static my_bool rocksdb_large_prefix = 0; static my_bool rocksdb_allow_to_start_after_corruption = 0; static char* rocksdb_git_hash; +uint32_t rocksdb_ignore_datadic_errors = 0; + char *compression_types_val= const_cast<char*>(get_rocksdb_supported_compression_types()); static unsigned long rocksdb_write_policy = @@ -1908,6 +1910,15 @@ static MYSQL_SYSVAR_UINT( nullptr, nullptr, 1 /* default value */, 0 /* min value */, 2 /* max value */, 0); +static MYSQL_SYSVAR_UINT( + ignore_datadic_errors, rocksdb_ignore_datadic_errors, + PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, + "Ignore MyRocks' data directory errors. " + "(CAUTION: Use only to start the server and perform repairs. Do NOT use " + "for regular operation)", + nullptr, nullptr, 0 /* default value */, 0 /* min value */, + 1 /* max value */, 0); + static MYSQL_SYSVAR_STR(datadir, rocksdb_datadir, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, "RocksDB data directory", nullptr, nullptr, @@ -2143,6 +2154,8 @@ static struct st_mysql_sys_var *rocksdb_system_variables[] = { MYSQL_SYSVAR(rollback_on_timeout), MYSQL_SYSVAR(enable_insert_with_update_caching), + + MYSQL_SYSVAR(ignore_datadic_errors), nullptr}; static rocksdb::WriteOptions rdb_get_rocksdb_write_options( @@ -5205,6 +5218,13 @@ static int rocksdb_init_func(void *const p) { DBUG_RETURN(1); } + if (rocksdb_ignore_datadic_errors) + { + sql_print_information( + "CAUTION: Running with rocksdb_ignore_datadic_errors=1. " + " This should only be used to perform repairs"); + } + if (rdb_check_rocksdb_corruption()) { // NO_LINT_DEBUG sql_print_error( @@ -5636,7 +5656,14 @@ static int rocksdb_init_func(void *const p) { if (ddl_manager.init(&dict_manager, &cf_manager, rocksdb_validate_tables)) { // NO_LINT_DEBUG sql_print_error("RocksDB: Failed to initialize DDL manager."); - DBUG_RETURN(HA_EXIT_FAILURE); + + if (rocksdb_ignore_datadic_errors) + { + sql_print_error("RocksDB: rocksdb_ignore_datadic_errors=1, " + "trying to continue"); + } + else + DBUG_RETURN(HA_EXIT_FAILURE); } Rdb_sst_info::init(rdb); @@ -11613,6 +11640,12 @@ void Rdb_drop_index_thread::run() { "from cf id %u. MyRocks data dictionary may " "get corrupted.", d.cf_id); + if (rocksdb_ignore_datadic_errors) + { + sql_print_error("RocksDB: rocksdb_ignore_datadic_errors=1, " + "trying to continue"); + continue; + } abort(); } rocksdb::ColumnFamilyHandle *cfh = cf_manager.get_cf(d.cf_id); diff --git a/storage/rocksdb/ha_rocksdb.h b/storage/rocksdb/ha_rocksdb.h index 448900c5a91..8d0ace707f8 100644 --- a/storage/rocksdb/ha_rocksdb.h +++ b/storage/rocksdb/ha_rocksdb.h @@ -1062,6 +1062,8 @@ const int MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL= MariaDB_PLUGIN_MATURITY_STABLE; extern bool prevent_myrocks_loading; +extern uint32_t rocksdb_ignore_datadic_errors; + void sql_print_verbose_info(const char *format, ...); } // namespace myrocks diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result index f2f9adebf46..865fbf33b8d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result @@ -932,6 +932,7 @@ rocksdb_force_flush_memtable_now OFF rocksdb_force_index_records_in_range 0 rocksdb_git_hash # rocksdb_hash_index_allow_collision ON +rocksdb_ignore_datadic_errors 0 rocksdb_ignore_unknown_options ON rocksdb_index_type kBinarySearch rocksdb_info_log_level error_level diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_ignore_datadic_errors.result b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_ignore_datadic_errors.result new file mode 100644 index 00000000000..daa70a80683 --- /dev/null +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_ignore_datadic_errors.result @@ -0,0 +1,7 @@ +SET @start_global_value = @@global.ROCKSDB_IGNORE_DATADIC_ERRORS; +SELECT @start_global_value; +@start_global_value +0 +"Trying to set variable @@global.ROCKSDB_IGNORE_DATADIC_ERRORS to 444. It should fail because it is readonly." +SET @@global.ROCKSDB_IGNORE_DATADIC_ERRORS = 444; +ERROR HY000: Variable 'rocksdb_ignore_datadic_errors' is a read only variable diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_ignore_datadic_errors.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_ignore_datadic_errors.test new file mode 100644 index 00000000000..b412a018869 --- /dev/null +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_ignore_datadic_errors.test @@ -0,0 +1,6 @@ +--source include/have_rocksdb.inc + +--let $sys_var=ROCKSDB_IGNORE_DATADIC_ERRORS +--let $read_only=1 +--let $session=0 +--source include/rocksdb_sys_var.inc diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc index 3d07a3d2516..c624bd15d20 100644 --- a/storage/rocksdb/rdb_datadic.cc +++ b/storage/rocksdb/rdb_datadic.cc @@ -5263,6 +5263,12 @@ void Rdb_dict_manager::log_start_drop_index(GL_INDEX_ID gl_index_id, "from index id (%u,%u). MyRocks data dictionary may " "get corrupted.", gl_index_id.cf_id, gl_index_id.index_id); + if (rocksdb_ignore_datadic_errors) + { + sql_print_error("RocksDB: rocksdb_ignore_datadic_errors=1, " + "trying to continue"); + return; + } abort(); } }

1 0

[Commits] caa727fd713: Avoid a crash on MyRocks data inconsistency.
by psergey 08 Dec '21

08 Dec '21

revision-id: caa727fd7134e23bf2244e734434014e70c95e27 (mariadb-10.4.13-180-gcaa727fd713) parent(s): 98e9f790e6e216e2298d6e7a04117b52e4a0cbd3 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-08 22:08:18 +0300 message: Avoid a crash on MyRocks data inconsistency. In ha_rocksdb::open(), check if the number of indexes seen from the SQL layer matches the number of indexes in the internal MyRocks data dictionary. Produce an error if there is a mismatch. (If we don't produce this error, we are likely to crash as soon as we attempt to use an index) --- storage/rocksdb/ha_rocksdb.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 1f4b53029b8..938be7030bb 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -6708,6 +6708,17 @@ int ha_rocksdb::open(const char *const name, int mode, uint test_if_locked) { "dictionary"); DBUG_RETURN(HA_ERR_ROCKSDB_INVALID_TABLE); } + if (m_tbl_def->m_key_count != table->s->keys + has_hidden_pk(table)? 1:0) + { + sql_print_error("MyRocks: DDL mismatch: .frm file has %u indexes, " + "MyRocks has %u (%s hidden pk)", + table->s->keys, m_tbl_def->m_key_count, + has_hidden_pk(table)? "1" : "no"); + my_error(ER_INTERNAL_ERROR, MYF(0), + "MyRocks: DDL mismatch. Check the error log for details"); + DBUG_RETURN(HA_ERR_ROCKSDB_INVALID_TABLE); + } + m_lock_rows = RDB_LOCK_NONE; m_key_descr_arr = m_tbl_def->m_key_descr_arr;

1 0

[Commits] 98cb4351e14: Fix compilation on Windows
by psergey 03 Dec '21

03 Dec '21

revision-id: 98cb4351e141dcf65ea5a30f9f8c4bd352e374ea (mariadb-10.6.1-327-g98cb4351e14) parent(s): 103949d566d0652b781a17ce414ed07e7210ef07 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-03 20:26:37 +0300 message: Fix compilation on Windows --- sql/opt_histogram_json.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index dfac0dd3f2f..5d92c9535a4 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -182,7 +182,7 @@ class Histogram_json_builder : public Histogram_builder curtime.tm_hour, curtime.tm_min, curtime.tm_sec, - curtime.tm_zone); + system_time_zone); writer.add_member("target_histogram_size").add_ull(hist_width); writer.add_member("collected_at").add_str(buf);

1 0

[Commits] 103949d566d: MDEV-26764: JSON_HB Histograms: handle BINARY and unassigned characters
by psergey 03 Dec '21

03 Dec '21

revision-id: 103949d566d0652b781a17ce414ed07e7210ef07 (mariadb-10.6.1-326-g103949d566d) parent(s): 5fb922bea0c7f70b6c912946464c43b8c6a007d5 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-03 20:13:43 +0300 message: MDEV-26764: JSON_HB Histograms: handle BINARY and unassigned characters Encode such characters in hex. --- mysql-test/main/statistics_json.result | 32 ++++++++++- mysql-test/main/statistics_json.test | 7 ++- sql/opt_histogram_json.cc | 100 +++++++++++++++++++++++++++------ sql/opt_histogram_json.h | 13 ++++- 4 files changed, 130 insertions(+), 22 deletions(-) diff --git a/mysql-test/main/statistics_json.result b/mysql-test/main/statistics_json.result index 1948d5acb4e..50a79d8f834 100644 --- a/mysql-test/main/statistics_json.result +++ b/mysql-test/main/statistics_json.result @@ -7896,16 +7896,41 @@ a drop table t1; # # Another testcase: use a character that cannot be represented in utf8: +# Also, now it's testcase for: +# MDEV-26764: JSON_HB Histograms: handle BINARY and unassigned characters # create table t1 ( a varchar(100) character set cp1251); -insert into t1 values ( _cp1251 x'88'),( _cp1251 x'98'); +insert into t1 values ( _cp1251 x'88'),( _cp1251 x'88'), ( _cp1251 x'88'); +insert into t1 values ( _cp1251 x'98'),( _cp1251 x'98'); analyze table t1 persistent for all; Table Op Msg_type Msg_text -test.t1 analyze status Operation failed +test.t1 analyze status Engine-independent statistics collected +test.t1 analyze status OK select hist_type, histogram from mysql.column_stats where db_name=database() and table_name='t1'; hist_type histogram +JSON_HB { + "target_histogram_size": 10, + "collected_at": "REPLACED", + "collected_by": "REPLACED", + "histogram_hb": [ + { + "start": "€", + "size": 0.6, + "ndv": 1 + }, + { + "start_hex": "98", + "end_hex": "98", + "size": 0.4, + "ndv": 1 + } + ] +} +analyze select * from t1 where a=_cp1251 x'88'; +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 5 5.00 60.00 60.00 Using where drop table t1; # # ASAN use-after-poison my_strnxfrm_simple_internal / Histogram_json_hb::range_selectivity ... @@ -8102,7 +8127,8 @@ set histogram_type= JSON_HB, histogram_size= 1; insert into t1 values ('foo'),(unhex('9C')); analyze table t1 persistent for all; Table Op Msg_type Msg_text -test.t1 analyze status Operation failed +test.t1 analyze status Engine-independent statistics collected +test.t1 analyze status OK select * from t1; a foo diff --git a/mysql-test/main/statistics_json.test b/mysql-test/main/statistics_json.test index bcc80093891..b67df41d9ba 100644 --- a/mysql-test/main/statistics_json.test +++ b/mysql-test/main/statistics_json.test @@ -227,9 +227,12 @@ drop table t1; --echo # --echo # Another testcase: use a character that cannot be represented in utf8: +--echo # Also, now it's testcase for: +--echo # MDEV-26764: JSON_HB Histograms: handle BINARY and unassigned characters --echo # create table t1 ( a varchar(100) character set cp1251); -insert into t1 values ( _cp1251 x'88'),( _cp1251 x'98'); +insert into t1 values ( _cp1251 x'88'),( _cp1251 x'88'), ( _cp1251 x'88'); +insert into t1 values ( _cp1251 x'98'),( _cp1251 x'98'); analyze table t1 persistent for all; --source include/histogram_replaces.inc @@ -237,6 +240,8 @@ select hist_type, histogram from mysql.column_stats where db_name=database() and table_name='t1'; +analyze select * from t1 where a=_cp1251 x'88'; + drop table t1; --echo # diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index 023e69b83aa..dfac0dd3f2f 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -70,11 +70,11 @@ static bool json_unescape_to_string(const char *val, int val_len, String* out) succeeds. */ -static bool json_escape_to_string(const String *str, String* out) +static int json_escape_to_string(const String *str, String* out) { // Make sure 'out' has some memory allocated. if (!out->alloced_length() && out->alloc(128)) - return true; + return JSON_ERROR_OUT_OF_SPACE; while (1) { @@ -90,15 +90,15 @@ static bool json_escape_to_string(const String *str, String* out) if (res >= 0) { out->length(res); - return false; // Ok + return 0; // Ok } if (res != JSON_ERROR_OUT_OF_SPACE) - return true; // Some conversion error + return res; // Some conversion error // Out of space error. Try with a bigger buffer if (out->alloc(out->alloced_length()*2)) - return true; + return JSON_ERROR_OUT_OF_SPACE; } } @@ -208,8 +208,7 @@ class Histogram_json_builder : public Histogram_builder */ bool finalize_bucket_with_end_value(void *elem) { - writer.add_member("end"); - if (append_column_value(elem)) + if (append_column_value(elem, false)) return true; finalize_bucket(); return false; @@ -224,19 +223,18 @@ class Histogram_json_builder : public Histogram_builder { DBUG_ASSERT(bucket.size == 0); writer.start_object(); - writer.add_member("start"); - if (append_column_value(elem)) + if (append_column_value(elem, true)) return true; bucket.ndv= 1; bucket.size= cnt; return false; } - + /* Append the passed value into the JSON writer as string value */ - bool append_column_value(void *elem) + bool append_column_value(void *elem, bool is_start) { StringBuffer<MAX_FIELD_WIDTH> val; @@ -246,12 +244,21 @@ class Histogram_json_builder : public Histogram_builder // Escape the value for JSON StringBuffer<MAX_FIELD_WIDTH> escaped_val; - if (json_escape_to_string(str, &escaped_val)) - return true; - - // Note: The Json_writer does NOT do escapes (perhaps this should change?) - writer.add_str(escaped_val.c_ptr_safe()); - return false; + int rc= json_escape_to_string(str, &escaped_val); + if (!rc) + { + writer.add_member(is_start? "start": "end"); + writer.add_str(escaped_val.c_ptr_safe()); + return false; + } + if (rc == JSON_ERROR_ILLEGAL_SYMBOL) + { + escaped_val.set_hex(val.ptr(), val.length()); + writer.add_member(is_start? "start_hex": "end_hex"); + writer.add_str(escaped_val.c_ptr_safe()); + return false; + } + return true; } /* @@ -496,6 +503,41 @@ bool read_bucket_endpoint(json_engine_t *je, Field *field, String *out, } +bool read_hex_bucket_endpoint(json_engine_t *je, Field *field, String *out, + const char **err) +{ + if (json_read_value(je)) + return true; + + if (je->value_type != JSON_VALUE_STRING || je->value_escaped || + (je->value_len & 1)) + { + *err= "Expected a hex string"; + return true; + } + StringBuffer<128> buf; + + for (auto pc= je->value; pc < je->value + je->value_len; pc+=2) + { + int hex_char1= hexchar_to_int(pc[0]); + int hex_char2= hexchar_to_int(pc[1]); + if (hex_char1 == -1 || hex_char2 == -1) + { + *err= "Expected a hex string"; + return true; + } + buf.append((hex_char1 << 4) | hex_char2); + } + + field->store_text(buf.ptr(), buf.length(), field->charset()); + out->alloc(field->pack_length()); + uint bytes= field->get_key_image((uchar*)out->ptr(), + field->key_length(), Field::itRAW); + out->length(bytes); + return false; +} + + /* @brief Parse a JSON reprsentation for one histogram bucket @@ -619,6 +661,30 @@ int Histogram_json_hb::parse_bucket(json_engine_t *je, Field *field, } save1.restore_to(je); + // Less common endoints: + Json_string start_hex_str("start_hex"); + if (json_key_matches(je, start_hex_str.get())) + { + if (read_hex_bucket_endpoint(je, field, &value_buf, err)) + return 1; + + have_start= true; + continue; + } + save1.restore_to(je); + + Json_string end_hex_str("end_hex"); + if (json_key_matches(je, end_hex_str.get())) + { + if (read_hex_bucket_endpoint(je, field, &value_buf, err)) + return 1; + last_bucket_end_endp.assign(value_buf.ptr(), value_buf.length()); + *assigned_last_end= true; + continue; + } + save1.restore_to(je); + + // Some unknown member. Skip it. if (json_skip_key(je)) return 1; diff --git a/sql/opt_histogram_json.h b/sql/opt_histogram_json.h index a2f8bdd37a5..327c852db98 100644 --- a/sql/opt_histogram_json.h +++ b/sql/opt_histogram_json.h @@ -32,12 +32,18 @@ "histogram_hb": [ { "start": "value", "size":nnn.nn, "ndv": nnn }, ... - { "start": "value", "size":nnn.nn, "ndv": nnn, "end": "value"} + + // Optionally, start and/or end can be replaced with _hex variant + { "start_hex: "value", "size":nnn.nn, "ndv":nnn}, + + ... + { "start": "value", "size":nnn.nn, "ndv": nnn, "end": "value"}, ] } The histogram is an object with single member named Histogram_json_hb:: JSON_NAME. The value of that member is an array of buckets. + Each bucket is an object with these members: "start" - the first value in the bucket. "size" - fraction of table rows that is contained in the bucket. @@ -51,6 +57,11 @@ The exception is single-point buckets where last value is the same as the first value. + + start/end can be replaced with start_hex/end_hex. In _hex variant, the + constant is encoded in hex. This encoding is used to handle so called + "unassigned characters": some non-UTF8 charsets have byte combinations that + are not mapped to any UTF8 character. */ class Histogram_json_hb : public Histogram_base

1 0

[Commits] 5fb922bea0c: More test coverage
by psergey 03 Dec '21

03 Dec '21

revision-id: 5fb922bea0c7f70b6c912946464c43b8c6a007d5 (mariadb-10.6.1-325-g5fb922bea0c) parent(s): 99e762c7fafea895fcd2dbdd4fcf6cba75d80e5e author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-03 19:03:42 +0300 message: More test coverage --- mysql-test/main/statistics_json.result | 22 ++++++++++++++++++++++ mysql-test/main/statistics_json.test | 22 ++++++++++++++++++++++ sql/opt_histogram_json.cc | 2 -- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/statistics_json.result b/mysql-test/main/statistics_json.result index 127ac6feb4b..1948d5acb4e 100644 --- a/mysql-test/main/statistics_json.result +++ b/mysql-test/main/statistics_json.result @@ -8146,3 +8146,25 @@ analyze select * from t1 where a >= 0; id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 100 100.00 100.00 100.00 Using where drop table t1; +# +# More test coverage +# +create table t0(a int); +insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); +create table t1(a int); +insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C; +create table t2 (a int); +insert into t2 select 1 from t1; +insert into t2 select (a+1)*10 from t0; +insert into t2 values (0); +analyze table t2 persistent for all; +Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected +test.t2 analyze status OK +analyze select * from t2 where a < 1; +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 SIMPLE t2 ALL NULL NULL NULL NULL 1011 1011.00 8.33 0.10 Using where +analyze select * from t2 where a =100; +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 SIMPLE t2 ALL NULL NULL NULL NULL 1011 1011.00 0.10 0.10 Using where +drop table t0,t1,t2; diff --git a/mysql-test/main/statistics_json.test b/mysql-test/main/statistics_json.test index 2b2a93f5465..bcc80093891 100644 --- a/mysql-test/main/statistics_json.test +++ b/mysql-test/main/statistics_json.test @@ -353,3 +353,25 @@ analyze select * from t1 where a < 0; analyze select * from t1 where a > 0; analyze select * from t1 where a >= 0; drop table t1; + + +--echo # +--echo # More test coverage +--echo # +create table t0(a int); +insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); + +create table t1(a int); +insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C; + +create table t2 (a int); +insert into t2 select 1 from t1; +insert into t2 select (a+1)*10 from t0; +insert into t2 values (0); + +analyze table t2 persistent for all; +analyze select * from t2 where a < 1; +analyze select * from t2 where a =100; + +drop table t0,t1,t2; + diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index 572a65bc2ed..023e69b83aa 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -914,7 +914,6 @@ double Histogram_json_hb::range_selectivity(Field *field, key_range *min_endp, /* The range is "col > $CONST" and we've found a bucket that contains only the value $CONST. Move to the next bucket. - TODO: what if the last value in the histogram is a popular one? */ idx++; } @@ -948,7 +947,6 @@ double Histogram_json_hb::range_selectivity(Field *field, key_range *min_endp, /* The range is "col < $CONST" and we've found a bucket starting with $CONST. Move to the previous bucket. - TODO: what if the first value is the popular one? */ idx--; }

1 0