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

removed file

This commit is contained in:
Jan Steemann 2016-03-04 18:32:54 +01:00
parent 4de5e41044
commit ad4a9542ea
38 changed files with 44 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Replication/ContinuousSyncer.cpp
View File

@ -33,7 +33,7 @@
#include "SimpleHttpClient/SimpleHttpClient.h"
#include "SimpleHttpClient/SimpleHttpResult.h"
#include "Utils/CollectionGuard.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "VocBase/document-collection.h"
#include "VocBase/transaction.h"
#include "VocBase/vocbase.h"

1
arangod/Replication/InitialSyncer.cpp
View File

@ -33,7 +33,6 @@
#include "SimpleHttpClient/SimpleHttpClient.h"
#include "SimpleHttpClient/SimpleHttpResult.h"
#include "Utils/CollectionGuard.h"
#include "Utils/transactions.h"
#include "VocBase/DatafileHelper.h"
#include "VocBase/document-collection.h"
#include "VocBase/vocbase.h"

2
arangod/Replication/InitialSyncer.h
View File

@ -27,7 +27,7 @@
#include "Basics/Common.h"
#include "Basics/Logger.h"
#include "Replication/Syncer.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include <velocypack/Slice.h>

3
arangod/Replication/Syncer.cpp
View File

@ -22,7 +22,6 @@
////////////////////////////////////////////////////////////////////////////////
#include "Syncer.h"
#include "Basics/Exceptions.h"
#include "Basics/VelocyPackHelper.h"
#include "Rest/HttpRequest.h"
@ -32,7 +31,7 @@
#include "Utils/CollectionGuard.h"
#include "Utils/OperationOptions.h"
#include "Utils/OperationResult.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "VocBase/collection.h"
#include "VocBase/document-collection.h"
#include "VocBase/server.h"

2
arangod/RestHandler/RestBaseHandler.h
View File

@ -27,6 +27,8 @@
#include "Basics/Common.h"
#include "HttpServer/HttpHandler.h"
#include "Rest/HttpResponse.h"
#include "Utils/SingleCollectionTransaction.h"
#include "VocBase/update-policy.h"
struct TRI_json_t;

1
arangod/RestHandler/RestDocumentHandler.cpp
View File

@ -26,6 +26,7 @@
#include "Basics/StringUtils.h"
#include "Basics/VelocyPackHelper.h"
#include "Rest/HttpRequest.h"
#include "Utils/StandaloneTransactionContext.h"
#include "VocBase/document-collection.h"
#include "VocBase/vocbase.h"

1
arangod/RestHandler/RestEdgeHandler.cpp
View File

@ -23,6 +23,7 @@
#include "RestEdgeHandler.h"
#include "Rest/HttpRequest.h"
#include "Utils/StandaloneTransactionContext.h"
#include "VocBase/document-collection.h"
using namespace arangodb;

1
arangod/RestHandler/RestEdgesHandler.cpp
View File

@ -25,6 +25,7 @@
#include "Basics/JsonHelper.h"
#include "Basics/ScopeGuard.h"
#include "Cluster/ClusterMethods.h"
#include "Utils/StandaloneTransactionContext.h"
#include "VocBase/Traverser.h"
#include <velocypack/Iterator.h>

2
arangod/RestHandler/RestImportHandler.cpp
View File

@ -26,6 +26,8 @@
#include "Basics/StringUtils.h"
#include "Basics/VelocyPackHelper.h"
#include "Rest/HttpRequest.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/StandaloneTransactionContext.h"
#include "VocBase/document-collection.h"
#include "VocBase/edge-collection.h"
#include "VocBase/vocbase.h"

2
arangod/RestHandler/RestImportHandler.h
View File

@ -25,9 +25,7 @@
#define ARANGOD_REST_HANDLER_REST_IMPORT_HANDLER_H 1
#include "Basics/Common.h"
#include "RestHandler/RestVocbaseBaseHandler.h"
#include "Utils/transactions.h"
namespace arangodb {

1
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -39,7 +39,6 @@
#include "Utils/CollectionKeys.h"
#include "Utils/CollectionKeysRepository.h"
#include "Utils/CollectionNameResolver.h"
#include "Utils/transactions.h"
#include "Utils/TransactionContext.h"
#include "VocBase/compactor.h"
#include "VocBase/replication-applier.h"

3
arangod/RestHandler/RestVocbaseBaseHandler.h
View File

@ -28,7 +28,8 @@
#include "Rest/HttpResponse.h"
#include "RestHandler/RestBaseHandler.h"
#include "RestServer/VocbaseContext.h"
#include "Utils/transactions.h"
#include "Utils/OperationResult.h"
#include "VocBase/vocbase.h"
struct TRI_vocbase_t;

3
arangod/Utils/CollectionExport.cpp
View File

@ -25,7 +25,8 @@
#include "Basics/JsonHelper.h"
#include "Indexes/PrimaryIndex.h"
#include "Utils/CollectionGuard.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/StandaloneTransactionContext.h"
#include "VocBase/compactor.h"
#include "VocBase/Ditch.h"
#include "VocBase/vocbase.h"

5
arangod/Utils/CollectionKeys.cpp
View File

@ -23,10 +23,13 @@
#include "CollectionKeys.h"
#include "Utils/CollectionGuard.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/StandaloneTransactionContext.h"
#include "VocBase/compactor.h"
#include "VocBase/DatafileHelper.h"
#include "VocBase/Ditch.h"
#include "VocBase/document-collection.h"
#include "VocBase/server.h"
#include "VocBase/vocbase.h"
#include "Wal/LogfileManager.h"

2
arangod/Utils/SingleCollectionTransaction.h
View File

@ -25,12 +25,12 @@
#define ARANGOD_UTILS_SINGLE_COLLECTION_TRANSACTION_H 1
#include "Basics/Common.h"
#include "Utils/CollectionNameResolver.h"
#include "Utils/Transaction.h"
#include "Utils/TransactionContext.h"
#include "VocBase/Ditch.h"
#include "VocBase/document-collection.h"
#include "VocBase/transaction.h"
#include "VocBase/vocbase.h"
#include "VocBase/voc-types.h"
namespace arangodb {

1
arangod/Utils/StandaloneTransactionContext.cpp
View File

@ -22,6 +22,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "StandaloneTransactionContext.h"
#include "Utils/CollectionNameResolver.h"
#include "VocBase/transaction.h"
using namespace arangodb;

4
arangod/Utils/Transaction.cpp
View File

@ -21,8 +21,7 @@
/// @author Max Neunhoeffer
////////////////////////////////////////////////////////////////////////////////
#include "Utils/transactions.h"
//#include "Basics/conversions.h"
#include "Transaction.h"
#include "Basics/Exceptions.h"
#include "Basics/StringUtils.h"
#include "Basics/VelocyPackHelper.h"
@ -37,6 +36,7 @@
#include "VocBase/document-collection.h"
#include "VocBase/KeyGenerator.h"
#include "VocBase/MasterPointers.h"
#include "VocBase/server.h"
#include <velocypack/Builder.h>
#include <velocypack/Collection.h>

1
arangod/Utils/TransactionContext.cpp
View File

@ -22,6 +22,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "TransactionContext.h"
#include "Utils/CollectionNameResolver.h"
#include "VocBase/DatafileHelper.h"
#include "VocBase/Ditch.h"
#include "VocBase/document-collection.h"

1
arangod/Utils/TransactionContext.h
View File

@ -25,7 +25,6 @@
#define ARANGOD_UTILS_TRANSACTION_CONTEXT_H 1
#include "Basics/Common.h"
#include "Utils/CollectionNameResolver.h"
#include "VocBase/voc-types.h"
struct TRI_document_collection_t;

1
arangod/Utils/V8TransactionContext.cpp
View File

@ -22,6 +22,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "V8TransactionContext.h"
#include "Utils/CollectionNameResolver.h"
#include "VocBase/transaction.h"
#include "V8/v8-globals.h"

35
arangod/Utils/transactions.h
View File

@ -1,35 +0,0 @@
////////////////////////////////////////////////////////////////////////////////
/// DISCLAIMER
///
/// Copyright 2014-2016 ArangoDB GmbH, Cologne, Germany
/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
/// Copyright holder is ArangoDB GmbH, Cologne, Germany
///
/// @author Jan Steemann
////////////////////////////////////////////////////////////////////////////////
#ifndef ARANGOD_UTILS_TRANSACTIONS_H
#define ARANGOD_UTILS_TRANSACTIONS_H 1
#include "Basics/Common.h"
#include "Utils/CollectionNameResolver.h"
#include "Utils/ExplicitTransaction.h"
#include "Utils/ReplicationTransaction.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/StandaloneTransactionContext.h"
#include "Utils/V8TransactionContext.h"
#endif

2
arangod/V8Server/V8Traverser.cpp
View File

@ -23,9 +23,9 @@
#include "V8Traverser.h"
#include "Indexes/EdgeIndex.h"
#include "Utils/transactions.h"
#include "Utils/CollectionNameResolver.h"
#include "Utils/ShapedJsonTransformer.h"
#include "Utils/SingleCollectionTransaction.h"
#include "VocBase/document-collection.h"
#include "VocBase/KeyGenerator.h"
#include "VocBase/VocShaper.h"

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

@ -31,7 +31,7 @@
#include "Indexes/PrimaryIndex.h"
#include "Utils/OperationOptions.h"
#include "Utils/OperationResult.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/V8TransactionContext.h"
#include "V8/v8-conv.h"
#include "V8/v8-utils.h"

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

@ -33,7 +33,8 @@
#include "FulltextIndex/fulltext-result.h"
#include "FulltextIndex/fulltext-query.h"
#include "Utils/OperationCursor.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/V8TransactionContext.h"
#include "V8/v8-globals.h"
#include "V8/v8-conv.h"
#include "V8/v8-utils.h"

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

@ -40,7 +40,6 @@
#include "HttpServer/ApplicationEndpointServer.h"
#include "RestServer/ConsoleThread.h"
#include "RestServer/VocbaseContext.h"
#include "Utils/transactions.h"
#include "V8/JSLoader.h"
#include "V8/v8-conv.h"
#include "V8/v8-utils.h"

1
arangod/V8Server/v8-voccursor.cpp
View File

@ -25,7 +25,6 @@
#include "Basics/conversions.h"
#include "Utils/Cursor.h"
#include "Utils/CursorRepository.h"
#include "Utils/transactions.h"
#include "V8/v8-conv.h"
#include "V8/v8-vpack.h"
#include "V8Server/v8-voccursor.h"

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

@ -34,8 +34,8 @@
#include "Indexes/Index.h"
#include "Indexes/PrimaryIndex.h"
#include "Indexes/SkiplistIndex.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/V8TransactionContext.h"
#include "Utils/transactions.h"
#include "V8/v8-conv.h"
#include "V8/v8-globals.h"
#include "V8/v8-utils.h"

3
arangod/V8Server/v8-wrapshapedjson.cpp
View File

@ -24,7 +24,7 @@
#include "v8-wrapshapedjson.h"
#include "Basics/conversions.h"
#include "Basics/Logger.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/V8TransactionContext.h"
#include "V8/v8-conv.h"
#include "V8Server/v8-shape-conv.h"
@ -35,7 +35,6 @@
using namespace arangodb;
using namespace arangodb::basics;
using namespace arangodb::rest;
////////////////////////////////////////////////////////////////////////////////
/// @brief wrapped class for TRI_shaped_json_t

3
arangod/VocBase/Graphs.cpp
View File

@ -24,7 +24,8 @@
#include "Basics/JsonHelper.h"
#include "Aql/Graphs.h"
#include "Cluster/ClusterMethods.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/StandaloneTransactionContext.h"
#include "VocBase/Graphs.h"
using namespace arangodb::basics;

3
arangod/VocBase/auth.cpp
View File

@ -27,7 +27,8 @@
#include "Basics/VelocyPackHelper.h"
#include "Basics/WriteLocker.h"
#include "Rest/SslInterface.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/StandaloneTransactionContext.h"
#include "VocBase/collection.h"
#include "VocBase/document-collection.h"
#include "VocBase/vocbase.h"

3
arangod/VocBase/compactor.cpp
View File

@ -26,7 +26,6 @@
#endif
#include "compactor.h"
#include "Basics/conversions.h"
#include "Basics/files.h"
#include "Basics/FileUtils.h"
@ -35,8 +34,8 @@
#include "Basics/tri-strings.h"
#include "Basics/WriteLocker.h"
#include "Indexes/PrimaryIndex.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/StandaloneTransactionContext.h"
#include "Utils/transactions.h"
#include "VocBase/DatafileHelper.h"
#include "VocBase/DatafileStatistics.h"
#include "VocBase/document-collection.h"

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

@ -43,9 +43,9 @@
#include "Indexes/PrimaryIndex.h"
#include "Indexes/SkiplistIndex.h"
#include "RestServer/ArangoServer.h"
#include "Utils/transactions.h"
#include "Utils/CollectionReadLocker.h"
#include "Utils/CollectionWriteLocker.h"
#include "Utils/SingleCollectionTransaction.h"
#include "VocBase/DatafileHelper.h"
#include "VocBase/Ditch.h"
#include "VocBase/edge-collection.h"

4
arangod/VocBase/document-collection.h
View File

@ -35,7 +35,6 @@
#include "VocBase/Ditch.h"
#include "VocBase/MasterPointers.h"
#include "VocBase/shaped-json.h"
#include "VocBase/transaction.h"
#include "VocBase/update-policy.h"
#include "VocBase/voc-types.h"
#include "Wal/Marker.h"
@ -53,6 +52,9 @@ namespace velocypack {
class Builder;
class Slice;
}
namespace wal {
struct DocumentOperation;
}
}
////////////////////////////////////////////////////////////////////////////////

2
arangod/VocBase/voc-types.h
View File

@ -42,7 +42,7 @@ struct TRI_doc_mptr_t;
#define TRI_VOC_PARAMETER_FILE "parameter.json"
////////////////////////////////////////////////////////////////////////////////
/// @brief tick type (48bit)
/// @brief tick type (56bit)
////////////////////////////////////////////////////////////////////////////////
typedef uint64_t TRI_voc_tick_t;

1
arangod/VocBase/vocbase.cpp
View File

@ -39,7 +39,6 @@
#include "Basics/WriteLocker.h"
#include "Utils/CollectionKeysRepository.h"
#include "Utils/CursorRepository.h"
#include "Utils/transactions.h"
#include "VocBase/auth.h"
#include "VocBase/cleanup.h"
#include "VocBase/compactor.h"

3
arangod/Wal/CollectorThread.cpp
View File

@ -22,7 +22,6 @@
////////////////////////////////////////////////////////////////////////////////
#include "CollectorThread.h"
#include "Basics/ConditionLocker.h"
#include "Basics/Exceptions.h"
#include "Basics/hashes.h"
@ -34,8 +33,8 @@
#include "Indexes/PrimaryIndex.h"
#include "Utils/CollectionGuard.h"
#include "Utils/DatabaseGuard.h"
#include "Utils/SingleCollectionTransaction.h"
#include "Utils/StandaloneTransactionContext.h"
#include "Utils/transactions.h"
#include "VocBase/DatafileHelper.h"
#include "VocBase/DatafileStatistics.h"
#include "VocBase/document-collection.h"

2
arangod/Wal/CollectorThread.h
View File

@ -28,7 +28,7 @@
#include "Basics/ConditionVariable.h"
#include "Basics/Mutex.h"
#include "Basics/Thread.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "VocBase/datafile.h"
#include "VocBase/DatafileStatistics.h"
#include "VocBase/Ditch.h"

3
arangod/Wal/RecoverState.h
View File

@ -25,7 +25,7 @@
#define ARANGOD_WAL_RECOVER_STATE_H 1
#include "Basics/Common.h"
#include "Utils/transactions.h"
#include "Utils/SingleCollectionTransaction.h"
#include "VocBase/datafile.h"
#include "VocBase/document-collection.h"
#include "VocBase/server.h"
@ -33,6 +33,7 @@
#include "VocBase/vocbase.h"
#include "Wal/Logfile.h"
#include "Wal/Marker.h"
#include <functional>
namespace arangodb {