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

Do not push <Class const> into vector. It does not work everywhere

This commit is contained in:
Michael Hackstein 2015-08-07 13:24:24 +02:00
parent 98106510d2
commit 8e3e2d547d
17 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/Index.h
View File

@ -97,7 +97,7 @@ namespace triagens {
auto * name = static_cast<TRI_json_t const*>(TRI_AtVector(&f->_value._objects, i));
if (TRI_IsStringJson(name)) {
std::vector<triagens::basics::AttributeName const> parsedAttributes;
std::vector<triagens::basics::AttributeName> parsedAttributes;
TRI_ParseAttributeString(std::string(name->_value._string.data, name->_value._string.length - 1), parsedAttributes);
fields.emplace_back(parsedAttributes);
}
@ -176,7 +176,7 @@ namespace triagens {
triagens::arango::Index::IndexType type;
bool unique;
bool sparse;
std::vector<std::vector<triagens::basics::AttributeName const>> fields;
std::vector<std::vector<triagens::basics::AttributeName>> fields;
private:

2
arangod/Indexes/CapConstraint.cpp
View File

@ -52,7 +52,7 @@ CapConstraint::CapConstraint (TRI_idx_iid_t iid,
TRI_document_collection_t* collection,
size_t count,
int64_t size)
: Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName const>>()),
: Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName>>()),
_count(count),
_size(static_cast<int64_t>(size)) {

2
arangod/Indexes/EdgeIndex.cpp
View File

@ -315,7 +315,7 @@ static bool IsEqualElementEdgeToByKey (void const* left,
EdgeIndex::EdgeIndex (TRI_idx_iid_t iid,
TRI_document_collection_t* collection)
: Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName const>>({ { { TRI_VOC_ATTRIBUTE_FROM, false } }, { { TRI_VOC_ATTRIBUTE_TO , false } } })),
: Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName>>({ { { TRI_VOC_ATTRIBUTE_FROM, false } }, { { TRI_VOC_ATTRIBUTE_TO , false } } })),
_edgesFrom(nullptr),
_edgesTo(nullptr) {

2
arangod/Indexes/FulltextIndex.cpp
View File

@ -121,7 +121,7 @@ FulltextIndex::FulltextIndex (TRI_idx_iid_t iid,
TRI_document_collection_t* collection,
std::string const& attribute,
int minWordLength)
: Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName const>> { { { attribute, false } } } ),
: Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName>> { { { attribute, false } } } ),
_pid(0),
_fulltextIndex(nullptr),
_minWordLength(minWordLength > 0 ? minWordLength : 1) {

4
arangod/Indexes/GeoIndex2.cpp
View File

@ -49,7 +49,7 @@ using namespace triagens::arango;
GeoIndex2::GeoIndex2 (TRI_idx_iid_t iid,
TRI_document_collection_t* collection,
std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
std::vector<TRI_shape_pid_t> const& paths,
bool geoJson)
: Index(iid, collection, fields),
@ -76,7 +76,7 @@ GeoIndex2::GeoIndex2 (TRI_idx_iid_t iid,
GeoIndex2::GeoIndex2 (TRI_idx_iid_t iid,
TRI_document_collection_t* collection,
std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
std::vector<TRI_shape_pid_t> const& paths)
: Index(iid, collection, fields),
_paths(paths),

4
arangod/Indexes/GeoIndex2.h
View File

@ -58,13 +58,13 @@ namespace triagens {
GeoIndex2 (TRI_idx_iid_t,
struct TRI_document_collection_t*,
std::vector<std::vector<triagens::basics::AttributeName const>> const&,
std::vector<std::vector<triagens::basics::AttributeName>> const&,
std::vector<TRI_shape_pid_t> const&,
bool);
GeoIndex2 (TRI_idx_iid_t,
struct TRI_document_collection_t*,
std::vector<std::vector<triagens::basics::AttributeName const>> const&,
std::vector<std::vector<triagens::basics::AttributeName>> const&,
std::vector<TRI_shape_pid_t> const&);
~GeoIndex2 ();

2
arangod/Indexes/HashIndex.cpp
View File

@ -250,7 +250,7 @@ static int HashIndex_find (TRI_hash_array_t const* hashArray,
HashIndex::HashIndex (TRI_idx_iid_t iid,
TRI_document_collection_t* collection,
std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
std::vector<TRI_shape_pid_t> const& paths,
bool unique,
bool sparse)

2
arangod/Indexes/HashIndex.h
View File

@ -57,7 +57,7 @@ namespace triagens {
HashIndex (TRI_idx_iid_t,
struct TRI_document_collection_t*,
std::vector<std::vector<triagens::basics::AttributeName const>> const&,
std::vector<std::vector<triagens::basics::AttributeName>> const&,
std::vector<TRI_shape_pid_t> const&,
bool,
bool);

2
arangod/Indexes/Index.cpp
View File

@ -45,7 +45,7 @@ using namespace triagens::arango;
Index::Index (TRI_idx_iid_t iid,
TRI_document_collection_t* collection,
std::vector<std::vector<triagens::basics::AttributeName const>> const& fields)
std::vector<std::vector<triagens::basics::AttributeName>> const& fields)
: _iid(iid),
_collection(collection),
_fields(fields) {

6
arangod/Indexes/Index.h
View File

@ -76,7 +76,7 @@ namespace triagens {
Index (TRI_idx_iid_t,
struct TRI_document_collection_t*,
std::vector<std::vector<triagens::basics::AttributeName const> >const&);
std::vector<std::vector<triagens::basics::AttributeName> >const&);
virtual ~Index ();
@ -118,7 +118,7 @@ namespace triagens {
/// @brief return the index fields
////////////////////////////////////////////////////////////////////////////////
inline std::vector<std::vector<triagens::basics::AttributeName const>> const& fields () const {
inline std::vector<std::vector<triagens::basics::AttributeName>> const& fields () const {
return _fields;
}
@ -208,7 +208,7 @@ namespace triagens {
struct TRI_document_collection_t* _collection;
std::vector<std::vector<triagens::basics::AttributeName const>> const _fields;
std::vector<std::vector<triagens::basics::AttributeName>> const _fields;
};

2
arangod/Indexes/PrimaryIndex.cpp
View File

@ -73,7 +73,7 @@ uint64_t const PrimaryIndex::InitialSize = 251;
// -----------------------------------------------------------------------------
PrimaryIndex::PrimaryIndex (TRI_document_collection_t* collection)
: Index(0, collection, std::vector<std::vector<triagens::basics::AttributeName const>>( { { { TRI_VOC_ATTRIBUTE_KEY, false } } } )) {
: Index(0, collection, std::vector<std::vector<triagens::basics::AttributeName>>( { { { TRI_VOC_ATTRIBUTE_KEY, false } } } )) {
_primaryIndex._nrAlloc = 0;
_primaryIndex._nrUsed = 0;

2
arangod/Indexes/SkiplistIndex2.cpp
View File

@ -127,7 +127,7 @@ static int FillLookupOperator (TRI_index_operator_t* slOperator,
SkiplistIndex2::SkiplistIndex2 (TRI_idx_iid_t iid,
TRI_document_collection_t* collection,
std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
std::vector<TRI_shape_pid_t> const& paths,
bool unique,
bool sparse)

2
arangod/Indexes/SkiplistIndex2.h
View File

@ -57,7 +57,7 @@ namespace triagens {
SkiplistIndex2 (TRI_idx_iid_t,
struct TRI_document_collection_t*,
std::vector<std::vector<triagens::basics::AttributeName const>> const&,
std::vector<std::vector<triagens::basics::AttributeName>> const&,
std::vector<TRI_shape_pid_t> const&,
bool,
bool);

4
arangod/V8Server/v8-query.cpp
View File

@ -183,7 +183,7 @@ static void CalculateSkipLimitSlice (size_t length,
////////////////////////////////////////////////////////////////////////////////
static TRI_index_operator_t* SetupConditionsSkiplist (v8::Isolate* isolate,
std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
VocShaper* shaper,
v8::Handle<v8::Object> conditions) {
TRI_index_operator_t* lastOperator = nullptr;
@ -396,7 +396,7 @@ MEM_ERROR:
////////////////////////////////////////////////////////////////////////////////
static TRI_index_operator_t* SetupExampleSkiplist (v8::Isolate* isolate,
std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
VocShaper* shaper,
v8::Handle<v8::Object> example) {
TRI_json_t* parameters = TRI_CreateArrayJson(TRI_UNKNOWN_MEM_ZONE);

22
arangod/VocBase/document-collection.cpp
View File

@ -3371,7 +3371,7 @@ static int FillIndex (TRI_document_collection_t* document,
////////////////////////////////////////////////////////////////////////////////
static triagens::arango::Index* LookupPathIndexDocumentCollection (TRI_document_collection_t* collection,
std::vector<std::vector<triagens::basics::AttributeName const>> const& paths,
std::vector<std::vector<triagens::basics::AttributeName>> const& paths,
triagens::arango::Index::IndexType type,
int sparsity,
bool unique,
@ -3764,7 +3764,7 @@ bool TRI_DropIndexDocumentCollection (TRI_document_collection_t* document,
static int PidNamesByAttributeNames (std::vector<std::string> const& attributes,
VocShaper* shaper,
std::vector<TRI_shape_pid_t>& pids,
std::vector<std::vector<triagens::basics::AttributeName const>>& names,
std::vector<std::vector<triagens::basics::AttributeName>>& names,
bool sorted,
bool create) {
pids.reserve(attributes.size());
@ -3776,12 +3776,12 @@ static int PidNamesByAttributeNames (std::vector<std::string> const& attributes,
if (sorted) {
// combine name and pid
typedef std::pair<std::vector<triagens::basics::AttributeName const>, TRI_shape_pid_t> PidNameType;
typedef std::pair<std::vector<triagens::basics::AttributeName>, TRI_shape_pid_t> PidNameType;
std::vector<PidNameType> pidNames;
pidNames.reserve(attributes.size());
for (auto const& name : attributes) {
std::vector<triagens::basics::AttributeName const> attrNameList;
std::vector<triagens::basics::AttributeName> attrNameList;
TRI_ParseAttributeString(name, attrNameList);
TRI_ASSERT(attrNameList.size() > 0);
std::string pidPath;
@ -3821,7 +3821,7 @@ static int PidNamesByAttributeNames (std::vector<std::string> const& attributes,
else {
for (auto const& name : attributes) {
std::vector<triagens::basics::AttributeName const> attrNameList;
std::vector<triagens::basics::AttributeName> attrNameList;
TRI_ParseAttributeString(name, attrNameList);
TRI_ASSERT(attrNameList.size() > 0);
std::string pidPath;
@ -4097,14 +4097,14 @@ static triagens::arango::Index* CreateGeoIndexDocumentCollection (TRI_document_c
// create a new index
if (! location.empty()) {
geoIndex.reset(new triagens::arango::GeoIndex2(iid, document, std::vector<std::vector<triagens::basics::AttributeName const>> { { { location, false } } }, std::vector<TRI_shape_pid_t>{ loc }, geoJson));
geoIndex.reset(new triagens::arango::GeoIndex2(iid, document, std::vector<std::vector<triagens::basics::AttributeName>> { { { location, false } } }, std::vector<TRI_shape_pid_t>{ loc }, geoJson));
LOG_TRACE("created geo-index for location '%s': %ld",
location.c_str(),
(unsigned long) loc);
}
else if (! longitude.empty() && ! latitude.empty()) {
geoIndex.reset(new triagens::arango::GeoIndex2(iid, document, std::vector<std::vector<triagens::basics::AttributeName const>>{ { { latitude, false } } , { { longitude, false } } }, std::vector<TRI_shape_pid_t>{ lat, lon }));
geoIndex.reset(new triagens::arango::GeoIndex2(iid, document, std::vector<std::vector<triagens::basics::AttributeName>>{ { { latitude, false } } , { { longitude, false } } }, std::vector<TRI_shape_pid_t>{ lat, lon }));
LOG_TRACE("created geo-index for location '%s': %ld, %ld",
location.c_str(),
@ -4389,7 +4389,7 @@ static triagens::arango::Index* CreateHashIndexDocumentCollection (TRI_document_
bool unique,
bool* created) {
std::vector<TRI_shape_pid_t> paths;
std::vector<std::vector<triagens::basics::AttributeName const>> fields;
std::vector<std::vector<triagens::basics::AttributeName>> fields;
// determine the sorted shape ids for the attributes
int res = PidNamesByAttributeNames(attributes,
@ -4488,7 +4488,7 @@ triagens::arango::Index* TRI_LookupHashIndexDocumentCollection (TRI_document_col
int sparsity,
bool unique) {
std::vector<TRI_shape_pid_t> paths;
std::vector<std::vector<triagens::basics::AttributeName const>> fields;
std::vector<std::vector<triagens::basics::AttributeName>> fields;
// determine the sorted shape ids for the attributes
int res = PidNamesByAttributeNames(attributes,
@ -4556,7 +4556,7 @@ static triagens::arango::Index* CreateSkiplistIndexDocumentCollection (TRI_docum
bool unique,
bool* created) {
std::vector<TRI_shape_pid_t> paths;
std::vector<std::vector<triagens::basics::AttributeName const>> fields;
std::vector<std::vector<triagens::basics::AttributeName>> fields;
int res = PidNamesByAttributeNames(attributes,
document->getShaper(), // ONLY IN INDEX, PROTECTED by RUNTIME
@ -4652,7 +4652,7 @@ triagens::arango::Index* TRI_LookupSkiplistIndexDocumentCollection (TRI_document
int sparsity,
bool unique) {
std::vector<TRI_shape_pid_t> paths;
std::vector<std::vector<triagens::basics::AttributeName const>> fields;
std::vector<std::vector<triagens::basics::AttributeName>> fields;
// determine the unsorted shape ids for the attributes
int res = PidNamesByAttributeNames(attributes,

4
lib/Basics/AttributeNameParser.cpp
View File

@ -32,7 +32,7 @@
void triagens::basics::TRI_ParseAttributeString (
std::string const& input,
std::vector<AttributeName const>& result
std::vector<AttributeName>& result
) {
size_t parsedUntil = 0;
size_t length = input.length();
@ -62,7 +62,7 @@ void triagens::basics::TRI_ParseAttributeString (
}
void triagens::basics::TRI_AttributeNamesToString (
std::vector<AttributeName const> const& input,
std::vector<AttributeName> const& input,
std::string& result,
bool excludeExpansion
) {

4
lib/Basics/AttributeNameParser.h
View File

@ -77,7 +77,7 @@ namespace triagens {
void TRI_ParseAttributeString (
std::string const& input,
std::vector<AttributeName const>& result
std::vector<AttributeName>& result
);
////////////////////////////////////////////////////////////////////////////////
@ -85,7 +85,7 @@ namespace triagens {
////////////////////////////////////////////////////////////////////////////////
void TRI_AttributeNamesToString (
std::vector<AttributeName const> const& input,
std::vector<AttributeName> const& input,
std::string& result,
bool excludeExpansion = false
);