Skip to content

Commit

Permalink
bug(tianmu): fix throw exception while execute a union sql. (stoneato…
Browse files Browse the repository at this point in the history 
…m#671)

[summary]
1 TempTable::VerifyAttrsSizes optimization to reduce the size is
  incorrect,comment the optimization for temp sulution;
  • Loading branch information
lujiashun committed Oct 25, 2022
1 parent 5a5d6ff commit 19b25bc
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 25 deletions.
6 changes: 4 additions & 2 deletions mysql-test/suite/tianmu/r/issue226.result
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use test;
CREATE TABLE t1 (f1 VARCHAR(255) CHARACTER SET utf8) ENGINE=TIANMU;
create database test_tmp;
use test_tmp;
CREATE TABLE t1 (f1 VARCHAR(255) CHARACTER SET utf8mb4) ENGINE=TIANMU;
CREATE TABLE t2 AS SELECT LEFT(f1,171) AS f2 FROM t1 UNION SELECT LEFT(f1,171) AS f2 FROM t1;
INSERT INTO t2 VALUES ('a');
INSERT INTO t2 VALUES ('b');
Expand All @@ -11,3 +12,4 @@ b
c
DROP TABLE t1;
DROP TABLE t2;
drop database test_tmp;
7 changes: 5 additions & 2 deletions mysql-test/suite/tianmu/t/issue226.testbak → mysql-test/suite/tianmu/t/issue226.test
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
use test;
CREATE TABLE t1 (f1 VARCHAR(255) CHARACTER SET utf8) ENGINE=TIANMU;
--source include/have_tianmu.inc
create database test_tmp;
use test_tmp;
CREATE TABLE t1 (f1 VARCHAR(255) CHARACTER SET utf8mb4) ENGINE=TIANMU;
CREATE TABLE t2 AS SELECT LEFT(f1,171) AS f2 FROM t1 UNION SELECT LEFT(f1,171) AS f2 FROM t1;
INSERT INTO t2 VALUES ('a');
INSERT INTO t2 VALUES ('b');
INSERT INTO t2 VALUES ('c');
SELECT * FROM t2;
DROP TABLE t1;
DROP TABLE t2;
drop database test_tmp;
67 changes: 46 additions & 21 deletions storage/tianmu/core/temp_table_low.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ bool TempTable::OrderByAndMaterialize(std::vector<SortDescriptor> &ord, int64_t
if (no_dims == 1) {
for (int i = 0; i < filter.mind->NumOfDimensions(); i++) {
if (all_dims[i]) {
if (filter.mind->GetFilter(i)) one_dim = i; // exactly one filter (non-join or join with forgotten dims)
if (filter.mind->GetFilter(i))
one_dim = i; // exactly one filter (non-join or join with forgotten dims)
break;
}
}
Expand Down Expand Up @@ -160,7 +161,8 @@ bool TempTable::OrderByAndMaterialize(std::vector<SortDescriptor> &ord, int64_t
ord.clear();
if (task_num == 1) {
while (it.IsValid() && continue_now) {
if (m_conn->Killed()) throw common::KilledException();
if (m_conn->Killed())
throw common::KilledException();
if (it.PackrowStarted()) {
if (sorted_table.InitPackrow(it)) {
local_row += it.GetPackSizeLeft();
Expand Down Expand Up @@ -211,7 +213,8 @@ bool TempTable::OrderByAndMaterialize(std::vector<SortDescriptor> &ord, int64_t
for (int i = 0; i < task_num; i++)
res.insert(ha_rcengine_->query_thread_pool.add_task(&TempTable::TaskPutValueInST, this, &taskIterator[i],
current_txn_, &subsorted_table[i]));
if (filter.mind->m_conn->Killed()) throw common::KilledException("Query killed by user");
if (filter.mind->m_conn->Killed())
throw common::KilledException("Query killed by user");

for (int i = 0; i < task_num; ++i) {
local_row += res.get(i);
Expand Down Expand Up @@ -248,7 +251,8 @@ bool TempTable::OrderByAndMaterialize(std::vector<SortDescriptor> &ord, int64_t
valid = sorted_table.FetchNextRow();
if (valid && global_row >= offset) {
int col = 0;
if (m_conn->Killed()) throw common::KilledException();
if (m_conn->Killed())
throw common::KilledException();
for (auto &attr : attrs) {
if (attr->alias != nullptr) {
switch (attr->TypeName()) {
Expand Down Expand Up @@ -304,7 +308,8 @@ bool TempTable::OrderByAndMaterialize(std::vector<SortDescriptor> &ord, int64_t

void TempTable::FillMaterializedBuffers(int64_t local_limit, int64_t local_offset, ResultSender *sender,
bool pagewise) {
if (filter.mind->ZeroTuples()) return;
if (filter.mind->ZeroTuples())
return;

if (sender) {
SendResult(local_limit, local_offset, *sender, pagewise);
Expand All @@ -321,7 +326,8 @@ void TempTable::FillMaterializedBuffers(int64_t local_limit, int64_t local_offse
// Column statistics
if (m_conn->DisplayAttrStats()) {
for (uint j = 0; j < NumOfAttrs(); j++) {
if (attrs[j]->term.vc) attrs[j]->term.vc->DisplayAttrStats();
if (attrs[j]->term.vc)
attrs[j]->term.vc->DisplayAttrStats();
}
m_conn->SetDisplayAttrStats(false); // already displayed
}
Expand All @@ -334,14 +340,18 @@ void TempTable::FillMaterializedBuffers(int64_t local_limit, int64_t local_offse
break;
}
}
if (!has_intresting_columns) return;
if (!has_intresting_columns)
return;

MIIterator it(filter.mind, filter.mind->ValueOfPower());
if (pagewise && local_offset < no_materialized) local_offset = no_materialized; // continue filling
if (pagewise && local_offset < no_materialized)
local_offset = no_materialized; // continue filling

if (local_offset > 0) it.Skip(local_offset);
if (local_offset > 0)
it.Skip(local_offset);

if (!it.IsValid()) return;
if (!it.IsValid())
return;

int64_t row = local_offset;
std::vector<char> skip_parafilloutput;
Expand All @@ -362,7 +372,8 @@ void TempTable::FillMaterializedBuffers(int64_t local_limit, int64_t local_offse
skip_parafilloutput.push_back(skip);
}

if (attrs.size() == 0) return;
if (attrs.size() == 0)
return;

// Semantics of variables:
// row - a row number in orig. tables
Expand All @@ -375,7 +386,8 @@ void TempTable::FillMaterializedBuffers(int64_t local_limit, int64_t local_offse
int64_t page_end = (((row - local_offset) / page_size) + 1) * page_size + local_offset;
// where the current TempTable buffer ends, in terms of multiindex rows
// (integer division)
if (page_end > no_obj + local_offset) page_end = no_obj + local_offset;
if (page_end > no_obj + local_offset)
page_end = no_obj + local_offset;

for (uint i = 0; i < NumOfAttrs(); i++) attrs[i]->CreateBuffer(page_end - start_row, m_conn, pagewise);

Expand All @@ -400,9 +412,11 @@ void TempTable::FillMaterializedBuffers(int64_t local_limit, int64_t local_offse
res.get_all_with_except();

for (uint i = 1; i < attrs.size(); i++)
if (skip_parafilloutput[i]) FillbufferTask(attrs[i], current_txn_, &page_start, start_row, page_end);
if (skip_parafilloutput[i])
FillbufferTask(attrs[i], current_txn_, &page_start, start_row, page_end);

if (lazy) break;
if (lazy)
break;
}
}

Expand All @@ -413,7 +427,8 @@ void TempTable::SendResult(int64_t limit, int64_t offset, ResultSender &sender,
//////// Column statistics ////////////////////////
if (m_conn->DisplayAttrStats()) {
for (uint j = 0; j < NumOfAttrs(); j++) {
if (attrs[j]->term.vc) attrs[j]->term.vc->DisplayAttrStats();
if (attrs[j]->term.vc)
attrs[j]->term.vc->DisplayAttrStats();
}
m_conn->SetDisplayAttrStats(false); // already displayed
}
Expand All @@ -426,12 +441,15 @@ void TempTable::SendResult(int64_t limit, int64_t offset, ResultSender &sender,
break;
}
}
if (!has_intresting_columns) return;
if (!has_intresting_columns)
return;

MIIterator it(filter.mind, filter.mind->ValueOfPower());
if (pagewise && offset < no_materialized) offset = no_materialized; // continue filling
if (pagewise && offset < no_materialized)
offset = no_materialized; // continue filling

if (offset > 0) it.Skip(offset);
if (offset > 0)
it.Skip(offset);

int row = 0;
bool first_row_for_vc = true;
Expand Down Expand Up @@ -482,7 +500,8 @@ void TempTable::SendResult(int64_t limit, int64_t offset, ResultSender &sender,
sender.SendRow(record, this);
row++;
++it;
if (lazy) break;
if (lazy)
break;
}
for (auto &attr : attrs) {
attr->term.vc->UnlockSourcePacks();
Expand All @@ -492,7 +511,8 @@ void TempTable::SendResult(int64_t limit, int64_t offset, ResultSender &sender,
std::vector<AttributeTypeInfo> TempTable::GetATIs(bool orig) {
std::vector<AttributeTypeInfo> deas;
for (uint i = 0; i < NumOfAttrs(); i++) {
if (!IsDisplayAttr(i)) continue;
if (!IsDisplayAttr(i))
continue;
deas.emplace_back(attrs[i]->TypeName(), attrs[i]->Type().NotNull(),
orig ? attrs[i]->orig_precision : attrs[i]->Type().GetPrecision(), attrs[i]->Type().GetScale(),
false, attrs[i]->Type().GetCollation());
Expand All @@ -513,6 +533,9 @@ void TempTable::VerifyAttrsSizes() // verifies attr[i].field_size basing on the
} else {
vcolumn::VirtualColumn *vc = attrs[i]->term.vc;
int max_length = attrs[i]->term.vc->MaxStringSize();
// TODO, the code has some bug, max_length in some case wil be negative, see #671
// comment the optimization code for temp solution;
#if 0
if (dynamic_cast<vcolumn::ExpressionColumn *>(vc)) {
auto &var_map = dynamic_cast<vcolumn::ExpressionColumn *>(vc)->GetVarMap();
for (auto &it : var_map) {
Expand All @@ -525,6 +548,7 @@ void TempTable::VerifyAttrsSizes() // verifies attr[i].field_size basing on the
}
}
}
#endif
attrs[i]->OverrideStringSize(max_length);
}
}
Expand All @@ -546,7 +570,8 @@ size_t TempTable::TaskPutValueInST(MIIterator *it, Transaction *ci, SorterWrappe
bool continue_now = true;
current_txn_ = ci;
while (it->IsValid() && continue_now) {
if (m_conn->Killed()) throw common::KilledException();
if (m_conn->Killed())
throw common::KilledException();
if (it->PackrowStarted()) {
if (st->InitPackrow(*it)) {
local_row += it->GetPackSizeLeft();
Expand Down

0 comments on commit 19b25bc

Please sign in to comment.