1
0
Fork 0
Commit Graph

10899 Commits

Author SHA1 Message Date
jsteemann 1cfee8059a remove TRI_json_t remainders 2016-08-18 16:13:52 +02:00
Kaveh Vahedipour 9cbffca282 accidentally commented out reportIn mutex_locker 2016-08-18 16:06:47 +02:00
Wilfried Goesgens 7250db8830 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-18 15:59:12 +02:00
Wilfried Goesgens a89e612723 Work on the NSIS client package 2016-08-18 15:58:13 +02:00
Kaveh Vahedipour aee9548308 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-18 15:55:51 +02:00
Kaveh Vahedipour 1940642c2c AgentConfiguration needed to handle its own read/write locks 2016-08-18 15:55:38 +02:00
Kaveh Vahedipour 6edc1ff5fa AgentConfiguration needed to handle its own read/write locks 2016-08-18 15:54:42 +02:00
Michael Hackstein 793a157b16 Fixed Cluster constructor of logical collection. 2016-08-18 15:18:12 +02:00
Andreas Streichardt dc74a0b681 Throw exceptions to avoid any circus behaviour 2016-08-18 14:52:45 +02:00
Andreas Streichardt 887da49edf Fix segfault when backend fails 2016-08-18 13:02:55 +02:00
Michael Hackstein d3ba488271 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-18 12:38:07 +02:00
Andreas Streichardt e7dd194129 Wow...tried waiting for cluster members to shutdown...forgot to set bool flag...fail 2016-08-18 12:25:25 +02:00
jsteemann 370093d37f removed unused method 2016-08-18 11:47:27 +02:00
Jan Christoph Uhde e5794ac583 enable handling of multiple vpacks in a message 2016-08-18 11:44:03 +02:00
Michael Hackstein bb91925903 Readded temporary logical collections in cluster. Otherwise it is entirely unclear when which collection has to be deleted. 2016-08-18 11:38:16 +02:00
jsteemann 2c47d442df Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-18 11:31:06 +02:00
jsteemann 53e567f28f Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 11:30:07 +02:00
jsteemann b5cfdb47b3 fixed "collection not found" errors 2016-08-18 11:24:19 +02:00
Andreas Streichardt 03b9d97e2f Implement proper cluster shutdown 2016-08-18 11:23:23 +02:00
jsteemann a2085066e0 use VPack 2016-08-18 10:36:52 +02:00
Michael Hackstein 41d70c1df5 Fixed filename Typo 2016-08-18 10:28:27 +02:00
jsteemann b2cb551685 moved functionality from vocbase into DatabaseFeature 2016-08-18 09:24:26 +02:00
Jan Christoph Uhde 48ac791dd6 prepare auth 2016-08-18 08:36:42 +02:00
Andreas Streichardt 3f412debf0 Revert futile attempts to implement client resilience tests 2016-08-17 18:12:40 +02:00
Andreas Streichardt 70af1e3647 Implement proper cluster shutdown 2016-08-17 17:25:39 +02:00
jsteemann ca16eb691a moved drop collection functionality into engine 2016-08-17 16:43:48 +02:00
Michael Hackstein dce3cf412d Removed warnings. 2016-08-17 15:57:33 +02:00
Michael Hackstein f893b8715c Removed TRI_vocbase_col_t it was not used anywhere anymore. 2016-08-17 15:29:50 +02:00
jsteemann 0d20651614 centralize functionality 2016-08-17 15:11:45 +02:00
Michael Hackstein cd9a2e14b6 Fixed all single-server tests. Cluster state is not yet fixed. Still needs some internal cleanup 2016-08-17 14:43:57 +02:00
Kaveh Vahedipour 6f2d87ac71 intermediate for bug tracking 2016-08-17 13:27:42 +02:00
Jan Christoph Uhde 34c0aa3540 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-test
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (30 commits)
  potentially fix thread pool shutdown issues
  Remove the boost documentation. The wintendo can't stand long filenames in 2016
  move CleanupThread into engine
  Revert "Disable testcases for now, it triggers the crash on windows."
  slightly improve execution logic
  grunt build
  improved gv
  removed obsolete defines
  assert a certain size
  removed unused version attribute
  removed unused method
  removed unused attributes
  removed unused enum
  privatized
  Revert "Remove iconv-lite"
  privatize some compaction infos
  changed index detection
  removed unused files
  privatize method
  privatized method
  ...
2016-08-17 13:25:37 +02:00
Jan Christoph Uhde 3fb68c632d handleSimpleError now respects messageId 2016-08-17 13:22:31 +02:00
jsteemann a751834e6f move functionality into engine 2016-08-17 12:33:22 +02:00
Michael Hackstein 21335bb398 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-17 11:23:04 +02:00
Michael Hackstein 17a6da8afb Removed all references on TRI_vocbase_col_t and replaced them by LogicalCollection class. Not everything is properly moved and implemetned yet. This commit causes crashes. 2016-08-17 11:10:39 +02:00
jsteemann 84656f776b move CleanupThread into engine 2016-08-17 10:48:17 +02:00
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +02:00
jsteemann c44379adb2 slightly improve execution logic 2016-08-17 09:11:36 +02:00
Kaveh Vahedipour c613fe50e2 pushing out of desperation 2016-08-16 17:51:21 +02:00
jsteemann b06cf9ea3b assert a certain size 2016-08-16 17:38:24 +02:00
jsteemann 803a3c84ce removed unused version attribute 2016-08-16 17:21:59 +02:00
jsteemann 294f4092d6 removed unused method 2016-08-16 17:09:29 +02:00
jsteemann 76f3747d6d removed unused attributes 2016-08-16 16:57:16 +02:00
jsteemann be9add59af removed unused enum 2016-08-16 16:27:25 +02:00
jsteemann 4bd4413300 privatized 2016-08-16 16:15:49 +02:00
jsteemann 8e32f7abfa privatize some compaction infos 2016-08-16 16:08:27 +02:00
jsteemann b241ff1844 changed index detection 2016-08-16 15:55:10 +02:00
Kaveh Vahedipour 632461db33 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-16 15:46:16 +02:00
Kaveh Vahedipour 1a23803238 multiagent gossip 2016-08-16 15:46:00 +02:00
jsteemann b4bf27b28a removed unused files 2016-08-16 15:09:59 +02:00
jsteemann c3a2d9ecc9 privatize method 2016-08-16 15:03:36 +02:00
jsteemann ff88487c54 privatized method 2016-08-16 14:57:22 +02:00
jsteemann 7b72451dd3 implemented dropIndex 2016-08-16 14:52:31 +02:00
jsteemann 61fc8993c6 small cleanup 2016-08-16 14:21:58 +02:00
jsteemann c7277235d7 use WRITE_LOCKER 2016-08-16 14:18:27 +02:00
Jan Christoph Uhde 341891ed74 clang format 2016-08-16 13:33:16 +02:00
Jan Christoph Uhde 6f2ce0cd5a make better use of readbuffer 2016-08-16 13:32:30 +02:00
jsteemann d5af72f47f fix typo in method name 2016-08-16 13:11:39 +02:00
jsteemann 3d2591f746 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-16 13:09:18 +02:00
jsteemann f8ed409997 moved CheckCollection into storage engine 2016-08-16 13:06:11 +02:00
jsteemann 7231436c5e always remove compactor thread 2016-08-16 12:18:09 +02:00
jsteemann a957963222 "privatize" compactor thread 2016-08-16 12:11:14 +02:00
jsteemann 9547b2b746 remove unused private members 2016-08-16 11:23:06 +02:00
Jan Christoph Uhde d8d6fb1ed0 Merge branch 'obi-velocystream' into engine-vs-velocystream
* obi-velocystream:
  fix buffer clean up
  avoid bug that occurred during buffer resize by allocating up front
  i fix type of execepton so it gets caught
  avoid dumper exception
  failed try to resolve externals
  add sanitizeExternalsChecked function
  added handleSimpleError for database not found
  fix build issue
  silence complier warnings
  fix: now returns object instead of string
  try to fix simple route
2016-08-16 11:12:23 +02:00
Jan Christoph Uhde 9afe3a1016 fix buffer clean up 2016-08-16 10:58:20 +02:00
Michael Hackstein 14e0411a87 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-16 10:29:26 +02:00
Jan Christoph Uhde a3328dc944 avoid bug that occurred during buffer resize by allocating up front 2016-08-16 10:28:31 +02:00
Jan Christoph Uhde a7229bb698 i fix type of execepton so it gets caught 2016-08-16 09:29:02 +02:00
Jan Christoph Uhde b50659ed27 avoid dumper exception 2016-08-16 09:12:54 +02:00
Jan Christoph Uhde d142dc6b08 Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream
* 'obi-velocystream' of github.com:arangodb/arangodb:
  added handleSimpleError for database not found
2016-08-16 08:52:51 +02:00
Jan Christoph Uhde 1d1e19678d failed try to resolve externals 2016-08-15 22:58:21 +02:00
Kaveh Vahedipour a712b60ee3 single agent with uuid after fresh start 2016-08-15 19:28:42 +02:00
jsteemann c00c4cd2bc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-15 18:58:43 +02:00
jsteemann d4df305573 slightly improve query performance 2016-08-15 18:57:37 +02:00
jsteemann 000fd9cbdc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-15 18:35:43 +02:00
jsteemann 680042b062 moved compaction info into StorageEngine 2016-08-15 18:35:22 +02:00
jsteemann d2c1d75705 make unary minus and plus being executed in native C++ 2016-08-15 18:07:28 +02:00
Kaveh Vahedipour 131291c2f9 single agent with uuid after fresh start 2016-08-15 17:53:01 +02:00
a-brandt 758cc8c985 added handleSimpleError for database not found 2016-08-15 17:05:35 +02:00
jsteemann 9b0ba1ebb9 simplification 2016-08-15 16:00:19 +02:00
jsteemann 4f1384b948 remove unnecessary string conversions 2016-08-15 15:58:51 +02:00
jsteemann 1ec14d0bba privatize attributes 2016-08-15 15:47:39 +02:00
Jan Christoph Uhde dfb9e3ae0c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (71 commits)
  jslint
  finally fixed some nasty bugs after refactoring
  jslint
  Update README.md
  execute ternary operator in C++ as well
  added libs
  added libs
  added build
  upgraded to boost 1.61.0
  Tweak Aardvark's SUPPORT > Documentation tab
  Docs: Data model -> Data models, note that NOT_NULL() is equal to SQL's COALESCE()
  Correct HTTP docs about user parameters
  generated files
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  ...
2016-08-15 15:18:54 +02:00
Jan Christoph Uhde e511cd4ab9 silence complier warnings 2016-08-15 15:18:10 +02:00
jsteemann 209c108c59 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-15 14:34:01 +02:00
jsteemann e9cabbecb7 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-15 14:26:50 +02:00
jsteemann ae40ea5450 finally fixed some nasty bugs after refactoring 2016-08-15 14:26:09 +02:00
Jan Christoph Uhde 02f1c4199f fix: now returns object instead of string 2016-08-15 14:06:27 +02:00
Kaveh Vahedipour 6279818369 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-15 13:14:15 +02:00
Kaveh Vahedipour 692d01638c single agent with uuid after fresh start 2016-08-15 13:13:58 +02:00
Jan Christoph Uhde 21144a37c4 try to fix simple route 2016-08-15 12:51:28 +02:00
jsteemann ed1e29bf57 execute ternary operator in C++ as well 2016-08-15 11:07:12 +02:00
Michael Hackstein 94ca36fdb2 Removed cluster-wide CollectionInfo and replaced it with a logical collection. The Logical collection shall be always available, in cluster and single server. 2016-08-15 09:08:24 +02:00
Jan Christoph Uhde 61e384e8f2 Merge remote-tracking branch 'origin/engine-vs-velocystream' into merge_jans
* origin/engine-vs-velocystream: (54 commits)
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  Couldn't query two different keys beginning with the same string in one level
  Add download and slack buttons to documentation header
  gv
  Adjustment for Repository Version
  Adjustment for Repository Version
  Adjustment for Repository Version
  Update build-repository.h.in
  improved gv
  Create build-repository.h.in
  queryView bugfix
  grunt build
  improved gv, added limit
  improved gv
  ...
2016-08-15 08:51:38 +02:00
Jan Christoph Uhde 39c84522fa vpack from body should be generated 2016-08-12 19:12:05 +02:00
Michael Hackstein 79fd589ac0 Added the first files for the LogicalCollections that are available in Cluster and Locally. All operations should use these logical collections. 2016-08-12 15:06:43 +02:00
Jan Christoph Uhde 757f276e33 add partial implementaion for vpp in v8 route 2016-08-12 15:06:22 +02:00
Michael Hackstein 796151ec19 Fixed a false nullptr assertion and removed dead code 2016-08-12 15:05:08 +02:00
Jan Christoph Uhde e62b4f69d6 add better logging and clean up code 2016-08-12 15:05:03 +02:00
Michael Hackstein 95d14e056d Fixed override warning 2016-08-12 15:04:17 +02:00
Jan Christoph Uhde 3d4e1f6922 clean up code 2016-08-11 16:44:12 +02:00
Michael Hackstein fe4fcee9e2 Added some assertions for nullptr when acessing TRI_collection_t 2016-08-11 15:36:36 +02:00
Michael Hackstein 5d8040f3d2 Removed dead code 2016-08-11 15:34:44 +02:00
Kaveh Vahedipour ec27b6f60e Agency compiling again 2016-08-11 13:52:17 +02:00
Jan Christoph Uhde a1d6909f88 make use of generateBody in payload and fix some bugs in VppCommTask 2016-08-11 13:20:58 +02:00
Michael Hackstein 7b328d39e9 Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-11 12:41:08 +02:00
Kaveh Vahedipour 4759b2a434 Agency compiling again 2016-08-11 12:05:53 +02:00
Jan Christoph Uhde fa42f55545 clang format 2016-08-10 20:08:17 +02:00
Kaveh Vahedipour 39ca341097 trying to rebuild agency 2016-08-10 17:10:01 +02:00
Kaveh Vahedipour 1d47bc4ad5 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-10 17:08:54 +02:00
Kaveh Vahedipour a0c02ca29d trying to rebuild agency 2016-08-10 17:08:36 +02:00
Jan Christoph Uhde fe84762bef fix header of velocypack chunks 2016-08-10 16:42:42 +02:00
Jan Christoph Uhde c4444ae4e4 fix vppCommTask - do not return true when false should be returned 2016-08-10 15:17:31 +02:00
Jan Christoph Uhde 804d2e70d4 mini fixes 2016-08-10 12:50:50 +02:00
Andreas Streichardt 87c8c0033a Improve clusterawareness in foxx and foxx queues 2016-08-10 12:26:24 +02:00
Andreas Streichardt a4b21d0abc Couldn't query two different keys beginning with the same string in one level 2016-08-10 12:26:24 +02:00
Jan Christoph Uhde da0c40cff7 server should now reply 2016-08-10 11:11:26 +02:00
Jan Christoph Uhde 8f6ff64d00 fix errors in vpp protocol 2016-08-09 19:09:24 +02:00
Kaveh Vahedipour 46e201fc63 2/3 through new startup 2016-08-09 18:48:45 +02:00
Kaveh Vahedipour 5bdf6fcdb6 2/3 through new startup 2016-08-09 18:40:59 +02:00
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +02:00
Kaveh Vahedipour 8f75b4a891 removing debug warnings 2016-08-08 09:40:08 +02:00
Jan Christoph Uhde 65b8e6beac vpack is now put into v8 - but the vpack used must be compatible to json 2016-08-05 18:12:40 +02:00
Jan Steemann 103b19f22f fix confusion with local and cluster databases 2016-08-05 17:45:20 +02:00
jsteemann 0ceccf6370 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-05 16:23:30 +02:00
jsteemann 3733d64dda moved functionality 2016-08-05 16:23:22 +02:00
Jan Steemann cb4b091301 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-05 16:18:24 +02:00
Jan Steemann 34dc856bdc removed useless && 2016-08-05 16:17:05 +02:00
Jan Steemann 0de5561659 moved mostly unused functions 2016-08-05 16:14:39 +02:00
Kaveh Vahedipour 7069fc0da0 raft testing revealed performance optimisation in receiver and of appendentries 2016-08-05 14:59:39 +02:00
Kaveh Vahedipour fcf96f42a7 removing debug warnings 2016-08-05 14:41:24 +02:00
jsteemann 6b9a4a2e7f moved path-related functionality into engine 2016-08-05 14:09:58 +02:00
Kaveh Vahedipour 770d8777a2 raft testing revealed performance optimisation in receiver and of appendentries 2016-08-05 12:47:08 +02:00
Kaveh Vahedipour b4883e69e4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-05 12:36:29 +02:00
Kaveh Vahedipour c586b63f03 raft testing revealed performance optimisation in receiver and of appendentries 2016-08-05 12:36:23 +02:00
Jan Christoph Uhde 65e5d4e6ac fix handling of content type 2016-08-05 12:25:29 +02:00
Andreas Streichardt 1a5d9bef55 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-05 11:24:43 +02:00
jsteemann 6e47a19d37 removed define 2016-08-05 09:51:06 +02:00
Kaveh Vahedipour bc042e858e raft testing revealed performance optimisation in receiver and of appendentries 2016-08-05 09:41:50 +02:00
jsteemann f91bfee6d0 prevent warning on shutdown 2016-08-05 09:33:59 +02:00
Jan Christoph Uhde 0bcbe92433 Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream
* origin/engine-vs-velocystream: (95 commits)
  move it a class method
  speed up compaction and cleanup a bit
  privatization
  added functions V8_TO_VPACK and VPACK_TO_V8
  fixed compaction bug
  fixed compaction bug
  raft testing revealed performance optimisation in receiver and of appendentries
  more streamlining, links to the UDF documentation.
  refactoring
  By simran: review UDF documentation.
  Explain clustering impacts in the optimizer chapter.
  fixed tests
  WG beautification
  Remove iconv-lite
  Add iconv-lite and timezone
  Add missing package description file.
  compaction bug in agency
  compaction bug in agency
  compaction bug in agency
  fixed compaction bug
  ...
2016-08-04 18:48:51 +02:00
jsteemann 326b518acf move it a class method 2016-08-04 17:30:42 +02:00
jsteemann 1139505641 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 17:19:05 +02:00
jsteemann e06e2312c2 speed up compaction and cleanup a bit 2016-08-04 17:18:50 +02:00
jsteemann 95ac01313b privatization 2016-08-04 17:06:51 +02:00
Jan Christoph Uhde 50fe64d6ca convert contentTypes 2016-08-04 16:42:30 +02:00
Kaveh Vahedipour becf446cac fixed compaction bug 2016-08-04 15:57:32 +02:00
Kaveh Vahedipour 21ff8be494 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-04 15:46:29 +02:00
Kaveh Vahedipour 307332e817 raft testing revealed performance optimisation in receiver and of appendentries 2016-08-04 15:46:23 +02:00
jsteemann 635d4d537c refactoring 2016-08-04 14:03:43 +02:00
Andreas Streichardt f28d429bd5 fix ssl endpoint 2016-08-04 13:34:42 +02:00
jsteemann bc6633e4c0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 13:33:10 +02:00
jsteemann 5d640b7144 fixed tests 2016-08-04 13:32:54 +02:00
Jan Christoph Uhde 01c1c09d5a add first vpack test -- content type has to be fixed first 2016-08-04 13:32:25 +02:00
jsteemann 8a200f754c WG beautification 2016-08-04 12:36:14 +02:00
Jan Christoph Uhde 54eda61754 connect response to CommTask WriteBuffers 2016-08-03 16:08:04 +02:00
jsteemann ac1e4c1ef7 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-03 14:43:56 +02:00
Kaveh Vahedipour 99db350780 compaction bug in agency 2016-08-03 14:20:06 +02:00
Kaveh Vahedipour 9484cddd0c compaction bug in agency 2016-08-03 14:13:38 +02:00
Kaveh Vahedipour c49499c5b5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-03 13:59:57 +02:00
Kaveh Vahedipour 0221f2582c fixed compaction bug 2016-08-03 13:59:40 +02:00
jsteemann 8baa7ec955 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-03 13:39:00 +02:00
Jan Steemann fe87b25ebb produce more meaningful error messages 2016-08-03 13:36:13 +02:00
Kaveh Vahedipour fde28d1a61 sped up agency communication. startLocalCluster now starts up about the same time regardless of agency size. 2016-08-03 13:13:48 +02:00
jsteemann 2256ffd5b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-03 10:52:03 +02:00
Kaveh Vahedipour 8a6e23fbdb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-03 10:31:53 +02:00
Kaveh Vahedipour e42d8e432b wrong push on startLocalCluster 2016-08-03 10:31:42 +02:00
Jan Christoph Uhde cae1d47e5d fix build errors 2016-08-03 09:42:20 +02:00
Jan Steemann 53ad777be7 fixed extraction of _id attribute 2016-08-03 09:21:37 +02:00
Jan Christoph Uhde cb275e239f add: clean buffer for VppCommTask 2016-08-03 09:20:22 +02:00
Jan Steemann 31dcdca4d3 fixed extraction of _id attribute in Traversal condition 2016-08-02 17:02:02 +02:00
Kaveh Vahedipour 97f5e957fa supervision not woken up after leadership change 2016-08-02 16:09:24 +02:00
jsteemann f437ef95c5 simplify threads 2016-08-02 16:06:47 +02:00
Jan Christoph Uhde 08cc5c543e remove unused code - small fixes 2016-08-02 15:57:30 +02:00
jsteemann dd30b47b9d make _state private 2016-08-02 15:31:55 +02:00
jsteemann f219a5605b Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-02 15:00:57 +02:00
jsteemann 8f07f97fb4 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 15:00:35 +02:00
jsteemann 9677210e57 refactoring 2016-08-02 15:00:25 +02:00
jsteemann f1596fa459 refactoring 2016-08-02 14:01:04 +02:00
Kaveh Vahedipour 5c0c95f618 fixed compaction bug in RAFT 2016-08-02 13:55:53 +02:00
Jan Christoph Uhde 53b08d018b Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (34 commits)
  some fixes
  integrated agency bugfix from 3.0
  integrated agency bugfix from 3.0
  Add tokens so we can enable the uid during the build.
  Add missing body parameter descriptin. Thanks to @janavolkova9 for pointing this out.
  Fix the representation of the post bodys; thanks to @janavolkova9 for pointing out.
  just in case someone changes the epoch
  added a panic interrupt of memory gets low
  fixed epoch computation
  Fix switch warning
  entirely removed TRI_document_collection_t
  Fix a bug in <coll>.replace() with isRestore and _rev.
  refactoring
  Style cleanup for the docker mesos cluster.
  BOLD
  Polish docs
  Fix foxx issues in cluster
  Add technical details about UDFs in clusters
  moved functionality into TRI_collection_t
  Fix bug in synchronous replication.
  ...
2016-08-02 13:50:44 +02:00
jsteemann 3664511e36 privatize vocbase methods 2016-08-02 13:49:22 +02:00
jsteemann 09437deb1a Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 13:49:18 +02:00
Kaveh Vahedipour e326dc3c53 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-02 13:13:14 +02:00
Kaveh Vahedipour cab4d78eee fixed compaction bug in RAFT 2016-08-02 13:13:05 +02:00
Jan Christoph Uhde 25226b1459 add: header() / headers() implemented for VppRequest 2016-08-02 11:36:06 +02:00
jsteemann 10341eafdb Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 09:42:17 +02:00
Wilfried Goesgens 04a1be577f Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-02 09:22:46 +02:00
jsteemann 99aaf7de9b Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-02 08:43:34 +02:00
jsteemann cc51773a46 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-01 17:17:05 +02:00
jsteemann 788922f55a some fixes 2016-08-01 17:16:23 +02:00
Kaveh Vahedipour 3a1e10eecb integrated agency bugfix from 3.0 2016-08-01 14:41:13 +00:00
Kaveh Vahedipour da893cc056 integrated agency bugfix from 3.0 2016-08-01 13:46:52 +00:00
Jan Christoph Uhde c59a553723 fix some errors -- http tests failing in cluster 2016-08-01 15:19:11 +02:00
Frank Celler da85dc2adc added a panic interrupt of memory gets low 2016-08-01 13:43:30 +02:00
Andreas Streichardt 376075f51d Fix switch warning 2016-08-01 13:43:30 +02:00
Max Neunhoeffer 935f977132 Fix a bug in <coll>.replace() with isRestore and _rev. 2016-08-01 13:43:30 +02:00
Andreas Streichardt 6f156d8554 Fix foxx issues in cluster
Bootstrap will now be done on the bootstrap coordinator.

queues will now be executed by the "foxxmaster"
2016-08-01 13:43:30 +02:00
Jan Christoph Uhde ef12d8dc2c struggle with ctor 2016-08-01 11:48:30 +02:00