Skip to content

M
mariadb
Commit e7f2dc6b authored by unknown's avatar unknown
Browse files
Options

Added better printout for condition pushdown

parent 6cacf67b
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 35 deletions
sql/ha_ndbcluster.cc
View file @ e7f2dc6b
...@@ -2454,7 +2454,7 @@ void ha_ndbcluster::unpack_record(byte* buf) ...@@ -2454,7 +2454,7 @@ void ha_ndbcluster::unpack_record(byte* buf)
DBUG_PRINT("hidden", ("%d: %s \"%llu\"", hidden_no, DBUG_PRINT("hidden", ("%d: %s \"%llu\"", hidden_no,
hidden_col->getName(), rec->u_64_value())); hidden_col->getName(), rec->u_64_value()));
} }
print_results(); //print_results();
#endif #endif
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -5553,39 +5553,32 @@ void ndb_serialize_cond(const Item *item, void *arg) ...@@ -5553,39 +5553,32 @@ void ndb_serialize_cond(const Item *item, void *arg)
? context->expecting_field_result(STRING_RESULT) : true) && ? context->expecting_field_result(STRING_RESULT) : true) &&
context->expecting_field_result(field->result_type())) context->expecting_field_result(field->result_type()))
{ {
// Currently only support for unsigned int const NDBCOL *col= tab->getColumn(field->field_name);
if (field->result_type() == INT_RESULT && DBUG_ASSERT(col);
!(field->flags & UNSIGNED_FLAG)) curr_cond->ndb_item= new Ndb_item(field, col->getColumnNo());
*context->supported_ptr= FALSE; context->dont_expect(Item::FIELD_ITEM);
else context->expect_no_field_result();
if (context->expect_mask)
{ {
const NDBCOL *col= tab->getColumn(field->field_name); // We have not seen second argument yet
DBUG_ASSERT(col); if (type == MYSQL_TYPE_DATE || type == MYSQL_TYPE_YEAR)
curr_cond->ndb_item= new Ndb_item(field, col->getColumnNo()); context->expect_only(Item::STRING_ITEM);
context->dont_expect(Item::FIELD_ITEM); else
context->expect_no_field_result(); switch(field->result_type()) {
if (context->expect_mask) case(STRING_RESULT):
{
// We have not seen second argument yet
if (type == MYSQL_TYPE_DATE || type == MYSQL_TYPE_YEAR)
context->expect_only(Item::STRING_ITEM); context->expect_only(Item::STRING_ITEM);
else break;
switch(field->result_type()) { case(REAL_RESULT):
case(STRING_RESULT): context->expect_only(Item::REAL_ITEM);
context->expect_only(Item::STRING_ITEM); break;
break; case(INT_RESULT):
case(REAL_RESULT): context->expect_only(Item::INT_ITEM);
context->expect_only(Item::REAL_ITEM); break;
break; default:
case(INT_RESULT): break;
context->expect_only(Item::INT_ITEM); }
break;
default:
break;
}
}
break;
} }
break;
} }
} }
*context->supported_ptr= FALSE; *context->supported_ptr= FALSE;
...@@ -5907,11 +5900,11 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -5907,11 +5900,11 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
: (b->type == NDB_FIELD)? b : (b->type == NDB_FIELD)? b
: NULL; : NULL;
if (!value || !field) break; if (!value || !field) break;
DBUG_PRINT("info", ("Generating LT filter"));
const void* value_ptr = value->get_value(); const void* value_ptr = value->get_value();
if (a == field) if (a == field)
{ {
DBUG_PRINT("info", ("Generating LT filter"));
if (filter->cmp(NdbScanFilter::COND_LT, if (filter->cmp(NdbScanFilter::COND_LT,
field->get_field_no(), field->get_field_no(),
value_ptr, value_ptr,
...@@ -5920,6 +5913,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -5920,6 +5913,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
} }
else else
{ {
DBUG_PRINT("info", ("Generating GT filter"));
if (filter->cmp(NdbScanFilter::COND_GT, if (filter->cmp(NdbScanFilter::COND_GT,
field->get_field_no(), field->get_field_no(),
value_ptr, value_ptr,
...@@ -5943,11 +5937,11 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -5943,11 +5937,11 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
: (b->type == NDB_FIELD)? b : (b->type == NDB_FIELD)? b
: NULL; : NULL;
if (!value || !field) break; if (!value || !field) break;
DBUG_PRINT("info", ("Generating LE filter"));
const void* value_ptr = value->get_value(); const void* value_ptr = value->get_value();
if (a == field) if (a == field)
{ {
DBUG_PRINT("info", ("Generating LE filter"));
if (filter->cmp(NdbScanFilter::COND_LE, if (filter->cmp(NdbScanFilter::COND_LE,
field->get_field_no(), field->get_field_no(),
value_ptr, value_ptr,
...@@ -5956,6 +5950,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -5956,6 +5950,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
} }
else else
{ {
DBUG_PRINT("info", ("Generating GE filter"));
if (filter->cmp(NdbScanFilter::COND_GE, if (filter->cmp(NdbScanFilter::COND_GE,
field->get_field_no(), field->get_field_no(),
value_ptr, value_ptr,
...@@ -5979,11 +5974,11 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -5979,11 +5974,11 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
: (b->type == NDB_FIELD)? b : (b->type == NDB_FIELD)? b
: NULL; : NULL;
if (!value || !field) break; if (!value || !field) break;
DBUG_PRINT("info", ("Generating GE filter"));
const void* value_ptr = value->get_value(); const void* value_ptr = value->get_value();
if (a == field) if (a == field)
{ {
DBUG_PRINT("info", ("Generating GE filter"));
if (filter->cmp(NdbScanFilter::COND_GE, if (filter->cmp(NdbScanFilter::COND_GE,
field->get_field_no(), field->get_field_no(),
value_ptr, value_ptr,
...@@ -5992,6 +5987,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -5992,6 +5987,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
} }
else else
{ {
DBUG_PRINT("info", ("Generating LE filter"));
if (filter->cmp(NdbScanFilter::COND_LE, if (filter->cmp(NdbScanFilter::COND_LE,
field->get_field_no(), field->get_field_no(),
value_ptr, value_ptr,
...@@ -6015,7 +6011,6 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -6015,7 +6011,6 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
: (b->type == NDB_FIELD)? b : (b->type == NDB_FIELD)? b
: NULL; : NULL;
if (!value || !field) break; if (!value || !field) break;
DBUG_PRINT("info", ("Generating GT filter"));
const void* value_ptr = value->get_value(); const void* value_ptr = value->get_value();
if (!value) if (!value)
...@@ -6023,6 +6018,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -6023,6 +6018,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
if (a == field) if (a == field)
{ {
DBUG_PRINT("info", ("Generating GT filter"));
if (filter->cmp(NdbScanFilter::COND_GT, if (filter->cmp(NdbScanFilter::COND_GT,
field->get_field_no(), field->get_field_no(),
value_ptr, value_ptr,
...@@ -6031,6 +6027,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond, ...@@ -6031,6 +6027,7 @@ ha_ndbcluster::build_scan_filter_predicate(Ndb_cond * &cond,
} }
else else
{ {
DBUG_PRINT("info", ("Generating LT filter"));
if (filter->cmp(NdbScanFilter::COND_LT, if (filter->cmp(NdbScanFilter::COND_LT,
field->get_field_no(), field->get_field_no(),
value_ptr, value_ptr,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7