1
0
Fork 0
Commit Graph

5520 Commits

Author SHA1 Message Date
Willi Goesgens ea76accb72 Set the unhandled exception handler in windows, so we can catch crashes. 2015-02-17 15:42:33 +01:00
Willi Goesgens d61fc4343a Set debug message trap for failing windows arangobench tests. 2015-02-17 14:27:25 +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 e250a31b0c shaper changes 2015-02-15 21:53:27 +01:00
Jan Steemann 205736a028 added optimizer rule "propagate-constant-attributes" 2015-02-15 13:29:53 +01:00
Jan Steemann db2cd7acc9 added `filtered` attribute to AQL execution statistics 2015-02-13 21:37:49 +01:00
Willi Goesgens da5f86f16b Windows service deletion - only remove the service entry if it matches our binary path. 2015-02-13 16:21:35 +01:00
Willi Goesgens 154882ae5f Add signal handler. 2015-02-13 14:44:21 +01:00
Willi Goesgens e48a75f6e2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-13 14:12:20 +01:00
Willi Goesgens df226e5a82 - install SIG11 handler which prints backtrace to the console. (in windows we don't get cores)
- fix exit handling for windows process control.
2015-02-13 14:11:15 +01:00
Jan Steemann 3ed5d54fbb removed unusued functions 2015-02-13 13:45:18 +01:00
Michael Hackstein 63991b62dd Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes 2015-02-13 10:20:56 +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 3ffdfe0756 authentication realm 2015-02-13 10:12:35 +01:00
Jan Steemann 9ba591e961 handle call to sync() with wrong parameter type 2015-02-12 00:29:23 +01:00
Jan Steemann 1701be206f more sparse tests 2015-02-11 21:21:14 +01:00
Jan Steemann 33a4d2c4dc added tests 2015-02-11 19:34:00 +01:00
Jan Steemann b1d023821e fixed tests 2015-02-11 18:46:52 +01:00
Jan Steemann ec2b866200 Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
2015-02-11 17:53:23 +01:00
Jan Steemann c04064dcf2 cast variable 2015-02-11 13:51:01 +01:00
Jan Steemann 6f12e69bae Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes 2015-02-11 09:51:16 +01:00
Jan Steemann f7210e3604 sparse index tests 2015-02-11 00:25:30 +01:00
Frank Celler 3e35e94a83 added hidden option --fronend-version-check 2015-02-10 21:24:24 +01:00
Jan Steemann a26bd2b223 auto-migrate old hash indexes 2015-02-10 11:34:51 +01:00
Jan Steemann a0309c44e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes
Conflicts:
	.travis.yml
2015-02-09 20:32:18 +01:00
Jan Steemann 82c7522d4e test fixes 2015-02-09 20:08:06 +01:00
Jan Steemann ff813a7d11 removed wrong comment 2015-02-09 11:33:13 +01:00
Max Neunhoeffer dd0d57b41a Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2015-02-07 21:35:18 +01:00
Max Neunhoeffer 134aa7fce8 Add breakpoint facility via console for JavaScript code in server. 2015-02-07 21:34:20 +01:00
Jan Steemann 491e755cd8 turn indexed accesses (e.g. a['foo']) into attribute accesses (e.g. a.foo) during AST optimization
this qualifies the indexed accesses to be used with an IndexRangeNode later
2015-02-07 16:55:25 +01:00
Jan Steemann 831d98376f small changes 2015-02-07 16:32:36 +01:00
Jan Steemann 003d7e9112 sparse indexes, initial commit, untested 2015-02-07 03:07:41 +01:00
Jan Steemann acc354839d made functions static 2015-02-06 21:15:05 +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 dd74c6ac87 execute read and write operations of different collections in the same AQL query in lockstep, and not sequentially 2015-02-05 18:27:10 +01:00
Jan Steemann cdd31f2b92 constification 2015-02-05 00:10:30 +01:00
Jan Steemann e84a5e8eb3 use indexes for sorting in more cases 2015-02-05 00:10:12 +01:00
Willi Goesgens 026ef06b4d Relax error messages of fox being unable to create app directories - this will fail if a cluster is ran on the same set of files. 2015-02-04 13:18:16 +01:00
Willi Goesgens b17abadd42 Put error messages of simple http client into cluster comm results. 2015-02-04 11:25:12 +01:00
Jan Steemann b6ffa6f874 updated CHANGELOG 2015-02-04 00:25:05 +01:00
Jan Steemann cef1e7bffe a bit less copying 2015-02-04 00:23:17 +01:00
Jan Steemann 5d9c0e018e dynamic attribute names in AQL 2015-02-03 22:51:40 +01:00
Jan Steemann 320d7c3e8f reduce var scope 2015-02-03 16:20:41 +01:00
Michael Hackstein acc4aabdad Renamed App folder from databases to _db. It is now consistent with url 2015-02-03 15:45:00 +01:00
Jan Steemann d06c3c1ff3 changed "file names" of anonymous commands 2015-02-03 12:46:34 +01:00
Jan Steemann c18ff7f300 use-index-for-sort rule can now remove sorts in more cases 2015-02-02 22:53:25 +01:00
Jan Steemann e30ddf0df3 fixed indexing test 2015-02-02 20:33:45 +01:00
Jan Steemann 875a695b22 selectivity estimates 2015-02-02 20:14:36 +01:00
Jan Steemann 423d22ed71 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-02 18:56:17 +01:00
Frank Celler 23e66107a5 moved try/catch into a block 2015-02-02 17:07:31 +01:00
Jan Steemann 39603ebaf4 added selectivity estimates for some index types 2015-01-30 23:04:46 +01:00
Willi Goesgens 2333d8d3ad Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-30 16:47:12 +01:00
Willi Goesgens 5e1720132f Stacktraces & asserts for windows too. 2015-01-30 16:46:56 +01:00
Max Neunhoeffer 600cef8ec4 Merge branch 'devel' of ssh://github.com/arangodb/arangodb into devel 2015-01-30 15:25:16 +01:00
Max Neunhoeffer 45903b0c79 Silence a few unnecessary error logs. 2015-01-30 15:24:34 +01:00
Max Neunhoeffer a5728d6793 Get rid of unnecessary warning about _lockedShards. 2015-01-30 15:04:39 +01:00
Jan Steemann 8273970856 fixed leak 2015-01-30 12:37:31 +01:00
Jan Steemann e13092168d added optimizer tests
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2015-01-29 21:40:43 +01:00
Willi Goesgens ba387a0483 Initialize the platform pointer. 2015-01-29 19:02:31 +01:00
Willi Goesgens e666fd6dfc Properly shut down V8 to make Valgrind happy 2015-01-29 17:31:30 +01:00
Jan Steemann 2ad6f4179f fixed leak 2015-01-29 15:37:23 +01:00
Jan Steemann bac987ea00 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-29 15:32:27 +01:00
Jan Steemann ddc8e52a59 fixed leak 2015-01-29 15:31:55 +01:00
Frank Celler a03ce44254 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-29 15:21:21 +01:00
Frank Celler 7aa4591678 arangod/Aql/Expression.cpp 2015-01-29 15:21:14 +01:00
Frank Celler 94884d3f5a silenced warning 2015-01-29 15:19:28 +01:00
Jan Steemann 4142169526 fixed spurious errors when accessing a local collection from a cluster DB server
Conflicts:
	arangod/Aql/Collection.cpp
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/Index.h
2015-01-29 13:06:01 +01:00
Jan Steemann 39d72b1530 more sanity checks on startup & shutdown 2015-01-29 09:51:11 +01:00
Willi Goesgens b4ba07f765 If arangod doesn't successfully initialise ICU on startup it will now abort. 2015-01-28 17:32:59 +01:00
Thomas Schmidts f21a26c2c1 Merge pull request #1228 from stackmagic/tickdoc
replication dump response doc detail
2015-01-28 16:37:00 +01:00
Max Neunhoeffer e24278828c Changes to cluster startup for mesos cooperation.
This simplifies the cluster startup by introducing a further agency
lookup step using "local info" to find the "id". This allows an external
discovery process (see scripts/discover.js as an example) to configure
a new server in the cluster dynamically when it starts up.

New GNUmakefile targets
  pack-tar-config
  pack-tar
2015-01-28 12:58:24 +01:00
Patrick Huber 387c7686e7 document how the http status code and lastincluded http headers relate to each other 2015-01-28 11:04:18 +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
Jan Steemann 8a5d7d9085 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-27 09:25:02 +01:00
Jan Steemann 9c8af4f751 shutdown order 2015-01-26 16:43:22 +01:00
Jan Steemann eb5b379a55 lookup by id, too 2015-01-26 10:27:30 +01:00
Jan Steemann c49986d0e8 preparation for conditions 2015-01-25 10:40:13 +01:00
Jan Steemann 844582865f more accurate subquery cost estimation 2015-01-24 16:47:09 +01:00
Jan Steemann 02af05c50a use different cluster test methods 2015-01-24 14:08:16 +01:00
Jan Steemann a327016312 added method for cluster test 2015-01-24 14:07:06 +01:00
Jan Steemann 6a433177c0 use Escape 2015-01-24 14:06:20 +01:00
Jan Steemann ef61b53184 use TRI_AddressVector 2015-01-24 14:05:38 +01:00
Jan Steemann f732dce7b5 changed assertion types 2015-01-24 14:04:27 +01:00
Jan Steemann 81a74f4c7f use TRI_AddressVector 2015-01-24 14:03:41 +01:00
Jan Steemann 5aa3d09085 fixed wrong comment 2015-01-24 14:03:12 +01:00
Jan Steemann 0d8bf44215 gc adjustment 2015-01-23 20:51:42 +01:00
Jan Steemann 0f94293efd shutdown time 2015-01-23 18:56:01 +01:00
Jan Steemann 5d12a3da3b garbage collection 2015-01-23 16:45:00 +01:00
Jan Steemann 7db19894ca do not pass name in TRI_ERROR_ARANGO_ILLEGAL_NAME 2015-01-23 12:38:40 +01:00
Jan Steemann 81db41763f foxx file upload 2015-01-23 11:23:58 +01:00
Jan Steemann d348f60e59 added AQL optimizer rule "move-calculations-down" 2015-01-22 20:36:38 +01:00
Jan Steemann a5ff6aa05e more accurate cost estimation for EnumerateListNode
fixed typos
2015-01-22 19:35:21 +01:00
Jan Steemann fd3e123253 optimizations for AST node flagging and V8 object creation 2015-01-22 19:35:20 +01:00
Jan Steemann bdb50d873e fixed method comments 2015-01-22 19:35:20 +01:00
Willi Goesgens bdbfeb9a15 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-22 18:08:32 +01:00
Jan Steemann 87b1f7fde3 enable indexes in even more cases 2015-01-22 17:24:47 +01:00
Jan Steemann 70fba85a67 enforce an error code 2015-01-22 15:20:57 +01:00
Jan Steemann 1c935b6ab2 added tests for filter order, not optimization etc. 2015-01-22 14:16:58 +01:00
Jan Steemann 8aeded5c86 fixed documentation 2015-01-22 13:36:01 +01:00
Jan Steemann f75e4dfbb3 issue #1219: /_api/replication/logger-state clients field 2015-01-22 11:06:55 +01:00
Willi Goesgens ab29510f44 Add the collection names which we didn't find to the exception message. 2015-01-21 15:06:13 +01:00
Willi Goesgens 854f733c49 Exceptions:
- Assert that the associated errorcode has format options so if you call a THROW-macro with parameters these don't get lost unheard.
  - Add new macro which offers format strings, so you can throw standard errors with custom messages.
2015-01-21 15:03:21 +01:00
Jan Steemann 14e82da2b0 fixed leak 2015-01-19 22:25:16 +01:00
Willi Goesgens b1f881254d Upgrade V8 to 3.31.74.1 2015-01-19 19:29:31 +01:00
Jan Steemann d534a41e21 recovery tests
Conflicts:
	arangod/Wal/LogfileManager.cpp

Conflicts:
	arangod/Wal/LogfileManager.cpp
2015-01-19 18:14:03 +01:00
Jan Steemann ee51a8ebfd added more tests for indexes 2015-01-19 11:10:57 +01:00
Jan Steemann 86716e1834 fix subquery optimization 2015-01-19 11:01:32 +01:00
Jan Steemann 7d41861fed constified methods 2015-01-18 21:11:22 +01:00
Jan Steemann 63bf4c888a flush WAL status file after collection to shorten recovery 2015-01-18 21:06:57 +01:00
Jan Steemann 1003e52cf7 some cleanup 2015-01-18 16:41:48 +01:00
Jan Steemann 958ae69479 added tests 2015-01-18 15:34:35 +01:00
Jan Steemann a7538ca6e3 lazy hash index iteration 2015-01-18 03:25:06 +01:00
Jan Steemann cacaddd5e0 less copying hash index results 2015-01-18 00:52:41 +01:00
Jan Steemann 9b66ab3a61 added AQL functions MD5, SHA1, and RANDOM_TOKEN 2015-01-17 22:40:47 +01:00
Jan Steemann 685d03f0d7 some cleanup 2015-01-17 19:35:11 +01:00
Jan Steemann 18467b0d66 less memory allocations when parsing AQL queries 2015-01-17 18:12:56 +01:00
Jan Steemann 823369c815 disable the use of indexes in certain unsafe situations 2015-01-17 17:45:36 +01:00
Jan Steemann eac7ce5d13 removed unused define 2015-01-16 21:58:13 +01:00
Jan Steemann 5ce1735372 use TRI_UNKNOWN_MEM_ZONE 2015-01-16 20:40:08 +01:00
Jan Steemann ba783a4584 allow specifying minLength and maxLengths for PATHS AQL function 2015-01-16 12:34:11 +01:00
Jan Steemann 578afe98d9 removed documentation for removed methods 2015-01-15 23:06:04 +01:00
Jan Steemann b9c52dca9e fix for intermittent 404 errors in Foxx and other actions 2015-01-15 23:06:04 +01:00
Jan Steemann 957fa189d2 better diagnostics for arangoimp 2015-01-15 13:42:31 +01:00
Jan Steemann 2d7a7b87aa move variable declarations to usage 2015-01-13 20:46:33 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 44bbc2164c less string allocation when parsing numbers 2015-01-12 23:42:24 +01:00
Jan Steemann e5b0c11234 preallocate string buffer 2015-01-12 23:40:33 +01:00
Jan Steemann 691623e905 less code 2015-01-12 19:45:08 +01:00
Jan Steemann 04bdf59ca3 fixed memleaks 2015-01-12 18:19:35 +01:00
Jan Steemann 2cbc278e6c finally 2015-01-12 14:23:26 +01:00
Jan Steemann d02de8d7e0 more tests 2015-01-12 11:59:19 +01:00
Max Neunhoeffer 892f11d2e8 Clarify code for cluster modififying AQL. 2015-01-12 10:37:06 +01:00
Jan Steemann 2d0a37d826 automatically create _keys in DistributeNode on insert 2015-01-12 10:33:05 +01:00
Jan Steemann 2de9760820 fixed empty error message 2015-01-09 23:29:36 +01:00
Jan Steemann cba74d0803 fixed memleaks 2015-01-09 18:27:59 +01:00
Jan Steemann 25d30c2b96 indentation 2015-01-09 16:51:00 +01:00
Jan Steemann 99fd370ebd added missing arguments in constructor 2015-01-09 14:15:44 +01:00
Jan Steemann 5e48769311 fixed crash on test shutdown 2015-01-09 14:12:24 +01:00
Jan Steemann 080c66cfe9 fixed invalid member access 2015-01-09 10:40:33 +01:00
Jan Steemann 8683b1f613 documentation for data-modification operations with return values 2015-01-08 23:16:37 +01:00
Willi Goesgens a145d2bd9d Ups, if we don't throw but break, we mustn't leave the context twice. 2015-01-08 18:18:46 +01:00
Willi Goesgens aa1cdc09e2 Make shure we leave all contexts we open in the propper sequence. 2015-01-08 17:53:13 +01:00
Jan Steemann ec1c671d20 added derived file 2015-01-08 17:23:02 +01:00
Jan Steemann 0aa4ac137a fixed compile warning 2015-01-08 17:22:47 +01:00
Jan Steemann 1e32056ce5 change precedence of NOT IN 2015-01-08 17:22:33 +01:00
Jan Steemann 5498ab0aeb added derived file 2015-01-08 16:41:30 +01:00
Jan Steemann 5f4fe21681 added asserts for context locker 2015-01-08 16:41:12 +01:00
Jan Steemann 08df3e503a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-08 16:36:15 +01:00
Jan Steemann f2590881f1 return old or new values in data-modification operations 2015-01-08 16:35:54 +01:00
Willi Goesgens 9e26914696 After freeing the locker, null its struct member so we remain to know its gone. 2015-01-08 16:20:30 +01:00
Jan Steemann 74bb6b6dc3 fix isolates and contexts 2015-01-07 18:15:29 +01:00
Jan Steemann 8fa9341d7d added derived files 2015-01-07 17:44:32 +01:00
Jan Steemann 064d066462 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-07 17:41:09 +01:00
Jan Steemann 9cb3feefc6 propertly cast 2015-01-07 17:40:58 +01:00
Jan Steemann be4512fad3 removed duplicate method 2015-01-07 17:40:40 +01:00
Willi Goesgens e2f206fd2c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/Aql/grammar.cpp
2015-01-07 15:50:44 +01:00
Willi Goesgens f905123802 Implement REMOVE/INSERT/UPDATE/REPLACE return the changed values 2015-01-07 15:48:13 +01:00
Jan Steemann c591357dd3 slightly changed cost estimation for IndexRangeNode 2015-01-07 15:11:42 +01:00
Jan Steemann 2148e695f4 added derived files 2015-01-07 10:42:35 +01:00
Jan Steemann 89d9a538fc renamed tokens 2015-01-07 10:42:22 +01:00
Jan Steemann ad812c47db added derived file 2015-01-07 09:43:43 +01:00
Jan Steemann 62696b6984 prerequisites for further COLLECT optimizations 2015-01-07 09:42:46 +01:00
Jan Steemann ac0bb85c3d issue #1201: better error checking for fulltext index with multiple attributes 2015-01-05 09:41:56 +01:00
Jan Steemann f3b142849f fixed leaks during reverts 2015-01-03 01:28:23 +01:00
Jan Steemann 58edf3fee7 comments 2015-01-02 20:00:08 +01:00
Jan Steemann 8333591e3f issue #1199: Cannot unlink root node of plan 2015-01-02 17:38:33 +01:00
Jan Steemann cc0a4cdb4f issue #1200: fixed short-circuiting of [*] operator
Conflicts:
	arangod/Aql/grammar.cpp

Conflicts:
	arangod/Aql/grammar.cpp
2015-01-02 13:49:51 +01:00
Jan Steemann 0768c3cb38 fixed segfault 2015-01-02 09:10:28 +01:00
Max Neunhoeffer a976da2a07 Fix an issue in the cluster AQL where UPDATE d._key WITH ... did not work. 2014-12-24 01:23:48 +01:00
Max Neunhoeffer cf94935ebc Fix a bug in optimizer rule for DistributeNode. 2014-12-24 00:43:38 +01:00
Max Neunhoeffer 910f0d2e28 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-24 00:20:41 +01:00
Max Neunhoeffer 20424bd642 Fix a bug in modifying AQL when REPLACE/UPDATE uses DistributeNode. 2014-12-24 00:18:39 +01:00
Frank Celler 6c7a51127f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-23 23:41:26 +01:00
Max Neunhoeffer 6fe1fb8568 Fix modifying AQL in cluster. 2014-12-23 22:44:01 +01:00
Max Neunhoeffer 1cdf439845 Broken version, errors not yet fixed. 2014-12-23 16:51:48 +01:00
Frank Celler 1748e403e4 added TRI_FORCE_ARMV6 2014-12-23 16:31:20 +01:00
Max Neunhoeffer 4634ad366e Take out some more debugging output. 2014-12-23 14:52:07 +01:00
Max Neunhoeffer 05c069f361 Another fix for the distributed locking problem in cluster AQL. 2014-12-23 14:35:19 +01:00
Max Neunhoeffer 1782039138 Fix cluster-wide locking for AQL. 2014-12-22 16:21:45 +01:00
Max Neunhoeffer 797c15b753 Fix two compiler warnings. 2014-12-22 14:51:28 +01:00
Max Neunhoeffer e50a705d9a Squashed commit of the following: organise locking in distributed AQL
Locking is now done in an extra round after the query is fully
instanciated in the cluster. All participating shards are locked
in alphabetical order of their shard ID (local collection name).
For this to work there is a new action in the RestAqlHandler plus a
mechanism to prevent the usual locking from happening: Each thread has a
thread local static class variable of
  triagens::arango::Transaction::_makeNolockHeaders
which is of type std::unordered_set<std::string>*.
Whenever this is not equal to nullptr and a local collection name is
stored in there, no locking or unlocking takes place. This information
is forwarded by the X-Arango-Nolock HTTP header, whenever an HTTP
request is sent via ClusterComm to a shard.
2014-12-22 14:40:22 +01:00
Jan Steemann 8412e3d89a removed sort expressions that are constants 2014-12-21 19:47:50 +01:00
Jan Steemann 6d6d67f06f activated optimizer rule remove-sort-rand
fixed tests, updated documentation
2014-12-21 18:50:50 +01:00
Jan Steemann d358b80080 ES6 2014-12-20 04:02:24 +01:00
Jan Steemann 19d2d6668f added random iteration for collections 2014-12-19 18:01:13 +01:00
Jan Steemann a82ac45190 fixed tests on ARM 2014-12-19 17:59:36 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Jan Steemann d92057dd03 the great rename: array => object, list => array 2014-12-18 22:33: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 a56ad5df36 fixed unintentionally broken tests 2014-12-17 14:44:18 +01:00
Willi Goesgens a6481cd1a7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-17 14:32:35 +01:00
Willi Goesgens 807643f000 the context-cope exits the context for us - we don't need to do this anymore by ourselves. 2014-12-17 14:32:03 +01:00
Jan Steemann 2ab3aa998d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-17 14:21:37 +01:00
Jan Steemann db1ddb880b wait for sync thread outside of lock 2014-12-17 14:21:24 +01:00
Willi Goesgens fb3ec155a8 Re-Instanciate the context-scope guard were needed. 2014-12-17 13:59:56 +01:00
Jan Steemann dd60e53ce3 added more collect special cases 2014-12-16 22:52:33 +01:00
Jan Steemann 89402bdc79 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-16 13:54:59 +01:00
Jan Steemann f35f8d1643 fixed ranges, added tests 2014-12-16 13:54:46 +01:00