tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move DistinctCursor to operator.cpp

Browse Source 
Summary: Depends on D1980

Reviewers: mtomic

Reviewed By: mtomic

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1986
This commit is contained in:
Teon Banek 2019-04-25 13:18:41 +02:00
parent e3fbe56588
commit bc46de7b33
2 changed files with 40 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/query/plan/operator.cpp
View File

@ -3042,6 +3042,46 @@ void Unwind::UnwindCursor::Reset() {
input_value_it_ = input_value_.end();
}
class DistinctCursor : public Cursor {
public:
DistinctCursor(const Distinct &self, database::GraphDbAccessor *db,
utils::MemoryResource *mem)
: self_(self), input_cursor_(self.input_->MakeCursor(db, mem)) {}
bool Pull(Frame &frame, ExecutionContext &context) override {
SCOPED_PROFILE_OP("Distinct");
while (true) {
if (!input_cursor_->Pull(frame, context)) return false;
std::vector<TypedValue> row;
row.reserve(self_.value_symbols_.size());
for (const auto &symbol : self_.value_symbols_)
row.emplace_back(frame[symbol]);
if (seen_rows_.insert(std::move(row)).second) return true;
}
}
void Shutdown() override { input_cursor_->Shutdown(); }
void Reset() override {
input_cursor_->Reset();
seen_rows_.clear();
}
private:
const Distinct &self_;
const std::unique_ptr<Cursor> input_cursor_;
// a set of already seen rows
std::unordered_set<std::vector<TypedValue>,
// use FNV collection hashing specialized for a vector of
// TypedValues
utils::FnvCollection<std::vector<TypedValue>, TypedValue,
TypedValue::Hash>,
TypedValueVectorEqual>
seen_rows_;
};
Distinct::Distinct(const std::shared_ptr<LogicalOperator> &input,
const std::vector<Symbol> &value_symbols)
: input_(input ? input : std::make_shared<Once>()),
@ -3064,32 +3104,6 @@ std::vector<Symbol> Distinct::ModifiedSymbols(const SymbolTable &table) const {
return input_->ModifiedSymbols(table);
}
Distinct::DistinctCursor::DistinctCursor(const Distinct &self,
database::GraphDbAccessor *db,
utils::MemoryResource *mem)
: self_(self), input_cursor_(self.input_->MakeCursor(db, mem)) {}
bool Distinct::DistinctCursor::Pull(Frame &frame, ExecutionContext &context) {
SCOPED_PROFILE_OP("Distinct");
while (true) {
if (!input_cursor_->Pull(frame, context)) return false;
std::vector<TypedValue> row;
row.reserve(self_.value_symbols_.size());
for (const auto &symbol : self_.value_symbols_)
row.emplace_back(frame[symbol]);
if (seen_rows_.insert(std::move(row)).second) return true;
}
}
void Distinct::DistinctCursor::Shutdown() { input_cursor_->Shutdown(); }
void Distinct::DistinctCursor::Reset() {
input_cursor_->Reset();
seen_rows_.clear();
}
Union::Union(const std::shared_ptr<LogicalOperator> &left_op,
const std::shared_ptr<LogicalOperator> &right_op,
const std::vector<Symbol> &union_symbols,

24
src/query/plan/operator.lcp
View File

@ -2439,30 +2439,6 @@ This implementation maintains input ordering.")
input_ = input;
}
cpp<#)
(:private
#>cpp
class DistinctCursor : public Cursor {
public:
DistinctCursor(const Distinct &, database::GraphDbAccessor *,
utils::MemoryResource *);
bool Pull(Frame &, ExecutionContext &) override;
void Shutdown() override;
void Reset() override;
private:
const Distinct &self_;
const std::unique_ptr<Cursor> input_cursor_;
// a set of already seen rows
std::unordered_set<
std::vector<TypedValue>,
// use FNV collection hashing specialized for a vector of TypedValues
utils::FnvCollection<std::vector<TypedValue>, TypedValue,
TypedValue::Hash>,
TypedValueVectorEqual>
seen_rows_;
};
cpp<#)
(:serialize (:slk) (:capnp))
(:clone))