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

removed unused resolver

This commit is contained in:
Jan Steemann 2013-11-05 10:52:00 +01:00
parent 90e7ea3f97
commit c5619d0795
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1047,7 +1047,7 @@ static v8::Handle<v8::Value> ExecuteSkiplistQuery (v8::Arguments const& argv,
trx.lockRead(); trx.lockRead();
// extract the index // extract the index
TRI_index_t* idx = TRI_LookupIndexByHandle(resolver, col, argv[0], false, &err); TRI_index_t* idx = TRI_LookupIndexByHandle(col, argv[0], false, &err);
if (idx == 0) { if (idx == 0) {
return scope.Close(v8::ThrowException(err)); return scope.Close(v8::ThrowException(err));
@ -1246,7 +1246,7 @@ static v8::Handle<v8::Value> ExecuteBitarrayQuery (v8::Arguments const& argv,
// ............................................................................. // .............................................................................
v8::Handle<v8::Object> err; v8::Handle<v8::Object> err;
TRI_index_t* idx = TRI_LookupIndexByHandle(resolver, col, argv[0], false, &err); TRI_index_t* idx = TRI_LookupIndexByHandle(col, argv[0], false, &err);
if (idx == 0) { if (idx == 0) {
return scope.Close(v8::ThrowException(err)); return scope.Close(v8::ThrowException(err));
@ -2068,7 +2068,7 @@ static v8::Handle<v8::Value> ByExampleHashIndexQuery (ReadTransactionType& trx,
result->Set(v8::String::New("documents"), documents); result->Set(v8::String::New("documents"), documents);
// extract the index // extract the index
TRI_index_t* idx = TRI_LookupIndexByHandle(trx.resolver(), collection, argv[0], false, err); TRI_index_t* idx = TRI_LookupIndexByHandle(collection, argv[0], false, err);
if (idx == 0) { if (idx == 0) {
return scope.Close(v8::ThrowException(*err)); return scope.Close(v8::ThrowException(*err));
@ -2567,7 +2567,7 @@ static v8::Handle<v8::Value> FulltextQuery (ReadTransactionType& trx,
} }
// extract the index // extract the index
TRI_index_t* idx = TRI_LookupIndexByHandle(trx.resolver(), collection, argv[0], false, err); TRI_index_t* idx = TRI_LookupIndexByHandle(collection, argv[0], false, err);
if (idx == 0) { if (idx == 0) {
return scope.Close(v8::ThrowException(*err)); return scope.Close(v8::ThrowException(*err));
@ -2848,7 +2848,7 @@ static v8::Handle<v8::Value> NearQuery (ReadTransactionType& trx,
} }
// extract the index // extract the index
TRI_index_t* idx = TRI_LookupIndexByHandle(trx.resolver(), collection, argv[0], false, err); TRI_index_t* idx = TRI_LookupIndexByHandle(collection, argv[0], false, err);
if (idx == 0) { if (idx == 0) {
return scope.Close(v8::ThrowException(*err)); return scope.Close(v8::ThrowException(*err));
@ -2979,7 +2979,7 @@ static v8::Handle<v8::Value> JS_TopQuery (v8::Arguments const& argv) {
} }
v8::Handle<v8::Object> err; v8::Handle<v8::Object> err;
TRI_index_t* idx = TRI_LookupIndexByHandle(resolver, col, argv[0], false, &err); TRI_index_t* idx = TRI_LookupIndexByHandle(col, argv[0], false, &err);
if (idx == 0) { if (idx == 0) {
return scope.Close(v8::ThrowException(err)); return scope.Close(v8::ThrowException(err));
@ -3044,7 +3044,7 @@ static v8::Handle<v8::Value> WithinQuery (ReadTransactionType& trx,
} }
// extract the index // extract the index
TRI_index_t* idx = TRI_LookupIndexByHandle(trx.resolver(), collection, argv[0], false, err); TRI_index_t* idx = TRI_LookupIndexByHandle(collection, argv[0], false, err);
if (idx == 0) { if (idx == 0) {
return scope.Close(v8::ThrowException(*err)); return scope.Close(v8::ThrowException(*err));

7
arangod/V8Server/v8-vocbase.cpp
View File

@ -4825,8 +4825,6 @@ static v8::Handle<v8::Value> JS_DropIndexVocbaseCol (v8::Arguments const& argv)
return scope.Close(v8::ThrowException(err)); return scope.Close(v8::ThrowException(err));
} }
CollectionNameResolver resolver(collection->_vocbase);
TRI_primary_collection_t* primary = collection->_collection; TRI_primary_collection_t* primary = collection->_collection;
if (! TRI_IS_DOCUMENT_COLLECTION(collection->_type)) { if (! TRI_IS_DOCUMENT_COLLECTION(collection->_type)) {
@ -4841,7 +4839,7 @@ static v8::Handle<v8::Value> JS_DropIndexVocbaseCol (v8::Arguments const& argv)
TRI_V8_EXCEPTION_USAGE(scope, "dropIndex(<index-handle>)"); TRI_V8_EXCEPTION_USAGE(scope, "dropIndex(<index-handle>)");
} }
TRI_index_t* idx = TRI_LookupIndexByHandle(resolver, collection, argv[0], true, &err); TRI_index_t* idx = TRI_LookupIndexByHandle(collection, argv[0], true, &err);
if (idx == 0) { if (idx == 0) {
if (err.IsEmpty()) { if (err.IsEmpty()) {
@ -8638,8 +8636,7 @@ v8::Handle<v8::Value> TRI_ParseDocumentOrDocumentHandle (const CollectionNameRes
/// @brief looks up an index identifier /// @brief looks up an index identifier
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
TRI_index_t* TRI_LookupIndexByHandle (const CollectionNameResolver& resolver, TRI_index_t* TRI_LookupIndexByHandle (TRI_vocbase_col_t const* collection,
TRI_vocbase_col_t const* collection,
v8::Handle<v8::Value> val, v8::Handle<v8::Value> val,
bool ignoreNotFound, bool ignoreNotFound,
v8::Handle<v8::Object>* err) { v8::Handle<v8::Object>* err) {

3
arangod/V8Server/v8-vocbase.h
View File

@ -67,8 +67,7 @@ v8::Handle<v8::Value> TRI_ParseDocumentOrDocumentHandle (const triagens::arango:
/// @brief looks up a index identifier /// @brief looks up a index identifier
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
TRI_index_t* TRI_LookupIndexByHandle (const triagens::arango::CollectionNameResolver&, TRI_index_t* TRI_LookupIndexByHandle (TRI_vocbase_col_t const*,
TRI_vocbase_col_t const*,
v8::Handle<v8::Value>, v8::Handle<v8::Value>,
bool, bool,
v8::Handle<v8::Object>*); v8::Handle<v8::Object>*);