diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-09-12 09:27:37 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-09-12 09:27:37 +0200 |
commit | 9b5aa4c862b0dfbba33d16fb7554d3385ada4d11 (patch) | |
tree | 4fb80aee7f7460609de59fbf4626b6182f1f3e45 | |
parent | 16d276959a550d326a561f44259af02f242d65fa (diff) | |
download | sink-9b5aa4c862b0dfbba33d16fb7554d3385ada4d11.tar.gz sink-9b5aa4c862b0dfbba33d16fb7554d3385ada4d11.zip |
Simplified code
-rw-r--r-- | common/datastorequery.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp index a56fb4a..ad21910 100644 --- a/common/datastorequery.cpp +++ b/common/datastorequery.cpp | |||
@@ -535,7 +535,6 @@ void DataStoreQuery::setupQuery(const Sink::QueryBase &query_) | |||
535 | } | 535 | } |
536 | query.setBaseFilters(baseFilters); | 536 | query.setBaseFilters(baseFilters); |
537 | 537 | ||
538 | QSet<QByteArray> remainingFilters = query.getBaseFilters().keys().toSet(); | ||
539 | QByteArray appliedSorting; | 538 | QByteArray appliedSorting; |
540 | 539 | ||
541 | //Determine initial set | 540 | //Determine initial set |
@@ -545,10 +544,7 @@ void DataStoreQuery::setupQuery(const Sink::QueryBase &query_) | |||
545 | return Source::Ptr::create(query.ids().toVector(), this); | 544 | return Source::Ptr::create(query.ids().toVector(), this); |
546 | } else { | 545 | } else { |
547 | QSet<QByteArray> appliedFilters; | 546 | QSet<QByteArray> appliedFilters; |
548 | |||
549 | auto resultSet = mStore.indexLookup(mType, query, appliedFilters, appliedSorting); | 547 | auto resultSet = mStore.indexLookup(mType, query, appliedFilters, appliedSorting); |
550 | remainingFilters = remainingFilters - appliedFilters; | ||
551 | |||
552 | if (!appliedFilters.isEmpty()) { | 548 | if (!appliedFilters.isEmpty()) { |
553 | //We have an index lookup as starting point | 549 | //We have an index lookup as starting point |
554 | return Source::Ptr::create(resultSet, this); | 550 | return Source::Ptr::create(resultSet, this); |