Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 10 additions & 16 deletions cpp/src/reader/expression.cc
Original file line number Diff line number Diff line change
Expand Up @@ -178,23 +178,17 @@ Expression* QueryExpression::optimize(Expression* expression,
if (regular_left == nullptr || regular_right == nullptr) {
return nullptr;
}
Expression* mid_ret = nullptr;
if (type == AND_EXPR) {
mid_ret = new Expression(AND_EXPR, regular_left, regular_right);
my_exprs_.push_back(mid_ret);
} else if (type == OR_EXPR) {
mid_ret = new Expression(OR_EXPR, regular_left, regular_right);
my_exprs_.push_back(mid_ret);
// Reuse the node being optimized instead of allocating a second
// node wrapping the same children: the result becomes
// QueryExpression::expression_ and must be owned exactly once.
expression->left_ = regular_left;
expression->right_ = regular_right;

if (regular_left->type_ == GLOBALTIME_EXPR ||
regular_right->type_ == GLOBALTIME_EXPR) {
return optimize(expression, series_paths);
} else {
std::cout << "unsupported Expression type:" << type
<< std::endl;
}

if (mid_ret->left_->type_ == GLOBALTIME_EXPR ||
mid_ret->right_->type_ == GLOBALTIME_EXPR) {
return optimize(mid_ret, series_paths);
} else {
return mid_ret;
return expression;
}
}
} else {
Expand Down
45 changes: 32 additions & 13 deletions cpp/src/reader/qds_with_timegenerator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ int64_t SeriesScanStream::front() {
} else {
if (col_iter_->end()) {
int ret = E_OK; // cppcheck-suppress unreadVariable
delete col_iter_;
col_iter_ = nullptr;
tsblock_->reset();
if (RET_FAIL(ssi_->get_next(tsblock_, false))) {
delete col_iter_;
col_iter_ = nullptr;
return INVALID_NEXT_TIMESTAMP;
} else {
delete col_iter_;
col_iter_ = new ColIterator(0, tsblock_);
ASSERT(!col_iter_->end());
}
Expand Down Expand Up @@ -136,15 +136,23 @@ void* ValueAt::at(int64_t target_timestamp) {
}
}
tf_->reset_value(target_timestamp);
if (RET_FAIL(ssi_->get_next(tsblock_, (tsblock_ == nullptr), tf_))) {
delete time_col_iter_;
time_col_iter_ = nullptr;
delete value_col_iter_;
value_col_iter_ = nullptr;
// The iterators above only exist after the first lookup allocated
// tsblock_; keep the original allocate-if-null contract and only reset
// an already materialized block before it is reused.
const bool alloc_tsblock = (tsblock_ == nullptr);
if (tsblock_ != nullptr) {
tsblock_->reset();
}
if (RET_FAIL(ssi_->get_next(tsblock_, alloc_tsblock, tf_))) {
cur_time_ = INT64_MAX;
return nullptr;
} else {
delete time_col_iter_;
delete value_col_iter_;
time_col_iter_ = new ColIterator(0, tsblock_);
value_col_iter_ = new ColIterator(1, tsblock_);
}
time_col_iter_ = new ColIterator(0, tsblock_);
value_col_iter_ = new ColIterator(1, tsblock_);
Comment thread
ColinLeeo marked this conversation as resolved.
Resolved
}
}

Expand Down Expand Up @@ -306,7 +314,7 @@ int QDSWithTimeGenerator::init(TsFileIOReader* io_reader, QueryExpression* qe) {
return ret;
} else {
va.io_reader_ = io_reader_;
data_types.push_back(va.value_col_iter_->get_data_type());
data_types.push_back(va.ssi_->get_data_type());
value_at_vec_.push_back(va);
}
}
Expand Down Expand Up @@ -412,16 +420,27 @@ int QDSWithTimeGenerator::construct_node_tree(Expression* expr, Node*& node) {
if (RET_FAIL(construct_node_tree(expr->left_, node->left_))) {
} else if (RET_FAIL(construct_node_tree(expr->right_, node->right_))) {
}
if (ret != E_OK) {
destroy_node(node);
node = nullptr;
}
} else if (expr->type_ == SERIES_EXPR) {
Node* leaf = new Node(LEAF_NODE);
Path& path = expr->series_path_;
int ret = io_reader_->alloc_ssi(path.device_id_, path.measurement_,
leaf->sss_.ssi_, pa_, expr->filter_);
ret = io_reader_->alloc_ssi(path.device_id_, path.measurement_,
leaf->sss_.ssi_, pa_, expr->filter_);
if (E_OK == ret) {
leaf->sss_.init();
} else if (ret == E_NO_MORE_DATA) {
// The filter pruned every chunk of this series. Keep the leaf so
// parent AND/OR nodes still have a child; its stream reports
// INVALID_NEXT_TIMESTAMP for every lookup.
ret = E_OK;
}
if (ret == E_OK) {
node = leaf;
} else {
// do nothing, this leaf node will return no data at all.
delete leaf;
}
}
return ret;
Expand Down
Loading
Loading