From 8da5a6c0b37b88d2d5c604d8feab5b962f11fbe3 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Thu, 14 Aug 2014 13:17:21 +0200 Subject: [PATCH] Cleanup: killall tabs. --- arangod/V8Server/v8-collection-util.cpp | 7 +++---- arangod/V8Server/v8-collection.cpp | 2 +- arangod/V8Server/v8-collection.h | 8 ++++---- arangod/V8Server/v8-replication.cpp | 10 +++++----- arangod/V8Server/v8-util.cpp | 10 ++++------ arangod/V8Server/v8-vocbaseprivate.h | 8 ++++---- arangod/V8Server/v8-voccursor.cpp | 12 ++++++------ arangod/V8Server/v8-voccursor.h | 20 +++++++++---------- arangod/V8Server/v8-vocindex.cpp | 26 +++++++++++++------------ arangod/V8Server/v8-wrapshapedjson.cpp | 20 +++++++++---------- arangod/V8Server/v8-wrapshapedjson.h | 11 +++++------ 11 files changed, 66 insertions(+), 68 deletions(-) diff --git a/arangod/V8Server/v8-collection-util.cpp b/arangod/V8Server/v8-collection-util.cpp index bfd647fbe6..ee7fd9485f 100644 --- a/arangod/V8Server/v8-collection-util.cpp +++ b/arangod/V8Server/v8-collection-util.cpp @@ -62,7 +62,7 @@ void FreeCoordinatorCollection (TRI_vocbase_col_t* collection) { /// @brief convert a collection info into a TRI_vocbase_col_t //////////////////////////////////////////////////////////////////////////////// TRI_vocbase_col_t* CoordinatorCollection (TRI_vocbase_t* vocbase, - CollectionInfo const& ci) { + CollectionInfo const& ci) { TRI_vocbase_col_t* c = static_cast(TRI_Allocate(TRI_UNKNOWN_MEM_ZONE, sizeof(TRI_vocbase_col_t), false)); if (c == nullptr) { @@ -109,8 +109,8 @@ TRI_vocbase_col_t* CoordinatorCollection (TRI_vocbase_t* vocbase, /// @brief check if a name belongs to a collection //////////////////////////////////////////////////////////////////////////////// bool EqualCollection (CollectionNameResolver const* resolver, - string const& collectionName, - TRI_vocbase_col_t const* collection) { + string const& collectionName, + TRI_vocbase_col_t const* collection) { if (collectionName == StringUtils::itoa(collection->_cid)) { return true; } @@ -210,4 +210,3 @@ v8::Handle WrapCollection (TRI_vocbase_col_t const* collection) { return scope.Close(result); } - diff --git a/arangod/V8Server/v8-collection.cpp b/arangod/V8Server/v8-collection.cpp index 61c25780c0..289902a165 100644 --- a/arangod/V8Server/v8-collection.cpp +++ b/arangod/V8Server/v8-collection.cpp @@ -514,7 +514,7 @@ static v8::Handle DocumentVocbaseCol (bool useCollection, //////////////////////////////////////////////////////////////////////////////// TRI_vocbase_col_t const* UseCollection (v8::Handle collection, - v8::Handle* err) { + v8::Handle* err) { int res = TRI_ERROR_INTERNAL; TRI_vocbase_col_t* col = TRI_UnwrapClass(collection, WRP_VOCBASE_COL_TYPE); diff --git a/arangod/V8Server/v8-collection.h b/arangod/V8Server/v8-collection.h index f40df05569..3027fc3f0f 100644 --- a/arangod/V8Server/v8-collection.h +++ b/arangod/V8Server/v8-collection.h @@ -50,16 +50,16 @@ void ReleaseCollection (TRI_vocbase_col_t const* collection); /// @brief convert a collection info into a TRI_vocbase_col_t //////////////////////////////////////////////////////////////////////////////// TRI_vocbase_col_t* CoordinatorCollection (TRI_vocbase_t* vocbase, - triagens::arango::CollectionInfo const& ci); + triagens::arango::CollectionInfo const& ci); /////////////////////////////////////////////////////////////////////////////// /// @brief check if a name belongs to a collection //////////////////////////////////////////////////////////////////////////////// bool EqualCollection (triagens::arango::CollectionNameResolver const* resolver, - std::string const& collectionName, - TRI_vocbase_col_t const* collection); + std::string const& collectionName, + TRI_vocbase_col_t const* collection); -///////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// /// @brief wraps a TRI_vocbase_col_t //////////////////////////////////////////////////////////////////////////////// v8::Handle WrapCollection (TRI_vocbase_col_t const* collection); diff --git a/arangod/V8Server/v8-replication.cpp b/arangod/V8Server/v8-replication.cpp index 5e1e008007..806704527c 100644 --- a/arangod/V8Server/v8-replication.cpp +++ b/arangod/V8Server/v8-replication.cpp @@ -590,11 +590,11 @@ static v8::Handle JS_ForgetApplierReplication (v8::Arguments const& a void TRI_InitV8replication (v8::Handle context, - TRI_server_t* server, - TRI_vocbase_t* vocbase, - JSLoader* loader, - const size_t threadNumber, - TRI_v8_global_t* v8g){ + TRI_server_t* server, + TRI_vocbase_t* vocbase, + JSLoader* loader, + const size_t threadNumber, + TRI_v8_global_t* v8g){ // replication functions. not intended to be used by end users TRI_AddGlobalFunctionVocbase(context, "REPLICATION_LOGGER_STATE", JS_StateLoggerReplication, true); diff --git a/arangod/V8Server/v8-util.cpp b/arangod/V8Server/v8-util.cpp index 2c7455f622..e79e9b5d6c 100644 --- a/arangod/V8Server/v8-util.cpp +++ b/arangod/V8Server/v8-util.cpp @@ -139,9 +139,9 @@ static bool ParseDocumentHandle (v8::Handle const arg, /// @brief parse document or document handle from a v8 value (string | object) //////////////////////////////////////////////////////////////////////////////// bool ExtractDocumentHandle (v8::Handle const val, - string& collectionName, - TRI_voc_key_t& key, - TRI_voc_rid_t& rid) { + string& collectionName, + TRI_voc_key_t& key, + TRI_voc_rid_t& rid) { // reset the collection identifier and the revision collectionName = ""; rid = 0; @@ -156,7 +156,7 @@ bool ExtractDocumentHandle (v8::Handle const val, TRI_v8_global_t* v8g = static_cast(v8::Isolate::GetCurrent()->GetData()); v8::Handle obj = val->ToObject(); - + if (obj->Has(v8g->_IdKey)) { v8::Handle didVal = obj->Get(v8g->_IdKey); @@ -191,5 +191,3 @@ bool ExtractDocumentHandle (v8::Handle const val, // unknown value type. give up return false; } - - diff --git a/arangod/V8Server/v8-vocbaseprivate.h b/arangod/V8Server/v8-vocbaseprivate.h index 35705df3bb..0492cc2516 100644 --- a/arangod/V8Server/v8-vocbaseprivate.h +++ b/arangod/V8Server/v8-vocbaseprivate.h @@ -89,7 +89,7 @@ extern int32_t const WRP_VOCBASE_COL_TYPE; /// @brief create a v8 document id value from the parameters //////////////////////////////////////////////////////////////////////////////// v8::Handle V8DocumentId (std::string const& collectionName, - std::string const& key) ; + std::string const& key) ; //////////////////////////////////////////////////////////////////////////////// @@ -117,8 +117,8 @@ v8::Handle CreateErrorObjectAhuacatl (TRI_aql_error_t* error); /// @brief parse document or document handle from a v8 value (string | object) //////////////////////////////////////////////////////////////////////////////// bool ExtractDocumentHandle (v8::Handle const val, - std::string& collectionName, - TRI_voc_key_t& key, - TRI_voc_rid_t& rid); + std::string& collectionName, + TRI_voc_key_t& key, + TRI_voc_rid_t& rid); #endif diff --git a/arangod/V8Server/v8-voccursor.cpp b/arangod/V8Server/v8-voccursor.cpp index 84b22f37bb..d24c5fb3f5 100644 --- a/arangod/V8Server/v8-voccursor.cpp +++ b/arangod/V8Server/v8-voccursor.cpp @@ -69,7 +69,7 @@ static int32_t const WRP_GENERAL_CURSOR_TYPE = 3; /// @brief function that encapsulates execution of an AQL query //////////////////////////////////////////////////////////////////////////////// v8::Handle ExecuteQueryNativeAhuacatl (TRI_aql_context_t* context, - TRI_json_t const* parameters) { + TRI_json_t const* parameters) { v8::HandleScope scope; // parse & validate @@ -796,11 +796,11 @@ static v8::Handle JS_DeleteCursor (v8::Arguments const& argv) { // generate the general cursor template // ............................................................................. void TRI_InitV8cursor (v8::Handle context, - TRI_server_t* server, - TRI_vocbase_t* vocbase, - JSLoader* loader, - const size_t threadNumber, - TRI_v8_global_t* v8g){ + TRI_server_t* server, + TRI_vocbase_t* vocbase, + JSLoader* loader, + const size_t threadNumber, + TRI_v8_global_t* v8g){ v8::Handle rt; v8::Handle ft; v8::Isolate* isolate = v8::Isolate::GetCurrent(); diff --git a/arangod/V8Server/v8-voccursor.h b/arangod/V8Server/v8-voccursor.h index 2a52bd0e81..372d4788ca 100644 --- a/arangod/V8Server/v8-voccursor.h +++ b/arangod/V8Server/v8-voccursor.h @@ -39,11 +39,11 @@ /// @brief function that encapsulates execution of an AQL query //////////////////////////////////////////////////////////////////////////////// v8::Handle ExecuteQueryCursorAhuacatl (TRI_vocbase_t* const vocbase, - TRI_aql_context_t* const context, - TRI_json_t const* parameters, - bool doCount, - uint32_t batchSize, - double cursorTtl); + TRI_aql_context_t* const context, + TRI_json_t const* parameters, + bool doCount, + uint32_t batchSize, + double cursorTtl); void TRI_InitV8indexArangoDB (v8::Handle context, TRI_server_t* server, @@ -54,10 +54,10 @@ void TRI_InitV8indexArangoDB (v8::Handle context, v8::Handle ArangoDBNS); extern void TRI_InitV8cursor (v8::Handle context, - TRI_server_t* server, - TRI_vocbase_t* vocbase, - triagens::arango::JSLoader* loader, - const size_t threadNumber, - TRI_v8_global_t* v8g); + TRI_server_t* server, + TRI_vocbase_t* vocbase, + triagens::arango::JSLoader* loader, + const size_t threadNumber, + TRI_v8_global_t* v8g); #endif diff --git a/arangod/V8Server/v8-vocindex.cpp b/arangod/V8Server/v8-vocindex.cpp index 3f2ec2e133..2843acfda4 100644 --- a/arangod/V8Server/v8-vocindex.cpp +++ b/arangod/V8Server/v8-vocindex.cpp @@ -1963,12 +1963,13 @@ static v8::Handle JS_CreateEdgeCollectionVocbase (v8::Arguments const } void TRI_InitV8indexArangoDB (v8::Handle context, - TRI_server_t* server, - TRI_vocbase_t* vocbase, - JSLoader* loader, - const size_t threadNumber, - TRI_v8_global_t* v8g, - v8::Handle rt){ + TRI_server_t* server, + TRI_vocbase_t* vocbase, + JSLoader* loader, + const size_t threadNumber, + TRI_v8_global_t* v8g, + v8::Handle rt){ + TRI_AddMethodVocbase(rt, "_create", JS_CreateVocbase, true); TRI_AddMethodVocbase(rt, "_createEdgeCollection", JS_CreateEdgeCollectionVocbase); TRI_AddMethodVocbase(rt, "_createDocumentCollection", JS_CreateDocumentCollectionVocbase); @@ -1977,12 +1978,13 @@ void TRI_InitV8indexArangoDB (v8::Handle context, void TRI_InitV8indexCollection (v8::Handle context, - TRI_server_t* server, - TRI_vocbase_t* vocbase, - JSLoader* loader, - const size_t threadNumber, - TRI_v8_global_t* v8g, - v8::Handle rt){ + TRI_server_t* server, + TRI_vocbase_t* vocbase, + JSLoader* loader, + const size_t threadNumber, + TRI_v8_global_t* v8g, + v8::Handle rt){ + TRI_AddMethodVocbase(rt, "dropIndex", JS_DropIndexVocbaseCol); TRI_AddMethodVocbase(rt, "ensureIndex", JS_EnsureIndexVocbaseCol); TRI_AddMethodVocbase(rt, "lookupIndex", JS_LookupIndexVocbaseCol); diff --git a/arangod/V8Server/v8-wrapshapedjson.cpp b/arangod/V8Server/v8-wrapshapedjson.cpp index b10928c23a..c155228ce0 100644 --- a/arangod/V8Server/v8-wrapshapedjson.cpp +++ b/arangod/V8Server/v8-wrapshapedjson.cpp @@ -65,11 +65,11 @@ static int const SLOT_BARRIER = 2; //////////////////////////////////////////////////////////////////////////////// static v8::Handle AddBasicDocumentAttributes ( - CollectionNameResolver const* resolver, - TRI_v8_global_t* v8g, - TRI_voc_cid_t cid, - TRI_df_marker_t const* marker, - v8::Handle result) { + CollectionNameResolver const* resolver, + TRI_v8_global_t* v8g, + TRI_voc_cid_t cid, + TRI_df_marker_t const* marker, + v8::Handle result) { TRI_ASSERT(marker != nullptr); TRI_voc_rid_t rid = TRI_EXTRACT_MARKER_RID(marker); @@ -446,11 +446,11 @@ static v8::Handle MapGetIndexedShapedJson (uint32_t idx, // generate the TRI_shaped_json_t template // ............................................................................. void TRI_InitV8shaped_json (v8::Handle context, - TRI_server_t* server, - TRI_vocbase_t* vocbase, - triagens::arango::JSLoader* loader, - const size_t threadNumber, - TRI_v8_global_t* v8g){ + TRI_server_t* server, + TRI_vocbase_t* vocbase, + triagens::arango::JSLoader* loader, + const size_t threadNumber, + TRI_v8_global_t* v8g){ v8::Handle rt; v8::Handle ft; v8::Isolate* isolate = v8::Isolate::GetCurrent(); diff --git a/arangod/V8Server/v8-wrapshapedjson.h b/arangod/V8Server/v8-wrapshapedjson.h index b01d0d808b..7db37eb57d 100644 --- a/arangod/V8Server/v8-wrapshapedjson.h +++ b/arangod/V8Server/v8-wrapshapedjson.h @@ -63,10 +63,9 @@ v8::Handle TRI_WrapShapedJson (T& trx, } void TRI_InitV8shaped_json (v8::Handle context, - TRI_server_t* server, - TRI_vocbase_t* vocbase, - triagens::arango::JSLoader* loader, - const size_t threadNumber, - TRI_v8_global_t* v8g); + TRI_server_t* server, + TRI_vocbase_t* vocbase, + triagens::arango::JSLoader* loader, + const size_t threadNumber, + TRI_v8_global_t* v8g); #endif -