Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(tianmu): fix endless loop occurs during data_cache (#1352) #1353

Merged
merged 2 commits into from
Mar 6, 2023
Merged

fix(tianmu): fix endless loop occurs during data_cache (#1352) #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91705f0
fix(tianmu): fix endless loop occurs during data_cache (#1352)
adofsauron Mar 3, 2023
f31b760
Merge branch 'stonedb-5.7-dev' into stonedb-5.7-dev
mergify[bot] Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions mysql-test/suite/tianmu/r/issue1352.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
DROP DATABASE IF EXISTS issue1352_test;
CREATE DATABASE issue1352_test;
USE issue1352_test;
CREATE TABLE test (dt TIMESTAMP) engine=tianmu;
insert test values(now());
RingsC marked this conversation as resolved.
Show resolved Hide resolved
EXPLAIN SELECT dt FROM test WHERE dt >= date_sub(now(), INTERVAL 30 DAY) AND dt < now();
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE test NULL ALL NULL NULL NULL NULL 1 100.00 Using where with pushed condition ((`issue1352_test`.`test`.`dt` >= <cache>((now() - interval 30 day))) and (`issue1352_test`.`test`.`dt` < <cache>(now())))(t0) Pckrows: 1, susp. 0 (0 empty 1 full). Conditions: 1
EXPLAIN SELECT dt FROM test WHERE dt < date_sub(now(), INTERVAL 30 DAY) AND dt < now();
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE test NULL ALL NULL NULL NULL NULL 1 100.00 Using where with pushed condition ((`issue1352_test`.`test`.`dt` < <cache>((now() - interval 30 day))) and (`issue1352_test`.`test`.`dt` < <cache>(now())))(t0) Pckrows: 1, susp. 0 (1 empty 0 full). Conditions: 1
EXPLAIN SELECT dt FROM test WHERE dt >= date_sub(now(), INTERVAL 30 DAY) AND dt >= now();
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE test NULL ALL NULL NULL NULL NULL 1 100.00 Using where with pushed condition ((`issue1352_test`.`test`.`dt` >= <cache>((now() - interval 30 day))) and (`issue1352_test`.`test`.`dt` >= <cache>(now())))(t0) Pckrows: 1, susp. 0 (1 empty 0 full). Conditions: 1
EXPLAIN SELECT count(dt) FROM test WHERE dt >= date_sub(now(), INTERVAL 30 DAY) AND dt >= now() group by dt;
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE test NULL ALL NULL NULL NULL NULL 1 100.00 Using where with pushed condition ((`issue1352_test`.`test`.`dt` >= <cache>((now() - interval 30 day))) and (`issue1352_test`.`test`.`dt` >= <cache>(now())))(t0) Pckrows: 1, susp. 0 (1 empty 0 full). Conditions: 1; Using temporary; Using filesort
EXPLAIN SELECT count(dt) FROM test WHERE dt >= date_sub(now(), INTERVAL 30 DAY) AND dt >= now() group by dt;
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE test NULL ALL NULL NULL NULL NULL 1 100.00 Using where with pushed condition ((`issue1352_test`.`test`.`dt` >= <cache>((now() - interval 30 day))) and (`issue1352_test`.`test`.`dt` >= <cache>(now())))(t0) Pckrows: 1, susp. 0 (1 empty 0 full). Conditions: 1; Using temporary; Using filesort
EXPLAIN SELECT dt FROM test WHERE dt >= date_add(now(), INTERVAL 30 DAY) AND dt < now();
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE test NULL ALL NULL NULL NULL NULL 1 100.00 Using where with pushed condition ((`issue1352_test`.`test`.`dt` >= <cache>((now() + interval 30 day))) and (`issue1352_test`.`test`.`dt` < <cache>(now())))
DROP TABLE test;
DROP DATABASE issue1352_test;
36 changes: 36 additions & 0 deletions mysql-test/suite/tianmu/t/issue1352.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--source include/have_tianmu.inc

--disable_warnings

DROP DATABASE IF EXISTS issue1352_test;
CREATE DATABASE issue1352_test;

USE issue1352_test;

## DDL

CREATE TABLE test (dt TIMESTAMP) engine=tianmu;

### insert data

insert test values(now());

## explain

EXPLAIN SELECT dt FROM test WHERE dt >= date_sub(now(), INTERVAL 30 DAY) AND dt < now();

EXPLAIN SELECT dt FROM test WHERE dt < date_sub(now(), INTERVAL 30 DAY) AND dt < now();

EXPLAIN SELECT dt FROM test WHERE dt >= date_sub(now(), INTERVAL 30 DAY) AND dt >= now();

EXPLAIN SELECT count(dt) FROM test WHERE dt >= date_sub(now(), INTERVAL 30 DAY) AND dt >= now() group by dt;

EXPLAIN SELECT count(dt) FROM test WHERE dt >= date_sub(now(), INTERVAL 30 DAY) AND dt >= now() group by dt;

EXPLAIN SELECT dt FROM test WHERE dt >= date_add(now(), INTERVAL 30 DAY) AND dt < now();

## clean test table

DROP TABLE test;

DROP DATABASE issue1352_test;
32 changes: 18 additions & 14 deletions storage/tianmu/core/mysql_expression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,8 +579,11 @@ bool operator==(Item const &, Item const &);

namespace {
bool generic_item_same(Item const &left, Item const &right) {
return ((&left == &right) ||
((left.type() == right.type()) && (left.result_type() == right.result_type()) &&
if (&left == &right) {
return true;
}

return (((left.type() == right.type()) && (left.result_type() == right.result_type()) &&
(left.cast_to_int_type() == right.cast_to_int_type()) &&
(left.string_field_type() == right.string_field_type()) && (left.field_type() == right.field_type()) &&
(left.const_during_execution() == right.const_during_execution()) && (left == right)));
Expand All @@ -601,8 +604,8 @@ bool operator==(Item const &left, Item const &right) {
} break;
case (Item::COND_ITEM):
case (Item::FUNC_ITEM): {
Item_func const *l = static_cast<Item_func const *>(&left);
Item_func const *r = static_cast<Item_func const *>(&right);
Item_func const *l = down_cast<Item_func const *>(&left);
Item_func const *r = down_cast<Item_func const *>(&right);
same = !std::strcmp(l->func_name(), r->func_name());
same = same && (l->arg_count == r->arg_count);
same = same && l->functype() == r->functype();
Expand All @@ -611,8 +614,8 @@ bool operator==(Item const &left, Item const &right) {
same = same && l->item_name.eq_safe(r->item_name);
if (l->functype() == Item_func::GUSERVAR_FUNC) {
if (same) {
Item_func_get_user_var const *ll = static_cast<Item_func_get_user_var const *>(&left);
Item_func_get_user_var const *rr = static_cast<Item_func_get_user_var const *>(&right);
Item_func_get_user_var const *ll = down_cast<Item_func_get_user_var const *>(&left);
Item_func_get_user_var const *rr = down_cast<Item_func_get_user_var const *>(&right);
same = !std::strcmp(ll->name.ptr(), rr->name.ptr());
}
} else {
Expand All @@ -628,13 +631,13 @@ bool operator==(Item const &left, Item const &right) {
same = same && ((l->int_type == r->int_type) && (l->date_sub_interval == r->date_sub_interval));

if (l->functype() == Item_func::IN_FUNC) {
const Item_func_in *l = static_cast<const Item_func_in *>(&left);
const Item_func_in *r = static_cast<const Item_func_in *>(&right);
const Item_func_in *l = down_cast<const Item_func_in *>(&left);
const Item_func_in *r = down_cast<const Item_func_in *>(&right);
same = same && l->negated == r->negated;
}
if (same && (l->functype() == Item_func::COND_AND_FUNC || l->functype() == Item_func::COND_OR_FUNC)) {
Item_cond *l = const_cast<Item_cond *>(static_cast<Item_cond const *>(&left));
Item_cond *r = const_cast<Item_cond *>(static_cast<Item_cond const *>(&right));
Item_cond *l = const_cast<Item_cond *>(down_cast<Item_cond const *>(&left));
Item_cond *r = const_cast<Item_cond *>(down_cast<Item_cond const *>(&right));
List_iterator<Item> li(*l->argument_list());
List_iterator<Item> ri(*r->argument_list());
Item *il, *ir;
Expand All @@ -649,13 +652,13 @@ bool operator==(Item const &left, Item const &right) {
}
} break;
case static_cast<int>(Item_tianmufield::enumTIANMUFiledItem::TIANMUFIELD_ITEM): {
Item_tianmufield const *l = static_cast<Item_tianmufield const *>(&left);
Item_tianmufield const *r = static_cast<Item_tianmufield const *>(&right);
Item_tianmufield const *l = down_cast<Item_tianmufield const *>(&left);
Item_tianmufield const *r = down_cast<Item_tianmufield const *>(&right);
same = (*l == *r);
} break;
case (Item::REF_ITEM): {
Item_ref const *l = static_cast<Item_ref const *>(&left);
Item_ref const *r = static_cast<Item_ref const *>(&right);
Item_ref const *l = down_cast<Item_ref const *>(&left);
Item_ref const *r = down_cast<Item_ref const *>(&right);
same = (!(l->ref || r->ref)) ||
(l->ref && r->ref &&
((!(*(l->ref) || *(r->ref))) || (*(l->ref) && *(r->ref) && (*(*(l->ref)) == *(*(r->ref))))));
Expand All @@ -665,6 +668,7 @@ bool operator==(Item const &left, Item const &right) {
case (Item::DECIMAL_ITEM):
case (Item::REAL_ITEM):
case (Item::VARBIN_ITEM):
case (Item::CACHE_ITEM):
case (Item::INT_ITEM): {
same = left.eq(&right, true);
} break;
Expand Down