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

Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 

Conflicts:
	arangod/VocBase/edge-collection.h
This commit is contained in:
Jan Steemann 2014-05-21 18:06:44 +02:00
parent 0caa570274 e7560357d2
commit 5373f1cea0
175 changed files with 331 additions and 641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Actions/RestActionHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_ACTIONS_REST_ACTION_HANDLER_H
#define TRIAGENS_ACTIONS_REST_ACTION_HANDLER_H 1
#include "Basics/Common.h"
#include "RestHandler/RestVocbaseBaseHandler.h"
#include "Actions/actions.h"

2
arangod/Ahuacatl/ahuacatl-access-optimiser.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_ACCESS_OPTIMISER_H
#define TRIAGENS_AHUACATL_AHUACATL_ACCESS_OPTIMISER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/string-buffer.h"
#include "Ahuacatl/ahuacatl-ast-node.h"

2
arangod/Ahuacatl/ahuacatl-ast-node.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_AST_NODE_H
#define TRIAGENS_AHUACATL_AHUACATL_AST_NODE_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "Ahuacatl/ahuacatl-node.h"

2
arangod/Ahuacatl/ahuacatl-bind-parameter.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_BIND_PARAMETER_H
#define TRIAGENS_AHUACATL_AHUACATL_BIND_PARAMETER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/tri-strings.h"
#include "BasicsC/hashes.h"
#include "BasicsC/vector.h"

2
arangod/Ahuacatl/ahuacatl-codegen.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_CODEGEN_H
#define TRIAGENS_AHUACATL_AHUACATL_CODEGEN_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "BasicsC/conversions.h"
#include "BasicsC/tri-strings.h"

2
arangod/Ahuacatl/ahuacatl-collections.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_COLLECTIONS_H
#define TRIAGENS_AHUACATL_AHUACATL_COLLECTIONS_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/vector.h"
#include "VocBase/vocbase.h"

2
arangod/Ahuacatl/ahuacatl-context.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_CONTEXT_H
#define TRIAGENS_AHUACATL_AHUACATL_CONTEXT_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "BasicsC/vector.h"

2
arangod/Ahuacatl/ahuacatl-conversions.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_CONVERSIONS_H
#define TRIAGENS_AHUACATL_AHUACATL_CONVERSIONS_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "Ahuacatl/ahuacatl-ast-node.h"

2
arangod/Ahuacatl/ahuacatl-error.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_ERROR_H
#define TRIAGENS_AHUACATL_AHUACATL_ERROR_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
// -----------------------------------------------------------------------------
// --SECTION-- public types

2
arangod/Ahuacatl/ahuacatl-explain.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_EXPLAIN_H
#define TRIAGENS_AHUACATL_AHUACATL_EXPLAIN_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
struct TRI_aql_context_s;
struct TRI_json_s;

2
arangod/Ahuacatl/ahuacatl-functions.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_FUNCTIONS_H
#define TRIAGENS_AHUACATL_AHUACATL_FUNCTIONS_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "Ahuacatl/ahuacatl-ast-node.h"

2
arangod/Ahuacatl/ahuacatl-grammar.yy
View File

@ -10,7 +10,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <BasicsC/common.h>
#include <Basics/Common.h>
#include <BasicsC/conversions.h>
#include <BasicsC/tri-strings.h>

2
arangod/Ahuacatl/ahuacatl-index.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_INDEX_H
#define TRIAGENS_AHUACATL_AHUACATL_INDEX_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/vector.h"
#include "VocBase/index.h"

2
arangod/Ahuacatl/ahuacatl-node.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_NODE_H
#define TRIAGENS_AHUACATL_AHUACATL_NODE_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/vector.h"
// -----------------------------------------------------------------------------

2
arangod/Ahuacatl/ahuacatl-optimiser.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_OPTIMISER_H
#define TRIAGENS_AHUACATL_AHUACATL_OPTIMISER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
struct TRI_aql_context_s;

2
arangod/Ahuacatl/ahuacatl-parser-functions.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_PARSER_FUNCTIONS_H
#define TRIAGENS_AHUACATL_AHUACATL_PARSER_FUNCTIONS_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "Ahuacatl/ahuacatl-context.h"
#include "Ahuacatl/ahuacatl-error.h"

2
arangod/Ahuacatl/ahuacatl-parser.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_PARSER_H
#define TRIAGENS_AHUACATL_AHUACATL_PARSER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/vector.h"
// -----------------------------------------------------------------------------

2
arangod/Ahuacatl/ahuacatl-result.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_RESULT_H
#define TRIAGENS_AHUACATL_AHUACATL_RESULT_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/logging.h"
#include "BasicsC/json.h"

2
arangod/Ahuacatl/ahuacatl-scope.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_SCOPE_H
#define TRIAGENS_AHUACATL_AHUACATL_SCOPE_H 1
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "BasicsC/vector.h"

2
arangod/Ahuacatl/ahuacatl-statement-dump.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_STATEMENT_DUMP_H
#define TRIAGENS_AHUACATL_AHUACATL_STATEMENT_DUMP_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
struct TRI_aql_statement_list_s;

2
arangod/Ahuacatl/ahuacatl-statement-walker.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_STATEMENT_WALKER_H
#define TRIAGENS_AHUACATL_AHUACATL_STATEMENT_WALKER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/vector.h"
#include "Ahuacatl/ahuacatl-ast-node.h"

2
arangod/Ahuacatl/ahuacatl-statementlist.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_STATEMENTLIST_H
#define TRIAGENS_AHUACATL_AHUACATL_STATEMENTLIST_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/vector.h"
struct TRI_aql_node_s;

2
arangod/Ahuacatl/ahuacatl-variable.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_AHUACATL_AHUACATL_VARIABLE_H
#define TRIAGENS_AHUACATL_AHUACATL_VARIABLE_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/tri-strings.h"
#include "BasicsC/hashes.h"
#include "BasicsC/vector.h"

10
arangod/BitIndexes/bitarrayIndex.h
View File

@ -28,15 +28,11 @@
#ifndef TRIAGENS_BIT_INDEXES_BITARRAY_INDEX_H
#define TRIAGENS_BIT_INDEXES_BITARRAY_INDEX_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "IndexIterators/index-iterator.h"
#include "IndexOperators/index-operator.h"
#include "ShapedJson/shaped-json.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declaration
// -----------------------------------------------------------------------------
@ -119,10 +115,6 @@ int BitarrayIndex_update (BitarrayIndex*, TRI_bitarray_index_key_t*, TRI_bitarra
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

9
arangod/BitIndexes/masterblocktable.h
View File

@ -37,10 +37,6 @@
#include "IndexIterators/index-iterator.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- bitarray private types
// -----------------------------------------------------------------------------
@ -616,11 +612,6 @@ static int64_t compareIndexOf(MasterTable_t* mt, size_t item, bool* equality) {
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

46
arangod/CMakeLists.txt
View File

@ -46,29 +46,29 @@ add_executable(
${BIN_ARANGOD}
Actions/actions.cpp
Actions/RestActionHandler.cpp
Ahuacatl/ahuacatl-access-optimiser.c
Ahuacatl/ahuacatl-ast-node.c
Ahuacatl/ahuacatl-bind-parameter.c
Ahuacatl/ahuacatl-codegen.c
Ahuacatl/ahuacatl-collections.c
Ahuacatl/ahuacatl-context.c
Ahuacatl/ahuacatl-conversions.c
Ahuacatl/ahuacatl-error.c
Ahuacatl/ahuacatl-explain.c
Ahuacatl/ahuacatl-functions.c
Ahuacatl/ahuacatl-grammar.c
Ahuacatl/ahuacatl-index.c
Ahuacatl/ahuacatl-node.c
Ahuacatl/ahuacatl-optimiser.c
Ahuacatl/ahuacatl-parser-functions.c
Ahuacatl/ahuacatl-parser.c
Ahuacatl/ahuacatl-result.c
Ahuacatl/ahuacatl-scope.c
Ahuacatl/ahuacatl-statement-dump.c
Ahuacatl/ahuacatl-statement-walker.c
Ahuacatl/ahuacatl-statementlist.c
Ahuacatl/ahuacatl-tokens.c
Ahuacatl/ahuacatl-variable.c
Ahuacatl/ahuacatl-access-optimiser.cpp
Ahuacatl/ahuacatl-ast-node.cpp
Ahuacatl/ahuacatl-bind-parameter.cpp
Ahuacatl/ahuacatl-codegen.cpp
Ahuacatl/ahuacatl-collections.cpp
Ahuacatl/ahuacatl-context.cpp
Ahuacatl/ahuacatl-conversions.cpp
Ahuacatl/ahuacatl-error.cpp
Ahuacatl/ahuacatl-explain.cpp
Ahuacatl/ahuacatl-functions.cpp
Ahuacatl/ahuacatl-grammar.cpp
Ahuacatl/ahuacatl-index.cpp
Ahuacatl/ahuacatl-node.cpp
Ahuacatl/ahuacatl-optimiser.cpp
Ahuacatl/ahuacatl-parser-functions.cpp
Ahuacatl/ahuacatl-parser.cpp
Ahuacatl/ahuacatl-result.cpp
Ahuacatl/ahuacatl-scope.cpp
Ahuacatl/ahuacatl-statement-dump.cpp
Ahuacatl/ahuacatl-statement-walker.cpp
Ahuacatl/ahuacatl-statementlist.cpp
Ahuacatl/ahuacatl-tokens.cpp
Ahuacatl/ahuacatl-variable.cpp
BitIndexes/bitarray.cpp
BitIndexes/bitarrayIndex.cpp
CapConstraint/cap-constraint.cpp

10
arangod/CapConstraint/cap-constraint.h
View File

@ -28,14 +28,10 @@
#ifndef TRIAGENS_CAP_CONSTRAINT_CAP_CONSTRAINT_H
#define TRIAGENS_CAP_CONSTRAINT_CAP_CONSTRAINT_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/index.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- CAP CONSTRAINT
// -----------------------------------------------------------------------------
@ -99,10 +95,6 @@ void TRI_FreeCapConstraint (TRI_index_t*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

2
arangod/Cluster/ApplicationCluster.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_CLUSTER_APPLICATION_CLUSTER_H
#define TRIAGENS_CLUSTER_APPLICATION_CLUSTER_H 1
#include "Basics/Common.h"
#include "ApplicationServer/ApplicationFeature.h"
#include "Cluster/ServerState.h"

2
arangod/Cluster/ClusterComm.h
View File

@ -28,7 +28,6 @@
#ifndef TRIAGENS_CLUSTER_COMM_H
#define TRIAGENS_CLUSTER_COMM_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "Basics/ReadWriteLock.h"
#include "Basics/ConditionVariable.h"
@ -38,7 +37,6 @@
#include "SimpleHttpClient/SimpleHttpResult.h"
#include "SimpleHttpClient/SimpleHttpClient.h"
#include "VocBase/voc-types.h"
#include "Cluster/AgencyComm.h"
#include "Cluster/ClusterInfo.h"
#include "Cluster/ServerState.h"

2
arangod/Cluster/ClusterMethods.h
View File

@ -28,7 +28,6 @@
#ifndef TRIAGENS_CLUSTER_METHODS_H
#define TRIAGENS_CLUSTER_METHODS_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "Rest/HttpRequest.h"
@ -39,7 +38,6 @@
#include "VocBase/primary-collection.h"
#include "VocBase/update-policy.h"
#include "VocBase/voc-types.h"
#include "Cluster/AgencyComm.h"
#include "Cluster/ClusterInfo.h"
#include "Cluster/ServerState.h"

2
arangod/Cluster/RestShardHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_CLUSTER_REST_SHARD_HANDLER_H
#define TRIAGENS_CLUSTER_REST_SHARD_HANDLER_H 1
#include "Basics/Common.h"
#include "Admin/RestBaseHandler.h"
namespace triagens {

2
arangod/Cluster/ServerJob.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_CLUSTER_SERVER_JOB_H
#define TRIAGENS_CLUSTER_SERVER_JOB_H 1
#include "Basics/Common.h"
#include "Dispatcher/Job.h"
#include "Basics/Exceptions.h"

10
arangod/FulltextIndex/fulltext-query.h
View File

@ -28,11 +28,7 @@
#ifndef TRIAGENS_FULLTEXT_INDEX_FULLTEXT_QUERY_H
#define TRIAGENS_FULLTEXT_INDEX_FULLTEXT_QUERY_H 1
#include "BasicsC/common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "Basics/Common.h"
// -----------------------------------------------------------------------------
// --SECTION-- private defines
@ -159,10 +155,6 @@ bool TRI_SetQueryFulltextIndex (TRI_fulltext_query_t* const,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/FulltextIndex/fulltext-wordlist.h
View File

@ -28,11 +28,7 @@
#ifndef TRIAGENS_FULLTEXT_INDEX_FULLTEXT_WORDLIST_H
#define TRIAGENS_FULLTEXT_INDEX_FULLTEXT_WORDLIST_H 1
#include "BasicsC/common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "Basics/Common.h"
// -----------------------------------------------------------------------------
// --SECTION-- public types
@ -110,10 +106,6 @@ void TRI_SortWordlistFulltextIndex (TRI_fulltext_wordlist_t* const);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

11
arangod/GeoIndex/GeoIndex.h
View File

@ -28,14 +28,13 @@
/* GeoIndex.h - header file for GeoIndex algorithms */
/* Version 2.1 8.1.2012 R. A. Parker */
#include "BasicsC/common.h"
#ifndef TRIAGENS_GEO_INDEX_GEOINDEX_H
#define TRIAGENS_GEO_INDEX_GEOINDEX_H 1
#include "Basics/Common.h"
#include "IndexIterators/index-iterator.h"
#include "IndexOperators/index-operator.h"
#ifdef __cplusplus
extern "C" {
#endif
/* first the things that a user might want to change */
/* a GeoString - a signed type of at least 64 bits */
@ -121,8 +120,6 @@ void GeoIndex_INDEXDUMP(GeoIndex * gi, FILE * f);
int GeoIndex_INDEXVALID(GeoIndex * gi);
#endif
#ifdef __cplusplus
}
#endif
/* end of GeoIndex.h */

10
arangod/GeoIndex/geo-index.h
View File

@ -28,14 +28,10 @@
#ifndef TRIAGENS_GEO_INDEX_GEO_INDEX_H
#define TRIAGENS_GEO_INDEX_GEO_INDEX_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/index.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- GEO INDEX
// -----------------------------------------------------------------------------
@ -121,10 +117,6 @@ GeoCoordinates* TRI_NearestGeoIndex (TRI_index_t* idx,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
arangod/HashIndex/hash-array.h
View File

@ -29,13 +29,9 @@
#ifndef TRIAGENS_HASH_INDEX_HASH_ARRAY_H
#define TRIAGENS_HASH_INDEX_HASH_ARRAY_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/vector.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -254,10 +250,6 @@ int TRI_RemoveKeyHashArrayMulti (TRI_hash_array_t*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
arangod/HashIndex/hash-index.h
View File

@ -29,15 +29,11 @@
#ifndef TRIAGENS_HASH_INDEX_HASH_INDEX_H
#define TRIAGENS_HASH_INDEX_HASH_INDEX_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "HashIndex/hash-array.h"
#include "VocBase/index.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -143,10 +139,6 @@ TRI_index_result_t TRI_LookupHashIndex (TRI_index_t*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

14
arangod/IndexIterators/index-iterator.h
View File

@ -28,14 +28,10 @@
#ifndef TRIAGENS_INDEX_ITERATORS_INDEX_ITERATOR_H
#define TRIAGENS_INDEX_ITERATORS_INDEX_ITERATOR_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "IndexOperators/index-operator.h"
#include "ShapedJson/shaped-json.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public types
// -----------------------------------------------------------------------------
@ -174,18 +170,10 @@ void TRI_DestroyIndexIterator (TRI_index_iterator_t*);
void TRI_FreeIndexIterator (TRI_index_iterator_t*);
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

2
arangod/IndexOperators/index-operator.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_INDEX_OPERATORS_INDEX_OPERATOR_H
#define TRIAGENS_INDEX_OPERATORS_INDEX_OPERATOR_H 1
#include "Basics/Common.h"
#include "BasicsC/json.h"
#include "ShapedJson/json-shaper.h"
#include "ShapedJson/shaped-json.h"

2
arangod/MRServer/ApplicationMR.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_MRSERVER_APPLICATION_MR_H
#define TRIAGENS_MRSERVER_APPLICATION_MR_H 1
#include "Basics/Common.h"
#include "ApplicationServer/ApplicationFeature.h"
#include "MRuby/mr-utils.h"

2
arangod/MRServer/mr-actions.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_MRSERVER_MR_ACTIONS_H
#define TRIAGENS_MRSERVER_MR_ACTIONS_H 1
#include "Basics/Common.h"
#include "MRuby/mr-utils.h"
// -----------------------------------------------------------------------------

8
arangod/Replication/replication-static.cpp
View File

@ -33,10 +33,6 @@
using namespace std;
using namespace triagens::arango;
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
@ -87,10 +83,6 @@ int TRI_RunContinuousSyncerReplication (void* ptr) {
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
// Local Variables:
// mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}"

10
arangod/Replication/replication-static.h
View File

@ -28,14 +28,10 @@
#ifndef TRIAGENS_REPLICATION_REPLICATION_STATIC_H
#define TRIAGENS_REPLICATION_REPLICATION_STATIC_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -77,10 +73,6 @@ int TRI_RunContinuousSyncerReplication (void*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

2
arangod/RestHandler/RestBatchHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_REST_HANDLER_REST_BATCH_HANDLER_H
#define TRIAGENS_REST_HANDLER_REST_BATCH_HANDLER_H 1
#include "Basics/Common.h"
#include "RestHandler/RestVocbaseBaseHandler.h"
using namespace triagens::basics;

2
arangod/RestHandler/RestDocumentHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_REST_HANDLER_REST_DOCUMENT_HANDLER_H
#define TRIAGENS_REST_HANDLER_REST_DOCUMENT_HANDLER_H 1
#include "Basics/Common.h"
#include "RestHandler/RestVocbaseBaseHandler.h"
// -----------------------------------------------------------------------------

2
arangod/RestHandler/RestEdgeHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_REST_HANDLER_REST_EDGE_HANDLER_H
#define TRIAGENS_REST_HANDLER_REST_EDGE_HANDLER_H 1
#include "Basics/Common.h"
#include "RestHandler/RestDocumentHandler.h"
// -----------------------------------------------------------------------------

2
arangod/RestHandler/RestImportHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_REST_HANDLER_REST_IMPORT_HANDLER_H
#define TRIAGENS_REST_HANDLER_REST_IMPORT_HANDLER_H 1
#include "Basics/Common.h"
#include "RestHandler/RestVocbaseBaseHandler.h"
// -----------------------------------------------------------------------------

2
arangod/RestHandler/RestPleaseUpgradeHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_REST_HANDLER_REST_PLEASE_UPGRADE_HANDLER_H
#define TRIAGENS_REST_HANDLER_REST_PLEASE_UPGRADE_HANDLER_H 1
#include "Basics/Common.h"
#include "HttpServer/HttpHandler.h"
// -----------------------------------------------------------------------------

2
arangod/RestHandler/RestUploadHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_REST_HANDLER_REST_UPLOAD_HANDLER_H
#define TRIAGENS_REST_HANDLER_REST_UPLOAD_HANDLER_H 1
#include "Basics/Common.h"
#include "RestHandler/RestVocbaseBaseHandler.h"
#include "HttpServer/HttpServer.h"

2
arangod/RestHandler/RestVocbaseBaseHandler.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_REST_HANDLER_REST_VOCBASE_BASE_HANDLER_H
#define TRIAGENS_REST_HANDLER_REST_VOCBASE_BASE_HANDLER_H 1
#include "Basics/Common.h"
#include "Admin/RestBaseHandler.h"
#include "BasicsC/json.h"

2
arangod/RestServer/ArangoServer.cpp
View File

@ -49,7 +49,7 @@
#include "Basics/RandomGenerator.h"
#include "Basics/Utf8Helper.h"
#include "BasicsC/files.h"
#include "BasicsC/init.h"
#include "Basics/init.h"
#include "BasicsC/logging.h"
#include "BasicsC/messages.h"
#include "BasicsC/tri-strings.h"

10
arangod/SkipLists/skiplistIndex.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_SKIP_LISTS_SKIPLIST_INDEX_H
#define TRIAGENS_SKIP_LISTS_SKIPLIST_INDEX_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/skip-list.h"
@ -36,10 +36,6 @@
#include "IndexOperators/index-operator.h"
#include "ShapedJson/shaped-json.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -164,10 +160,6 @@ uint64_t SkiplistIndex_getNrUsed (SkiplistIndex*);
size_t SkiplistIndex_memoryUsage (SkiplistIndex const*);
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

2
arangod/Utils/AhuacatlGuard.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_AHUACATL_GUARD_H
#define TRIAGENS_UTILS_AHUACATL_GUARD_H 1
#include "Basics/Common.h"
#include "Ahuacatl/ahuacatl-context.h"
#include "BasicsC/json.h"
#include "BasicsC/logging.h"

2
arangod/Utils/AhuacatlTransaction.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_AHUACATL_TRANSACTION_H
#define TRIAGENS_UTILS_AHUACATL_TRANSACTION_H 1
#include "Basics/Common.h"
#include "Cluster/ServerState.h"
#include "Utils/CollectionNameResolver.h"

2
arangod/Utils/Barrier.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_BARRIER_H
#define TRIAGENS_UTILS_BARRIER_H 1
#include "Basics/Common.h"
#include "VocBase/barrier.h"
#include "VocBase/primary-collection.h"

2
arangod/Utils/EmbeddableTransaction.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_EMBEDDABLE_TRANSACTION_H
#define TRIAGENS_UTILS_EMBEDDABLE_TRANSACTION_H 1
#include "Basics/Common.h"
namespace triagens {
namespace arango {

2
arangod/Utils/ExplicitTransaction.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_USER_TRANSACTION_H
#define TRIAGENS_UTILS_USER_TRANSACTION_H 1
#include "Basics/Common.h"
#include "Utils/Transaction.h"
#include "VocBase/server.h"
#include "VocBase/transaction.h"

2
arangod/Utils/RestTransactionContext.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_REST_TRANSACTION_CONTEXT_H
#define TRIAGENS_UTILS_REST_TRANSACTION_CONTEXT_H 1
#include "Basics/Common.h"
#include "VocBase/transaction.h"
namespace triagens {

2
arangod/Utils/SingleCollectionReadOnlyTransaction.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_SINGLE_COLLECTION_READ_ONLY_TRANSACTION_H
#define TRIAGENS_UTILS_SINGLE_COLLECTION_READ_ONLY_TRANSACTION_H 1
#include "Basics/Common.h"
#include "Utils/CollectionNameResolver.h"
#include "Utils/SingleCollectionTransaction.h"

2
arangod/Utils/SingleCollectionTransaction.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_UTILS_SINGLE_COLLECTION_TRANSACTION_H
#define TRIAGENS_UTILS_SINGLE_COLLECTION_TRANSACTION_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/logging.h"
#include "BasicsC/voc-errors.h"

2
arangod/Utils/SingleCollectionWriteTransaction.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_SINGLE_COLLECTION_WRITE_TRANSACTION_H
#define TRIAGENS_UTILS_SINGLE_COLLECTION_WRITE_TRANSACTION_H 1
#include "Basics/Common.h"
#include "Utils/CollectionNameResolver.h"
#include "Utils/SingleCollectionTransaction.h"

2
arangod/Utils/StandaloneTransaction.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_STANDALONE_TRANSACTION_H
#define TRIAGENS_UTILS_STANDALONE_TRANSACTION_H 1
#include "Basics/Common.h"
namespace triagens {
namespace arango {

2
arangod/Utils/Transaction.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_TRANSACTION_H
#define TRIAGENS_UTILS_TRANSACTION_H 1
#include "Basics/Common.h"
#include "Cluster/ServerState.h"
#include "VocBase/barrier.h"

2
arangod/Utils/V8TransactionContext.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_UTILS_V8TRANSACTION_CONTEXT_H
#define TRIAGENS_UTILS_V8TRANSACTION_CONTEXT_H 1
#include "Basics/Common.h"
#include <v8.h>
#include "V8/v8-globals.h"

2
arangod/V8Server/ApplicationV8.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_V8SERVER_APPLICATION_V8_H
#define TRIAGENS_V8SERVER_APPLICATION_V8_H 1
#include "Basics/Common.h"
#include "ApplicationServer/ApplicationFeature.h"
#include <v8.h>

2
arangod/V8Server/V8Job.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_V8SERVER_V8_JOB_H
#define TRIAGENS_V8SERVER_V8_JOB_H 1
#include "Basics/Common.h"
#include "Dispatcher/Job.h"
#include "BasicsC/json.h"

2
arangod/V8Server/V8PeriodicTask.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_V8SERVER_V8PERIODIC_TASK_H
#define TRIAGENS_V8SERVER_V8PERIODIC_TASK_H 1
#include "Basics/Common.h"
#include "Scheduler/PeriodicTask.h"
#include "VocBase/vocbase.h"

2
arangod/V8Server/V8TimerTask.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_V8SERVER_V8TIMER_TASK_H
#define TRIAGENS_V8SERVER_V8TIMER_TASK_H 1
#include "Basics/Common.h"
#include "Scheduler/TimerTask.h"
#include "VocBase/vocbase.h"

2
arangod/V8Server/v8-actions.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_V8SERVER_V8_ACTIONS_H
#define TRIAGENS_V8SERVER_V8_ACTIONS_H 1
#include "Basics/Common.h"
#include "V8/v8-globals.h"
#include "VocBase/vocbase.h"

2
arangod/V8Server/v8-query.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_V8SERVER_V8_QUERY_H
#define TRIAGENS_V8SERVER_V8_QUERY_H 1
#include "Basics/Common.h"
#include "V8/v8-globals.h"
#include "VocBase/vocbase.h"

10
arangod/VocBase/auth.h
View File

@ -28,11 +28,7 @@
#ifndef TRIAGENS_VOC_BASE_AUTH_H
#define TRIAGENS_VOC_BASE_AUTH_H 1
#include "BasicsC/common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "Basics/Common.h"
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
@ -134,10 +130,6 @@ bool TRI_CheckAuthenticationAuthInfo (struct TRI_vocbase_s*,
char const* password,
bool* mustChange);
#ifdef __cplusplus
}
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

10
arangod/VocBase/barrier.h
View File

@ -28,11 +28,9 @@
#ifndef TRIAGENS_VOC_BASE_BARRIER_H
#define TRIAGENS_VOC_BASE_BARRIER_H 1
#include "BasicsC/locks.h"
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "BasicsC/locks.h"
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
@ -267,10 +265,6 @@ void TRI_FreeBarrier (TRI_barrier_t* element);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/cleanup.h
View File

@ -28,14 +28,10 @@
#ifndef TRIAGENS_VOC_BASE_CLEANUP_H
#define TRIAGENS_VOC_BASE_CLEANUP_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/vocbase.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- defines
// -----------------------------------------------------------------------------
@ -74,10 +70,6 @@ void TRI_CleanupVocBase (void*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/collection.h
View File

@ -28,17 +28,13 @@
#ifndef TRIAGENS_VOC_BASE_COLLECTION_H
#define TRIAGENS_VOC_BASE_COLLECTION_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/vector.h"
#include "VocBase/datafile.h"
#include "VocBase/vocbase.h"
#ifdef __cplusplus
extern "C" {
#endif
////////////////////////////////////////////////////////////////////////////////
/// @page DurhamCollections Collections
///
@ -465,10 +461,6 @@ bool TRI_IsAllowedNameCollection (bool,
char const* TRI_TypeNameCollection (const TRI_col_type_e);
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/compactor.h
View File

@ -28,14 +28,10 @@
#ifndef TRIAGENS_VOC_BASE_COMPACTOR_H
#define TRIAGENS_VOC_BASE_COMPACTOR_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct TRI_vocbase_s;
// -----------------------------------------------------------------------------
@ -112,10 +108,6 @@ void TRI_CompactorVocBase (void*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/datafile.h
View File

@ -28,16 +28,12 @@
#ifndef TRIAGENS_VOC_BASE_DATAFILE_H
#define TRIAGENS_VOC_BASE_DATAFILE_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/locks.h"
#include "VocBase/vocbase.h"
#ifdef __cplusplus
extern "C" {
#endif
////////////////////////////////////////////////////////////////////////////////
/// @page DurhamDatafiles Datafiles
///
@ -637,10 +633,6 @@ void TRI_DestroyDatafileScan (TRI_df_scan_t* scan);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

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

@ -29,6 +29,8 @@
#ifndef TRIAGENS_VOC_BASE_DOCUMENT_COLLECTION_H
#define TRIAGENS_VOC_BASE_DOCUMENT_COLLECTION_H 1
#include "Basics/Common.h"
#include "VocBase/primary-collection.h"
#include "VocBase/headers.h"
@ -37,10 +39,6 @@
#include <regex.h>
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -685,10 +683,6 @@ int TRI_RotateJournalDocumentCollection (TRI_document_collection_t*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/general-cursor.h
View File

@ -28,14 +28,12 @@
#ifndef TRIAGENS_VOC_BASE_GENERAL_CURSOR_H
#define TRIAGENS_VOC_BASE_GENERAL_CURSOR_H 1
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "VocBase/server.h"
#include "VocBase/vocbase.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -300,10 +298,6 @@ void TRI_CleanupGeneralCursor (TRI_general_cursor_store_t*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/headers.h
View File

@ -28,11 +28,7 @@
#ifndef TRIAGENS_VOC_BASE_HEADERS_H
#define TRIAGENS_VOC_BASE_HEADERS_H 1
#include "BasicsC/common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "Basics/Common.h"
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
@ -116,10 +112,6 @@ void TRI_FreeSimpleHeaders (TRI_headers_t*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/index.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_VOC_BASE_INDEX_H
#define TRIAGENS_VOC_BASE_INDEX_H 1
#include "Basics/Common.h"
#include "VocBase/vocbase.h"
#include "BasicsC/associative-multi.h"
@ -42,10 +44,6 @@
#include "SkipLists/skiplistIndex.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -611,10 +609,6 @@ bool IndexComparator (TRI_json_t const* lhs, TRI_json_t const* rhs);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

9
arangod/VocBase/key-generator.h
View File

@ -28,15 +28,10 @@
#ifndef TRIAGENS_VOC_BASE_KEY_GENERATOR_H
#define TRIAGENS_VOC_BASE_KEY_GENERATOR_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/vocbase.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- KEY GENERATORS
// -----------------------------------------------------------------------------
@ -131,10 +126,6 @@ bool TRI_ValidateDocumentIdKeyGenerator (char const*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/marker.h
View File

@ -28,14 +28,10 @@
#ifndef TRIAGENS_VOC_BASE_MARKER_H
#define TRIAGENS_VOC_BASE_MARKER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/datafile.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
@ -72,10 +68,6 @@ void TRI_InitMarker (char*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/primary-collection.h
View File

@ -28,6 +28,8 @@
#ifndef TRIAGENS_VOC_BASE_PRIMARY_COLLECTION_H
#define TRIAGENS_VOC_BASE_PRIMARY_COLLECTION_H 1
#include "Basics/Common.h"
#include "VocBase/collection.h"
#include "BasicsC/json.h"
@ -38,10 +40,6 @@
#include "VocBase/update-policy.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -509,10 +507,6 @@ size_t TRI_DocumentIteratorPrimaryCollection (TRI_primary_collection_t*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/replication-applier.h
View File

@ -28,17 +28,13 @@
#ifndef TRIAGENS_VOC_BASE_REPLICATION_APPLIER_H
#define TRIAGENS_VOC_BASE_REPLICATION_APPLIER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/locks.h"
#include "BasicsC/threads.h"
#include "Replication/replication-static.h"
#include "VocBase/replication-common.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -312,10 +308,6 @@ int TRI_ForgetReplicationApplier (TRI_replication_applier_t*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/replication-dump.h
View File

@ -28,17 +28,13 @@
#ifndef TRIAGENS_VOC_BASE_REPLICATION_DUMP_H
#define TRIAGENS_VOC_BASE_REPLICATION_DUMP_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "ShapedJson/shaped-json.h"
#include "VocBase/replication-common.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -131,10 +127,6 @@ void TRI_DestroyDumpReplication (TRI_replication_dump_t*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/replication-logger.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_VOC_BASE_REPLICATION_LOGGER_H
#define TRIAGENS_VOC_BASE_REPLICATION_LOGGER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "BasicsC/locks.h"
@ -38,10 +38,6 @@
#include "VocBase/vocbase.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -322,10 +318,6 @@ int TRI_LogDocumentReplication (struct TRI_vocbase_s*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/replication-master.h
View File

@ -28,15 +28,11 @@
#ifndef TRIAGENS_VOC_BASE_REPLICATION_MASTER_H
#define TRIAGENS_VOC_BASE_REPLICATION_MASTER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/replication-common.h"
#include "VocBase/replication-logger.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- REPLICATION MASTER INFO
// -----------------------------------------------------------------------------
@ -100,10 +96,6 @@ void TRI_LogMasterInfoReplication (TRI_replication_master_info_t const*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/server.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_VOC_BASE_SERVER_H
#define TRIAGENS_VOC_BASE_SERVER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "BasicsC/locks.h"
#include "BasicsC/threads.h"
@ -36,11 +36,7 @@
#include "VocBase/voc-types.h"
#include "VocBase/vocbase-defaults.h"
#ifdef __cplusplus
extern "C" {
struct TRI_vocbase_s;
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public types
@ -301,10 +297,6 @@ bool TRI_MSync (int,
char const*,
char const*);
#ifdef __cplusplus
}
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

10
arangod/VocBase/synchroniser.h
View File

@ -28,11 +28,7 @@
#ifndef TRIAGENS_VOC_BASE_SYNCHRONISER_H
#define TRIAGENS_VOC_BASE_SYNCHRONISER_H 1
#include "BasicsC/common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "Basics/Common.h"
// -----------------------------------------------------------------------------
// --SECTION-- public functions
@ -53,10 +49,6 @@ void TRI_SynchroniserVocBase (void*);
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

11
arangod/VocBase/transaction.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_VOC_BASE_TRANSACTION_H
#define TRIAGENS_VOC_BASE_TRANSACTION_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "BasicsC/hashes.h"
@ -38,10 +38,6 @@
#include "VocBase/datafile.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -421,11 +417,6 @@ int TRI_CreateMarkerAbortTransaction (TRI_transaction_t*,
int TRI_CreateMarkerPrepareTransaction (TRI_transaction_t*,
struct TRI_doc_prepare_transaction_marker_s**);
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/update-policy.h
View File

@ -28,13 +28,9 @@
#ifndef TRIAGENS_VOC_BASE_DOCUMENT_POLICY_H
#define TRIAGENS_VOC_BASE_DOCUMENT_POLICY_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/vocbase.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public types
// -----------------------------------------------------------------------------
@ -103,10 +99,6 @@ int TRI_CheckUpdatePolicy (const TRI_doc_update_policy_t* const,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:

10
arangod/VocBase/voc-shaper.h
View File

@ -29,7 +29,7 @@
#ifndef TRIAGENS_VOC_BASE_VOC_SHAPER_H
#define TRIAGENS_VOC_BASE_VOC_SHAPER_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "ShapedJson/json-shaper.h"
#include "ShapedJson/shape-accessor.h"
@ -38,10 +38,6 @@
#include "VocBase/document-collection.h"
#include "Wal/Marker.h"
#ifdef __cplusplus
extern "C" {
#endif
struct TRI_document_collection_s;
// -----------------------------------------------------------------------------
@ -193,10 +189,6 @@ static inline void TRI_EXTRACT_SHAPED_JSON_MARKER (TRI_shaped_json_t& dst,
}
}
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

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

@ -28,11 +28,7 @@
#ifndef TRIAGENS_VOC_BASE_VOC_TYPES_H
#define TRIAGENS_VOC_BASE_VOC_TYPES_H 1
#include "BasicsC/common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "Basics/Common.h"
// -----------------------------------------------------------------------------
// --SECTION-- public defines
@ -149,10 +145,6 @@ TRI_voc_document_operation_e;
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

10
arangod/VocBase/vocbase-defaults.h
View File

@ -28,13 +28,9 @@
#ifndef TRIAGENS_VOC_BASE_VOCBASE_DEFAULTS_H
#define TRIAGENS_VOC_BASE_VOCBASE_DEFAULTS_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "VocBase/voc-types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct TRI_json_s;
struct TRI_vocbase_s;
@ -100,10 +96,6 @@ void TRI_FromJsonVocBaseDefaults (TRI_vocbase_defaults_t*,
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

10
arangod/VocBase/vocbase.h
View File

@ -28,7 +28,7 @@
#ifndef TRIAGENS_VOC_BASE_VOCBASE_H
#define TRIAGENS_VOC_BASE_VOCBASE_H 1
#include "BasicsC/common.h"
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "BasicsC/locks.h"
@ -37,10 +37,6 @@
#include "BasicsC/voc-errors.h"
#include "VocBase/vocbase-defaults.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -663,10 +659,6 @@ bool TRI_IsSystemVocBase (TRI_vocbase_t*);
bool TRI_IsAllowedNameVocBase (bool,
char const*);
#ifdef __cplusplus
}
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

2
arangoirb/MRClient/arangoirb.cpp
View File

@ -40,7 +40,7 @@
#include "Basics/StringUtils.h"
#include "BasicsC/csv.h"
#include "BasicsC/files.h"
#include "BasicsC/init.h"
#include "Basics/init.h"
#include "BasicsC/logging.h"
#include "BasicsC/shell-colors.h"
#include "BasicsC/tri-strings.h"

54
arangoirb/MRClient/mr-connection.c
View File

@ -1,54 +0,0 @@
////////////////////////////////////////////////////////////////////////////////
/// @brief mruby http conntection
///
/// @file
///
/// DISCLAIMER
///
/// Copyright 2004-2013 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 triAGENS GmbH, Cologne, Germany
///
/// @author Dr. Frank Celler
/// @author Copyright 2012-2013, triAGENS GmbH, Cologne, Germany
////////////////////////////////////////////////////////////////////////////////
#include "mr-connection.h"
// -----------------------------------------------------------------------------
// --SECTION-- module functions
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @addtogroup ArangoDB
/// @{
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @brief init mruby utilities
////////////////////////////////////////////////////////////////////////////////
void TRI_InitMRConnection (MR_state_t* mrb) {
}
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
// Local Variables:
// mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}"
// End:

97
arangoirb/MRClient/mr-connection.h
View File

@ -1,97 +0,0 @@
////////////////////////////////////////////////////////////////////////////////
/// @brief mruby http conntection
///
/// @file
///
/// DISCLAIMER
///
/// Copyright 2004-2013 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 triAGENS GmbH, Cologne, Germany
///
/// @author Dr. Frank Celler
/// @author Copyright 2012-2013, triAGENS GmbH, Cologne, Germany
////////////////////////////////////////////////////////////////////////////////
#ifndef TRIAGENS_MRCLIENT_MR_CONNECTION_H
#define TRIAGENS_MRCLIENT_MR_CONNECTION_H 1
#include "BasicsC/common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "mruby.h"
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// --SECTION-- public types
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @addtogroup ArangoDB
/// @{
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @addtogroup ArangoDB
/// @{
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
// -----------------------------------------------------------------------------
// --SECTION-- module functions
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @addtogroup ArangoDB
/// @{
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @brief init http connection
////////////////////////////////////////////////////////////////////////////////
void TRI_InitMRConnection (MR_state_t* mrb);
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif
// Local Variables:
// mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}"
// End:

2
arangosh/Benchmark/arangob.cpp
View File

@ -33,7 +33,7 @@
#include "Basics/ProgramOptions.h"
#include "Basics/ProgramOptionsDescription.h"
#include "Basics/StringUtils.h"
#include "BasicsC/init.h"
#include "Basics/init.h"
#include "BasicsC/logging.h"
#include "BasicsC/random.h"
#include "BasicsC/tri-strings.h"

Some files were not shown because too many files have changed in this diff Show More