susumu.yata
null+****@clear*****
Wed Jul 30 13:09:08 JST 2014
susumu.yata 2014-07-30 13:09:08 +0900 (Wed, 30 Jul 2014) New Revision: 0eaba3ef76cbecd4444646c384c32917ed35b086 https://github.com/groonga/grnxx/commit/0eaba3ef76cbecd4444646c384c32917ed35b086 Message: Refine codes. Modified files: lib/grnxx/sorter.cpp Modified: lib/grnxx/sorter.cpp (+6 -6) =================================================================== --- lib/grnxx/sorter.cpp 2014-07-30 12:31:08 +0900 (e82ec48) +++ lib/grnxx/sorter.cpp 2014-07-30 13:09:08 +0900 (36f3d24) @@ -69,7 +69,7 @@ class Node : public SorterNode { prior_to_() {} ~Node() {} - bool sort(Error *error, RecordSubset subset, Int begin, Int end); + bool sort(Error *error, RecordSubset records, Int begin, Int end); private: Order order_; @@ -92,12 +92,12 @@ class Node : public SorterNode { }; template <typename T> -bool Node<T>::sort(Error *error, RecordSubset subset, Int begin, Int end) { - if (!order_.expression->evaluate(error, subset, &values_)) { +bool Node<T>::sort(Error *error, RecordSubset records, Int begin, Int end) { + if (!order_.expression->evaluate(error, records, &values_)) { return false; } set_error(error); - return quick_sort(subset, values_.data(), begin, end); + return quick_sort(records, values_.data(), begin, end); } template <typename T> @@ -198,7 +198,7 @@ bool Node<T>::quick_sort(RecordSubset records, Value *values, if ((end > right) && ((records.size() - right) >= 2)) { Int next_begin = (begin < right) ? 0 : (begin - right); Int next_end = end - right; - if (!quick_sort(records.subset(right, records.size() - right), + if (!quick_sort(records.subset(right), values + right, next_begin, next_end)) { return false; } @@ -249,7 +249,7 @@ bool Node<T>::insertion_sort(RecordSubset records, Value *values) { } if ((records.size() - begin) >= 2) { if (!this->next_->sort(this->error_, - records.subset(begin, records.size() - begin), + records.subset(begin), 0, records.size() - begin)) { return false; } -------------- next part -------------- HTML����������������������������...下載
