diff --git a/arangod/Replication/ContinuousSyncer.cpp b/arangod/Replication/ContinuousSyncer.cpp index e410a4eafc..151fd82f1b 100644 --- a/arangod/Replication/ContinuousSyncer.cpp +++ b/arangod/Replication/ContinuousSyncer.cpp @@ -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" diff --git a/arangod/Replication/InitialSyncer.cpp b/arangod/Replication/InitialSyncer.cpp index 469cdfe189..646bf9f9c9 100644 --- a/arangod/Replication/InitialSyncer.cpp +++ b/arangod/Replication/InitialSyncer.cpp @@ -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" diff --git a/arangod/Replication/InitialSyncer.h b/arangod/Replication/InitialSyncer.h index 6755e518cb..dc4ed3e4b5 100644 --- a/arangod/Replication/InitialSyncer.h +++ b/arangod/Replication/InitialSyncer.h @@ -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 diff --git a/arangod/Replication/Syncer.cpp b/arangod/Replication/Syncer.cpp index c2b1c76316..26d9d71e0c 100644 --- a/arangod/Replication/Syncer.cpp +++ b/arangod/Replication/Syncer.cpp @@ -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" diff --git a/arangod/RestHandler/RestBaseHandler.h b/arangod/RestHandler/RestBaseHandler.h index 30e49bab3e..81b5c55e1f 100644 --- a/arangod/RestHandler/RestBaseHandler.h +++ b/arangod/RestHandler/RestBaseHandler.h @@ -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; diff --git a/arangod/RestHandler/RestDocumentHandler.cpp b/arangod/RestHandler/RestDocumentHandler.cpp index acb09ed273..3d69503cdd 100644 --- a/arangod/RestHandler/RestDocumentHandler.cpp +++ b/arangod/RestHandler/RestDocumentHandler.cpp @@ -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" diff --git a/arangod/RestHandler/RestEdgeHandler.cpp b/arangod/RestHandler/RestEdgeHandler.cpp index ad13b9d0b7..03d48039d3 100644 --- a/arangod/RestHandler/RestEdgeHandler.cpp +++ b/arangod/RestHandler/RestEdgeHandler.cpp @@ -23,6 +23,7 @@ #include "RestEdgeHandler.h" #include "Rest/HttpRequest.h" +#include "Utils/StandaloneTransactionContext.h" #include "VocBase/document-collection.h" using namespace arangodb; diff --git a/arangod/RestHandler/RestEdgesHandler.cpp b/arangod/RestHandler/RestEdgesHandler.cpp index 61c0c3bddd..dfa52ccdb6 100644 --- a/arangod/RestHandler/RestEdgesHandler.cpp +++ b/arangod/RestHandler/RestEdgesHandler.cpp @@ -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 diff --git a/arangod/RestHandler/RestImportHandler.cpp b/arangod/RestHandler/RestImportHandler.cpp index f600f0a98f..e93b41f4c8 100644 --- a/arangod/RestHandler/RestImportHandler.cpp +++ b/arangod/RestHandler/RestImportHandler.cpp @@ -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" diff --git a/arangod/RestHandler/RestImportHandler.h b/arangod/RestHandler/RestImportHandler.h index 7e08fd141e..84fc46d546 100644 --- a/arangod/RestHandler/RestImportHandler.h +++ b/arangod/RestHandler/RestImportHandler.h @@ -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 { diff --git a/arangod/RestHandler/RestReplicationHandler.cpp b/arangod/RestHandler/RestReplicationHandler.cpp index 6fe009dce7..ecd4ebf593 100644 --- a/arangod/RestHandler/RestReplicationHandler.cpp +++ b/arangod/RestHandler/RestReplicationHandler.cpp @@ -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" diff --git a/arangod/RestHandler/RestVocbaseBaseHandler.h b/arangod/RestHandler/RestVocbaseBaseHandler.h index 3081b0bdbd..aabded31df 100644 --- a/arangod/RestHandler/RestVocbaseBaseHandler.h +++ b/arangod/RestHandler/RestVocbaseBaseHandler.h @@ -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; diff --git a/arangod/Utils/CollectionExport.cpp b/arangod/Utils/CollectionExport.cpp index 4d3b98ebdb..c7353fa1d1 100644 --- a/arangod/Utils/CollectionExport.cpp +++ b/arangod/Utils/CollectionExport.cpp @@ -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" diff --git a/arangod/Utils/CollectionKeys.cpp b/arangod/Utils/CollectionKeys.cpp index 1cd6ff9723..389eb18440 100644 --- a/arangod/Utils/CollectionKeys.cpp +++ b/arangod/Utils/CollectionKeys.cpp @@ -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" diff --git a/arangod/Utils/SingleCollectionTransaction.h b/arangod/Utils/SingleCollectionTransaction.h index 18f4861b1d..773efdafb7 100644 --- a/arangod/Utils/SingleCollectionTransaction.h +++ b/arangod/Utils/SingleCollectionTransaction.h @@ -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 { diff --git a/arangod/Utils/StandaloneTransactionContext.cpp b/arangod/Utils/StandaloneTransactionContext.cpp index 977befb6e5..eeb1489950 100644 --- a/arangod/Utils/StandaloneTransactionContext.cpp +++ b/arangod/Utils/StandaloneTransactionContext.cpp @@ -22,6 +22,7 @@ //////////////////////////////////////////////////////////////////////////////// #include "StandaloneTransactionContext.h" +#include "Utils/CollectionNameResolver.h" #include "VocBase/transaction.h" using namespace arangodb; diff --git a/arangod/Utils/Transaction.cpp b/arangod/Utils/Transaction.cpp index 40761ae8ec..ce8dee08af 100644 --- a/arangod/Utils/Transaction.cpp +++ b/arangod/Utils/Transaction.cpp @@ -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 #include diff --git a/arangod/Utils/TransactionContext.cpp b/arangod/Utils/TransactionContext.cpp index eb8646b2c6..bc4a721425 100644 --- a/arangod/Utils/TransactionContext.cpp +++ b/arangod/Utils/TransactionContext.cpp @@ -22,6 +22,7 @@ //////////////////////////////////////////////////////////////////////////////// #include "TransactionContext.h" +#include "Utils/CollectionNameResolver.h" #include "VocBase/DatafileHelper.h" #include "VocBase/Ditch.h" #include "VocBase/document-collection.h" diff --git a/arangod/Utils/TransactionContext.h b/arangod/Utils/TransactionContext.h index 4d9140d7de..595ec8e2ce 100644 --- a/arangod/Utils/TransactionContext.h +++ b/arangod/Utils/TransactionContext.h @@ -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; diff --git a/arangod/Utils/V8TransactionContext.cpp b/arangod/Utils/V8TransactionContext.cpp index cc0cfe356a..67b4e93829 100644 --- a/arangod/Utils/V8TransactionContext.cpp +++ b/arangod/Utils/V8TransactionContext.cpp @@ -22,6 +22,7 @@ //////////////////////////////////////////////////////////////////////////////// #include "V8TransactionContext.h" +#include "Utils/CollectionNameResolver.h" #include "VocBase/transaction.h" #include "V8/v8-globals.h" diff --git a/arangod/Utils/transactions.h b/arangod/Utils/transactions.h deleted file mode 100644 index 689de31531..0000000000 --- a/arangod/Utils/transactions.h +++ /dev/null @@ -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 diff --git a/arangod/V8Server/V8Traverser.cpp b/arangod/V8Server/V8Traverser.cpp index 1dc80f5a3e..7a055d8dc4 100644 --- a/arangod/V8Server/V8Traverser.cpp +++ b/arangod/V8Server/V8Traverser.cpp @@ -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" diff --git a/arangod/V8Server/v8-collection.cpp b/arangod/V8Server/v8-collection.cpp index 388f078968..e3a07fef2c 100644 --- a/arangod/V8Server/v8-collection.cpp +++ b/arangod/V8Server/v8-collection.cpp @@ -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" diff --git a/arangod/V8Server/v8-query.cpp b/arangod/V8Server/v8-query.cpp index eab9e29915..8f8a509d7b 100644 --- a/arangod/V8Server/v8-query.cpp +++ b/arangod/V8Server/v8-query.cpp @@ -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" diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp index cb4951c69c..addbeb6317 100644 --- a/arangod/V8Server/v8-vocbase.cpp +++ b/arangod/V8Server/v8-vocbase.cpp @@ -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" diff --git a/arangod/V8Server/v8-voccursor.cpp b/arangod/V8Server/v8-voccursor.cpp index 4e6349dc35..a73f447787 100644 --- a/arangod/V8Server/v8-voccursor.cpp +++ b/arangod/V8Server/v8-voccursor.cpp @@ -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" diff --git a/arangod/V8Server/v8-vocindex.cpp b/arangod/V8Server/v8-vocindex.cpp index 6a780087c2..7064341253 100644 --- a/arangod/V8Server/v8-vocindex.cpp +++ b/arangod/V8Server/v8-vocindex.cpp @@ -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" diff --git a/arangod/V8Server/v8-wrapshapedjson.cpp b/arangod/V8Server/v8-wrapshapedjson.cpp index 463fab18ab..4b69a2298b 100644 --- a/arangod/V8Server/v8-wrapshapedjson.cpp +++ b/arangod/V8Server/v8-wrapshapedjson.cpp @@ -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 diff --git a/arangod/VocBase/Graphs.cpp b/arangod/VocBase/Graphs.cpp index 0d6f227cb2..0388bf128c 100644 --- a/arangod/VocBase/Graphs.cpp +++ b/arangod/VocBase/Graphs.cpp @@ -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; diff --git a/arangod/VocBase/auth.cpp b/arangod/VocBase/auth.cpp index 3492430406..ccc30cfca5 100644 --- a/arangod/VocBase/auth.cpp +++ b/arangod/VocBase/auth.cpp @@ -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" diff --git a/arangod/VocBase/compactor.cpp b/arangod/VocBase/compactor.cpp index fdadb40d03..da9a43dab6 100644 --- a/arangod/VocBase/compactor.cpp +++ b/arangod/VocBase/compactor.cpp @@ -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" diff --git a/arangod/VocBase/document-collection.cpp b/arangod/VocBase/document-collection.cpp index d83d8e7dfd..82d62a5d9c 100644 --- a/arangod/VocBase/document-collection.cpp +++ b/arangod/VocBase/document-collection.cpp @@ -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" diff --git a/arangod/VocBase/document-collection.h b/arangod/VocBase/document-collection.h index 6c87094c75..4d0327ded9 100644 --- a/arangod/VocBase/document-collection.h +++ b/arangod/VocBase/document-collection.h @@ -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; +} } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/VocBase/voc-types.h b/arangod/VocBase/voc-types.h index 9bf141e3be..97f28ae672 100644 --- a/arangod/VocBase/voc-types.h +++ b/arangod/VocBase/voc-types.h @@ -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; diff --git a/arangod/VocBase/vocbase.cpp b/arangod/VocBase/vocbase.cpp index f9be05c249..57d005e27a 100644 --- a/arangod/VocBase/vocbase.cpp +++ b/arangod/VocBase/vocbase.cpp @@ -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" diff --git a/arangod/Wal/CollectorThread.cpp b/arangod/Wal/CollectorThread.cpp index 9d688434bb..27c69f2ccd 100644 --- a/arangod/Wal/CollectorThread.cpp +++ b/arangod/Wal/CollectorThread.cpp @@ -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" diff --git a/arangod/Wal/CollectorThread.h b/arangod/Wal/CollectorThread.h index 14e3e7ee11..b5faaa7b8a 100644 --- a/arangod/Wal/CollectorThread.h +++ b/arangod/Wal/CollectorThread.h @@ -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" diff --git a/arangod/Wal/RecoverState.h b/arangod/Wal/RecoverState.h index 48208758db..4eb3469cfa 100644 --- a/arangod/Wal/RecoverState.h +++ b/arangod/Wal/RecoverState.h @@ -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 namespace arangodb {