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

removed some macros

This commit is contained in:
Jan Steemann 2014-10-16 16:31:49 +02:00
parent 70c59a61fd
commit 223820eba3
5 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/RestHandler/RestImportHandler.h
View File

@ -35,6 +35,8 @@
#include "RestHandler/RestVocbaseBaseHandler.h" #include "RestHandler/RestVocbaseBaseHandler.h"
#include "Utils/transactions.h" #include "Utils/transactions.h"
#define RestImportTransaction triagens::arango::SingleCollectionWriteTransaction<UINT64_MAX>
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- RestImportHandler // --SECTION-- RestImportHandler
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

12
arangod/Utils/transactions.h
View File

@ -39,18 +39,6 @@
#include "Utils/StandaloneTransactionContext.h" #include "Utils/StandaloneTransactionContext.h"
#include "Utils/V8TransactionContext.h" #include "Utils/V8TransactionContext.h"
////////////////////////////////////////////////////////////////////////////////
/// @brief shortcut for read-only transaction class type
////////////////////////////////////////////////////////////////////////////////
#define V8ReadTransaction triagens::arango::SingleCollectionReadOnlyTransaction
////////////////////////////////////////////////////////////////////////////////
/// @brief import transaction shortcut
////////////////////////////////////////////////////////////////////////////////
#define RestImportTransaction triagens::arango::SingleCollectionWriteTransaction<UINT64_MAX>
#endif #endif
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

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

@ -468,7 +468,7 @@ static v8::Handle<v8::Value> DocumentVocbaseCol (bool useCollection,
return scope.Close(DocumentVocbaseColCoordinator(col, argv, true)); return scope.Close(DocumentVocbaseColCoordinator(col, argv, true));
} }
V8ReadTransaction trx(new V8TransactionContext(true), vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -488,7 +488,7 @@ static v8::Handle<v8::Value> DocumentVocbaseCol (bool useCollection,
TRI_ASSERT(trx.hasBarrier()); TRI_ASSERT(trx.hasBarrier());
if (res == TRI_ERROR_NO_ERROR) { if (res == TRI_ERROR_NO_ERROR) {
result = TRI_WrapShapedJson<V8ReadTransaction>(trx, col->_cid, document.getDataPtr()); result = TRI_WrapShapedJson<SingleCollectionReadOnlyTransaction>(trx, col->_cid, document.getDataPtr());
} }
if (res != TRI_ERROR_NO_ERROR || document.getDataPtr() == nullptr) { // PROTECTED by trx here if (res != TRI_ERROR_NO_ERROR || document.getDataPtr() == nullptr) { // PROTECTED by trx here
@ -658,7 +658,7 @@ static v8::Handle<v8::Value> ExistsVocbaseCol (bool useCollection,
return scope.Close(DocumentVocbaseColCoordinator(col, argv, false)); return scope.Close(DocumentVocbaseColCoordinator(col, argv, false));
} }
V8ReadTransaction trx(new V8TransactionContext(true), vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1642,7 +1642,7 @@ static TRI_doc_collection_info_t* GetFiguresCoordinator (TRI_vocbase_col_t* coll
static TRI_doc_collection_info_t* GetFigures (TRI_vocbase_col_t* collection) { static TRI_doc_collection_info_t* GetFigures (TRI_vocbase_col_t* collection) {
TRI_ASSERT(collection != nullptr); TRI_ASSERT(collection != nullptr);
V8ReadTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid);
int res = trx.begin(); int res = trx.begin();
@ -2474,7 +2474,7 @@ static int GetRevision (TRI_vocbase_col_t* collection,
TRI_voc_rid_t& rid) { TRI_voc_rid_t& rid) {
TRI_ASSERT(collection != nullptr); TRI_ASSERT(collection != nullptr);
V8ReadTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid);
int res = trx.begin(); int res = trx.begin();
@ -3385,7 +3385,7 @@ static v8::Handle<v8::Value> JS_CheckPointersVocbaseCol (v8::Arguments const& ar
TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, collection); TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, collection);
V8ReadTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid);
int res = trx.begin(); int res = trx.begin();
@ -4049,7 +4049,7 @@ static v8::Handle<v8::Value> JS_CountVocbaseCol (v8::Arguments const& argv) {
return scope.Close(v8::Number::New((double) count)); return scope.Close(v8::Number::New((double) count));
} }
V8ReadTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid);
int res = trx.begin(); int res = trx.begin();

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

@ -60,7 +60,7 @@ using namespace triagens::arango;
/// @brief shortcut to wrap a shaped-json object in a read-only transaction /// @brief shortcut to wrap a shaped-json object in a read-only transaction
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define WRAP_SHAPED_JSON(...) TRI_WrapShapedJson<V8ReadTransaction>(__VA_ARGS__) #define WRAP_SHAPED_JSON(...) TRI_WrapShapedJson<SingleCollectionReadOnlyTransaction>(__VA_ARGS__)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- HELPER FUNCTIONS // --SECTION-- HELPER FUNCTIONS
@ -623,7 +623,7 @@ static v8::Handle<v8::Value> ExecuteSkiplistQuery (v8::Arguments const& argv,
TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col); TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col);
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -752,7 +752,7 @@ static v8::Handle<v8::Value> ExecuteSkiplistQuery (v8::Arguments const& argv,
/// @brief creates a geo result /// @brief creates a geo result
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static int StoreGeoResult (V8ReadTransaction& trx, static int StoreGeoResult (SingleCollectionReadOnlyTransaction& trx,
TRI_vocbase_col_t const* collection, TRI_vocbase_col_t const* collection,
GeoCoordinates* cors, GeoCoordinates* cors,
v8::Handle<v8::Array>& documents, v8::Handle<v8::Array>& documents,
@ -857,7 +857,7 @@ static v8::Handle<v8::Value> EdgesQuery (TRI_edge_direction_e direction,
TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID); TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID);
} }
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1014,7 +1014,7 @@ static v8::Handle<v8::Value> JS_AllQuery (v8::Arguments const& argv) {
uint32_t total = 0; uint32_t total = 0;
vector<TRI_doc_mptr_copy_t> docs; vector<TRI_doc_mptr_copy_t> docs;
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1089,7 +1089,7 @@ static v8::Handle<v8::Value> JS_NthQuery (v8::Arguments const& argv) {
uint32_t total = 0; uint32_t total = 0;
vector<TRI_doc_mptr_copy_t> docs; vector<TRI_doc_mptr_copy_t> docs;
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1164,7 +1164,7 @@ static v8::Handle<v8::Value> JS_Nth2Query (v8::Arguments const& argv) {
uint32_t total = 0; uint32_t total = 0;
vector<TRI_doc_mptr_copy_t> docs; vector<TRI_doc_mptr_copy_t> docs;
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1258,7 +1258,7 @@ static v8::Handle<v8::Value> JS_OffsetQuery (v8::Arguments const& argv) {
uint32_t total = 0; uint32_t total = 0;
vector<TRI_doc_mptr_copy_t> docs; vector<TRI_doc_mptr_copy_t> docs;
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1330,7 +1330,7 @@ static v8::Handle<v8::Value> JS_AnyQuery (v8::Arguments const& argv) {
TRI_doc_mptr_copy_t document; TRI_doc_mptr_copy_t document;
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1387,7 +1387,7 @@ static v8::Handle<v8::Value> JS_ByExampleQuery (v8::Arguments const& argv) {
TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col); TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col);
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1498,7 +1498,7 @@ static v8::Handle<v8::Value> JS_ByExampleQuery (v8::Arguments const& argv) {
/// It is the callers responsibility to acquire and free the required locks /// It is the callers responsibility to acquire and free the required locks
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static v8::Handle<v8::Value> ByExampleHashIndexQuery (V8ReadTransaction& trx, static v8::Handle<v8::Value> ByExampleHashIndexQuery (SingleCollectionReadOnlyTransaction& trx,
TRI_vocbase_col_t const* collection, TRI_vocbase_col_t const* collection,
v8::Handle<v8::Object>* err, v8::Handle<v8::Object>* err,
v8::Arguments const& argv) { v8::Arguments const& argv) {
@ -1619,7 +1619,7 @@ static v8::Handle<v8::Value> JS_ByExampleHashIndex (v8::Arguments const& argv) {
TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col); TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col);
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1793,7 +1793,7 @@ static v8::Handle<v8::Value> JS_ChecksumCollection (v8::Arguments const& argv) {
withData = TRI_ObjectToBoolean(argv[1]); withData = TRI_ObjectToBoolean(argv[1]);
} }
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1937,7 +1937,7 @@ static v8::Handle<v8::Value> JS_FirstQuery (v8::Arguments const& argv) {
TRI_vocbase_col_t const* col; TRI_vocbase_col_t const* col;
col = TRI_UnwrapClass<TRI_vocbase_col_t>(argv.Holder(), TRI_GetVocBaseColType()); col = TRI_UnwrapClass<TRI_vocbase_col_t>(argv.Holder(), TRI_GetVocBaseColType());
if (col == 0) { if (col == nullptr) {
TRI_V8_EXCEPTION_INTERNAL(scope, "cannot extract collection"); TRI_V8_EXCEPTION_INTERNAL(scope, "cannot extract collection");
} }
@ -1994,7 +1994,7 @@ static v8::Handle<v8::Value> JS_FirstQuery (v8::Arguments const& argv) {
/// the caller must ensure all relevant locks are acquired and freed /// the caller must ensure all relevant locks are acquired and freed
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static v8::Handle<v8::Value> FulltextQuery (V8ReadTransaction& trx, static v8::Handle<v8::Value> FulltextQuery (SingleCollectionReadOnlyTransaction& trx,
TRI_vocbase_col_t const* collection, TRI_vocbase_col_t const* collection,
v8::Handle<v8::Object>* err, v8::Handle<v8::Object>* err,
v8::Arguments const& argv) { v8::Arguments const& argv) {
@ -2116,7 +2116,7 @@ static v8::Handle<v8::Value> JS_FulltextQuery (v8::Arguments const& argv) {
TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col); TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col);
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -2172,7 +2172,7 @@ static v8::Handle<v8::Value> JS_LastQuery (v8::Arguments const& argv) {
TRI_vocbase_col_t const* col; TRI_vocbase_col_t const* col;
col = TRI_UnwrapClass<TRI_vocbase_col_t>(argv.Holder(), TRI_GetVocBaseColType()); col = TRI_UnwrapClass<TRI_vocbase_col_t>(argv.Holder(), TRI_GetVocBaseColType());
if (col == 0) { if (col == nullptr) {
TRI_V8_EXCEPTION_INTERNAL(scope, "cannot extract collection"); TRI_V8_EXCEPTION_INTERNAL(scope, "cannot extract collection");
} }
@ -2231,7 +2231,7 @@ static v8::Handle<v8::Value> JS_LastQuery (v8::Arguments const& argv) {
/// the caller must ensure all relevant locks are acquired and freed /// the caller must ensure all relevant locks are acquired and freed
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static v8::Handle<v8::Value> NearQuery (V8ReadTransaction& trx, static v8::Handle<v8::Value> NearQuery (SingleCollectionReadOnlyTransaction& trx,
TRI_vocbase_col_t const* collection, TRI_vocbase_col_t const* collection,
v8::Handle<v8::Object>* err, v8::Handle<v8::Object>* err,
v8::Arguments const& argv) { v8::Arguments const& argv) {
@ -2299,7 +2299,7 @@ static v8::Handle<v8::Value> JS_NearQuery (v8::Arguments const& argv) {
TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col); TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col);
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();
@ -2361,7 +2361,7 @@ static v8::Handle<v8::Value> JS_OutEdgesQuery (v8::Arguments const& argv) {
/// the caller must ensure all relevant locks are acquired and freed /// the caller must ensure all relevant locks are acquired and freed
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static v8::Handle<v8::Value> WithinQuery (V8ReadTransaction& trx, static v8::Handle<v8::Value> WithinQuery (SingleCollectionReadOnlyTransaction& trx,
TRI_vocbase_col_t const* collection, TRI_vocbase_col_t const* collection,
v8::Handle<v8::Object>* err, v8::Handle<v8::Object>* err,
v8::Arguments const& argv) { v8::Arguments const& argv) {
@ -2429,7 +2429,7 @@ static v8::Handle<v8::Value> JS_WithinQuery (v8::Arguments const& argv) {
TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col); TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, col);
V8ReadTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), col->_vocbase, col->_cid);
int res = trx.begin(); int res = trx.begin();

6
arangod/V8Server/v8-vocindex.cpp
View File

@ -539,7 +539,7 @@ static v8::Handle<v8::Value> EnsureIndexLocal (TRI_vocbase_col_t const* collecti
} }
} }
V8ReadTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1247,7 +1247,7 @@ static v8::Handle<v8::Value> JS_DropIndexVocbaseCol (v8::Arguments const& argv)
return scope.Close(DropIndexCoordinator(collection, argv[0])); return scope.Close(DropIndexCoordinator(collection, argv[0]));
} }
V8ReadTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid);
int res = trx.begin(); int res = trx.begin();
@ -1379,7 +1379,7 @@ static v8::Handle<v8::Value> JS_GetIndexesVocbaseCol (v8::Arguments const& argv)
return scope.Close(GetIndexesCoordinator(collection)); return scope.Close(GetIndexesCoordinator(collection));
} }
V8ReadTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid); SingleCollectionReadOnlyTransaction trx(new V8TransactionContext(true), collection->_vocbase, collection->_cid);
int res = trx.begin(); int res = trx.begin();