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

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

This commit is contained in:
Jan Steemann 2012-11-27 13:56:08 +01:00
parent d4daccb3a5 a78768e9e6
commit bd3c8189dc
36 changed files with 1393 additions and 1129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdParty/Makefile.all-in-one-icu vendored
View File

@ -10,7 +10,6 @@
BUILT_SOURCES += @ICU_BUILT@ BUILT_SOURCES += @ICU_BUILT@
ICUDIR = @abs_top_srcdir@/3rdParty/icu/BUILD ICUDIR = @abs_top_srcdir@/3rdParty/icu/BUILD
CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR)
@ICU_LIBS@: @srcdir@/.icu-build-@TRI_BITS@ @ICU_LIBS@: @srcdir@/.icu-build-@TRI_BITS@
@ -47,7 +46,7 @@ CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR)
### @brief additional files to remove ### @brief additional files to remove
################################################################################ ################################################################################
CLEANUP += .icu-build-@TRI_BITS@ CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR)
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE ## --SECTION-- END-OF-FILE

3
3rdParty/Makefile.all-in-one-libev vendored
View File

@ -9,7 +9,6 @@
################################################################################ ################################################################################
BUILT_SOURCES += @LIBEV_LIBS@ BUILT_SOURCES += @LIBEV_LIBS@
CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD
@LIBEV_LIBS@: @srcdir@/.libev-build-@TRI_BITS@ @LIBEV_LIBS@: @srcdir@/.libev-build-@TRI_BITS@
@ -36,7 +35,7 @@ CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD
### @brief additional files to remove ### @brief additional files to remove
################################################################################ ################################################################################
CLEANUP += .libev-build-@TRI_BITS@ CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE ## --SECTION-- END-OF-FILE

9
3rdParty/Makefile.all-in-one-mruby vendored
View File

@ -9,7 +9,6 @@
################################################################################ ################################################################################
BUILT_SOURCES += @MRUBY_LIBS@ BUILT_SOURCES += @MRUBY_LIBS@
CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@
@MRUBY_LIBS@: @srcdir@/.mruby-build-@TRI_BITS@ @MRUBY_LIBS@: @srcdir@/.mruby-build-@TRI_BITS@
@ -32,9 +31,15 @@ CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@
################################################################################ ################################################################################
### @brief additional files to remove ### @brief additional files to remove
###
### "clean" in mruby is broken
################################################################################ ################################################################################
CLEANUP += .mruby-build-@TRI_BITS@ CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@
CLEANUP_3RD += clean-mruby
clean-mruby:
cd @top_srcdir@/3rdParty/MRUBY && ( $(MAKE) -k clean || true )
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE ## --SECTION-- END-OF-FILE

11
3rdParty/Makefile.all-in-one-v8 vendored
View File

@ -9,7 +9,6 @@
################################################################################ ################################################################################
BUILT_SOURCES += @V8_LIBS@ BUILT_SOURCES += @V8_LIBS@
CLEANUP += @srcdir@/.v8-build-@TRI_BITS@
@V8_LIBS@: @srcdir@/.v8-build-@TRI_BITS@ @V8_LIBS@: @srcdir@/.v8-build-@TRI_BITS@
@ -34,7 +33,15 @@ CLEANUP += @srcdir@/.v8-build-@TRI_BITS@
### @brief additional files to remove ### @brief additional files to remove
################################################################################ ################################################################################
CLEANUP += .v8-build-@TRI_BITS@ CLEANUP += @srcdir@/.v8-build-@TRI_BITS@
CLEANUP_3RD += clean-v8
clean-v8:
cd @top_srcdir@/3rdParty/V8 && ( $(MAKE) clean || true )
rm -rf @top_srcdir@/3rdParty/V8/out
rm -rf @top_srcdir@/3rdParty/V8/tools/*.pyc
rm -rf @top_srcdir@/3rdParty/V8/build/gyp/pylib/gyp/*.pyc
rm -rf @top_srcdir@/3rdParty/V8/build/gyp/pylib/gyp/*/*.pyc
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE ## --SECTION-- END-OF-FILE

796
3rdParty/mruby/src/y.tab.c vendored
View File

File diff suppressed because it is too large Load Diff

55
CHANGELOG
View File

@ -13,14 +13,14 @@ v1.2.alpha (XXXX-XX-XX)
* the key must be at most 256 bytes long * the key must be at most 256 bytes long
* it must consist of valid UTF-8 characters only * it must consist of valid UTF-8 characters only
* the key must not contain the forward slash (/) * the key must not contain the forward slash (/)
* the key must not begin or end with a space, tab, newline, carriage return or * the key must not begin or end with a space, tab, newline, carriage return or
form feed character form feed character
Specifiying a document key is optional when creating new documents. If no Specifiying a document key is optional when creating new documents. If no
document key is specified, ArangoDB will create a document key itself. document key is specified, ArangoDB will create a document key itself.
There are no guarantees about the format and pattern of auto-generated document There are no guarantees about the format and pattern of auto-generated document
keys other than the above restrictions. keys other than the above restrictions.
Clients should therefore treat auto-generated document keys as opaque values. Clients should therefore treat auto-generated document keys as opaque values.
* allow collection names everywhere where a collection id can be used * allow collection names everywhere where a collection id can be used
This change allows using a collection name in place of a collection id at all places This change allows using a collection name in place of a collection id at all places
@ -31,23 +31,27 @@ v1.2.alpha (XXXX-XX-XX)
* collection names can also be used instead of collection ids in REST API calls * collection names can also be used instead of collection ids in REST API calls
* edges in edge collections can optionally be undirected * edges in edge collections can optionally be undirected
Edges now have a @LIT{_bidirectional} attribute that determines whether the edge is to be Edges now have a `_bidirectional` attribute that determines whether the edge is to be
treated as directed (unidirectional) or undirected (bidirectional). The attribute treated as directed (unidirectional) or undirected (bidirectional). The attribute
can be set when an edge is created. If ommitted, the default is to create unidirectional can be set when an edge is created. If ommitted, the default is to create unidirectional
edges (i.e. @LIT{_bidirectional: false}). edges (i.e. `_bidirectional: false`).
Unidirectional edges are handled as in previous versions of ArangoDB, that is they Unidirectional edges are handled as in previous versions of ArangoDB, that is they
have a @LIT{_from} and @LIT{_to} attribute that indicate the source and target vertices have a `_from` and `_to` attribute that indicate the source and target vertices
of the edge. Additionally, they now return the @LIT{_bidirectional} attribute with a of the edge. Additionally, they now return the `_bidirectional` attribute with a
value of @LIT{false}. value of `false`.
Bidirectional edges do not have unambigious sources and targets (the roles of the connected Bidirectional edges do not have unambigious sources and targets (the roles of the connected
vertices are unclear), so they return the connected vertices in a @LIT{_vertices} list. vertices are unclear), so they return the connected vertices in a `_vertices` list.
This list contains the two vertices that the edge connects. It is up to the user to This list contains the two vertices that the edge connects. It is up to the user to
figure out these edges' roles. Additionally, bidirectional edges return the figure out these edges' roles. Additionally, bidirectional edges return the
@LIT{_bidirectional} attribute with a value of @LIT{true}. `_bidirectional` attribute with a value of `true`.
v1.1.beta3 (XXXX-XX-XX) v1.1.0 (XXXX-XX-XX)
----------------------- -------------------
# fixed issue #269: fix make distclean & clean
* fixed issue #296: system collections not usable from AQL
* added collection type label to web interface * added collection type label to web interface
@ -66,14 +70,15 @@ v1.1.beta3 (XXXX-XX-XX)
* changed misleading AQL function name NOT_LIST() to FIRST_LIST() and slightly changed * changed misleading AQL function name NOT_LIST() to FIRST_LIST() and slightly changed
the behavior. The function will now return its first argument that is a list, or null the behavior. The function will now return its first argument that is a list, or null
if none of the arguments are lists. if none of the arguments are lists.
This is mostly downwards-compatible. The only change to 1.1 will happen if two This is mostly downwards-compatible. The only change to the previous implementation in
arguments were passed and the 1st and 2nd arguments were no lists. In 1.1, previously 1.1-beta will happen if two arguments were passed and the 1st and 2nd arguments were
the 2nd arguments was returned as is, but now null will be returned. both no lists. In previous 1.1, the 2nd argument was returned as is, but now null
will be returned.
* add AQL function FIRST_DOCUMENT(), with same behavior as FIRST_LIST(), but working * add AQL function FIRST_DOCUMENT(), with same behavior as FIRST_LIST(), but working
with documents instead of lists. with documents instead of lists.
* added UPGRADE file * added UPGRADING help text
* WARNING: * WARNING:
arangod now performs a database version check at startup. It will look for a file arangod now performs a database version check at startup. It will look for a file
@ -84,6 +89,9 @@ v1.1.beta3 (XXXX-XX-XX)
that users have full control over when they perform any updates/upgrades of their that users have full control over when they perform any updates/upgrades of their
data, and do not risk running an incompatible server/database state tandem. data, and do not risk running an incompatible server/database state tandem.
* fixed issue #284: fixed Javascript errors when adding edges/vertices without own
attributes
* fixed issue #283: AQL LENGTH() now works on documents, too * fixed issue #283: AQL LENGTH() now works on documents, too
* fixed issue #281: documentation for skip lists shows wrong example * fixed issue #281: documentation for skip lists shows wrong example
@ -95,9 +103,6 @@ v1.1.beta3 (XXXX-XX-XX)
the fix of this issue also implies validation of collection names / ids passed to the fix of this issue also implies validation of collection names / ids passed to
the REST edge create method. edges with invalid collection ids or names in the the REST edge create method. edges with invalid collection ids or names in the
"from" or "to" values will be rejected and not saved "from" or "to" values will be rejected and not saved
Also allow using collection names in document ids when creating edges from
Javascript using the edges.<collection>.save(from, to, data) method
v1.1.beta2 (2012-11-13) v1.1.beta2 (2012-11-13)
----------------------- -----------------------
@ -306,6 +311,18 @@ v1.0.4 (2012-11-12)
* strange error message in arangosh 1.0.3 at startup * strange error message in arangosh 1.0.3 at startup
v1.0.3 (2012-11-08)
-------------------
* fixed AQL optimiser bug
* issue #273: fixed segfault in arangosh on HTTP 40x
* issue #265: allow optional base64 encoding/decoding of action response data
* issue #252: _modules collection not created automatically
v1.0.2 (2012-10-22) v1.0.2 (2012-10-22)
------------------- -------------------

9
Documentation/Makefile.files
View File

@ -92,8 +92,8 @@ WIKI = \
SimpleQueries \ SimpleQueries \
Upgrading \ Upgrading \
UserManual \ UserManual \
UserManualBasics \
UserManualArangosh \ UserManualArangosh \
UserManualWebInterface \
UserManualActions \ UserManualActions \
jsUnity jsUnity
@ -250,12 +250,7 @@ endif
################################################################################ ################################################################################
CLEANUP += \ CLEANUP += \
$(DOXYGEN) \ Doxygen/*
Doxygen/doc \
Doxygen/latex \
Doxygen/website \
Doxygen/wiki \
Doxygen/xml
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE ## --SECTION-- END-OF-FILE

14
Documentation/Manual/NewFeatures11.md
View File

@ -103,16 +103,6 @@ removed. Replacing will also create a new revision:
For more information, please check @ref RestDocument. For more information, please check @ref RestDocument.
Blueprints API {#NewFeatures11BluePrintsAPI}
--------------------------------------------
Blueprints is a property graph model interface with provided
implementations. Databases that implement the Blueprints interfaces
automatically support Blueprints-enabled applications
(@EXTREF{http://tinkerpop.com/,http://tinkerpop.com}).
For more information please refer to @ref HttpBlueprints.
AQL Improvements {#NewFeatures11AqlImprovements} AQL Improvements {#NewFeatures11AqlImprovements}
------------------------------------------------ ------------------------------------------------
@ -218,7 +208,9 @@ parameter to `true` will force synchronisation.
Server Statistics {#NewFeatures11ServerStatistics} Server Statistics {#NewFeatures11ServerStatistics}
-------------------------------------------------- --------------------------------------------------
ArangoDB 1.1 allows querying the server status via REST API methods. ArangoDB 1.1 allows querying the server status via the administration
front-end (see @ref UserManualWebInterfaceStatistics) or via REST API
methods.
The following methods are available: The following methods are available:
- `GET /_admin/connection-statistics`: provides connection statistics - `GET /_admin/connection-statistics`: provides connection statistics

1
Documentation/Manual/NewFeatures11TOC.md
View File

@ -5,7 +5,6 @@ TOC {#NewFeatures11TOC}
- @ref NewFeatures11CollectionTypes - @ref NewFeatures11CollectionTypes
- @ref NewFeatures11BatchRequests - @ref NewFeatures11BatchRequests
- @ref NewFeatures11PartialUpdates - @ref NewFeatures11PartialUpdates
- @ref NewFeatures11BluePrintsAPI
- @ref NewFeatures11AqlImprovements - @ref NewFeatures11AqlImprovements
- @ref NewFeatures11DiskSynchronisation - @ref NewFeatures11DiskSynchronisation
- @ref NewFeatures11ServerStatistics - @ref NewFeatures11ServerStatistics

33
Documentation/UserManual/FirstStepsArangoDB.md
View File

@ -80,7 +80,34 @@ the ArangoDB database server.
arangodb 14536 0.1 0.6 5307264 23464 s002 S 1:21pm 0:00.18 /usr/local/sbin/arangod arangodb 14536 0.1 0.6 5307264 23464 s002 S 1:21pm 0:00.18 /usr/local/sbin/arangod
If there is no such process, check the log file If there is no such process, check the log file
`/var/log/arangodb/arangod.log` for errors. `/var/log/arangodb/arangod.log` for errors. If you see a log message
like
2012-11-20T00:36:55Z [17253] ERROR No version information file found in database directory.
2012-11-20T00:36:55Z [17253] FATAL Database version check failed. Please run arango-upgrade --database.directory "/tmp/my-database-path"
make sure that the program `arango-upgrade` has been used to initialse
(or update) the database stored at `/tmp/my-database-path`. If not run
arango-upgrade --database.directory /tmp/my-database-path
ArangoDB programs {#FirstStepsArangoDBBinaries}
===============================================
The ArangoDB database package comes with the following programs:
- _arangod_: The ArangoDB database daemon. This server program is
intended to run as daemon process and to server the various clients
connection to the server via TCP / HTTP. See @ref
FirstStepsServerStartStop.
- _arango-update_: Used to initialize or update the database.
- _arangosh_: The ArangoDB shell. A client that implements a
read-eval-print loop (REPL) and provides functions to access and
administrate the ArangoDB server. See @ref FirstStepsShellStartStop.
- _arangoimp_: A bulk importer for the ArangoDB server.
See @ref ImpManual
ArangoDB programs {#FirstStepsArangoDBBinaries} ArangoDB programs {#FirstStepsArangoDBBinaries}
=============================================== ===============================================
@ -311,7 +338,7 @@ The ArangoDB server has a graphical front-end, which allows you to
inspect the current state of the server from within your browser. You inspect the current state of the server from within your browser. You
can use the front-end using the following URL: can use the front-end using the following URL:
http://localhost:8529/_admin http://localhost:8529/_admin/html/index.html
Unless you have loaded an application into the ArangoDB server, which remaps Unless you have loaded an application into the ArangoDB server, which remaps
the paths, the front-end will also be available under the paths, the front-end will also be available under
@ -435,7 +462,7 @@ to a server, the version number of the ArangoDB server.
Command-Line Options {#FirstStepsShellStartStopOptions} Command-Line Options {#FirstStepsShellStartStopOptions}
------------------------------------------------------- -------------------------------------------------------
Use @LIT{--help} to get a list of command-line options: Use `--help` to get a list of command-line options:
> ./arangosh --help > ./arangosh --help
STANDARD options: STANDARD options:

9
Makefile.am
View File

@ -22,6 +22,12 @@ dist_man_MANS =
CLEANUP = CLEANUP =
################################################################################
### @brief tragets for cleanup of 3rd party libraries
################################################################################
CLEANUP_3RD =
################################################################################ ################################################################################
### @brief flex files ### @brief flex files
################################################################################ ################################################################################
@ -303,6 +309,9 @@ endif
## cleanup ## cleanup
################################################################################ ################################################################################
distclean-local:
@for i in $(CLEANUP_3RD); do $(MAKE) $$i; done
clean-local: clean-local:
rm -rf $(CLEANUP) rm -rf $(CLEANUP)
rm -f $(BUILT_SOURCES) rm -f $(BUILT_SOURCES)

864
arangod/Ahuacatl/ahuacatl-grammar.c
View File

File diff suppressed because it is too large Load Diff

14
arangod/Ahuacatl/ahuacatl-grammar.h
View File

@ -1,10 +1,8 @@
/* A Bison parser, made by GNU Bison 2.5. */
/* A Bison parser, made by GNU Bison 2.4.1. */ /* Bison interface for Yacc-like parsers in C
/* Skeleton interface for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -97,7 +95,7 @@
typedef union YYSTYPE typedef union YYSTYPE
{ {
/* Line 1676 of yacc.c */ /* Line 2132 of yacc.c */
#line 26 "arangod/Ahuacatl/ahuacatl-grammar.y" #line 26 "arangod/Ahuacatl/ahuacatl-grammar.y"
TRI_aql_node_t* node; TRI_aql_node_t* node;
@ -107,8 +105,8 @@ typedef union YYSTYPE
/* Line 1676 of yacc.c */ /* Line 2132 of yacc.c */
#line 112 "arangod/Ahuacatl/ahuacatl-grammar.h" #line 110 "arangod/Ahuacatl/ahuacatl-grammar.h"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */

48
arangod/Ahuacatl/ahuacatl-tokens.c
View File

@ -46,6 +46,7 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t; typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t; typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t; typedef uint32_t flex_uint32_t;
typedef uint64_t flex_uint64_t;
#else #else
typedef signed char flex_int8_t; typedef signed char flex_int8_t;
typedef short int flex_int16_t; typedef short int flex_int16_t;
@ -169,6 +170,11 @@ typedef void* yyscan_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif #endif
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2 #define EOB_ACT_LAST_MATCH 2
@ -182,7 +188,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
*/ */
#define YY_LESS_LINENO(n) \ #define YY_LESS_LINENO(n) \
do { \ do { \
int yyl;\ yy_size_t yyl;\
for ( yyl = n; yyl < yyleng; ++yyl )\ for ( yyl = n; yyl < yyleng; ++yyl )\
if ( yytext[yyl] == '\n' )\ if ( yytext[yyl] == '\n' )\
--yylineno;\ --yylineno;\
@ -204,11 +210,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE #ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state struct yy_buffer_state
@ -226,7 +227,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB /* Number of characters read into yy_ch_buf, not including EOB
* characters. * characters.
*/ */
int yy_n_chars; yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it, /* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to * and can realloc() it to grow it, and should free() it to
@ -305,7 +306,7 @@ static void Ahuacatl_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscann
YY_BUFFER_STATE Ahuacatl_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE Ahuacatl_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE Ahuacatl_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); YY_BUFFER_STATE Ahuacatl_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
void *Ahuacatlalloc (yy_size_t ,yyscan_t yyscanner ); void *Ahuacatlalloc (yy_size_t ,yyscan_t yyscanner );
void *Ahuacatlrealloc (void *,yy_size_t ,yyscan_t yyscanner ); void *Ahuacatlrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@ -356,7 +357,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*/ */
#define YY_DO_BEFORE_ACTION \ #define YY_DO_BEFORE_ACTION \
yyg->yytext_ptr = yy_bp; \ yyg->yytext_ptr = yy_bp; \
yyleng = (size_t) (yy_cp - yy_bp); \ yyleng = (yy_size_t) (yy_cp - yy_bp); \
yyg->yy_hold_char = *yy_cp; \ yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \ *yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp; yyg->yy_c_buf_p = yy_cp;
@ -628,8 +629,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */ size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char; char yy_hold_char;
int yy_n_chars; yy_size_t yy_n_chars;
int yyleng_r; yy_size_t yyleng_r;
char *yy_c_buf_p; char *yy_c_buf_p;
int yy_init; int yy_init;
int yy_start; int yy_start;
@ -686,7 +687,7 @@ FILE *Ahuacatlget_out (yyscan_t yyscanner );
void Ahuacatlset_out (FILE * out_str ,yyscan_t yyscanner ); void Ahuacatlset_out (FILE * out_str ,yyscan_t yyscanner );
int Ahuacatlget_leng (yyscan_t yyscanner ); yy_size_t Ahuacatlget_leng (yyscan_t yyscanner );
char *Ahuacatlget_text (yyscan_t yyscanner ); char *Ahuacatlget_text (yyscan_t yyscanner );
@ -753,7 +754,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \ { \
int c = '*'; \ int c = '*'; \
int n; \ yy_size_t n; \
for ( n = 0; n < max_size && \ for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \ buf[n] = (char) c; \
@ -914,7 +915,7 @@ yy_find_action:
if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
{ {
int yyl; yy_size_t yyl;
for ( yyl = 0; yyl < yyleng; ++yyl ) for ( yyl = 0; yyl < yyleng; ++yyl )
if ( yytext[yyl] == '\n' ) if ( yytext[yyl] == '\n' )
@ -1482,7 +1483,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ {
int num_to_read = yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 ) while ( num_to_read <= 0 )
@ -1496,7 +1497,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( b->yy_is_our_buffer ) if ( b->yy_is_our_buffer )
{ {
int new_size = b->yy_buf_size * 2; yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 ) if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8; b->yy_buf_size += b->yy_buf_size / 8;
@ -1527,7 +1528,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
/* Read in more data. */ /* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
yyg->yy_n_chars, (int) num_to_read ); yyg->yy_n_chars, num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
} }
@ -1652,7 +1653,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ /* need more input */ { /* need more input */
int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
++yyg->yy_c_buf_p; ++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) ) switch ( yy_get_next_buffer( yyscanner ) )
@ -1676,7 +1677,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
case EOB_ACT_END_OF_FILE: case EOB_ACT_END_OF_FILE:
{ {
if ( Ahuacatlwrap(yyscanner ) ) if ( Ahuacatlwrap(yyscanner ) )
return EOF; return 0;
if ( ! yyg->yy_did_buffer_switch_on_eof ) if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE; YY_NEW_FILE;
@ -1945,7 +1946,7 @@ void Ahuacatlpop_buffer_state (yyscan_t yyscanner)
*/ */
static void Ahuacatlensure_buffer_stack (yyscan_t yyscanner) static void Ahuacatlensure_buffer_stack (yyscan_t yyscanner)
{ {
int num_to_alloc; yy_size_t num_to_alloc;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (!yyg->yy_buffer_stack) { if (!yyg->yy_buffer_stack) {
@ -2043,12 +2044,11 @@ YY_BUFFER_STATE Ahuacatl_scan_string (yyconst char * yystr , yyscan_t yyscanner)
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
char *buf; char *buf;
yy_size_t n; yy_size_t n, i;
int i;
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2; n = _yybytes_len + 2;
@ -2158,7 +2158,7 @@ FILE *Ahuacatlget_out (yyscan_t yyscanner)
/** Get the length of the current token. /** Get the length of the current token.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
int Ahuacatlget_leng (yyscan_t yyscanner) yy_size_t Ahuacatlget_leng (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng; return yyleng;

10
arangod/Documentation/api-blueprints.dox
View File

@ -55,15 +55,9 @@
/// @anchor A_JSF_DELETE_blueprints_vertex /// @anchor A_JSF_DELETE_blueprints_vertex
/// @copydetails JSF_DELETE_blueprints_vertex /// @copydetails JSF_DELETE_blueprints_vertex
/// ///
///
///
///
/// @anchor A_JSF_POST_blueprints_vertices /// @anchor A_JSF_POST_blueprints_vertices
/// @copydetails JSF_POST_blueprints_vertices /// @copydetails JSF_POST_blueprints_vertices
/// ///
///
///
///
/// @anchor A_JSF_POST_blueprints_edge /// @anchor A_JSF_POST_blueprints_edge
/// @copydetails JSF_POST_blueprints_edge /// @copydetails JSF_POST_blueprints_edge
/// ///
@ -76,12 +70,8 @@
/// @anchor A_JSF_DELETE_blueprints_edge /// @anchor A_JSF_DELETE_blueprints_edge
/// @copydetails JSF_DELETE_blueprints_edge /// @copydetails JSF_DELETE_blueprints_edge
/// ///
///
///
///
/// @anchor A_JSF_POST_blueprints_edges /// @anchor A_JSF_POST_blueprints_edges
/// @copydetails JSF_POST_blueprints_edges /// @copydetails JSF_POST_blueprints_edges
///
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
// Local Variables: // Local Variables:

2
arangod/Documentation/user-manual.dox
View File

@ -38,6 +38,7 @@
/// <ul> /// <ul>
/// <li>@ref FirstStepsArangoDB</li> /// <li>@ref FirstStepsArangoDB</li>
/// <li>@ref UserManualArangosh</li> /// <li>@ref UserManualArangosh</li>
/// <li>@ref UserManualWebInterface</li>
/// <li>@ref ShellCollection</li> /// <li>@ref ShellCollection</li>
/// <li>@ref ShellDocument</li> /// <li>@ref ShellDocument</li>
/// <li>@ref ShellEdge</li> /// <li>@ref ShellEdge</li>
@ -52,6 +53,7 @@
/// @else /// @else
/// @copydetails FirstStepsArangoDBTOC /// @copydetails FirstStepsArangoDBTOC
/// @copydetails UserManualArangoshTOC /// @copydetails UserManualArangoshTOC
/// @copydetails UserManualWebInterfaceTOC
/// @copydetails ShellCollectionTOC /// @copydetails ShellCollectionTOC
/// @copydetails ShellDocumentTOC /// @copydetails ShellDocumentTOC
/// @copydetails ShellEdgeTOC /// @copydetails ShellEdgeTOC

2
arangod/HashIndex/hasharray.c
View File

@ -125,7 +125,7 @@ static bool AllocateTable (TRI_hasharray_t* array, size_t numElements) {
return false; return false;
} }
// check if memory was aligned on a cache line boundary // position array directly on a cache line boundary
offset = ((intptr_t) data) % CACHE_LINE_SIZE; offset = ((intptr_t) data) % CACHE_LINE_SIZE;
if (offset == 0) { if (offset == 0) {

12
arangod/MRServer/ApplicationMR.h
View File

@ -1,4 +1,4 @@
//////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// @brief MR enigne configuration /// @brief MR enigne configuration
/// ///
/// @file /// @file
@ -271,7 +271,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief path to the directory containing alternate startup scripts /// @brief path to the directory containing alternate startup scripts
/// ///
/// @CMDOPT{\-\-ruby.directory @CA{directory}} /// @CMDOPT{\--ruby.directory @CA{directory}}
/// ///
/// Specifies the @CA{directory} path to alternate startup MRuby files. /// Specifies the @CA{directory} path to alternate startup MRuby files.
/// Normally, the server will start using built-in MRuby core functionality. To /// Normally, the server will start using built-in MRuby core functionality. To
@ -284,7 +284,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief semicolon separated list of module directories /// @brief semicolon separated list of module directories
/// ///
/// @CMDOPT{\-\-ruby.modules-path @CA{directory}} /// @CMDOPT{\--ruby.modules-path @CA{directory}}
/// ///
/// Specifies the @CA{directory} path with user defined MRuby modules. Multiple /// Specifies the @CA{directory} path with user defined MRuby modules. Multiple
/// paths can be specified separated with commas. /// paths can be specified separated with commas.
@ -295,7 +295,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief path to the system action directory /// @brief path to the system action directory
/// ///
/// @CMDOPT{\-\-ruby.action-directory @CA{directory}} /// @CMDOPT{\--ruby.action-directory @CA{directory}}
/// ///
/// Specifies the @CA{directory} containg the system defined MRuby files that /// Specifies the @CA{directory} containg the system defined MRuby files that
/// can be invoked as actions. /// can be invoked as actions.
@ -306,7 +306,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief MRuby garbage collection interval (each x requests) /// @brief MRuby garbage collection interval (each x requests)
/// ///
/// @CMDOPT{\-\-ruby.gc-interval @CA{interval}} /// @CMDOPT{\--ruby.gc-interval @CA{interval}}
/// ///
/// Specifies the interval (approximately in number of requests) that the /// Specifies the interval (approximately in number of requests) that the
/// garbage collection for MRuby objects will be run in each thread. /// garbage collection for MRuby objects will be run in each thread.
@ -317,7 +317,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief MRuby garbage collection frequency (each x seconds) /// @brief MRuby garbage collection frequency (each x seconds)
/// ///
/// @CMDOPT{\-\-ruby.gc-frequency @CA{frequency}} /// @CMDOPT{\--ruby.gc-frequency @CA{frequency}}
/// ///
/// Specifies the frequency in seconds for the automatic garbage collection of /// Specifies the frequency in seconds for the automatic garbage collection of
/// MRuby objects. This setting is useful to have the garbage collection /// MRuby objects. This setting is useful to have the garbage collection

24
arangod/RestServer/ArangoServer.h
View File

@ -256,7 +256,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief number of dispatcher threads for non-database worker /// @brief number of dispatcher threads for non-database worker
/// ///
/// @CMDOPT{\-\-server.threads @CA{number}} /// @CMDOPT{\--server.threads @CA{number}}
/// ///
/// Specifies the @CA{number} of threads that are spawned to handle action /// Specifies the @CA{number} of threads that are spawned to handle action
/// requests using Rest, JavaScript, or Ruby. /// requests using Rest, JavaScript, or Ruby.
@ -267,7 +267,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief path to the database /// @brief path to the database
/// ///
/// @CMDOPT{\-\-database.directory @CA{directory}} /// @CMDOPT{\--database.directory @CA{directory}}
/// ///
/// The directory containing the collections and data-files. Defaults /// The directory containing the collections and data-files. Defaults
/// to @LIT{/var/lib/arango}. /// to @LIT{/var/lib/arango}.
@ -287,7 +287,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief remove on drop /// @brief remove on drop
/// ///
/// @CMDOPT{\-\-database.remove-on-drop @CA{flag}} /// @CMDOPT{\--database.remove-on-drop @CA{flag}}
/// ///
/// If @LIT{true} and you drop a collection, then they directory and all /// If @LIT{true} and you drop a collection, then they directory and all
/// associated datafiles will be removed from disk. If @LIT{false}, then they /// associated datafiles will be removed from disk. If @LIT{false}, then they
@ -304,7 +304,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief remove on compaction /// @brief remove on compaction
/// ///
/// @CMDOPT{\-\-database.remove-on-compaction @CA{flag}} /// @CMDOPT{\--database.remove-on-compaction @CA{flag}}
/// ///
/// Normally the garbage collection will removed compacted datafile. For debug /// Normally the garbage collection will removed compacted datafile. For debug
/// purposes you can use this option to keep the old datafiles. You should /// purposes you can use this option to keep the old datafiles. You should
@ -318,7 +318,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief default journal size /// @brief default journal size
/// ///
/// @CMDOPT{\-\-database.maximal-journal-size @CA{size}} /// @CMDOPT{\--database.maximal-journal-size @CA{size}}
/// ///
/// Maximal size of journal in bytes. Can be overwritten when creating a new /// Maximal size of journal in bytes. Can be overwritten when creating a new
/// collection. Note that this also limits the maximal size of a single /// collection. Note that this also limits the maximal size of a single
@ -332,7 +332,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief default wait for sync behavior /// @brief default wait for sync behavior
/// ///
/// @CMDOPT{\-\-database.wait-for-sync @CA{boolean}} /// @CMDOPT{\--database.wait-for-sync @CA{boolean}}
/// ///
/// Default wait-for-sync value. Can be overwritten when creating a new /// Default wait-for-sync value. Can be overwritten when creating a new
/// collection. /// collection.
@ -345,7 +345,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief force sync shapes /// @brief force sync shapes
/// ///
/// @CMDOPT{\-\-database.force-sync-shapes @CA{boolean}} /// @CMDOPT{\--database.force-sync-shapes @CA{boolean}}
/// ///
/// Force syncing of shape data to disk when writing shape information. /// Force syncing of shape data to disk when writing shape information.
/// If turned off, syncing will still happen for shapes of collections that /// If turned off, syncing will still happen for shapes of collections that
@ -360,7 +360,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief unit tests /// @brief unit tests
/// ///
/// @CMDOPT{\-\-javascript.unit-tests @CA{test-file}} /// @CMDOPT{\--javascript.unit-tests @CA{test-file}}
/// ///
/// Runs one or more unit tests. /// Runs one or more unit tests.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -370,7 +370,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief files to jslint /// @brief files to jslint
/// ///
/// @CMDOPT{\-\-jslint @CA{test-file}} /// @CMDOPT{\--jslint @CA{test-file}}
/// ///
/// Runs jslint on one or more files. /// Runs jslint on one or more files.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -380,7 +380,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief run script file /// @brief run script file
/// ///
/// @CMDOPT{\-\-javascript.script @CA{script-file}} /// @CMDOPT{\--javascript.script @CA{script-file}}
/// ///
/// Runs the script file. /// Runs the script file.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -390,7 +390,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief parameters to script file /// @brief parameters to script file
/// ///
/// @CMDOPT{\-\-javascript.script-parameter @CA{script-parameter}} /// @CMDOPT{\--javascript.script-parameter @CA{script-parameter}}
/// ///
/// Parameter to script. /// Parameter to script.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -400,7 +400,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief server default language /// @brief server default language
/// ///
/// @CMDOPT{\-\-default-language @CA{script-parameter}} /// @CMDOPT{\--default-language @CA{script-parameter}}
/// ///
/// Parameter to script. /// Parameter to script.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

12
arangod/V8Server/ApplicationV8.h
View File

@ -330,7 +330,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief path to the directory containing alternate startup scripts /// @brief path to the directory containing alternate startup scripts
/// ///
/// @CMDOPT{\-\-javascript.directory @CA{directory}} /// @CMDOPT{\--javascript.directory @CA{directory}}
/// ///
/// Specifies the @CA{directory} path to alternate startup JavaScript files. /// Specifies the @CA{directory} path to alternate startup JavaScript files.
/// Normally, the server will start using built-in JavaScript core /// Normally, the server will start using built-in JavaScript core
@ -343,7 +343,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief semicolon separated list of module directories /// @brief semicolon separated list of module directories
/// ///
/// @CMDOPT{\-\-javascript.modules-path @CA{directory}} /// @CMDOPT{\--javascript.modules-path @CA{directory}}
/// ///
/// Specifies the @CA{directory} path with user defined JavaScript modules. /// Specifies the @CA{directory} path with user defined JavaScript modules.
/// Multiple paths can be specified separated with commas. /// Multiple paths can be specified separated with commas.
@ -354,7 +354,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief path to the system action directory /// @brief path to the system action directory
/// ///
/// @CMDOPT{\-\-javascript.action-directory @CA{directory}} /// @CMDOPT{\--javascript.action-directory @CA{directory}}
/// ///
/// Specifies the @CA{directory} containg the system defined JavaScript files /// Specifies the @CA{directory} containg the system defined JavaScript files
/// that can be invoked as actions. /// that can be invoked as actions.
@ -377,7 +377,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief JavaScript garbage collection interval (each x requests) /// @brief JavaScript garbage collection interval (each x requests)
/// ///
/// @CMDOPT{\-\-javascript.gc-interval @CA{interval}} /// @CMDOPT{\--javascript.gc-interval @CA{interval}}
/// ///
/// Specifies the interval (approximately in number of requests) that the /// Specifies the interval (approximately in number of requests) that the
/// garbage collection for JavaScript objects will be run in each thread. /// garbage collection for JavaScript objects will be run in each thread.
@ -388,7 +388,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief JavaScript garbage collection frequency (each x seconds) /// @brief JavaScript garbage collection frequency (each x seconds)
/// ///
/// @CMDOPT{\-\-javascript.gc-frequency @CA{frequency}} /// @CMDOPT{\--javascript.gc-frequency @CA{frequency}}
/// ///
/// Specifies the frequency (in seconds) for the automatic garbage collection of /// Specifies the frequency (in seconds) for the automatic garbage collection of
/// JavaScript objects. This setting is useful to have the garbage collection /// JavaScript objects. This setting is useful to have the garbage collection
@ -400,7 +400,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief optional arguments to pass to v8 /// @brief optional arguments to pass to v8
/// ///
/// @CMDOPT{\-\-javascript.v8-options @CA{options}} /// @CMDOPT{\--javascript.v8-options @CA{options}}
/// ///
/// Optional arguments to pass to the V8 Javascript engine. The V8 engine will /// Optional arguments to pass to the V8 Javascript engine. The V8 engine will
/// run with default settings unless explicit options are specified using this /// run with default settings unless explicit options are specified using this

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

@ -6176,6 +6176,10 @@ TRI_v8_global_t* TRI_InitV8VocBridge (v8::Handle<v8::Context> context,
context->Global()->Set(TRI_V8_SYMBOL("VERSION"), v8::String::New(TRIAGENS_VERSION), v8::ReadOnly); context->Global()->Set(TRI_V8_SYMBOL("VERSION"), v8::String::New(TRIAGENS_VERSION), v8::ReadOnly);
context->Global()->Set(TRI_V8_SYMBOL("DATABASEPATH"), v8::String::New(vocbase->_path), v8::ReadOnly); context->Global()->Set(TRI_V8_SYMBOL("DATABASEPATH"), v8::String::New(vocbase->_path), v8::ReadOnly);
// .............................................................................
// create the global variables
// .............................................................................
context->Global()->Set(TRI_V8_SYMBOL("db"), context->Global()->Set(TRI_V8_SYMBOL("db"),
TRI_WrapVocBase(vocbase, TRI_COL_TYPE_DOCUMENT), TRI_WrapVocBase(vocbase, TRI_COL_TYPE_DOCUMENT),

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

@ -1,4 +1,4 @@
//////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// @brief primary collection with global read-write lock /// @brief primary collection with global read-write lock
/// ///
/// @file /// @file

227
config/compile
View File

@ -1,10 +1,9 @@
#! /bin/sh #! /bin/sh
# Wrapper for compilers which do not understand `-c -o'. # Wrapper for compilers which do not understand '-c -o'.
scriptversion=2009-10-06.20; # UTC scriptversion=2012-03-05.13; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software # Copyright (C) 1999-2012 Free Software Foundation, Inc.
# Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>. # Written by Tom Tromey <tromey@cygnus.com>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -29,21 +28,219 @@ scriptversion=2009-10-06.20; # UTC
# bugs to <bug-automake@gnu.org> or send patches to # bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>. # <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
file=`winepath -w "$file" || echo "$file"`
;;
esac
;;
esac
}
# func_cl_dashL linkdir
# Make cl look for libraries in LINKDIR
func_cl_dashL ()
{
func_file_conv "$1"
if test -z "$lib_path"; then
lib_path=$file
else
lib_path="$lib_path;$file"
fi
linker_opts="$linker_opts -LIBPATH:$file"
}
# func_cl_dashl library
# Do a library search-path lookup for cl
func_cl_dashl ()
{
lib=$1
found=no
save_IFS=$IFS
IFS=';'
for dir in $lib_path $LIB
do
IFS=$save_IFS
if $shared && test -f "$dir/$lib.dll.lib"; then
found=yes
lib=$dir/$lib.dll.lib
break
fi
if test -f "$dir/$lib.lib"; then
found=yes
lib=$dir/$lib.lib
break
fi
done
IFS=$save_IFS
if test "$found" != yes; then
lib=$lib.lib
fi
}
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
lib_path=
shared=:
linker_opts=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
*.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
;;
*)
func_file_conv "$2"
set x "$@" -Fe"$file"
shift
;;
esac
;;
-I)
eat=1
func_file_conv "$2" mingw
set x "$@" -I"$file"
shift
;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
-l)
eat=1
func_cl_dashl "$2"
set x "$@" "$lib"
shift
;;
-l*)
func_cl_dashl "${1#-l}"
set x "$@" "$lib"
shift
;;
-L)
eat=1
func_cl_dashL "$2"
;;
-L*)
func_cl_dashL "${1#-L}"
;;
-static)
shared=false
;;
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','
for flag in $arg; do
IFS="$save_ifs"
linker_opts="$linker_opts $flag"
done
IFS="$save_ifs"
;;
-Xlinker)
eat=1
linker_opts="$linker_opts $2"
;;
-*)
set x "$@" "$1"
shift
;;
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
func_file_conv "$1"
set x "$@" -Tp"$file"
shift
;;
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
func_file_conv "$1" mingw
set x "$@" "$file"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -n "$linker_opts"; then
linker_opts="-link$linker_opts"
fi
exec "$@" $linker_opts
exit 1
}
eat=
case $1 in case $1 in
'') '')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2 echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1; exit 1;
;; ;;
-h | --h*) -h | --h*)
cat <<\EOF cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS] Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'. Wrapper for compilers which do not understand '-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected. arguments, and rename the output as expected.
If you are trying to build a whole package this is not the If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'. right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-automake@gnu.org>. Report bugs to <bug-automake@gnu.org>.
EOF EOF
@ -53,11 +250,13 @@ EOF
echo "compile $scriptversion" echo "compile $scriptversion"
exit $? exit $?
;; ;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac esac
ofile= ofile=
cfile= cfile=
eat=
for arg for arg
do do
@ -66,8 +265,8 @@ do
else else
case $1 in case $1 in
-o) -o)
# configure might choose to run compile as `compile cc -o foo foo.c'. # configure might choose to run compile as 'compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object. # So we strip '-o arg' only if arg is an object.
eat=1 eat=1
case $2 in case $2 in
*.o | *.obj) *.o | *.obj)
@ -94,10 +293,10 @@ do
done done
if test -z "$ofile" || test -z "$cfile"; then if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a # If no '-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a # pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no # normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also # '.c' file was seen then we are probably linking. That is also
# ok. # ok.
exec "$@" exec "$@"
fi fi
@ -106,7 +305,7 @@ fi
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory. # Create the lock directory.
# Note: use `[/\\:.-]' here to ensure that we don't use the same name # Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected # that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build. # object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d

35
config/install-sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# install - install a program, script, or datafile # install - install a program, script, or datafile
scriptversion=2009-04-28.21; # UTC scriptversion=2011-11-20.07; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was # This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the # later released in X11R6 (xc/config/util/install.sh) with the
@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC
# FSF changes to this file are in the public domain. # FSF changes to this file are in the public domain.
# #
# Calling this script install-sh is preferred over install.sh, to prevent # Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it # 'make' implicit rules from creating a file called install from it
# when there is no Makefile. # when there is no Makefile.
# #
# This script is compatible with the BSD install script, but was written # This script is compatible with the BSD install script, but was written
@ -156,6 +156,10 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;; -s) stripcmd=$stripprog;;
-t) dst_arg=$2 -t) dst_arg=$2
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;; shift;;
-T) no_target_directory=true;; -T) no_target_directory=true;;
@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi fi
shift # arg shift # arg
dst_arg=$arg dst_arg=$arg
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
done done
fi fi
@ -194,13 +202,17 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2 echo "$0: no input file specified." >&2
exit 1 exit 1
fi fi
# It's OK to call `install-sh -d' without argument. # It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories. # This can happen when creating conditional directories.
exit 0 exit 0
fi fi
if test -z "$dir_arg"; then if test -z "$dir_arg"; then
trap '(exit $?); exit' 1 2 13 15 do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
trap "ret=141; $do_exit" 13
trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes. # Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps. # However, 'strip' requires both read and write access to temps.
@ -228,9 +240,9 @@ fi
for src for src
do do
# Protect names starting with `-'. # Protect names problematic for 'test' and other utilities.
case $src in case $src in
-*) src=./$src;; -* | [=\(\)!]) src=./$src;;
esac esac
if test -n "$dir_arg"; then if test -n "$dir_arg"; then
@ -252,12 +264,7 @@ do
echo "$0: no destination specified." >&2 echo "$0: no destination specified." >&2
exit 1 exit 1
fi fi
dst=$dst_arg dst=$dst_arg
# Protect names starting with `-'.
case $dst in
-*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work # If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored. # if double slashes aren't ignored.
@ -347,7 +354,7 @@ do
if test -z "$dir_arg" || { if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m. # Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writeable bit of parent directory when it shouldn't. # other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"` ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in case $ls_ld_tmpdir in
@ -385,7 +392,7 @@ do
case $dstdir in case $dstdir in
/*) prefix='/';; /*) prefix='/';;
-*) prefix='./';; [-=\(\)!]*) prefix='./';;
*) prefix='';; *) prefix='';;
esac esac
@ -403,7 +410,7 @@ do
for d for d
do do
test -z "$d" && continue test X"$d" = X && continue
prefix=$prefix$d prefix=$prefix$d
if test -d "$prefix"; then if test -d "$prefix"; then

148
config/missing
View File

@ -1,10 +1,9 @@
#! /bin/sh #! /bin/sh
# Common stub for a few missing GNU programs while installing. # Common stub for a few missing GNU programs while installing.
scriptversion=2009-04-28.21; # UTC scriptversion=2012-01-06.18; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, # Copyright (C) 1996-2012 Free Software Foundation, Inc.
# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -26,7 +25,7 @@ scriptversion=2009-04-28.21; # UTC
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information" echo 1>&2 "Try '$0 --help' for more information"
exit 1 exit 1
fi fi
@ -34,7 +33,7 @@ run=:
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
sed_minuso='s/.* -o \([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the # In the cases where this matters, 'missing' is being run in the
# srcdir already. # srcdir already.
if test -f configure.ac; then if test -f configure.ac; then
configure_ac=configure.ac configure_ac=configure.ac
@ -65,7 +64,7 @@ case $1 in
echo "\ echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]... $0 [OPTION]... PROGRAM [ARGUMENT]...
Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM. error status if there is no known handling for PROGRAM.
Options: Options:
@ -74,21 +73,20 @@ Options:
--run try to run the given command, and emulate it if it fails --run try to run the given command, and emulate it if it fails
Supported PROGRAM values: Supported PROGRAM values:
aclocal touch file \`aclocal.m4' aclocal touch file 'aclocal.m4'
autoconf touch file \`configure' autoconf touch file 'configure'
autoheader touch file \`config.h.in' autoheader touch file 'config.h.in'
autom4te touch the output file, or create a stub one autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files automake touch all 'Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch] bison create 'y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c flex create 'lex.yy.c', if possible, from existing .c
help2man touch the output file help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c lex create 'lex.yy.c', if possible, from existing .c
makeinfo touch the output file makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags yacc create 'y.tab.[ch]', if possible, from existing .[ch]
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
\`g' are ignored when checking the name. 'g' are ignored when checking the name.
Send bug reports to <bug-automake@gnu.org>." Send bug reports to <bug-automake@gnu.org>."
exit $? exit $?
@ -100,8 +98,8 @@ Send bug reports to <bug-automake@gnu.org>."
;; ;;
-*) -*)
echo 1>&2 "$0: Unknown \`$1' option" echo 1>&2 "$0: Unknown '$1' option"
echo 1>&2 "Try \`$0 --help' for more information" echo 1>&2 "Try '$0 --help' for more information"
exit 1 exit 1
;; ;;
@ -122,22 +120,13 @@ case $1 in
# Not GNU programs, they don't have --version. # Not GNU programs, they don't have --version.
;; ;;
tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
exit 1
fi
;;
*) *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed. # We have it, but it failed.
exit 1 exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
# Could not run --version or --help. This is probably someone # Could not run --version or --help. This is probably someone
# running `$TOOL --version' or `$TOOL --help' to check whether # running '$TOOL --version' or '$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing. # $TOOL exists and not knowing $TOOL uses missing.
exit 1 exit 1
fi fi
@ -149,27 +138,27 @@ esac
case $program in case $program in
aclocal*) aclocal*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if WARNING: '$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want you modified 'acinclude.m4' or '${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from to install the Automake and Perl packages. Grab them from
any GNU archive site." any GNU archive site."
touch aclocal.m4 touch aclocal.m4
;; ;;
autoconf*) autoconf*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if WARNING: '$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the you modified '${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU Autoconf and GNU m4 packages. Grab them from any GNU
archive site." archive site."
touch configure touch configure
;; ;;
autoheader*) autoheader*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if WARNING: '$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want you modified 'acconfig.h' or '${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them to install the Autoconf and GNU m4 packages. Grab them
from any GNU archive site." from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h" test -z "$files" && files="config.h"
@ -186,9 +175,9 @@ WARNING: \`$1' is $msg. You should only need it if
automake*) automake*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if WARNING: '$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages. You might want to install the Automake and Perl packages.
Grab them from any GNU archive site." Grab them from any GNU archive site."
find . -type f -name Makefile.am -print | find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' | sed 's/\.am$/.in/' |
@ -197,10 +186,10 @@ WARNING: \`$1' is $msg. You should only need it if
autom4te*) autom4te*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg. WARNING: '$1' is needed, but is $msg.
You might have modified some files without having the You might have modified some files without having the
proper tools for further handling them. proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU You can get '$1' as part of Autoconf from any GNU
archive site." archive site."
file=`echo "$*" | sed -n "$sed_output"` file=`echo "$*" | sed -n "$sed_output"`
@ -220,13 +209,13 @@ WARNING: \`$1' is needed, but is $msg.
bison*|yacc*) bison*|yacc*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if WARNING: '$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package you modified a '.y' file. You may need the Bison package
in order for those modifications to take effect. You can get in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site." Bison from any GNU archive site."
rm -f y.tab.c y.tab.h rm -f y.tab.c y.tab.h
if test $# -ne 1; then if test $# -ne 1; then
eval LASTARG="\${$#}" eval LASTARG=\${$#}
case $LASTARG in case $LASTARG in
*.y) *.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@ -250,13 +239,13 @@ WARNING: \`$1' $msg. You should only need it if
lex*|flex*) lex*|flex*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if WARNING: '$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package you modified a '.l' file. You may need the Flex package
in order for those modifications to take effect. You can get in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site." Flex from any GNU archive site."
rm -f lex.yy.c rm -f lex.yy.c
if test $# -ne 1; then if test $# -ne 1; then
eval LASTARG="\${$#}" eval LASTARG=\${$#}
case $LASTARG in case $LASTARG in
*.l) *.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@ -273,10 +262,10 @@ WARNING: \`$1' is $msg. You should only need it if
help2man*) help2man*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if WARNING: '$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take Help2man package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site." effect. You can get Help2man from any GNU archive site."
file=`echo "$*" | sed -n "$sed_output"` file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@ -291,12 +280,12 @@ WARNING: \`$1' is $msg. You should only need it if
makeinfo*) makeinfo*)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if WARNING: '$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file you modified a '.texi' or '.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX, call might also be the consequence of using a buggy 'make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or DU, IRIX). You might want to install the Texinfo package or
the \`GNU make' package. Grab either from any GNU archive site." the GNU make package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ... # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n "$sed_output"` file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@ -318,49 +307,14 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file touch $file
;; ;;
tar*)
shift
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
# messages.
if (gnutar --version > /dev/null 2>&1); then
gnutar "$@" && exit 0
fi
if (gtar --version > /dev/null 2>&1); then
gtar "$@" && exit 0
fi
firstarg="$1"
if shift; then
case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
;;
esac
fi
echo 1>&2 "\
WARNING: I can't seem to be able to run \`tar' with the given arguments.
You may want to install GNU tar or Free paxutils, or check the
command line arguments."
exit 1
;;
*) *)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg. WARNING: '$1' is needed, and is $msg.
You might have modified some files without having the You might have modified some files without having the
proper tools for further handling them. Check the \`README' file, proper tools for further handling them. Check the 'README' file,
it often tells you about the needed prerequisites for installing it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program." some other package would contain this missing '$1' program."
exit 1 exit 1
;; ;;
esac esac

2
html/admin/js/master.js
View File

@ -2957,6 +2957,8 @@ function systemAttributes () {
'_to' : true, '_to' : true,
'_bidirectional' : true, '_bidirectional' : true,
'_vertices' : true, '_vertices' : true,
'_from' : true,
'_to' : true,
'$id' : true '$id' : true
}; };
} }

14
js/common/modules/graph.js
View File

@ -1267,10 +1267,11 @@ Graph.prototype.addEdge = function (out_vertex, in_vertex, id, label, data) {
} }
if (data === null || typeof data !== "object") { if (data === null || typeof data !== "object") {
data = {}; shallow = {};
}
else {
shallow = data.shallowCopy || {};
} }
shallow = data.shallowCopy;
shallow.$id = id || null; shallow.$id = id || null;
shallow.$label = label || null; shallow.$label = label || null;
@ -1309,10 +1310,11 @@ Graph.prototype.addVertex = function (id, data) {
shallow; shallow;
if (data === null || typeof data !== "object") { if (data === null || typeof data !== "object") {
data = {}; shallow = {};
}
else {
shallow = data.shallowCopy || {};
} }
shallow = data.shallowCopy;
shallow.$id = id || null; shallow.$id = id || null;

1
js/server/arango-upgrade.js
View File

@ -286,7 +286,6 @@ function main (argv) {
return true; return true;
}); });
// loop through all tasks and execute them // loop through all tasks and execute them
console.log("Found " + allTasks.length + " defined task(s), " + activeTasks.length + " task(s) to run"); console.log("Found " + allTasks.length + " defined task(s), " + activeTasks.length + " task(s) to run");

40
lib/ApplicationServer/ApplicationServer.h
View File

@ -341,7 +341,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief program options /// @brief program options
/// ///
/// @CMDOPT{\-\-help} /// @CMDOPT{\--help}
/// ///
/// @CMDOPT{-h} /// @CMDOPT{-h}
/// ///
@ -409,7 +409,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief version of the application /// @brief version of the application
/// ///
/// @CMDOPT{\-\-version} /// @CMDOPT{\--version}
/// ///
/// @CMDOPT{-v} /// @CMDOPT{-v}
/// ///
@ -421,7 +421,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief config file /// @brief config file
/// ///
/// @CMDOPT{\-\-configuration @CA{filename}} /// @CMDOPT{\--configuration @CA{filename}}
/// ///
/// @CMDOPT{-c @CA{filename}} /// @CMDOPT{-c @CA{filename}}
/// ///
@ -500,7 +500,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief the user id to use for the process /// @brief the user id to use for the process
/// ///
/// @CMDOPT{\-\-uid @CA{uid}} /// @CMDOPT{\--uid @CA{uid}}
/// ///
/// The name (identity) of the user the server will run as. If this parameter is /// The name (identity) of the user the server will run as. If this parameter is
/// not specified, the server will not attempt to change its UID, so that the /// not specified, the server will not attempt to change its UID, so that the
@ -534,7 +534,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief the group id to use for the process /// @brief the group id to use for the process
/// ///
/// @CMDOPT{\-\-gid @CA{gid}} /// @CMDOPT{\--gid @CA{gid}}
/// ///
/// The name (identity) of the group the server will run as. If this parameter /// The name (identity) of the group the server will run as. If this parameter
/// is not specified, then the server will not attempt to change its GID, so /// is not specified, then the server will not attempt to change its GID, so
@ -564,7 +564,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log application name /// @brief log application name
/// ///
/// @CMDOPT{\-\-log.application @CA{name}} /// @CMDOPT{\--log.application @CA{name}}
/// ///
/// Specifies the @CA{name} of the application which should be logged if this item of /// Specifies the @CA{name} of the application which should be logged if this item of
/// information is to be logged. /// information is to be logged.
@ -575,7 +575,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log host name /// @brief log host name
/// ///
/// @CMDOPT{\-\-log.hostname @CA{name}} /// @CMDOPT{\--log.hostname @CA{name}}
/// ///
/// Specifies the @CA{name} of the operating environment (the "hostname") which /// Specifies the @CA{name} of the operating environment (the "hostname") which
/// should be logged if this item of information is to be logged. Note that /// should be logged if this item of information is to be logged. Note that
@ -587,7 +587,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log facility /// @brief log facility
/// ///
/// @CMDOPT{\-\-log.facility @CA{name}} /// @CMDOPT{\--log.facility @CA{name}}
/// ///
/// Specifies the name of the server instance which should be logged if this /// Specifies the name of the server instance which should be logged if this
/// item of information is to be logged. /// item of information is to be logged.
@ -598,9 +598,9 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log level /// @brief log level
/// ///
/// @CMDOPT{\-\-log.level @CA{level}} /// @CMDOPT{\--log.level @CA{level}}
/// ///
/// @CMDOPT{\-\-log @CA{level}} /// @CMDOPT{\--log @CA{level}}
/// ///
/// Allows the user to choose the level of information which is logged by the /// Allows the user to choose the level of information which is logged by the
/// server. The argument @CA{level} is specified as a string and can be one of /// server. The argument @CA{level} is specified as a string and can be one of
@ -670,7 +670,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log format /// @brief log format
/// ///
/// @CMDOPT{\-\-log.format @CA{format}} /// @CMDOPT{\--log.format @CA{format}}
/// ///
/// @copydetails triagens::basics::Logger::setLogFormat /// @copydetails triagens::basics::Logger::setLogFormat
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -680,7 +680,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log severity /// @brief log severity
/// ///
/// @CMDOPT{\-\-log.severity @CA{severity}} /// @CMDOPT{\--log.severity @CA{severity}}
/// ///
/// This parameter provides a set of standard log severities which can be /// This parameter provides a set of standard log severities which can be
/// used. The currently accepted @CA{severities} are: /// used. The currently accepted @CA{severities} are:
@ -701,7 +701,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log level /// @brief log level
/// ///
/// @CMDOPT{\-\-log.file @CA{filename}} /// @CMDOPT{\--log.file @CA{filename}}
/// ///
/// This option allows the user to specify the name of a file to which /// This option allows the user to specify the name of a file to which
/// information is logged. By default, if no log file is specified, the standard /// information is logged. By default, if no log file is specified, the standard
@ -719,7 +719,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log prefix /// @brief log prefix
/// ///
/// @CMDOPT{\-\-log.prefix @CA{prefix}} /// @CMDOPT{\--log.prefix @CA{prefix}}
/// ///
/// This option is used specify an prefix to logged text. /// This option is used specify an prefix to logged text.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -729,7 +729,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log level /// @brief log level
/// ///
/// @CMDOPT{\-\-log.syslog @CA{arg}} /// @CMDOPT{\--log.syslog @CA{arg}}
/// ///
/// If this option is set, then in addition to output being directed to the /// If this option is set, then in addition to output being directed to the
/// standard output (or to a specified file, in the case that the command line /// standard output (or to a specified file, in the case that the command line
@ -750,7 +750,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log thread identifier /// @brief log thread identifier
/// ///
/// @CMDOPT{\-\-log.thread} /// @CMDOPT{\--log.thread}
/// ///
/// Whenever log output is generated, the process ID is written as part of the /// Whenever log output is generated, the process ID is written as part of the
/// log information. Setting this option appends the thread id of the calling /// log information. Setting this option appends the thread id of the calling
@ -770,7 +770,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log line number /// @brief log line number
/// ///
/// @CMDOPT{\-\-log.line-number} /// @CMDOPT{\--log.line-number}
/// ///
/// Normally, if an human readable fatal, error, warning or info message is /// Normally, if an human readable fatal, error, warning or info message is
/// logged, no information about the file and line number is provided. The file /// logged, no information about the file and line number is provided. The file
@ -783,7 +783,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief log filter /// @brief log filter
/// ///
/// @CMDOPT{\-\-log.filter @CA{arg}} /// @CMDOPT{\--log.filter @CA{arg}}
/// ///
/// For debug and trace messages, only log those messages occurring in the /// For debug and trace messages, only log those messages occurring in the
/// file @CA{arg}. /// file @CA{arg}.
@ -794,7 +794,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief random number generator to use /// @brief random number generator to use
/// ///
/// @CMDOPT{\-\-random.generator @CA{arg}} /// @CMDOPT{\--random.generator @CA{arg}}
/// ///
/// The argument is an integer (1,2,3 or 4) which sets the manner in which /// The argument is an integer (1,2,3 or 4) which sets the manner in which
/// random numbers are generated. The default method (3) is to use the a /// random numbers are generated. The default method (3) is to use the a
@ -805,7 +805,7 @@ namespace triagens {
/// algorithm. Algorithm 4 is a combination of the blocking random number /// algorithm. Algorithm 4 is a combination of the blocking random number
/// generator and the Mersenne Twister. /// generator and the Mersenne Twister.
/// ///
/// @CMDOPT{\-\-random.no-seed} /// @CMDOPT{\--random.no-seed}
/// ///
/// By default, the random generator is seeded. Setting this option causes the /// By default, the random generator is seeded. Setting this option causes the
/// random number generator not to be seeded. (Seeding the random number /// random number generator not to be seeded. (Seeding the random number

3
lib/BasicsC/logging.c
View File

@ -1601,9 +1601,8 @@ TRI_log_appender_t* TRI_CreateLogAppenderSyslog (char const* name, char const* f
} }
} }
// and open logging // and open logging, openlog does not have a return value...
TRI_LockMutex(&appender->_mutex); TRI_LockMutex(&appender->_mutex);
// openlog does not have a return value...
openlog(name, LOG_CONS | LOG_PID, value); openlog(name, LOG_CONS | LOG_PID, value);
TRI_UnlockMutex(&appender->_mutex); TRI_UnlockMutex(&appender->_mutex);

20
lib/HttpServer/ApplicationEndpointServer.h
View File

@ -271,7 +271,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief endpoints for client HTTP requests /// @brief endpoints for client HTTP requests
/// ///
/// @CMDOPT{\-\-server.endpoint @CA{endpoint}} /// @CMDOPT{\--server.endpoint @CA{endpoint}}
/// ///
/// Specifies an @CA{endpoint} for HTTP requests by clients. Endpoints have /// Specifies an @CA{endpoint} for HTTP requests by clients. Endpoints have
/// the following pattern: /// the following pattern:
@ -299,7 +299,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief disable authentication for ALL client requests /// @brief disable authentication for ALL client requests
/// ///
/// @CMDOPT{\-\-server.disable-authentication @CA{value}} /// @CMDOPT{\--server.disable-authentication @CA{value}}
/// ///
/// Setting @CA{value} to true will turn off authentication on the server side /// Setting @CA{value} to true will turn off authentication on the server side
/// so all clients can execute any action without authorisation and privilege /// so all clients can execute any action without authorisation and privilege
@ -313,7 +313,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief timeout for HTTP keep-alive /// @brief timeout for HTTP keep-alive
/// ///
/// @CMDOPT{\-\-server.keep-alive-timeout} /// @CMDOPT{\--server.keep-alive-timeout}
/// ///
/// Allows to specify the timeout for HTTP keep-alive connections. The timeout /// Allows to specify the timeout for HTTP keep-alive connections. The timeout
/// value must be specified in seconds. /// value must be specified in seconds.
@ -327,7 +327,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief listen backlog size /// @brief listen backlog size
/// ///
/// @CMDOPT{\-\-server.backlog-size} /// @CMDOPT{\--server.backlog-size}
/// ///
/// Allows to specify the size of the backlog for the listen system call /// Allows to specify the size of the backlog for the listen system call
/// The default value is 10. The maximum value is platform-dependent. /// The default value is 10. The maximum value is platform-dependent.
@ -338,7 +338,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief keyfile containing server certificate /// @brief keyfile containing server certificate
/// ///
/// @CMDOPT{\-\-server.keyfile @CA{filename}} /// @CMDOPT{\--server.keyfile @CA{filename}}
/// ///
/// If SSL encryption is used, this option must be used to specify the filename /// If SSL encryption is used, this option must be used to specify the filename
/// of the server private key. The file must be PEM formatted and contain both /// of the server private key. The file must be PEM formatted and contain both
@ -367,7 +367,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief CA file /// @brief CA file
/// ///
/// @CMDOPT{\-\-server.cafile @CA{filename}} /// @CMDOPT{\--server.cafile @CA{filename}}
/// ///
/// This option can be used to specify a file with CA certificates that are sent /// This option can be used to specify a file with CA certificates that are sent
/// to the client whenever the server requests a client certificate. If the /// to the client whenever the server requests a client certificate. If the
@ -385,7 +385,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief SSL protocol type to use /// @brief SSL protocol type to use
/// ///
/// @CMDOPT{\-\-server.ssl-protocol @CA{value}} /// @CMDOPT{\--server.ssl-protocol @CA{value}}
/// ///
/// Use this option to specify the default encryption protocol to be used. /// Use this option to specify the default encryption protocol to be used.
/// The following variants are available: /// The following variants are available:
@ -404,7 +404,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief whether or not to use SSL session caching /// @brief whether or not to use SSL session caching
/// ///
/// @CMDOPT{\-\-server.ssl-cache @CA{value}} /// @CMDOPT{\--server.ssl-cache @CA{value}}
/// ///
/// Set to true if SSL session caching should be used. /// Set to true if SSL session caching should be used.
/// ///
@ -419,7 +419,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief ssl options to use /// @brief ssl options to use
/// ///
/// @CMDOPT{\-\-server.ssl-options @CA{value}} /// @CMDOPT{\--server.ssl-options @CA{value}}
/// ///
/// This option can be used to set various SSL-related options. Individual /// This option can be used to set various SSL-related options. Individual
/// option values must be combined using bitwise OR. /// option values must be combined using bitwise OR.
@ -441,7 +441,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief ssl cipher list to use /// @brief ssl cipher list to use
/// ///
/// @CMDOPT{\-\-server.ssl-cipher-list @CA{cipher-list}} /// @CMDOPT{\--server.ssl-cipher-list @CA{cipher-list}}
/// ///
/// This option can be used to restrict the server to certain SSL ciphers only, /// This option can be used to restrict the server to certain SSL ciphers only,
/// and to define the relative usage preference of SSL ciphers. /// and to define the relative usage preference of SSL ciphers.

44
lib/JsonParser/json-parser.c
View File

@ -89,6 +89,7 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t; typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t; typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t; typedef uint32_t flex_uint32_t;
typedef uint64_t flex_uint64_t;
#else #else
typedef signed char flex_int8_t; typedef signed char flex_int8_t;
typedef short int flex_int16_t; typedef short int flex_int16_t;
@ -212,6 +213,11 @@ typedef void* yyscan_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif #endif
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2 #define EOB_ACT_LAST_MATCH 2
@ -234,11 +240,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE #ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state struct yy_buffer_state
@ -256,7 +257,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB /* Number of characters read into yy_ch_buf, not including EOB
* characters. * characters.
*/ */
int yy_n_chars; yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it, /* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to * and can realloc() it to grow it, and should free() it to
@ -335,7 +336,7 @@ static void tri_jsp__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscann
YY_BUFFER_STATE tri_jsp__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_jsp__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE tri_jsp__scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_jsp__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE tri_jsp__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_jsp__scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
void *tri_jsp_alloc (yy_size_t ,yyscan_t yyscanner ); void *tri_jsp_alloc (yy_size_t ,yyscan_t yyscanner );
void *tri_jsp_realloc (void *,yy_size_t ,yyscan_t yyscanner ); void *tri_jsp_realloc (void *,yy_size_t ,yyscan_t yyscanner );
@ -386,7 +387,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*/ */
#define YY_DO_BEFORE_ACTION \ #define YY_DO_BEFORE_ACTION \
yyg->yytext_ptr = yy_bp; \ yyg->yytext_ptr = yy_bp; \
yyleng = (size_t) (yy_cp - yy_bp); \ yyleng = (yy_size_t) (yy_cp - yy_bp); \
yyg->yy_hold_char = *yy_cp; \ yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \ *yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp; yyg->yy_c_buf_p = yy_cp;
@ -565,8 +566,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */ size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char; char yy_hold_char;
int yy_n_chars; yy_size_t yy_n_chars;
int yyleng_r; yy_size_t yyleng_r;
char *yy_c_buf_p; char *yy_c_buf_p;
int yy_init; int yy_init;
int yy_start; int yy_start;
@ -613,7 +614,7 @@ FILE *tri_jsp_get_out (yyscan_t yyscanner );
void tri_jsp_set_out (FILE * out_str ,yyscan_t yyscanner ); void tri_jsp_set_out (FILE * out_str ,yyscan_t yyscanner );
int tri_jsp_get_leng (yyscan_t yyscanner ); yy_size_t tri_jsp_get_leng (yyscan_t yyscanner );
char *tri_jsp_get_text (yyscan_t yyscanner ); char *tri_jsp_get_text (yyscan_t yyscanner );
@ -672,7 +673,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \ { \
int c = '*'; \ int c = '*'; \
int n; \ yy_size_t n; \
for ( n = 0; n < max_size && \ for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \ buf[n] = (char) c; \
@ -1128,7 +1129,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ {
int num_to_read = yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 ) while ( num_to_read <= 0 )
@ -1142,7 +1143,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( b->yy_is_our_buffer ) if ( b->yy_is_our_buffer )
{ {
int new_size = b->yy_buf_size * 2; yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 ) if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8; b->yy_buf_size += b->yy_buf_size / 8;
@ -1173,7 +1174,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
/* Read in more data. */ /* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
yyg->yy_n_chars, (int) num_to_read ); yyg->yy_n_chars, num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
} }
@ -1298,7 +1299,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ /* need more input */ { /* need more input */
int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
++yyg->yy_c_buf_p; ++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) ) switch ( yy_get_next_buffer( yyscanner ) )
@ -1322,7 +1323,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
case EOB_ACT_END_OF_FILE: case EOB_ACT_END_OF_FILE:
{ {
if ( tri_jsp_wrap(yyscanner ) ) if ( tri_jsp_wrap(yyscanner ) )
return EOF; return 0;
if ( ! yyg->yy_did_buffer_switch_on_eof ) if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE; YY_NEW_FILE;
@ -1584,7 +1585,7 @@ void tri_jsp_pop_buffer_state (yyscan_t yyscanner)
*/ */
static void tri_jsp_ensure_buffer_stack (yyscan_t yyscanner) static void tri_jsp_ensure_buffer_stack (yyscan_t yyscanner)
{ {
int num_to_alloc; yy_size_t num_to_alloc;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (!yyg->yy_buffer_stack) { if (!yyg->yy_buffer_stack) {
@ -1682,12 +1683,11 @@ YY_BUFFER_STATE tri_jsp__scan_string (yyconst char * yystr , yyscan_t yyscanner)
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
YY_BUFFER_STATE tri_jsp__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) YY_BUFFER_STATE tri_jsp__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
char *buf; char *buf;
yy_size_t n; yy_size_t n, i;
int i;
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2; n = _yybytes_len + 2;
@ -1797,7 +1797,7 @@ FILE *tri_jsp_get_out (yyscan_t yyscanner)
/** Get the length of the current token. /** Get the length of the current token.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
int tri_jsp_get_leng (yyscan_t yyscanner) yy_size_t tri_jsp_get_leng (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng; return yyleng;

2
lib/Rest/AnyServer.h
View File

@ -168,7 +168,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief pid file /// @brief pid file
/// ///
/// @CMDOPT{\-\-pid-file @CA{filename}} /// @CMDOPT{\--pid-file @CA{filename}}
/// ///
/// The name of the process ID file to use when running the server as a /// The name of the process ID file to use when running the server as a
/// daemon. This parameter must be specified if either the flag @LIT{daemon} or /// daemon. This parameter must be specified if either the flag @LIT{daemon} or

4
lib/Scheduler/ApplicationScheduler.h
View File

@ -269,7 +269,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief number of scheduler threads /// @brief number of scheduler threads
/// ///
/// @CMDOPT{\-\-scheduler.threads @CA{arg}} /// @CMDOPT{\--scheduler.threads @CA{arg}}
/// ///
/// An integer argument which sets the number of threads to use in the IO /// An integer argument which sets the number of threads to use in the IO
/// scheduler. The default is 1. /// scheduler. The default is 1.
@ -280,7 +280,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief scheduler backend /// @brief scheduler backend
/// ///
/// @CMDOPT{\-\-scheduler.backend @CA{arg}} /// @CMDOPT{\--scheduler.backend @CA{arg}}
/// ///
/// The I/O method used by the event handler. The default (if this option is /// The I/O method used by the event handler. The default (if this option is
/// not specified) is to try all recommended backends. This is platform /// not specified) is to try all recommended backends. This is platform

1
lib/V8/V8LineEditor.cpp
View File

@ -251,6 +251,7 @@ V8LineEditor::V8LineEditor (v8::Handle<v8::Context> context, std::string const&
bool V8LineEditor::open (const bool autoComplete) { bool V8LineEditor::open (const bool autoComplete) {
if (autoComplete) { if (autoComplete) {
// issue #289: do not append a space after completion // issue #289: do not append a space after completion
rl_completion_append_character = '\0'; rl_completion_append_character = '\0';

44
lib/V8/v8-json.cpp
View File

@ -84,6 +84,7 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t; typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t; typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t; typedef uint32_t flex_uint32_t;
typedef uint64_t flex_uint64_t;
#else #else
typedef signed char flex_int8_t; typedef signed char flex_int8_t;
typedef short int flex_int16_t; typedef short int flex_int16_t;
@ -207,6 +208,11 @@ typedef void* yyscan_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif #endif
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2 #define EOB_ACT_LAST_MATCH 2
@ -229,11 +235,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE #ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state struct yy_buffer_state
@ -251,7 +252,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB /* Number of characters read into yy_ch_buf, not including EOB
* characters. * characters.
*/ */
int yy_n_chars; yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it, /* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to * and can realloc() it to grow it, and should free() it to
@ -330,7 +331,7 @@ static void tri_v8__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanne
YY_BUFFER_STATE tri_v8__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_v8__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE tri_v8__scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_v8__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
void *tri_v8_alloc (yy_size_t ,yyscan_t yyscanner ); void *tri_v8_alloc (yy_size_t ,yyscan_t yyscanner );
void *tri_v8_realloc (void *,yy_size_t ,yyscan_t yyscanner ); void *tri_v8_realloc (void *,yy_size_t ,yyscan_t yyscanner );
@ -381,7 +382,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*/ */
#define YY_DO_BEFORE_ACTION \ #define YY_DO_BEFORE_ACTION \
yyg->yytext_ptr = yy_bp; \ yyg->yytext_ptr = yy_bp; \
yyleng = (size_t) (yy_cp - yy_bp); \ yyleng = (yy_size_t) (yy_cp - yy_bp); \
yyg->yy_hold_char = *yy_cp; \ yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \ *yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp; yyg->yy_c_buf_p = yy_cp;
@ -553,8 +554,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */ size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char; char yy_hold_char;
int yy_n_chars; yy_size_t yy_n_chars;
int yyleng_r; yy_size_t yyleng_r;
char *yy_c_buf_p; char *yy_c_buf_p;
int yy_init; int yy_init;
int yy_start; int yy_start;
@ -601,7 +602,7 @@ FILE *tri_v8_get_out (yyscan_t yyscanner );
void tri_v8_set_out (FILE * out_str ,yyscan_t yyscanner ); void tri_v8_set_out (FILE * out_str ,yyscan_t yyscanner );
int tri_v8_get_leng (yyscan_t yyscanner ); yy_size_t tri_v8_get_leng (yyscan_t yyscanner );
char *tri_v8_get_text (yyscan_t yyscanner ); char *tri_v8_get_text (yyscan_t yyscanner );
@ -660,7 +661,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \ { \
int c = '*'; \ int c = '*'; \
int n; \ yy_size_t n; \
for ( n = 0; n < max_size && \ for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \ buf[n] = (char) c; \
@ -1107,7 +1108,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ {
int num_to_read = yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 ) while ( num_to_read <= 0 )
@ -1121,7 +1122,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( b->yy_is_our_buffer ) if ( b->yy_is_our_buffer )
{ {
int new_size = b->yy_buf_size * 2; yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 ) if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8; b->yy_buf_size += b->yy_buf_size / 8;
@ -1152,7 +1153,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
/* Read in more data. */ /* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
yyg->yy_n_chars, (int) num_to_read ); yyg->yy_n_chars, num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
} }
@ -1277,7 +1278,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ /* need more input */ { /* need more input */
int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
++yyg->yy_c_buf_p; ++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) ) switch ( yy_get_next_buffer( yyscanner ) )
@ -1301,7 +1302,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
case EOB_ACT_END_OF_FILE: case EOB_ACT_END_OF_FILE:
{ {
if ( tri_v8_wrap(yyscanner ) ) if ( tri_v8_wrap(yyscanner ) )
return EOF; return 0;
if ( ! yyg->yy_did_buffer_switch_on_eof ) if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE; YY_NEW_FILE;
@ -1561,7 +1562,7 @@ void tri_v8_pop_buffer_state (yyscan_t yyscanner)
*/ */
static void tri_v8_ensure_buffer_stack (yyscan_t yyscanner) static void tri_v8_ensure_buffer_stack (yyscan_t yyscanner)
{ {
int num_to_alloc; yy_size_t num_to_alloc;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (!yyg->yy_buffer_stack) { if (!yyg->yy_buffer_stack) {
@ -1659,12 +1660,11 @@ YY_BUFFER_STATE tri_v8__scan_string (yyconst char * yystr , yyscan_t yyscanner)
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
char *buf; char *buf;
yy_size_t n; yy_size_t n, i;
int i;
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2; n = _yybytes_len + 2;
@ -1774,7 +1774,7 @@ FILE *tri_v8_get_out (yyscan_t yyscanner)
/** Get the length of the current token. /** Get the length of the current token.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
int tri_v8_get_leng (yyscan_t yyscanner) yy_size_t tri_v8_get_leng (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng; return yyleng;