Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleaning up and removing redundant code

This commit is contained in:
James 2014-11-22 16:22:14 +00:00
parent e73a05bb16
commit 56aee80aa3
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/RangeInfo.cpp
View File

@ -406,7 +406,7 @@ void RangeInfoMap::eraseEmptyOrUndefined(std::string const& var) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
RangeInfoMapVec::RangeInfoMapVec (std::string const& var, /*RangeInfoMapVec::RangeInfoMapVec (std::string const& var,
std::string const& name, std::string const& name,
RangeInfoBound low, RangeInfoBound low,
RangeInfoBound high, RangeInfoBound high,
@ -414,7 +414,7 @@ RangeInfoMapVec::RangeInfoMapVec (std::string const& var,
_rangeInfoMapVec() { _rangeInfoMapVec() {
_rangeInfoMapVec.emplace_back(new RangeInfoMap(var, name, low, high, equality)); _rangeInfoMapVec.emplace_back(new RangeInfoMap(var, name, low, high, equality));
} }*/
RangeInfoMapVec::RangeInfoMapVec (RangeInfoMap* rim) : RangeInfoMapVec::RangeInfoMapVec (RangeInfoMap* rim) :
_rangeInfoMapVec() { _rangeInfoMapVec() {

40
arangod/Aql/RangeInfo.h
View File

@ -528,6 +528,10 @@ namespace triagens {
_equality = false; _equality = false;
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief clone
////////////////////////////////////////////////////////////////////////////////
RangeInfo clone () { RangeInfo clone () {
RangeInfo copy(_var, _attr); RangeInfo copy(_var, _attr);
@ -588,6 +592,11 @@ namespace triagens {
RangeInfoMap () : _ranges() { RangeInfoMap () : _ranges() {
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief construct RangeInfoMap containing single RangeInfo created from the
/// args
////////////////////////////////////////////////////////////////////////////////
RangeInfoMap (std::string const& var, RangeInfoMap (std::string const& var,
std::string const& name, std::string const& name,
RangeInfoBound low, RangeInfoBound low,
@ -614,6 +623,11 @@ namespace triagens {
return &((*it).second); return &((*it).second);
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief find, find all the range info for variable <var> and attribute <attr>
/// ownership is not transferred
////////////////////////////////////////////////////////////////////////////////
RangeInfo* find (std::string const& var, std::string const& attr) { RangeInfo* find (std::string const& var, std::string const& attr) {
auto map = find(var); auto map = find(var);
if (map == nullptr) { if (map == nullptr) {
@ -626,7 +640,6 @@ namespace triagens {
} }
return &((*it).second); return &((*it).second);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -657,6 +670,10 @@ namespace triagens {
return _ranges.size(); return _ranges.size();
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief empty, the number of range infos stored
////////////////////////////////////////////////////////////////////////////////
bool empty () const { bool empty () const {
return _ranges.empty(); return _ranges.empty();
} }
@ -694,11 +711,13 @@ namespace triagens {
std::unordered_set<std::string> attributes (std::string const& var); std::unordered_set<std::string> attributes (std::string const& var);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief private data//TODO: make iterators for this i.e. method for begin and /// @brief private data
//end ////TODO: make iterators for this i.e. method for begin and end, so that this
//can be private
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
std::unordered_map<std::string, std::unordered_map<std::string, RangeInfo>> _ranges; std::unordered_map<std::string, std::unordered_map<std::string,
RangeInfo>> _ranges;
}; };
@ -721,15 +740,10 @@ namespace triagens {
RangeInfoMapVec () : _rangeInfoMapVec() { RangeInfoMapVec () : _rangeInfoMapVec() {
} }
////////////////////////////////////////////////////////////////////////////////
// construct RangeInfoMapVec containing a single RangeInfoMap containing a /// @brief constructor: construct RangeInfoMapVec containing a single
// single RangeInfo /// RangeInfoMap containing a single RangeInfo.
////////////////////////////////////////////////////////////////////////////////
RangeInfoMapVec (std::string const& var,
std::string const& name,
RangeInfoBound low,
RangeInfoBound high,
bool equality);
RangeInfoMapVec (RangeInfoMap* rim); RangeInfoMapVec (RangeInfoMap* rim);