Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,413 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

717 Commits

Author SHA1 Message Date
Jan Steemann c71dc4d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-query-cache 2015-07-13 10:49:14 +02:00
Willi Goesgens bd7aa7c305 Remove the global include to iostream; this reduces the compile time by 10% 
( http://herbsutter.com/2013/08/19/gotw-7a-solution-minimizing-compile-time-dependencies-part-1/  for inspiration)
 2015-07-07 12:11:21 +02:00
Jan Steemann 61e09fe10c mini optimization 2015-06-27 06:51:11 +02:00
Jan Steemann f7d5a612d9 do not use EscapableHandleScope for TRI_json_t to V8 conversions 
Using EscapableHandleScope is slower than using a HandleScope directly
and also burst earlier with out of memory
 2015-06-19 15:06:33 +02:00
Willi Goesgens 9c7d49a666 Merge branch 'v8_4.2' of github.com:arangodb/arangodb into devel 2015-06-18 10:34:08 +02:00
Jan Steemann 3d4f323718 fix some issues with multiple databases and database-switching 2015-06-10 13:24:38 +02:00
Jan Steemann a6b2998b5d added try...catch blocks for V8-to-CPP bindings 2015-06-08 16:04:42 +02:00
Jan Steemann 2178ace348 fixed invalid usage of null 2015-06-03 09:25:35 +02:00
Jan Steemann 4c7994597a cppcheck 2015-06-02 22:49:22 +02:00
Jan Steemann 39cf9c527c micro optimizations 2015-06-01 14:56:01 +02:00
Willi Goesgens 1d6765b603 Add TryCatch to JS_Load, since V8 doesn't like to continue here without that. 2015-05-29 16:51:47 +02:00
Jan Steemann ad59242822 fixed ambiguous attribute name "version" for collections 2015-05-28 11:54:57 +02:00
Jan Steemann 4dde6e49cd goodbye barriers, welcome ditches 2015-05-28 10:23:30 +02:00
Jan Steemann 03461903fe fixed over-eager V8 context entering and exiting in non-cluster mode 2015-05-27 14:02:13 +02:00
Jan Steemann 07e553cd8d Merge branch 'devel' of https://github.com/arangodb/arangodb into index-cxx 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2015-05-26 17:07:26 +02:00
Jan Steemann a9f2769ffa now compiles and links 2015-05-23 04:31:13 +02:00
Willi Goesgens fe19440bca Add documentation for some more filesystem calls; change sequence. 2015-05-22 16:34:27 +02:00
Willi Goesgens 871a95122c Work on documentation - not all documentation from the code seems to appear in the generated documentation. 2015-05-22 15:37:23 +02:00
Willi Goesgens c418f10729 Implement copying of files, since copyRecursive can't copy single files. 2015-05-21 15:49:10 +02:00
Jan Steemann 688b21fe51 fixed namespaces 2015-05-20 15:49:39 +02:00
Willi Goesgens 8e858bc96d Upgrade V8 to 4.2.77 
- v8 now requires llvm libstdc++ inline
  - ForceDelete is gone now; employ new tactics of working with wrapping shaped json
  - gold crashes while linking V8, remove it.
 2015-05-20 15:10:28 +02:00
Willi Goesgens 470c0401c1 Add filename to the exception 2015-05-13 10:49:15 +02:00
Jan Steemann 771f2db94b cleanup 2015-05-11 17:26:42 +02:00
Jan Steemann dd51747a3d fix issue in regex 2015-05-08 17:45:00 +02:00
Jan Steemann 5ad7dea0c8 use auto for HTTP response headers iteration 2015-05-08 17:44:33 +02:00
Jan Steemann 6b412a1c01 Merge branch 'json-privatisierung' of https://github.com/arangodb/arangodb into json-privatisierung 2015-05-07 13:05:12 +02:00
Jan Steemann 537b115eac optimized json parsing for V8 clients 2015-05-07 12:36:50 +02:00
Jan Steemann a007a867ee "privatized" TRI_vector_t internals. 
This allows changing the internals of TRI_vector_t structs in order to make the struct smaller.
On 64 bits, the size of TRI_vector_t is reduced from 48 bytes to 28 bytes.
TRI_json_t does benefit from this, as its biggest component is a TRI_vector_t.
 2015-05-05 10:31:02 +02:00
Jan Steemann 8dbcf0e23f Visual Studio adjustments 2015-04-30 11:46:55 +02:00
Jan Steemann baa5e39348 removed lib/Basics/utf8-helper.cpp and merged with lib/Basics/Utf8Helper.cpp 2015-04-21 17:53:35 +02:00
Jan Steemann e1312f2088 attempt to satisfy scan-build a bit 2015-04-16 11:47:18 +02:00
Jan Steemann 61c42e0ee2 fix relative URL redirects in internal.download() 2015-04-15 14:00:35 +02:00
Jan Steemann 524bfd63ff make relative URLs work 2015-04-15 12:33:10 +02:00
Willi Goesgens 6579eefc33 Add function that can copy files recursive. 2015-04-14 14:46:17 +02:00
Jan Steemann 0e93087d50 slightly faster V8 => JSON conversion in AQL 2015-04-03 16:00:38 +02:00
Jan Steemann ef25118d02 removed unused method 2015-04-03 15:02:52 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask 
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
 2015-03-31 09:12:01 +02:00
Willi Goesgens 0690b4943f - Replace the javascript implementation of makeDirectoryRecursive by our native implementation 
- fix the native implementation so it doesn't try to create driveletters as directories.
 2015-03-26 17:23:57 +01:00
Jan Steemann 4566aa085a add __filename and __dirname to global context also when using internal.load() 2015-03-25 18:06:42 +01:00
Jan Steemann 7ec3a18e04 added internal.options() 2015-03-25 17:08:29 +01:00
Jan Steemann d567c012c3 added SYS_OPTIONS() to get options 2015-03-25 16:55:24 +01:00
Willi Goesgens 07c850b025 Windows: String::Value is the way to get twobyte-strings. 2015-03-24 15:55:55 +01:00
Willi Goesgens fad2e60895 Fix windows compile of getenv facilities 2015-03-23 17:06:09 +01:00
Willi Goesgens 6ec5920057 don't let the mac-fix break linux ;-) 2015-03-23 11:15:46 +01:00
Frank Celler 8950175eac added external 2015-03-23 10:51:14 +01:00
Willi Goesgens 696b7431ff Fix windows compilaton for V8 environment adoption routines. 2015-03-20 13:20:06 +01:00
Willi Goesgens 958d89c91e Add files for environment. 2015-03-20 12:03:05 +01:00
Willi Goesgens 108fccdbf7 Add environment variable to V8 wrapping. 2015-03-20 11:55:32 +01:00
Jan Steemann 1298bd40a8 added tests for out-of-memory situations 2015-03-20 08:54:15 +01:00
Jan Steemann 8c6cafceb3 fix arangosh multi-line input for ES6 template strings 2015-03-19 21:03:48 +01:00
Jan Steemann 8ec3d7b619 fixed Windows compile errors 2015-03-18 18:10:49 +01:00
Willi Goesgens a95a496920 Add (unix) implementation for chmod 2015-03-18 13:41:26 +01:00
Jan Steemann a45dcf499e remove broken log message 2015-03-05 10:40:40 +01:00
Willi Goesgens a3e03a7dc7 Fix available time for garbage collection to be not bigger as the callers value of availableTime 2015-03-05 10:31:08 +01:00
Jan Steemann 9d2196ebfd VS 2015-03-03 13:12:12 +01:00
Willi Goesgens ae5af7f023 Run microtasks after garbage collection; they may also need to clean up stuff. 2015-03-03 11:03:56 +01:00
Willi Goesgens 2619529f63 Relax cluster timeout when compiled with -DCOVERAGE 2015-02-26 11:01:53 +01:00
Jan Steemann f46187d698 Revert "removed unused attribute" 
This reverts commit f04a4a89391b87d928aeae5efbfb591058997786.
 2015-02-24 11:27:55 +01:00
Willi Goesgens 47a6e56501 Fix use after free. 2015-02-24 10:36:07 +01:00
Willi Goesgens bdcabd1a62 More verbose error message when declining to remove a directory outside of the temp directory. 2015-02-23 18:11:01 +01:00
Jan Steemann 55d03dd8fd removed unused attribute 2015-02-23 16:27:19 +01:00
Jan Steemann 3d8235d820 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-23 15:36:02 +01:00
Jan Steemann 43545bf6fe attempt to fix compile warning 2015-02-23 15:35:47 +01:00
Willi Goesgens dcac88c35a Fix error message on tempfile creation 2015-02-23 15:28:46 +01:00
Willi Goesgens a58974d773 Improve error handling 
- directory creation
  - zip extraction
 2015-02-23 12:26:49 +01:00
Willi Goesgens cd9ad14160 Fix error handling in directory creation: only catch errors of directory existing; throw meaningfull error message. 2015-02-20 12:55:46 +01:00
Willi Goesgens 8ce7be78e2 improve error message while moving files - now contains source, destination and system error. 2015-02-19 19:25:05 +01:00
Jan Steemann 05fadde9e2 small changes 2015-02-19 13:58:50 +01:00
Jan Steemann 9be27a4788 fixed crash 2015-02-19 10:24:58 +01:00
Jan Steemann 59936f1f98 small optimizations 2015-02-19 09:31:00 +01:00
Jan Steemann cb1aed4eea fixed invalid types 2015-02-17 17:16:31 +01:00
Michael Hackstein 0c78629199 Merge branch 'foxx-pathes' of github.com:arangodb/arangodb into devel 2015-02-16 14:17:52 +01:00
Jan Steemann 1e0dae153c cleanup 2015-02-15 23:57:41 +01:00
Jan Steemann e250a31b0c shaper changes 2015-02-15 21:53:27 +01:00
Willi Goesgens e65db6114c No need to step down to c-strings here. 2015-02-13 11:48:33 +01:00
Michael Hackstein 5b3fae42aa Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes 
Conflicts:
	js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	lib/Basics/voc-errors.cpp
	lib/Basics/voc-errors.h
 2015-02-13 10:20:36 +01:00
Jan Steemann 65d32cbb25 fixed cppcheck complaint 2015-02-13 00:23:39 +01:00
Michael Hackstein aad7e46f10 Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes 
Conflicts:
	Documentation/Books/Users/SUMMARY.md
	js/actions/api-system.js
	js/common/bootstrap/modules.js
	js/server/modules/org/arangodb/foxx/manager.js
	js/server/tests/shell-routing.js
 2015-02-06 17:22:01 +01:00
Jan Steemann f7c10cb2a6 added stack traces for ArangoError 2015-02-03 17:45:08 +01:00
Jan Steemann d06c3c1ff3 changed "file names" of anonymous commands 2015-02-03 12:46:34 +01:00
Willi Goesgens 293a3fe7d3 Differenciate whether we fail to locate or execute a script in error messages. 2015-01-27 12:25:40 +01:00
Jan Steemann 7af624e2f0 selectivty, try 0 2015-01-27 09:34:04 +01:00
Frank Celler 1b722fe368 generated files 2015-01-26 11:59:05 +01:00
Jan Steemann 8580d49aec added TRI_SimplifiedObjectToJson 2015-01-25 10:33:24 +01:00
Jan Steemann 0d8bf44215 gc adjustment 2015-01-23 20:51:42 +01:00
Jan Steemann 5d12a3da3b garbage collection 2015-01-23 16:45:00 +01:00
Willi Goesgens 26281d94c9 When throwing the exception of being unable to open a file add the filename. 2015-01-22 15:09:59 +01:00
Jan Steemann 37ae686d4b re-introduced odd (but compatible) behavior in ObjectToJson 2015-01-17 23:24:23 +01:00
Jan Steemann 9b66ab3a61 added AQL functions MD5, SHA1, and RANDOM_TOKEN 2015-01-17 22:40:47 +01:00
Jan Steemann 402d56c1af when parsing or converting JSON, create elements in-place if possible to avoid memory allocations 2015-01-17 21:48:18 +01:00
Jan Steemann af3fef03a0 fixed possible segmentation fault when passing a Buffer object into a V8 function as a parameter 2015-01-13 22:49:07 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 906d22a691 make fs.move() behave identical on Linux and Windows 
Conflicts:
	CHANGELOG
 2015-01-12 20:13:11 +01:00
Jan Steemann 8a86c798a1 use IndexedPropertyAccessor for Buffer 2015-01-09 16:51:22 +01:00
Jan Steemann 3ce99bae8c removed duplicate Reset() call 2015-01-09 10:41:26 +01:00
Jan Steemann f3b142849f fixed leaks during reverts 2015-01-03 01:28:23 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Jan Steemann 0c38d60732 less replacements in flex output 2014-12-17 17:26:37 +01:00
Jan Steemann cc3b97491d added derived files 2014-12-17 10:30:32 +01:00
Jan Steemann e8f51f1b5f issue #1185: parse non-fractional numbers with exponent 2014-12-17 10:28:48 +01:00
Jan Steemann 50e08ab099 removed unused file 2014-12-16 17:30:48 +01:00
Max Neunhoeffer bf915da2e3 Use an unordered_map for JSBarriers. 2014-12-16 09:57:44 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Frank Celler 10e07f1982 added generated files 2014-11-12 14:58:51 +01:00
Frank Celler 88d1f78464 Merge remote-tracking branch 'origin/2.3' into devel 
Conflicts:
	CHANGELOG
 2014-11-12 04:57:41 +01:00
Jan Steemann 26c3b0174f fixed tests 2014-10-31 19:58:20 +01:00
Jan Steemann d4d3e37a0d added internal.parseFile 2014-10-30 19:18:05 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Willi Goesgens 28f3b27922 These are not pointers. 2014-10-27 15:52:00 +01:00
Willi Goesgens 2378e2cef3 - don't output pseudo filenames in errors 
- use nullptr
 2014-10-27 15:46:53 +01:00
Jan Steemann 0a0f5f86ab issue #1056: "fs": zip functions fail with passwords 2014-10-25 00:36:46 +02:00
Alan Plum 55f3c9829c Fixed PBKDF2 usage. 2014-10-22 17:29:17 +02:00
Jan Steemann 12ac3b8bdd added comment 2014-10-21 10:45:27 +02:00
Jan Steemann 3d70c55d85 fixed isatty handling 2014-10-21 10:43:30 +02:00
Jan Steemann fbdcffbd16 no colors if output is not a tty 2014-10-18 01:39:56 +02:00
Jan Steemann d4da8cb908 fixed arangosh 2014-10-17 13:25:49 +02:00
Jan Steemann 0aa02a696b pass ApplicationV8 to queries 2014-10-17 10:35:02 +02:00
Jan Steemann dcb9427b6f rewrote transaction contexts 2014-10-16 15:53:28 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +02:00
Jan Steemann c946a1536a documentation for fs 2014-10-15 14:01:15 +02:00
Jan Steemann 6bd448be46 added support for reading / writing binary data in fs.readFileSync && fs.write 2014-10-14 19:07:16 +02:00
Jan Steemann 1ba2030e0b debug info 2014-10-13 11:10:12 +02:00
Jan Steemann d9cc80bab7 fixes for Visual Studio 2014-10-10 14:37:03 +02:00
Willi Goesgens 73d121ece7 Add the possible error messages from waitpid to the result output. 2014-10-10 11:44:48 +02:00
Willi Goesgens e433a2831e Add a new wrapper which does fork + waitpid in one js call, so we're closer to the flame and less eventually miss something. 2014-10-08 16:48:30 +02:00
Jan Steemann ff80fafba5 fixed cached lookups of collections on the server, which may have caused spurious problems after collection rename operations 2014-10-08 14:59:02 +02:00
Jan Steemann 0f83d8132f fixed some transaction threading errors 2014-10-06 18:39:01 +02:00
Jan Steemann ce9499eac8 less string copying, less regex slowdown when importing CSV files 2014-09-30 23:20:12 +02:00
Jan Steemann 0d075dca3f pass queryRegistry into the AQL functions 2014-09-29 09:30:32 +02:00
Jan Steemann dbf964e204 small optimizations 2014-09-24 12:09:13 +02:00
Jan Steemann ddfb5c965d merged experimental features 2014-09-24 09:42:16 +02:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 669cb3b235 renamed files 2014-09-13 01:44:01 +02:00
Jan Steemann 953b8cdfe3 renamed files 2014-09-13 00:34:48 +02:00
Jan Steemann 0dc0bc834f more files renamed 2014-09-13 00:20:30 +02:00
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
 2014-09-09 22:18:52 +02:00
Alan Plum b0995dfdb7 Replaced PBKDF2_HMAC with PBKDF2_HMAC_SHA1 for OSX compat. 2014-09-08 14:32:40 +02:00
Alan Plum 6f9376e264 Fixed PBKDF2HMAC comment. 2014-09-05 16:35:27 +02:00
Alan Plum 469af580e5 Added PBKDF2-HMAC. 2014-09-05 16:23:37 +02:00
Alan Plum 4e3659c01a Added support for sha384, sha512. 2014-09-04 23:17:58 +02:00
Jan Steemann 005e727bde Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	lib/V8/v8-conv.cpp
 2014-09-01 16:15:32 +02:00
Jan Steemann 848ce68dc3 fixed too eager duplicates check for shaper 2014-09-01 15:48:58 +02:00
Jan Steemann 66d556b003 re-added cases for data types 2014-08-30 02:42:35 +02:00
Jan Steemann 799a845967 added V8StringConverter 2014-08-30 02:32:59 +02:00
Jan Steemann 6f5271823e use auto 2014-08-23 01:54:28 +02:00
Jan Steemann dcfa59806e more C++11 2014-08-23 00:51:13 +02:00
Jan Steemann 45d5d0f53a cppcheck 2014-08-22 13:53:21 +02:00
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
 2014-08-13 16:29:57 +02:00
Jan Steemann 0a70e979f8 call `toJSON` function of objects (if present) when serializing 2014-08-13 16:05:58 +02:00
Frank Celler f6e242039d relaxed % and escaping 2014-08-12 14:53:59 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Jan Steemann cb2e9a8a37 fixed JSON conversion 2014-08-07 15:48:33 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Jan Steemann ac7b47c0b7 nullptr 2014-08-06 09:42:36 +02:00
Jan Steemann fe4d83e80b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	Documentation/Books/Users/Aql/README.mdpp
	Documentation/Books/Users/AqlExtending/README.mdpp
 2014-08-05 15:09:28 +02:00
Thomas Schmidts baf6635627 Added missing methods to fs module. fix #978 2014-08-05 13:37:40 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00
Jan Steemann f4e8775ddc nicer parser error messages 2014-07-30 12:30:06 +02:00
Frank Celler e436ecfa40 if a cancelation has occured, flush the module cache 2014-07-08 11:54:53 +02:00
Frank Celler 0703809e00 added isIP 2014-07-07 18:46:02 +02:00
Thomas Schmidts 1a78807a67 Fixed a few @startDocuBlock errors 2014-07-07 16:15:50 +02:00
Jan Steemann f939b079c4 recovery 2014-07-03 22:49:49 +02:00
Jan Steemann 1d051f4e1e fixed shaping of regexp/date objects etc 
this is disallowed, but due to an invalid sequence of if statements such attributes
were silently converted into `{ }` before and no error was returned to the user
 2014-07-03 16:58:40 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Thomas Schmidts a828ed3d08 Changed some code comments 2014-07-01 16:30:36 +02:00
Frank Celler 7bdc42a7d1 added yy_fatal_error unused function fix 2014-06-30 09:21:24 +02:00
Jan Steemann 76de1ae762 cppcheck 2014-06-27 22:20:17 +02:00
Jan Steemann 96569367d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/document-collection.cpp
 2014-06-26 13:07:53 +02:00
Frank Celler 4ae1f0cd4a added temporary attribute entries in shaper 2014-06-26 12:50:50 +02:00
Jan Steemann 723a0ab265 fixed some memory errors 2014-06-26 11:52:37 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
Jan Steemann 5dc4f31e29 dont provide functionality in non-debug mode 2014-06-24 00:34:53 +02:00
Jan Steemann 69eb029c56 CXX 2014-06-21 03:21:55 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Alan Plum a682767efc Added HMAC MD5. 2014-06-17 13:25:07 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +02:00
Jan Steemann b3d18d0deb cppcheck 2014-06-16 09:50:38 +02:00
Jan Steemann 47999865d6 read-only mode 2014-06-13 15:32:13 +02:00
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann 229e710dd1 less memset 2014-06-05 01:15:40 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
Jan Steemann 57d0d4a5ca inlined some functions 2014-05-28 21:12:16 +02:00
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
 2014-05-26 17:28:16 +02:00
Jan Steemann adfaf9b760 garbage collection 2014-05-26 16:06:18 +02:00
Frank Celler ecd5641d03 added i/o stats 2014-05-25 23:11:03 +02:00
Jan Steemann ea97d443b0 use wal shape and attribute markers 2014-05-22 16:00:00 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00