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

the great rename

This commit is contained in:
Jan Steemann 2014-09-13 00:10:11 +02:00
parent d940df4c6a
commit 87afcf5e8d
238 changed files with 657 additions and 700 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UnitTests/Basics/associative-multi-pointer-test.cpp
View File

@ -27,10 +27,10 @@
#include <boost/test/unit_test.hpp>
#include "BasicsC/associative-multi.h"
#include "BasicsC/hashes.h"
#include "BasicsC/tri-strings.h"
#include "BasicsC/conversions.h"
#include "Basics/associative-multi.h"
#include "Basics/hashes.h"
#include "Basics/tri-strings.h"
#include "Basics/conversions.h"
#include <vector>

6
UnitTests/Basics/associative-pointer-test.cpp
View File

@ -28,9 +28,9 @@
#include <boost/test/unit_test.hpp>
#include "BasicsC/associative.h"
#include "BasicsC/hashes.h"
#include "BasicsC/tri-strings.h"
#include "BasicsC/conversions.h"
#include "Basics/hashes.h"
#include "Basics/tri-strings.h"
#include "Basics/conversions.h"
// -----------------------------------------------------------------------------
// --SECTION-- private macros

6
UnitTests/Basics/associative-synced-test.cpp
View File

@ -28,9 +28,9 @@
#include <boost/test/unit_test.hpp>
#include "BasicsC/associative.h"
#include "BasicsC/hashes.h"
#include "BasicsC/tri-strings.h"
#include "BasicsC/conversions.h"
#include "Basics/hashes.h"
#include "Basics/tri-strings.h"
#include "Basics/conversions.h"
// -----------------------------------------------------------------------------
// --SECTION-- private macros

2
UnitTests/Basics/conversions-test.cpp
View File

@ -25,7 +25,7 @@
/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
////////////////////////////////////////////////////////////////////////////////
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include <boost/test/unit_test.hpp>
// -----------------------------------------------------------------------------

4
UnitTests/Basics/csv-test.cpp
View File

@ -29,8 +29,8 @@
#include <sstream>
#include "BasicsC/csv.h"
#include "BasicsC/tri-strings.h"
#include "Basics/csv.h"
#include "Basics/tri-strings.h"
////////////////////////////////////////////////////////////////////////////////
/// @brief create a parser instance

3
UnitTests/Basics/files-test.cpp
View File

@ -29,12 +29,11 @@
#include "Basics/StringBuffer.h"
#include "BasicsC/files.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/random.h"
using namespace triagens::basics;
// -----------------------------------------------------------------------------
// --SECTION-- setup / tear-down
// -----------------------------------------------------------------------------

2
UnitTests/Basics/hashes-test.cpp
View File

@ -27,7 +27,7 @@
#include <boost/test/unit_test.hpp>
#include "BasicsC/hashes.h"
#include "Basics/hashes.h"
// -----------------------------------------------------------------------------
// --SECTION-- private macros

2
UnitTests/Basics/json-test.cpp
View File

@ -27,7 +27,7 @@
#include <boost/test/unit_test.hpp>
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/string-buffer.h"
// -----------------------------------------------------------------------------

2
UnitTests/Basics/string-test.cpp
View File

@ -27,7 +27,7 @@
#include <boost/test/unit_test.hpp>
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
// -----------------------------------------------------------------------------
// --SECTION-- private macros

2
UnitTests/Basics/string-utf8-normalize-test.cpp
View File

@ -28,7 +28,7 @@
#include <boost/test/unit_test.hpp>
#include "BasicsC/utf8-helper.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Basics/Utf8Helper.h"
// -----------------------------------------------------------------------------

2
UnitTests/Basics/string-utf8-test.cpp
View File

@ -27,7 +27,7 @@
#include <boost/test/unit_test.hpp>
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
// -----------------------------------------------------------------------------
// --SECTION-- private macros

4
arangod/Ahuacatl/ahuacatl-access-optimiser.cpp
View File

@ -29,10 +29,10 @@
#include "ahuacatl-access-optimiser.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "BasicsC/string-buffer.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Basics/json-utilities.h"
#include "Ahuacatl/ahuacatl-context.h"

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

@ -36,7 +36,7 @@
#include "Ahuacatl/ahuacatl-ast-node.h"
struct TRI_aql_context_s;
struct TRI_json_s;
struct TRI_json_t;
struct TRI_vector_pointer_s;
// -----------------------------------------------------------------------------
@ -96,7 +96,7 @@ TRI_aql_reference_e;
////////////////////////////////////////////////////////////////////////////////
typedef struct TRI_aql_range_s {
struct TRI_json_s* _value;
struct TRI_json_t* _value;
TRI_aql_range_e _type;
}
TRI_aql_range_t;
@ -111,7 +111,7 @@ typedef struct TRI_aql_field_access_s {
TRI_aql_access_e _type;
union {
struct TRI_json_s* _value; // used for TRI_AQL_ACCESS_EXACT, TRI_AQL_ACCESS_LIST
struct TRI_json_t* _value; // used for TRI_AQL_ACCESS_EXACT, TRI_AQL_ACCESS_LIST
TRI_aql_range_t _singleRange; // used for TRI_AQL_ACCESS_RANGE_SINGLE

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

@ -29,7 +29,7 @@
#include "Ahuacatl/ahuacatl-bind-parameter.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "Ahuacatl/ahuacatl-context.h"
#include "Ahuacatl/ahuacatl-conversions.h"

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

@ -31,15 +31,15 @@
#define ARANGODB_AHUACATL_AHUACATL__BIND__PARAMETER_H 1
#include "Basics/Common.h"
#include "BasicsC/tri-strings.h"
#include "BasicsC/hashes.h"
#include "Basics/tri-strings.h"
#include "Basics/hashes.h"
#include "BasicsC/vector.h"
#include "BasicsC/associative.h"
#include "Ahuacatl/ahuacatl-ast-node.h"
struct TRI_aql_context_s;
struct TRI_json_s;
struct TRI_json_t;
// -----------------------------------------------------------------------------
// --SECTION-- public types
@ -51,7 +51,7 @@ struct TRI_json_s;
typedef struct TRI_aql_bind_parameter_s {
char* _name;
struct TRI_json_s* _value;
struct TRI_json_t* _value;
}
TRI_aql_bind_parameter_t;
@ -84,7 +84,7 @@ void TRI_FreeBindParametersAql (struct TRI_aql_context_s* const);
////////////////////////////////////////////////////////////////////////////////
bool TRI_AddParameterValuesAql (struct TRI_aql_context_s* const,
const struct TRI_json_s* const);
const struct TRI_json_t* const);
////////////////////////////////////////////////////////////////////////////////
/// @brief validate bind parameters passed

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

@ -32,8 +32,8 @@
#include "Basics/Common.h"
#include "BasicsC/associative.h"
#include "BasicsC/conversions.h"
#include "BasicsC/tri-strings.h"
#include "Basics/conversions.h"
#include "Basics/tri-strings.h"
#include "BasicsC/string-buffer.h"
#include "BasicsC/vector.h"

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

@ -30,7 +30,7 @@
#include "Ahuacatl/ahuacatl-collections.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "BasicsC/vector.h"
#include "VocBase/index.h"
#include "VocBase/document-collection.h"

6
arangod/Ahuacatl/ahuacatl-context.cpp
View File

@ -29,10 +29,10 @@
#include "Ahuacatl/ahuacatl-context.h"
#include "BasicsC/hashes.h"
#include "BasicsC/json.h"
#include "Basics/hashes.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Ahuacatl/ahuacatl-access-optimiser.h"
#include "Ahuacatl/ahuacatl-ast-node.h"

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

@ -39,7 +39,7 @@
struct TRI_aql_node_t;
struct TRI_aql_parser_s;
struct TRI_json_s;
struct TRI_json_t;
struct TRI_vocbase_s;
// -----------------------------------------------------------------------------
@ -96,7 +96,7 @@ typedef struct TRI_aql_context_s {
char* _writeCollection;
struct TRI_aql_node_t* _writeOptions;
struct TRI_json_s* _userOptions;
struct TRI_json_t* _userOptions;
bool _fullCount;
bool _isCoordinator;
}
@ -114,7 +114,7 @@ TRI_aql_context_t* TRI_CreateContextAql (struct TRI_vocbase_s*,
const char* const,
const size_t,
bool,
struct TRI_json_s*);
struct TRI_json_t*);
////////////////////////////////////////////////////////////////////////////////
/// @brief free a context
@ -133,7 +133,7 @@ bool TRI_ValidateQueryContextAql (TRI_aql_context_t* const);
////////////////////////////////////////////////////////////////////////////////
bool TRI_BindQueryContextAql (TRI_aql_context_t* const,
const struct TRI_json_s* const);
const struct TRI_json_t* const);
////////////////////////////////////////////////////////////////////////////////
/// @brief perform some AST optimisations
@ -186,7 +186,7 @@ void TRI_SetErrorContextAql (const char* file,
/// @brief get the value of an option variable
////////////////////////////////////////////////////////////////////////////////
struct TRI_json_s* TRI_GetOptionContextAql (TRI_aql_context_t* const,
struct TRI_json_t* TRI_GetOptionContextAql (TRI_aql_context_t* const,
const char*);
#endif

6
arangod/Ahuacatl/ahuacatl-conversions.cpp
View File

@ -29,11 +29,11 @@
#include "Ahuacatl/ahuacatl-conversions.h"
#include "BasicsC/conversions.h"
#include "BasicsC/json.h"
#include "Basics/conversions.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "BasicsC/string-buffer.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Ahuacatl/ahuacatl-context.h"
#include "Ahuacatl/ahuacatl-functions.h"

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

@ -45,7 +45,7 @@ struct TRI_string_buffer_s;
/// @brief create a json struct from a value node
////////////////////////////////////////////////////////////////////////////////
struct TRI_json_s* TRI_NodeJsonAql (struct TRI_aql_context_s* const,
struct TRI_json_t* TRI_NodeJsonAql (struct TRI_aql_context_s* const,
const TRI_aql_node_t* const);
////////////////////////////////////////////////////////////////////////////////
@ -53,7 +53,7 @@ struct TRI_json_s* TRI_NodeJsonAql (struct TRI_aql_context_s* const,
////////////////////////////////////////////////////////////////////////////////
TRI_aql_node_t* TRI_JsonNodeAql (struct TRI_aql_context_s* const,
const struct TRI_json_s* const);
const struct TRI_json_t* const);
////////////////////////////////////////////////////////////////////////////////
/// @brief convert a value node to its Javascript representation

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

@ -29,7 +29,7 @@
#include "Ahuacatl/ahuacatl-error.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
// -----------------------------------------------------------------------------
// --SECTION-- defines

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

@ -29,7 +29,7 @@
#include "Ahuacatl/ahuacatl-explain.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/string-buffer.h"
#include "Ahuacatl/ahuacatl-collections.h"

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

@ -33,7 +33,7 @@
#include "Basics/Common.h"
struct TRI_aql_context_s;
struct TRI_json_s;
struct TRI_json_t;
// -----------------------------------------------------------------------------
// --SECTION-- public types
@ -43,7 +43,7 @@ typedef struct TRI_aql_explain_s {
struct TRI_aql_context_s* _context;
size_t _count;
size_t _level;
struct TRI_json_s* _result;
struct TRI_json_t* _result;
}
TRI_aql_explain_t;
@ -57,7 +57,7 @@ TRI_aql_explain_t;
/// note: the caller of this function must free the returned json_t
////////////////////////////////////////////////////////////////////////////////
struct TRI_json_s* TRI_ExplainAql (struct TRI_aql_context_s* const);
struct TRI_json_t* TRI_ExplainAql (struct TRI_aql_context_s* const);
#endif

4
arangod/Ahuacatl/ahuacatl-functions.cpp
View File

@ -30,9 +30,9 @@
#include "Ahuacatl/ahuacatl-functions.h"
#include "BasicsC/associative.h"
#include "BasicsC/hashes.h"
#include "Basics/hashes.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Ahuacatl/ahuacatl-access-optimiser.h"
#include "Ahuacatl/ahuacatl-collections.h"

4
arangod/Ahuacatl/ahuacatl-grammar.cpp
View File

@ -77,8 +77,8 @@
#include <stdlib.h>
#include <Basics/Common.h>
#include <BasicsC/conversions.h>
#include <BasicsC/tri-strings.h>
#include <Basics/conversions.h>
#include <Basics/tri-strings.h>
#include "Ahuacatl/ahuacatl-ast-node.h"
#include "Ahuacatl/ahuacatl-context.h"

4
arangod/Ahuacatl/ahuacatl-grammar.y
View File

@ -12,8 +12,8 @@
#include <stdlib.h>
#include <Basics/Common.h>
#include <BasicsC/conversions.h>
#include <BasicsC/tri-strings.h>
#include <Basics/conversions.h>
#include <Basics/tri-strings.h>
#include "Ahuacatl/ahuacatl-ast-node.h"
#include "Ahuacatl/ahuacatl-context.h"

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

@ -30,7 +30,7 @@
#include "Ahuacatl/ahuacatl-index.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "BasicsC/string-buffer.h"
#include "Ahuacatl/ahuacatl-access-optimiser.h"

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

@ -30,7 +30,7 @@
#include "Ahuacatl/ahuacatl-optimiser.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Ahuacatl/ahuacatl-ast-node.h"
#include "Ahuacatl/ahuacatl-access-optimiser.h"

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

@ -32,7 +32,7 @@
#include "Basics/Common.h"
#include "BasicsC/logging.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "VocBase/general-cursor.h"

114
arangod/Ahuacatl/ahuacatl-tokens.cpp
View File

@ -33,7 +33,7 @@
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
* if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
@ -50,7 +50,7 @@ typedef uint32_t flex_uint32_t;
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
@ -184,7 +184,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
/* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
* access to the local variable yy_act. Since yyless() is a macro, it would break
* existing scanners that call yyless() from OUTSIDE Ahuacatllex.
* existing scanners that call yyless() from OUTSIDE Ahuacatllex.
* One obvious solution it to make yy_act a global. I tried that, and saw
* a 5% performance hit in a non-yylineno scanner, because yy_act is
* normally declared as a variable-- so it is not worth it.
@ -196,7 +196,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
if ( yytext[yyl] == '\n' )\
--yylineno;\
}while(0)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
do \
@ -258,7 +258,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
@ -608,9 +608,9 @@ static yyconst flex_int16_t yy_chk[452] =
/* Table of booleans, true if rule could match eol. */
static yyconst flex_int32_t yy_rule_can_match_eol[79] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0,
0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, };
/* The intent behind this definition is that it'll catch
@ -623,7 +623,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[79] =
#include "Basics/Common.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Ahuacatl/ahuacatl-ast-node.h"
#include "Ahuacatl/ahuacatl-context.h"
@ -715,9 +715,9 @@ static int yy_init_globals (yyscan_t yyscanner );
/* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/
# define yylval yyg->yylval_r
# define yylloc yyg->yylloc_r
int Ahuacatllex_init (yyscan_t* scanner);
int Ahuacatllex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
@ -756,9 +756,9 @@ YYSTYPE * Ahuacatlget_lval (yyscan_t yyscanner );
void Ahuacatlset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
YYLTYPE *Ahuacatlget_lloc (yyscan_t yyscanner );
void Ahuacatlset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
@ -979,7 +979,7 @@ yy_find_action:
int yyl;
for ( yyl = 0; yyl < yyleng; ++yyl )
if ( yytext[yyl] == '\n' )
do{ yylineno++;
yycolumn=0;
}while(0)
@ -1035,7 +1035,7 @@ YY_RULE_SETUP
YY_BREAK
case 7:
YY_RULE_SETUP
{
{
return T_LIMIT;
}
YY_BREAK
@ -1234,7 +1234,7 @@ YY_RULE_SETUP
case 39:
YY_RULE_SETUP
{
return T_RANGE;
return T_RANGE;
}
YY_BREAK
/* ---------------------------------------------------------------------------
@ -1287,10 +1287,10 @@ YY_RULE_SETUP
* --------------------------------------------------------------------------- */
case 47:
YY_RULE_SETUP
{
{
/* unquoted string */
yylval->strval = TRI_RegisterStringAql(yyextra, yytext, yyleng, false);
return T_STRING;
yylval->strval = TRI_RegisterStringAql(yyextra, yytext, yyleng, false);
return T_STRING;
}
YY_BREAK
case 48:
@ -1410,17 +1410,17 @@ YY_RULE_SETUP
YY_BREAK
case 63:
YY_RULE_SETUP
{
{
/* a numeric integer value */
yylval->strval = TRI_RegisterStringAql(yyextra, yytext, yyleng, false);
yylval->strval = TRI_RegisterStringAql(yyextra, yytext, yyleng, false);
return T_INTEGER;
}
YY_BREAK
case 64:
YY_RULE_SETUP
{
{
/* a numeric double value */
yylval->strval = TRI_RegisterStringAql(yyextra, yytext, yyleng, false);
yylval->strval = TRI_RegisterStringAql(yyextra, yytext, yyleng, false);
return T_DOUBLE;
}
YY_BREAK
@ -1432,7 +1432,7 @@ YY_RULE_SETUP
{
/* bind parameters must start with a @
if followed by another @, this is a collection name parameter */
yylval->strval = TRI_RegisterStringAql(yyextra, yytext + 1, yyleng - 1, false);
yylval->strval = TRI_RegisterStringAql(yyextra, yytext + 1, yyleng - 1, false);
return T_PARAMETER;
}
YY_BREAK
@ -1443,7 +1443,7 @@ case 66:
/* rule 66 can match eol */
YY_RULE_SETUP
{
/* whitespace is ignored */
/* whitespace is ignored */
}
YY_BREAK
case 67:
@ -1469,7 +1469,7 @@ YY_RULE_SETUP
YY_BREAK
case 70:
YY_RULE_SETUP
{
{
// eat comment in chunks
}
YY_BREAK
@ -1487,7 +1487,7 @@ YY_RULE_SETUP
YY_BREAK
case 73:
YY_RULE_SETUP
{
{
// eat comment in chunks
}
YY_BREAK
@ -1930,7 +1930,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
yyg->yy_hold_char = *++yyg->yy_c_buf_p;
if ( c == '\n' )
do{ yylineno++;
yycolumn=0;
}while(0)
@ -2013,7 +2013,7 @@ static void Ahuacatl_load_buffer_state (yyscan_t yyscanner)
YY_BUFFER_STATE Ahuacatl_create_buffer (FILE * file, int size , yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
b = (YY_BUFFER_STATE) Ahuacatlalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in Ahuacatl_create_buffer()" );
@ -2057,7 +2057,7 @@ static void Ahuacatl_load_buffer_state (yyscan_t yyscanner)
#ifndef __cplusplus
extern int isatty (int );
#endif /* __cplusplus */
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a Ahuacatlrestart() or at EOF.
@ -2083,7 +2083,7 @@ extern int isatty (int );
}
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
errno = oerrno;
}
@ -2189,9 +2189,9 @@ static void Ahuacatlensure_buffer_stack (yyscan_t yyscanner)
, yyscanner);
if ( ! yyg->yy_buffer_stack )
YY_FATAL_ERROR( "out of dynamic memory in Ahuacatlensure_buffer_stack()" );
memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
yyg->yy_buffer_stack_max = num_to_alloc;
yyg->yy_buffer_stack_top = 0;
return;
@ -2220,12 +2220,12 @@ static void Ahuacatlensure_buffer_stack (yyscan_t yyscanner)
* @param base the character buffer
* @param size the size in bytes of the character buffer
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
* @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE Ahuacatl_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
if ( size < 2 ||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
@ -2261,7 +2261,7 @@ YY_BUFFER_STATE Ahuacatl_scan_buffer (char * base, yy_size_t size , yyscan_t y
*/
YY_BUFFER_STATE Ahuacatl_scan_string (yyconst char * yystr , yyscan_t yyscanner)
{
return Ahuacatl_scan_bytes(yystr,strlen(yystr) ,yyscanner);
}
@ -2278,14 +2278,14 @@ YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char * yybytes, int _yybytes_len
char *buf;
yy_size_t n;
int i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
buf = (char *) Ahuacatlalloc(n ,yyscanner );
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in Ahuacatl_scan_bytes()" );
for ( i = 0; i < _yybytes_len; ++i )
for ( i = 0; i < (int) _yybytes_len; ++i )
buf[i] = yybytes[i];
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
@ -2346,10 +2346,10 @@ YY_EXTRA_TYPE Ahuacatlget_extra (yyscan_t yyscanner)
int Ahuacatlget_lineno (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (! YY_CURRENT_BUFFER)
return 0;
return yylineno;
}
@ -2359,10 +2359,10 @@ int Ahuacatlget_lineno (yyscan_t yyscanner)
int Ahuacatlget_column (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (! YY_CURRENT_BUFFER)
return 0;
return yycolumn;
}
@ -2423,8 +2423,8 @@ void Ahuacatlset_lineno (int line_number , yyscan_t yyscanner)
/* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
yy_fatal_error( "Ahuacatlset_lineno called with no buffer" , yyscanner);
yy_fatal_error( "Ahuacatlset_lineno called with no buffer" , yyscanner);
yylineno = line_number;
}
@ -2438,8 +2438,8 @@ void Ahuacatlset_column (int column_no , yyscan_t yyscanner)
/* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
yy_fatal_error( "Ahuacatlset_column called with no buffer" , yyscanner);
yy_fatal_error( "Ahuacatlset_column called with no buffer" , yyscanner);
yycolumn = column_no;
}
@ -2492,13 +2492,13 @@ YYLTYPE *Ahuacatlget_lloc (yyscan_t yyscanner)
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yylloc;
}
void Ahuacatlset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yylloc = yylloc_param;
}
/* User-visible API */
/* Ahuacatllex_init is special because it creates the scanner itself, so it is
@ -2546,20 +2546,20 @@ int Ahuacatllex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_global
errno = EINVAL;
return 1;
}
*ptr_yy_globals = (yyscan_t) Ahuacatlalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
if (*ptr_yy_globals == NULL){
errno = ENOMEM;
return 1;
}
/* By setting to 0xAA, we expose bugs in
yy_init_globals. Leave at 0x00 for releases. */
memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
Ahuacatlset_extra (yy_user_defined, *ptr_yy_globals);
return yy_init_globals ( *ptr_yy_globals );
}
@ -2674,11 +2674,3 @@ void Ahuacatlfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// Local Variables:
// mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @page\\|// --SECTION--\\|/// @\\}"
// End:

2
arangod/Ahuacatl/ahuacatl-tokens.ll
View File

@ -15,7 +15,7 @@
%{
#include "Basics/Common.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Ahuacatl/ahuacatl-ast-node.h"
#include "Ahuacatl/ahuacatl-context.h"

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

@ -31,8 +31,8 @@
#define ARANGODB_AHUACATL_AHUACATL__VARIABLE_H 1
#include "Basics/Common.h"
#include "BasicsC/tri-strings.h"
#include "BasicsC/hashes.h"
#include "Basics/tri-strings.h"
#include "Basics/hashes.h"
#include "BasicsC/vector.h"
#include "BasicsC/associative.h"

2
arangod/Aql/Ast.cpp
View File

@ -30,7 +30,7 @@
#include "Aql/Ast.h"
#include "Aql/Collection.h"
#include "Aql/Executor.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Utils/Exception.h"
#include "VocBase/collection.h"

2
arangod/Aql/Ast.h
View File

@ -36,7 +36,7 @@
#include "Aql/Scopes.h"
#include "Aql/Variable.h"
#include "Aql/VariableGenerator.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include <functional>

2
arangod/Aql/AstNode.h
View File

@ -31,7 +31,7 @@
#define ARANGODB_AQL_ASTNODE_H 1
#include "Basics/Common.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/vector.h"
#include "Basics/JsonHelper.h"
#include "Utils/Exception.h"

2
arangod/Aql/BindParameters.cpp
View File

@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "Aql/BindParameters.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "Utils/Exception.h"
using namespace triagens::aql;

8
arangod/Aql/BindParameters.h
View File

@ -31,14 +31,12 @@
#define ARANGODB_AQL_QUERY_BIND_PARAMETERS_H 1
#include "Basics/Common.h"
#include "BasicsC/json.h"
struct TRI_json_s;
#include "Basics/json.h"
namespace triagens {
namespace aql {
typedef std::unordered_map<std::string, std::pair<struct TRI_json_s const*, bool>> BindParametersType;
typedef std::unordered_map<std::string, std::pair<TRI_json_t const*, bool>> BindParametersType;
// -----------------------------------------------------------------------------
// --SECTION-- class BindParameters
@ -101,7 +99,7 @@ namespace triagens {
/// @brief the parameter json
////////////////////////////////////////////////////////////////////////////////
struct TRI_json_s* _json;
TRI_json_t* _json;
////////////////////////////////////////////////////////////////////////////////
/// @brief pointer to collection parameters

2
arangod/Aql/ExecutionPlan.h
View File

@ -34,7 +34,7 @@
#include "Aql/ExecutionNode.h"
#include "Aql/ModificationOptions.h"
#include "Aql/Query.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
namespace triagens {
namespace aql {

4
arangod/Aql/Executor.h
View File

@ -35,7 +35,7 @@
#include "Aql/Variable.h"
#include "V8/v8-globals.h"
struct TRI_json_s;
struct TRI_json_t;
namespace triagens {
namespace basics {
@ -87,7 +87,7 @@ namespace triagens {
/// @brief executes an expression directly
////////////////////////////////////////////////////////////////////////////////
struct TRI_json_s* executeExpression (AstNode const*);
struct TRI_json_t* executeExpression (AstNode const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief returns a reference to a built-in function

2
arangod/Aql/Expression.cpp
View File

@ -36,7 +36,7 @@
#include "Aql/Variable.h"
#include "Basics/JsonHelper.h"
#include "Basics/StringBuffer.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "ShapedJson/shaped-json.h"
#include "VocBase/document-collection.h"
#include "Utils/Exception.h"

4
arangod/Aql/Expression.h
View File

@ -36,7 +36,7 @@
#include "Basics/JsonHelper.h"
#include "Utils/AqlTransaction.h"
struct TRI_json_s;
struct TRI_json_t;
namespace triagens {
namespace basics {
@ -257,7 +257,7 @@ namespace triagens {
union {
V8Expression* _func;
struct TRI_json_s* _data;
struct TRI_json_t* _data;
};
////////////////////////////////////////////////////////////////////////////////

4
arangod/Aql/Query.cpp
View File

@ -36,8 +36,8 @@
#include "Aql/ExecutionEngine.h"
#include "Aql/Optimizer.h"
#include "Basics/JsonHelper.h"
#include "BasicsC/json.h"
#include "BasicsC/tri-strings.h"
#include "Basics/json.h"
#include "Basics/tri-strings.h"
#include "Utils/AqlTransaction.h"
#include "Utils/Exception.h"
#include "Utils/V8TransactionContext.h"

8
arangod/Aql/Query.h
View File

@ -38,7 +38,7 @@
#include "Utils/AqlTransaction.h"
#include "Utils/V8TransactionContext.h"
struct TRI_json_s;
struct TRI_json_t;
struct TRI_vocbase_s;
namespace triagens {
@ -85,13 +85,13 @@ namespace triagens {
Query (struct TRI_vocbase_s*,
char const*,
size_t,
struct TRI_json_s*,
struct TRI_json_s*);
struct TRI_json_t*,
struct TRI_json_t*);
Query (struct TRI_vocbase_s*,
triagens::basics::Json queryStruct,
QueryType Type,
struct TRI_json_s*);
struct TRI_json_t*);
~Query ();

2
arangod/Aql/QueryResult.h
View File

@ -31,7 +31,7 @@
#define ARANGODB_AQL_QUERY_RESULT_H 1
#include "Basics/Common.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
namespace triagens {
namespace aql {

2
arangod/Aql/V8Expression.cpp
View File

@ -30,7 +30,7 @@
#include "Aql/V8Expression.h"
#include "Aql/Executor.h"
#include "Aql/Variable.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "V8/v8-conv.h"
using namespace triagens::aql;

4
arangod/Aql/grammar.y
View File

@ -12,8 +12,8 @@
#include <stdlib.h>
#include <Basics/Common.h>
#include <BasicsC/conversions.h>
#include <BasicsC/tri-strings.h>
#include <Basics/conversions.h>
#include <Basics/tri-strings.h>
#include "Aql/AstNode.h"
#include "Aql/Parser.h"

2
arangod/BitIndexes/masterblocktable.h
View File

@ -33,7 +33,7 @@
#include "BasicsC/associative.h"
#include "BasicsC/common.h"
#include "BasicsC/hashes.h"
#include "Basics/hashes.h"
#include "BasicsC/locks.h"
#include "BasicsC/vector.h"

2
arangod/CapConstraint/cap-constraint.cpp
View File

@ -30,7 +30,7 @@
#include "cap-constraint.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Utils/Exception.h"
#include "Utils/transactions.h"
#include "VocBase/document-collection.h"

2
arangod/Cluster/AgencyComm.cpp
View File

@ -33,7 +33,7 @@
#include "Basics/StringUtils.h"
#include "Basics/StringBuffer.h"
#include "Basics/WriteLocker.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "Cluster/ServerState.h"
#include "Rest/Endpoint.h"

2
arangod/Cluster/AgencyComm.h
View File

@ -33,7 +33,7 @@
#include "Basics/Common.h"
#include "Basics/ReadWriteLock.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "Rest/HttpRequest.h"
namespace triagens {

6
arangod/Cluster/ClusterInfo.cpp
View File

@ -30,10 +30,10 @@
#include "Cluster/ClusterInfo.h"
#include "BasicsC/conversions.h"
#include "BasicsC/json.h"
#include "Basics/conversions.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "BasicsC/vector.h"
#include "Basics/json-utilities.h"
#include "Basics/JsonHelper.h"

10
arangod/Cluster/ClusterInfo.h
View File

@ -39,7 +39,7 @@
#include "VocBase/voc-types.h"
#include "VocBase/vocbase.h"
struct TRI_json_s;
struct TRI_json_t;
struct TRI_memory_zone_s;
struct TRI_server_s;
@ -71,7 +71,7 @@ namespace triagens {
CollectionInfo ();
CollectionInfo (struct TRI_json_s*);
CollectionInfo (struct TRI_json_t*);
CollectionInfo (CollectionInfo const&);
@ -293,7 +293,7 @@ namespace triagens {
CollectionInfoCurrent ();
CollectionInfoCurrent (ShardID const&, struct TRI_json_s*);
CollectionInfoCurrent (ShardID const&, struct TRI_json_t*);
CollectionInfoCurrent (CollectionInfoCurrent const&);
@ -1043,9 +1043,9 @@ namespace triagens {
_uniqid;
// Cached data from the agency, we reload whenever necessary:
std::map<DatabaseID, struct TRI_json_s*> _plannedDatabases;
std::map<DatabaseID, struct TRI_json_t*> _plannedDatabases;
// from Plan/Databases
std::map<DatabaseID, std::map<ServerID, struct TRI_json_s*> >
std::map<DatabaseID, std::map<ServerID, struct TRI_json_t*> >
_currentDatabases; // from Current/Databases
AllCollections _collections;

6
arangod/Cluster/ClusterMethods.cpp
View File

@ -30,9 +30,9 @@
#include "Cluster/ClusterInfo.h"
#include "Cluster/ClusterComm.h"
#include "BasicsC/conversions.h"
#include "BasicsC/json.h"
#include "BasicsC/tri-strings.h"
#include "Basics/conversions.h"
#include "Basics/json.h"
#include "Basics/tri-strings.h"
#include "BasicsC/vector.h"
#include "Basics/json-utilities.h"
#include "Basics/StringUtils.h"

8
arangod/Cluster/ClusterMethods.h
View File

@ -44,7 +44,7 @@
#include "Cluster/ServerState.h"
#include "Cluster/ClusterComm.h"
struct TRI_json_s;
struct TRI_json_t;
struct TRI_vector_pointer_s;
namespace triagens {
@ -70,8 +70,8 @@ namespace triagens {
bool shardKeysChanged (std::string const& dbname,
std::string const& collname,
struct TRI_json_s const* oldJson,
struct TRI_json_s const* newJson,
struct TRI_json_t const* oldJson,
struct TRI_json_t const* newJson,
bool isPatch);
////////////////////////////////////////////////////////////////////////////////
@ -79,7 +79,7 @@ namespace triagens {
////////////////////////////////////////////////////////////////////////////////
int usersOnCoordinator (std::string const& dbname,
struct TRI_json_s*& result);
struct TRI_json_t*& result);
////////////////////////////////////////////////////////////////////////////////
/// @brief returns revision for a sharded collection

2
arangod/FulltextIndex/fulltext-query.cpp
View File

@ -30,7 +30,7 @@
#include "fulltext-query.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "BasicsC/utf8-helper.h"
#include "fulltext-index.h"

2
arangod/GeoIndex/geo-index.cpp
View File

@ -30,7 +30,7 @@
#include "geo-index.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "VocBase/document-collection.h"
#include "VocBase/voc-shaper.h"

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

@ -32,7 +32,7 @@
#include "Basics/Common.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "ShapedJson/json-shaper.h"
#include "ShapedJson/shaped-json.h"
#include "VocBase/vocbase.h"

2
arangod/Replication/ContinuousSyncer.cpp
View File

@ -29,7 +29,7 @@
#include "ContinuousSyncer.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "Basics/JsonHelper.h"
#include "Basics/StringBuffer.h"
#include "Rest/HttpRequest.h"

16
arangod/Replication/ContinuousSyncer.h
View File

@ -40,7 +40,7 @@
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
struct TRI_json_s;
struct TRI_json_t;
struct TRI_server_s;
struct TRI_vocbase_s;
@ -120,45 +120,45 @@ namespace triagens {
/// @brief starts a transaction, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int startTransaction (struct TRI_json_s const*);
int startTransaction (struct TRI_json_t const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief aborts a transaction, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int abortTransaction (struct TRI_json_s const*);
int abortTransaction (struct TRI_json_t const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief commits a transaction, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int commitTransaction (struct TRI_json_s const*);
int commitTransaction (struct TRI_json_t const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief process a document operation, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int processDocument (TRI_replication_operation_e,
struct TRI_json_s const*,
struct TRI_json_t const*,
std::string&);
////////////////////////////////////////////////////////////////////////////////
/// @brief renames a collection, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int renameCollection (struct TRI_json_s const*);
int renameCollection (struct TRI_json_t const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief changes the properties of a collection, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int changeCollection (struct TRI_json_s const*);
int changeCollection (struct TRI_json_t const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief apply a single marker from the continuous log
////////////////////////////////////////////////////////////////////////////////
int applyLogMarker (struct TRI_json_s const*,
int applyLogMarker (struct TRI_json_t const*,
bool&,
std::string&);

4
arangod/Replication/InitialSyncer.cpp
View File

@ -29,9 +29,9 @@
#include "InitialSyncer.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Basics/JsonHelper.h"
#include "Basics/StringUtils.h"
#include "SimpleHttpClient/SimpleHttpClient.h"

10
arangod/Replication/InitialSyncer.h
View File

@ -38,7 +38,7 @@
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
struct TRI_json_s;
struct TRI_json_t;
struct TRI_replication_applier_configuration_s;
struct TRI_transaction_collection_s;
struct TRI_vocbase_s;
@ -185,8 +185,8 @@ namespace triagens {
/// @brief handle the information about a collection
////////////////////////////////////////////////////////////////////////////////
int handleCollection (struct TRI_json_s const*,
struct TRI_json_s const*,
int handleCollection (struct TRI_json_t const*,
struct TRI_json_t const*,
std::string&,
sync_phase_e);
@ -194,14 +194,14 @@ namespace triagens {
/// @brief handle the inventory response of the master
////////////////////////////////////////////////////////////////////////////////
int handleInventoryResponse (struct TRI_json_s const*,
int handleInventoryResponse (struct TRI_json_t const*,
std::string&);
////////////////////////////////////////////////////////////////////////////////
/// @brief iterate over all collections from a list and apply an action
////////////////////////////////////////////////////////////////////////////////
int iterateCollections (struct TRI_json_s const*,
int iterateCollections (struct TRI_json_t const*,
std::string&,
sync_phase_e);

4
arangod/Replication/Syncer.cpp
View File

@ -30,8 +30,8 @@
#include "Syncer.h"
#include "BasicsC/files.h"
#include "BasicsC/json.h"
#include "BasicsC/tri-strings.h"
#include "Basics/json.h"
#include "Basics/tri-strings.h"
#include "Basics/JsonHelper.h"
#include "Rest/HttpRequest.h"
#include "SimpleHttpClient/GeneralClientConnection.h"

16
arangod/Replication/Syncer.h
View File

@ -42,7 +42,7 @@
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
struct TRI_json_s;
struct TRI_json_t;
struct TRI_replication_applier_configuration_s;
struct TRI_transaction_collection_s;
struct TRI_vocbase_s;
@ -107,7 +107,7 @@ namespace triagens {
/// @brief extract the collection id from JSON
////////////////////////////////////////////////////////////////////////////////
TRI_voc_cid_t getCid (struct TRI_json_s const*) const;
TRI_voc_cid_t getCid (struct TRI_json_t const*) const;
////////////////////////////////////////////////////////////////////////////////
/// @brief apply a single marker from the collection dump
@ -117,34 +117,34 @@ namespace triagens {
TRI_replication_operation_e,
const TRI_voc_key_t,
const TRI_voc_rid_t,
struct TRI_json_s const*,
struct TRI_json_t const*,
std::string&);
////////////////////////////////////////////////////////////////////////////////
/// @brief creates a collection, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int createCollection (struct TRI_json_s const*,
int createCollection (struct TRI_json_t const*,
struct TRI_vocbase_col_s**);
////////////////////////////////////////////////////////////////////////////////
/// @brief drops a collection, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int dropCollection (struct TRI_json_s const*,
int dropCollection (struct TRI_json_t const*,
bool);
////////////////////////////////////////////////////////////////////////////////
/// @brief creates an index, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int createIndex (struct TRI_json_s const*);
int createIndex (struct TRI_json_t const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief drops an index, based on the JSON provided
////////////////////////////////////////////////////////////////////////////////
int dropIndex (struct TRI_json_s const*);
int dropIndex (struct TRI_json_t const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief get master state
@ -156,7 +156,7 @@ namespace triagens {
/// @brief handle the state response of the master
////////////////////////////////////////////////////////////////////////////////
int handleStateResponse (struct TRI_json_s const*,
int handleStateResponse (struct TRI_json_t const*,
std::string&);
// -----------------------------------------------------------------------------

4
arangod/RestHandler/RestDocumentHandler.cpp
View File

@ -30,8 +30,8 @@
#include "RestDocumentHandler.h"
#include "Basics/StringUtils.h"
#include "BasicsC/conversions.h"
#include "BasicsC/json.h"
#include "Basics/conversions.h"
#include "Basics/json.h"
#include "BasicsC/string-buffer.h"
#include "Basics/json-utilities.h"
#include "Rest/HttpRequest.h"

4
arangod/RestHandler/RestEdgeHandler.cpp
View File

@ -30,8 +30,8 @@
#include "RestEdgeHandler.h"
#include "Basics/StringUtils.h"
#include "BasicsC/conversions.h"
#include "BasicsC/tri-strings.h"
#include "Basics/conversions.h"
#include "Basics/tri-strings.h"
#include "Cluster/ServerState.h"
#include "Cluster/ClusterInfo.h"
#include "Cluster/ClusterMethods.h"

2
arangod/RestHandler/RestImportHandler.cpp
View File

@ -31,7 +31,7 @@
#include "Basics/JsonHelper.h"
#include "Basics/StringUtils.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Rest/HttpRequest.h"
#include "VocBase/document-collection.h"
#include "VocBase/edge-collection.h"

2
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -30,7 +30,7 @@
#include "RestReplicationHandler.h"
#include "Basics/JsonHelper.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "BasicsC/files.h"
#include "BasicsC/logging.h"
#include "HttpServer/HttpServer.h"

16
arangod/RestHandler/RestReplicationHandler.h
View File

@ -38,7 +38,7 @@
#include "VocBase/edge-collection.h"
#include "VocBase/replication-common.h"
struct TRI_json_s;
struct TRI_json_t;
struct TRI_replication_log_state_s;
struct TRI_transaction_collection_s;
struct TRI_vocbase_col_s;
@ -195,13 +195,13 @@ namespace triagens {
/// @brief extract the collection id from JSON TODO: move
////////////////////////////////////////////////////////////////////////////////
TRI_voc_cid_t getCid (struct TRI_json_s const*) const;
TRI_voc_cid_t getCid (struct TRI_json_t const*) const;
////////////////////////////////////////////////////////////////////////////////
/// @brief creates a collection, based on the JSON provided TODO: move
////////////////////////////////////////////////////////////////////////////////
int createCollection (struct TRI_json_s const*,
int createCollection (struct TRI_json_t const*,
struct TRI_vocbase_col_s**,
bool);
@ -221,7 +221,7 @@ namespace triagens {
/// @brief restores the structure of a collection TODO MOVE
////////////////////////////////////////////////////////////////////////////////
int processRestoreCollection (struct TRI_json_s const*,
int processRestoreCollection (struct TRI_json_t const*,
bool,
bool,
bool,
@ -231,7 +231,7 @@ namespace triagens {
/// @brief restores the structure of a collection, coordinator case
////////////////////////////////////////////////////////////////////////////////
int processRestoreCollectionCoordinator (struct TRI_json_s const*,
int processRestoreCollectionCoordinator (struct TRI_json_t const*,
bool,
bool,
bool,
@ -241,7 +241,7 @@ namespace triagens {
/// @brief restores the indexes of a collection TODO MOVE
////////////////////////////////////////////////////////////////////////////////
int processRestoreIndexes (struct TRI_json_s const*,
int processRestoreIndexes (struct TRI_json_t const*,
bool,
std::string&);
@ -249,7 +249,7 @@ namespace triagens {
/// @brief restores the indexes of a collection, coordinator case
////////////////////////////////////////////////////////////////////////////////
int processRestoreIndexesCoordinator (struct TRI_json_s const*,
int processRestoreIndexesCoordinator (struct TRI_json_t const*,
bool,
std::string&);
@ -262,7 +262,7 @@ namespace triagens {
TRI_replication_operation_e,
const TRI_voc_key_t,
const TRI_voc_rid_t,
struct TRI_json_s const*,
struct TRI_json_t const*,
std::string&);
////////////////////////////////////////////////////////////////////////////////

4
arangod/RestHandler/RestVocbaseBaseHandler.cpp
View File

@ -31,9 +31,9 @@
#include "Basics/JsonHelper.h"
#include "Basics/StringUtils.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "BasicsC/string-buffer.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Rest/HttpRequest.h"
#include "ShapedJson/shaped-json.h"
#include "Utils/DocumentHelper.h"

5
arangod/RestHandler/RestVocbaseBaseHandler.h
View File

@ -34,7 +34,7 @@
#include "Admin/RestBaseHandler.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "Basics/json-utilities.h"
@ -45,7 +45,6 @@
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
struct TRI_json_s;
struct TRI_document_collection_t;
struct TRI_vocbase_col_s;
struct TRI_vocbase_s;
@ -343,7 +342,7 @@ namespace triagens {
/// @brief parses the body
////////////////////////////////////////////////////////////////////////////////
struct TRI_json_s* parseJsonBody ();
TRI_json_t* parseJsonBody ();
////////////////////////////////////////////////////////////////////////////////
/// @brief extract a string attribute from a JSON array

4
arangod/RestServer/ArangoServer.cpp
View File

@ -45,8 +45,8 @@
#include "BasicsC/files.h"
#include "Basics/init.h"
#include "BasicsC/logging.h"
#include "BasicsC/messages.h"
#include "BasicsC/tri-strings.h"
#include "Basics/messages.h"
#include "Basics/tri-strings.h"
#include "Dispatcher/ApplicationDispatcher.h"
#include "Dispatcher/Dispatcher.h"
#include "HttpServer/ApplicationEndpointServer.h"

2
arangod/RestServer/ConsoleThread.cpp
View File

@ -31,7 +31,7 @@
#include "ApplicationServer/ApplicationServer.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Rest/Version.h"
#include "VocBase/vocbase.h"
#include "V8/V8LineEditor.h"

2
arangod/RestServer/VocbaseContext.cpp
View File

@ -30,7 +30,7 @@
#include "VocbaseContext.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Cluster/ServerState.h"
#include "Rest/ConnectionInfo.h"
#include "VocBase/auth.h"

4
arangod/RestServer/arango.cpp
View File

@ -29,9 +29,9 @@
#include "Basics/Common.h"
#include "BasicsC/messages.h"
#include "Basics/messages.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Rest/InitialiseRest.h"
#include "RestServer/ArangoServer.h"

2
arangod/Utils/AhuacatlGuard.h
View File

@ -33,7 +33,7 @@
#include "Basics/Common.h"
#include "Ahuacatl/ahuacatl-context.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "VocBase/vocbase.h"
#include "Cluster/ServerState.h"

2
arangod/Utils/DocumentHelper.cpp
View File

@ -29,7 +29,7 @@
#include "DocumentHelper.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "Basics/StringUtils.h"
#include "VocBase/vocbase.h"

4
arangod/Utils/DocumentHelper.h
View File

@ -34,7 +34,7 @@
#include "Utils/CollectionNameResolver.h"
#include "VocBase/voc-types.h"
struct TRI_json_s;
struct TRI_json_t;
namespace triagens {
namespace arango {
@ -88,7 +88,7 @@ namespace triagens {
/// @brief extract the "_key" attribute from a JSON object
////////////////////////////////////////////////////////////////////////////////
static int getKey (struct TRI_json_s const*,
static int getKey (struct TRI_json_t const*,
TRI_voc_key_t*);
};

2
arangod/Utils/Transaction.h
View File

@ -47,7 +47,7 @@
#include "BasicsC/logging.h"
#include "BasicsC/random.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Utils/CollectionNameResolver.h"
#include "Utils/DocumentHelper.h"

2
arangod/V8Server/ApplicationV8.cpp
View File

@ -40,7 +40,7 @@
#include "Basics/Thread.h"
#include "Basics/WriteLocker.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Dispatcher/ApplicationDispatcher.h"
#include "Rest/HttpRequest.h"
#include "Scheduler/ApplicationScheduler.h"

2
arangod/V8Server/V8Job.cpp
View File

@ -28,7 +28,7 @@
#include "V8Job.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "V8/v8-conv.h"
#include "V8/v8-utils.h"

2
arangod/V8Server/V8Job.h
View File

@ -32,7 +32,7 @@
#include "Basics/Common.h"
#include "Dispatcher/Job.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
struct TRI_vocbase_s;

2
arangod/V8Server/V8PeriodicTask.cpp
View File

@ -28,7 +28,7 @@
#include "V8PeriodicTask.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "Dispatcher/Dispatcher.h"
#include "Scheduler/Scheduler.h"
#include "V8/v8-conv.h"

8
arangod/V8Server/V8PeriodicTask.h
View File

@ -35,7 +35,7 @@
#include "VocBase/vocbase.h"
struct TRI_json_s;
struct TRI_json_t;
// -----------------------------------------------------------------------------
// --SECTION-- class V8PeriodicTask
@ -71,7 +71,7 @@ namespace triagens {
double,
double,
std::string const&,
struct TRI_json_s*);
struct TRI_json_t*);
////////////////////////////////////////////////////////////////////////////////
/// @brief destructor
@ -89,7 +89,7 @@ namespace triagens {
/// @brief get a task specific description in JSON format
////////////////////////////////////////////////////////////////////////////////
virtual void getDescription (struct TRI_json_s*);
virtual void getDescription (struct TRI_json_t*);
////////////////////////////////////////////////////////////////////////////////
/// @brief whether or not the task is user-defined
@ -145,7 +145,7 @@ namespace triagens {
/// @brief paramaters
////////////////////////////////////////////////////////////////////////////////
struct TRI_json_s* _parameters;
struct TRI_json_t* _parameters;
////////////////////////////////////////////////////////////////////////////////
/// @brief creation timestamp

2
arangod/V8Server/V8QueueJob.cpp
View File

@ -28,7 +28,7 @@
#include "V8QueueJob.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "V8/v8-conv.h"
#include "V8/v8-utils.h"

2
arangod/V8Server/V8QueueJob.h
View File

@ -29,7 +29,7 @@
#define ARANGODB_V8SERVER_V8_QUEUE_JOB_H 1
#include "Dispatcher/Job.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
struct TRI_vocbase_s;

2
arangod/V8Server/V8TimerTask.cpp
View File

@ -28,7 +28,7 @@
#include "V8TimerTask.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "Dispatcher/Dispatcher.h"
#include "Scheduler/Scheduler.h"
#include "V8/v8-conv.h"

8
arangod/V8Server/V8TimerTask.h
View File

@ -35,7 +35,7 @@
#include "VocBase/vocbase.h"
struct TRI_json_s;
struct TRI_json_t;
// -----------------------------------------------------------------------------
// --SECTION-- class V8TimerTask
@ -70,7 +70,7 @@ namespace triagens {
rest::Dispatcher*,
double,
std::string const&,
struct TRI_json_s*);
struct TRI_json_t*);
////////////////////////////////////////////////////////////////////////////////
/// @brief destructor
@ -88,7 +88,7 @@ namespace triagens {
/// @brief get a task specific description in JSON format
////////////////////////////////////////////////////////////////////////////////
virtual void getDescription (struct TRI_json_s*);
virtual void getDescription (struct TRI_json_t*);
////////////////////////////////////////////////////////////////////////////////
/// @brief whether or not the task is user-defined
@ -144,7 +144,7 @@ namespace triagens {
/// @brief paramaters
////////////////////////////////////////////////////////////////////////////////
struct TRI_json_s* _parameters;
struct TRI_json_t* _parameters;
////////////////////////////////////////////////////////////////////////////////
/// @brief creation timestamp

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

@ -34,11 +34,11 @@
#include "Basics/ReadLocker.h"
#include "Basics/StringUtils.h"
#include "Basics/WriteLocker.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "BasicsC/files.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Rest/HttpRequest.h"
#include "Rest/HttpResponse.h"
#include "V8/v8-conv.h"

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

@ -30,7 +30,7 @@
#include "v8-collection.h"
#include "v8-vocbaseprivate.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "V8/v8-conv.h"
using namespace std;

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

@ -35,7 +35,7 @@
#include "Ahuacatl/ahuacatl-explain.h"
#include "Basics/Utf8Helper.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "Basics/json-utilities.h"
#include "V8/v8-conv.h"
#include "Utils/transactions.h"
@ -54,7 +54,6 @@
#include "unicode/timezone.h"
#include "v8-vocbase.h"
#include "v8-vocbaseprivate.h"
#include "v8-vocindex.h"
using namespace std;

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

@ -29,7 +29,7 @@
#include "v8-dispatcher.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Basics/StringUtils.h"
#include "Dispatcher/ApplicationDispatcher.h"
#include "Dispatcher/Dispatcher.h"

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

@ -28,8 +28,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "v8-vocbaseprivate.h"
#include "BasicsC/conversions.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "VocBase/key-generator.h"
#include "V8/v8-conv.h"
#include "Utils/DocumentHelper.h"

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

@ -41,7 +41,7 @@
#include "Aql/Query.h"
#include "Basics/Utf8Helper.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "Basics/json-utilities.h"
#include "Utils/transactions.h"
#include "Utils/AhuacatlGuard.h"

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

@ -37,7 +37,7 @@
#include "Ahuacatl/ahuacatl-result.h"
#include "Utils/AhuacatlTransaction.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "V8/v8-conv.h"
#include "Utils/transactions.h"

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

@ -32,7 +32,7 @@
#include "v8-vocbaseprivate.h"
#include "v8-collection.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "V8/v8-conv.h"
#include "Utils/transactions.h"
#include "Utils/V8TransactionContext.h"

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

@ -30,7 +30,7 @@
#include "v8-wrapshapedjson.h"
#include "v8-vocbaseprivate.h"
#include "BasicsC/conversions.h"
#include "Basics/conversions.h"
#include "V8/v8-conv.h"
#include "VocBase/key-generator.h"
#include "Utils/transactions.h"

4
arangod/VocBase/auth.cpp
View File

@ -29,9 +29,9 @@
#include "auth.h"
#include "BasicsC/json.h"
#include "Basics/json.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "Basics/JsonHelper.h"
#include "Rest/SslInterface.h"
#include "ShapedJson/shape-accessor.h"

4
arangod/VocBase/auth.h
View File

@ -36,7 +36,7 @@
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
struct TRI_json_s;
struct TRI_json_t;
struct TRI_vocbase_s;
// -----------------------------------------------------------------------------
@ -101,7 +101,7 @@ bool TRI_LoadAuthInfo (struct TRI_vocbase_s*);
////////////////////////////////////////////////////////////////////////////////
bool TRI_PopulateAuthInfo (struct TRI_vocbase_s*,
struct TRI_json_s const*);
struct TRI_json_t const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief reload the authentication info

2
arangod/VocBase/cleanup.cpp
View File

@ -31,7 +31,7 @@
#include "BasicsC/files.h"
#include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h"
#include "Basics/tri-strings.h"
#include "VocBase/barrier.h"
#include "VocBase/compactor.h"
#include "VocBase/document-collection.h"

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