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

10943 Commits

Author SHA1 Message Date
Max Neunhoeffer 3c49b204e1 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-07-29 17:24:20 +02:00
Max Neunhoeffer 1bdf0ded43 Fix a bug in <coll>.replace() with isRestore and _rev. 2016-07-29 17:22:12 +02:00
jsteemann 80f1a7aaee Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-29 17:16:20 +02:00
jsteemann 59ed0a902c refactoring 2016-07-29 17:07:16 +02:00
Andreas Streichardt 526c8f42c2 Fix foxx issues in cluster 
Bootstrap will now be done on the bootstrap coordinator.

queues will now be executed by the "foxxmaster"
 2016-07-29 16:06:31 +02:00
Wilfried Goesgens 41a2b867d1 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-07-29 15:37:17 +02:00
jsteemann 6b308191e1 moved functionality into TRI_collection_t 2016-07-29 11:49:58 +02:00
Jan Christoph Uhde 5f370e0f46 reading vpp should work now! 2016-07-29 11:03:26 +02:00
jsteemann 621e3df766 moved parts into TRI_collection_t 2016-07-29 09:14:05 +02:00
jsteemann 9f6545ce13 moved function into class 2016-07-29 09:07:02 +02:00
Jan Christoph Uhde 8d1a627770 Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream-4 
* 'devel' of github.com:arangodb/arangodb:
  updated CHANGELOG
  Remove sleep
  fixed issue in `INTERSECTION` AQL function with duplicate elements in the source arrays
  fixed broken downloads in firefox, issue: #1968
 2016-07-28 18:16:31 +02:00
Jan Christoph Uhde af108e8fcd fix RestBatchHandler 2016-07-28 18:15:26 +02:00
jsteemann ba6bb338ba Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-28 17:25:19 +02:00
Jan Steemann ddecc740e6 fixed issue in `INTERSECTION` AQL function with duplicate elements in the source arrays 2016-07-28 17:11:21 +02:00
Jan Christoph Uhde d574570174 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-4 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (70 commits)
  fixed undefined behavior
  fixed tests
  Latest performance measuring scripts and analysis program.
  moved dropCollection into TRI_vocbase_t
  make ctor explicit
  Improve error handling
  removed unused consts
  Fix ssl tests (CORS)
  more refactoring
  some vocbase refactoring
  updated CHANGELOG
  added thread affinity for MacOSX
  moved query id generation
  refactoring
  Fix testing.js
  Docs: make examples clearer that require modules, add note about aqlQuery -> aql
  Docs (arangosh): aqlQuery -> aql
  reactivate TickIterator
  refactoring
  New script version.
  ...
 2016-07-28 16:36:36 +02:00
jsteemann deca131a58 fixed undefined behavior 2016-07-28 16:35:27 +02:00
Jan Christoph Uhde 4f00b0a48e silence compiler warning 2016-07-28 16:16:56 +02:00
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
jsteemann b48779c821 fixed tests 2016-07-28 15:56:38 +02:00
Jan Christoph Uhde fa0015e658 add: implemented part of VppCommTask 2016-07-28 13:58:51 +02:00
jsteemann 329b733090 moved dropCollection into TRI_vocbase_t 2016-07-28 13:14:12 +02:00
jsteemann be8df652b7 make ctor explicit 2016-07-28 12:06:22 +02:00
jsteemann 45f775e56f removed unused consts 2016-07-28 12:04:03 +02:00
jsteemann b3bdd3a66a more refactoring 2016-07-28 11:47:20 +02:00
jsteemann b71e12f6a0 some vocbase refactoring 2016-07-28 11:06:21 +02:00
jsteemann cc5eaea09c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-28 09:10:17 +02:00
Frank Celler 24db83573a added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00
jsteemann 5d6cd9ef71 moved query id generation 2016-07-27 17:44:31 +02:00
jsteemann 31407c3561 refactoring 2016-07-27 17:15:52 +02:00
jsteemann 314a6f6c29 reactivate TickIterator 2016-07-27 16:04:22 +02:00
jsteemann 55eda66d4a Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-27 15:57:56 +02:00
jsteemann 10a60b5458 refactoring 2016-07-27 15:40:25 +02:00
Jan Christoph Uhde 36167b8e17 Merge remote-tracking branch 'origin/devel' into obi-velocystream-4 
* origin/devel: (23 commits)
  Fix trusted origin tests
  Fix CORS with credentials
  New version of script.
  updated CHANGELOG
  grunt build [ci skip]
  improved gv
  added expand function to gv
  enable: compile_commands.json
  semistandard fix
  improved gv
  gv bugfix
  updated license
  improved gv
  Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32
  improved gv performance
  fix handling of empty query strings
  fixed query editor issues
  Modularize perf script.
  Add one more event.
  Add a first perf probe monitoring script.
  ...

Conflicts:
	arangod/GeneralServer/HttpCommTask.cpp
 2016-07-27 13:25:34 +02:00
jsteemann 26ce0c6936 some collection handling refactoring 2016-07-27 13:12:26 +02:00
Jan Christoph Uhde 732c182388 fix building 2016-07-27 12:08:07 +02:00
Jan Christoph Uhde 3f57335fe4 with error 2016-07-27 11:48:21 +02:00
Andreas Streichardt 5fe3274000 Fix CORS with credentials 2016-07-27 11:25:46 +02:00
Jan Christoph Uhde 9965ca9c6a Merge branch 'obi-velocystream-2' into obi-velocystream-3 
* obi-velocystream-2: (21 commits)
  enable VPACK
  add some documentation
  add some documenation
  get rid fo cookies in non-http requests
  Documentation improvements
  Docs: Fix locking and isolation code examples (require db object and use AQL traversal)
  fix recovery edge case
  grunt build [ci skip]
  added edge hover event
  redirect to new gv
  ui added query execution of selected text
  gv improvements
  removed unused code path
  added convenience method getRegister()
  remove body() method from GeneralRequest
  Removing unnecessary library "z" by cross-compiling
  Adaptation of V8 architecture "arm64" with "aarch64" processor.
  Complete to __aarch64__ achritectur
  add: VppResponse
  cppcheck
  ...

Conflicts:
	arangod/GeneralServer/GeneralCommTask.cpp
	arangod/GeneralServer/GeneralCommTask.h
	arangod/GeneralServer/HttpCommTask.h
 2016-07-27 10:11:50 +02:00
Frank Celler e008a3b306 moved accessControlAllowOrigins to GeneralServerFeature 2016-07-27 09:09:07 +02:00
Frank Celler 078457c302 cleanup of calls 2016-07-26 17:20:14 +02:00
jsteemann 008fc46dfc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-26 16:25:50 +02:00
jsteemann 89e0c11b44 refactoring 2016-07-26 16:25:38 +02:00
Jan Steemann c879761d15 fix handling of empty query strings 2016-07-26 16:18:15 +02:00
Wilfried Goesgens c6a1bcc226 Cleanup buildsystem 
- add RPM support
  - move macros in own file
  - cleanup sequence
  - add CMAKE switch "-DPACKAGING=[DEB|RPM|DARWIN]" that prepares package building
 2016-07-26 16:13:34 +02:00
Jan Christoph Uhde d93b709b4f add some documentation 2016-07-26 13:51:56 +02:00
jsteemann df4daf4122 CleanupThread is now derived from Thread 2016-07-26 12:54:08 +02:00
Jan Christoph Uhde c17d6d0e3a add some documenation 2016-07-26 11:43:01 +02:00
Jan Christoph Uhde 96772223df Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream-2 
* 'devel' of github.com:arangodb/arangodb:
  Documentation improvements
  Docs: Fix locking and isolation code examples (require db object and use AQL traversal)
  fix recovery edge case
  grunt build [ci skip]
  added edge hover event
  redirect to new gv
  ui added query execution of selected text
  gv improvements
  removed unused code path
  added convenience method getRegister()
  Removing unnecessary library "z" by cross-compiling
  Adaptation of V8 architecture "arm64" with "aarch64" processor.
 2016-07-26 10:39:24 +02:00
Jan Christoph Uhde 4c37db381a get rid fo cookies in non-http requests 2016-07-26 10:38:34 +02:00
jsteemann 9af8a30a36 fixed compactor locks 2016-07-26 10:22:44 +02:00
jsteemann b54f0a15d8 removed last occurrence of TRI_vector_t in arangod 2016-07-26 08:04:30 +02:00
jsteemann 253cb173a9 cleanup compaction responsibility a little bit 2016-07-26 07:34:02 +02:00
jsteemann 2c88ac61d3 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 17:58:02 +02:00
jsteemann d6baadf59a fix recovery edge case 2016-07-25 17:57:25 +02:00
jsteemann 9e2b75de7d refactoring 2016-07-25 17:31:16 +02:00
jsteemann 0113c78712 use function object 2016-07-25 17:22:41 +02:00
jsteemann 2d293261cc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 16:54:12 +02:00
jsteemann fe99ca558a removed unused code path 2016-07-25 16:52:39 +02:00
jsteemann d3946a5f3c added convenience method getRegister() 2016-07-25 16:52:27 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
Jan Christoph Uhde 61323d4ddc Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream-2 
* 'devel' of github.com:arangodb/arangodb:
  Complete to __aarch64__ achritectur
  cppcheck
  gv improvement + bugfix
  initialize all instance variables
  updated CHANGELOG
  issue #1962
  issue #1959
  fixed exporting documents webui
  set GYP_CROSSCOMPILE by  CROSS_COMPILING
 2016-07-25 16:47:50 +02:00
Jan Christoph Uhde da81c32539 remove body() method from GeneralRequest 2016-07-25 16:46:53 +02:00
jsteemann fe3f89fe6b Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 16:45:00 +02:00
Frank Celler 23d7fc7247 moved startThread from HttpCommTask to RestHandler 2016-07-25 16:40:29 +02:00
jsteemann 50f3dcfb3f cleanup 2016-07-25 16:16:07 +02:00
jsteemann 158f21b0da cppcheck 2016-07-25 16:00:27 +02:00
jsteemann 6a480c0214 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 15:48:57 +02:00
jsteemann a0f0055b6f moved all database management functions into DatabaseFeature 2016-07-25 15:48:37 +02:00
jsteemann 33c94e5041 moved database lookup functions into DatabaseFeature 2016-07-25 14:56:39 +02:00
jsteemann b288d3e4dd moved dropDatabaseCoordinator() into DatabaseFeature 2016-07-25 14:04:55 +02:00
jsteemann de6d7182c8 move deletion of databases into DatabaseFeature 2016-07-25 13:56:34 +02:00
jsteemann e8a5b5ccf5 move createDatabase into DatabaseFeature 2016-07-25 12:35:53 +02:00
Jan Steemann ee7def3440 initialize all instance variables 2016-07-25 12:23:19 +02:00
jsteemann a92ac7be28 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 11:14:44 +02:00
Frank Celler a7679fe16f silenced compiler warning 2016-07-24 11:30:39 +02:00
Frank Celler 96e69b5b92 moved create of CommTask into ListenTask 2016-07-23 20:04:38 +02:00
Frank Celler a92add0a9f renamed RestServerFeature to GeneralServerFeature 2016-07-23 14:16:10 +02:00
Jan Christoph Uhde c370e9e6fe Merge remote-tracking branch 'origin/devel' into obi-velocystream-1-squashed 
* origin/devel: (23 commits)
  grunt build [ci skip]
  improved gv
  fixed landscape smartphone navigation bug, improved login screen css
  improved code modal output
  updated font awesome to version 4.6.3
  version check improved
  fixed issue: #1881
  Update ISSUE_TEMPLATE.md
  documents view, now able to remove first filter element
  support view
  replaced require("internal").db by require("@arangodb").db
  gv improvements
  grunt build [ci skip]
  gv improvements
  added read/write context info
  HLC adjustments for tests
  fixed issue #1954
  fixed issue #1954
  added test case
  fixed copying of AqlValues
  ...
 2016-07-23 01:19:30 +02:00
Jan Christoph Uhde b8c705868e Split Http- and HttpsCommTask 
add .ctags_exclude and new CommTasks

move some code form GeneralCommTask to HttpCommTask

move more code into HttpCommTask

fix ording or initialization

if access of classes

make _requestAsHttp() private

more cleanup
 2016-07-23 01:17:48 +02:00
jsteemann 95462e7796 moved database creation in DatabaseFeature 2016-07-22 17:43:22 +02:00
jsteemann 5993c1b094 refactoring 2016-07-22 15:46:45 +02:00
jsteemann 6c2d927e01 refactoring 2016-07-22 15:44:23 +02:00
jsteemann dfa2e59c4a don't access nullptr 2016-07-22 14:14:50 +02:00
jsteemann e55070dcd2 starting again... well, at least in some configuration 2016-07-22 14:03:03 +02:00
jsteemann 4f6b7a6146 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-22 11:16:17 +02:00
Jan Steemann 2aa1ae7db2 added read/write context info 2016-07-22 10:00:46 +02:00
jsteemann f3dfdb57d1 fixed issue #1954 2016-07-21 17:39:27 +02:00
jsteemann 431262cc19 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-21 16:42:47 +02:00
Jan Steemann 520e4b503f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-21 16:39:57 +02:00
Jan Steemann 5a4b946bd3 fixed issue #1954 2016-07-21 16:39:36 +02:00
Jan Steemann 27b846bbab fixed copying of AqlValues 2016-07-21 15:57:29 +02:00
Jan Steemann ca6fa5e7af copy row 0 2016-07-21 14:33:10 +02:00
Jan Steemann 74f7da4f45 don't copy unneeded registers 2016-07-21 12:10:09 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00
Max Neunhoeffer 410bd3d95b Default to JSON for the moment. 2016-07-20 16:19:17 -07:00
Max Neunhoeffer 2aa6cae452 Fix performance improvements w.r.t. headers. 2016-07-20 16:05:21 -07:00
Max Neunhoeffer 6f4b48cfcf Try to fix performance issue with single documents in cluster. 
This creates a fast path in performRequests for the case that only
one request is given. We use syncRequest instead of asyncRequest
to save a network roundtrip. Furthermore, all queues and locks
in ClusterComm are circumvented.
 2016-07-20 15:15:41 -07:00
jsteemann b9529d80e3 moved functionality into engine 2016-07-20 17:26:58 +02:00
jsteemann e36770efdf moved functionality 2016-07-20 16:25:41 +02:00
jsteemann 6c2d39da93 removed unused properties 2016-07-20 16:12:01 +02:00
jsteemann ca1da8fd4a moved functionality from TRI_server_t into DatabaseFeature 2016-07-20 16:09:12 +02:00
jsteemann 2b4c3707e3 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-20 13:22:29 +02:00
Jan Steemann 8369f652a4 fixed issue #1950 2016-07-20 09:38:25 +02:00
Jan Christoph Uhde 1804fa63fc Merge branch 'devel' into obi-rest-changes 
* devel:
  remove unused JsonHelper includes
  Swagger: change the way attribute types are written into the docs
  Docs: formatting
  Docs: AQL query cursors
  New example files for array indexes
  Documentation improvements
  Enhance description of bind parameters
  How to use log topics in config file and minor reformatting
  Improve indexing docs
  Match inline docublocks non-greedy and prevent name collisions by expecting a whitespace character after block name
  always flush log in case of exception
  New example file.
  by @servusoft : fix rocksdb cmake compile on ARM by removing unsupported compiler flag.
  by @servusoft : use signed char if we want to operate with `-1`
  issue #1944: nicer error logging in console.log()
  remove unused script
  eshint
  added test for V8 segfault
  fixed segfault in V8, by backporting https://bugs.chromium.org/p/v8/issues/detail?id=5033
 2016-07-19 10:27:53 +02:00
Jan Christoph Uhde 43d06efa76 remove: reinterpret_cast from user code 2016-07-19 10:07:09 +02:00
Jan Christoph Uhde 06bd01695a removed: body() from GeneralRequest 2016-07-19 09:16:07 +02:00
jsteemann 5ee344b685 added greetings feature 2016-07-18 18:32:27 +02:00
jsteemann 8cf7fc889d renamed method 2016-07-18 18:07:11 +02:00
jsteemann 7653b922b3 moved TRI_MSync out of server.h 2016-07-18 17:58:28 +02:00
jsteemann 232b46cef2 removed useless include 2016-07-18 17:51:04 +02:00
jsteemann 8313682b2c refactoring 2016-07-18 17:48:24 +02:00
jsteemann 53f77017fb moved SERVER away from DatabasePathFeature 2016-07-18 17:33:11 +02:00
jsteemann b005ba61fe removed unused method 2016-07-18 17:20:31 +02:00
jsteemann 2dab54a751 removed a define 2016-07-18 17:15:41 +02:00
jsteemann f373a2c327 removed TRI_vocbase_defaults_t 2016-07-18 16:55:25 +02:00
jsteemann 904868d996 renamed DatabaseServerFeature to DatabasePathFeature 2016-07-18 15:41:10 +02:00
jsteemann 073cfb15e7 moved index threads into a feature of its own 2016-07-18 15:23:25 +02:00
jsteemann 14d6ba7c73 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-18 14:37:33 +02:00
jsteemann 807f287868 moved server id detection and pagesize detection into their own features 2016-07-18 14:37:12 +02:00
Jan Steemann a0ff5e9dc3 remove unused JsonHelper includes 2016-07-18 13:52:08 +02:00
Jan Christoph Uhde 002a1e55cb add: payload/addPayload methods 2016-07-18 13:16:08 +02:00
jsteemann b9b01b4c77 always flush log in case of exception 2016-07-18 11:44:14 +02:00
jsteemann 56ba9342c8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-18 11:08:22 +02:00
jsteemann d8a95222a2 adjusted error messages 2016-07-18 11:08:12 +02:00
Jan Christoph Uhde 36736e3694 Merge remote-tracking branch 'origin/devel' into obi-rest-changes-next 
* origin/devel: (47 commits)
  grunt build [ci skip]
  gv settings [ci skip]
  attempt to fix issue #1943
  Add missing documentation of the users database list and the hint that this should be used instead of the database api.
  added dev button to graphs view [ci skip]
  grunt build [ci skip]
  Remove jshint
  Mention updating license info
  Prevent World War 3
  Always use --global-style when installing npm deps
  gv - editable & createable nodes, edges [ci skip]
  Rebuild aardvark
  Make sure Show Interface check asks for HTML
  oops, @not supported here.
  Fix phrase explaining when the collections are dropped alongside the graph definition.
  fixed issue #1941
  gv [ci skip]
  added test for "fake" _key values
  fixed issue #1942
  In Farbe und in STEREREOOOUU!
  ...
 2016-07-17 00:14:07 +02:00
Jan Christoph Uhde f2c660627f Merge branch 'obi-rest-changes' into devel 
* obi-rest-changes:
  virtualize functions of request/response
  ignore build.sh
 2016-07-16 19:36:01 +00:00
Jan Christoph Uhde a0dca93e65 complete: adding toVelocyPack() function that returns slice instead of builder 2016-07-16 21:33:03 +02:00
Jan Steemann 60bb0f2dde attempt to fix issue #1943 2016-07-15 17:40:42 +02:00
Jan Christoph Uhde beae8a8f74 first changes for set/get payload methods -> 
toVelocyPack now returns slices
 2016-07-15 16:38:13 +02:00
jsteemann 43b3b19ea5 server start 2016-07-15 16:30:03 +02:00
jsteemann 2b42784d81 fixed compile error 2016-07-15 14:45:02 +02:00
jsteemann 30d32bb70e factored out lock-file handling into LockFileFeature 2016-07-15 14:44:06 +02:00
jsteemann 87a96ece67 engine selection 2016-07-15 12:40:29 +02:00
jsteemann 7742e709a3 storage engine selection at server start 2016-07-15 12:26:40 +02:00
Jan Christoph Uhde 6e9304cdc4 Merge remote-tracking branch 'origin/devel' into obi-rest-changes 
* origin/devel: (43 commits)
  added dev button to graphs view [ci skip]
  grunt build [ci skip]
  Remove jshint
  Mention updating license info
  Prevent World War 3
  Always use --global-style when installing npm deps
  gv - editable & createable nodes, edges [ci skip]
  Rebuild aardvark
  Make sure Show Interface check asks for HTML
  oops, @not supported here.
  Fix phrase explaining when the collections are dropped alongside the graph definition.
  fixed issue #1941
  gv [ci skip]
  added test for "fake" _key values
  fixed issue #1942
  In Farbe und in STEREREOOOUU!
  grunt [ci skip]
  gv [ci skip]
  Fix documentation.
  Fix fix.
  ...
 2016-07-15 09:20:04 +00:00
jsteemann bff23ecd06 added stub for storage engine 2016-07-15 10:54:37 +02:00
jsteemann 18c4ca3f53 renamed ReadCacheChunk to GlobalReadCacheChunk 2016-07-14 17:19:45 +02:00
jsteemann 49275ac898 added stub for CollectionRevisionCache 2016-07-14 17:12:39 +02:00
jsteemann 1ce21d408a fixed gc 2016-07-14 14:47:23 +02:00
jsteemann ccf3b206bd Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-14 10:13:43 +02:00
Jan Steemann 2441b2f700 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-14 10:09:01 +02:00
Jan Steemann a1c2b7cc63 fixed issue #1941 2016-07-14 10:08:17 +02:00
jsteemann 0c4d507ffc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-14 09:32:08 +02:00
Jan Steemann 6d856efd4f added test for "fake" _key values 2016-07-14 09:29:42 +02:00
jsteemann 3be664ca56 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-14 09:29:21 +02:00
Jan Christoph Uhde 682cf7a2f1 virtualize functions of request/response 2016-07-14 08:40:05 +02:00
jsteemann f5608449b2 fixed issue #1942 2016-07-13 20:32:59 +02:00
jsteemann 5672171c11 initial commit for rc implementation 2016-07-13 17:33:17 +02:00
Max Neunhoeffer a78fd42b67 Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
Jan Christoph Uhde 03e89265fd Merge branch 'devel' of github.com:arangodb/arangodb into obi-merge-restserver 
* 'devel' of github.com:arangodb/arangodb:
  updated CHANGELOG
  fixed array index batch insertion issue
  Fix syntax errors in  user auth documentation
  fix grammer.
  prevent compile warning
 2016-07-13 11:35:16 +02:00
Jan Steemann 6b7defc737 fixed array index batch insertion issue 2016-07-13 11:32:39 +02:00
jsteemann fe079b50f3 prevent compile warning 2016-07-13 09:45:23 +02:00
Jan Christoph Uhde ff49d7b0b4 Merge remote-tracking branch 'origin/devel' into obi-merge-restserver-next 
* origin/devel: (105 commits)
  Fixed failure tests in SkiplistIndex
  Fixed a bug with reset of new skiplist index iterator
  whitespace removal
  micro optimization for key generator key tracking
  GraphQL! Hype! 🎉
  explicit
  remove unused variable
  explicit
  Fix VS complaints
  complaints
  complaints
  updated CHANGELOG
  fixed issue #1937
  Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals.
  ignore revision ids
  fix destructuring of Externals in MERGE
  make it code.
  ignore primary and edge indexes during cluster restore
  grunt build [ci skip]
  semist.
  ...
 2016-07-13 07:33:13 +00:00
Michael Hackstein 6e5f6d1a48 Fixed failure tests in SkiplistIndex 2016-07-13 07:26:35 +02:00
Max Neunhoeffer 4649036943 Add and read out HLC time stamps in HTTP headers. 2016-07-12 23:36:14 +02:00
Max Neunhoeffer 985723e468 Add HLC timestamp as HTTP header in asyncRequst and syncRequest. 2016-07-12 23:11:57 +02:00
Max Neunhoeffer 18925faf8f Merge branch 'devel' into HLC 2016-07-12 22:51:40 +02:00
Michael Hackstein c46ff5c085 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 18:07:21 +02:00
Michael Hackstein 63bad694c5 Fixed a bug with reset of new skiplist index iterator 2016-07-12 18:07:11 +02:00
jsteemann 522b23590b whitespace removal 2016-07-12 17:58:05 +02:00
jsteemann d687cd7ebe micro optimization for key generator key tracking 2016-07-12 17:16:06 +02:00
jsteemann 04992ab68d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 17:01:40 +02:00
jsteemann 94556cb9fb explicit 2016-07-12 17:01:34 +02:00
Max Neunhoeffer 386f0fe883 Remove an unused var. 2016-07-12 16:56:51 +02:00
jsteemann 76f55d84bc remove unused variable 2016-07-12 16:56:48 +02:00
jsteemann 28479d3778 explicit 2016-07-12 16:56:42 +02:00
Max Neunhoeffer 183bcb50df FIx typo. 2016-07-12 16:55:59 +02:00
Max Neunhoeffer 2c2c50aa19 Rewrite old revision strings with new HLC time stamps. 2016-07-12 16:51:25 +02:00
jsteemann 6713ec39dc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 16:49:36 +02:00
Jan Steemann 5773154791 complaints 2016-07-12 15:37:37 +01:00
Jan Steemann d9aa695cea complaints 2016-07-12 15:36:47 +01:00
jsteemann dcfaee33e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 15:57:40 +02:00
Jan Steemann 403ba8a30c fixed issue #1937 2016-07-12 15:57:19 +02:00
Max Neunhoeffer 846e6b6127 Merge remote-tracking branch 'origin/devel' into HLC 2016-07-12 15:10:24 +02:00
Michael Hackstein daeef23761 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 14:46:35 +02:00
Michael Hackstein d9e1f41871 Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals. 2016-07-12 14:46:24 +02:00
Max Neunhoeffer 17e4c05de5 Change encoding of HLC time stamps, tolerate old ticks in _rev. 2016-07-12 14:01:33 +02:00
jsteemann e03cf68861 ignore revision ids 2016-07-12 13:54:41 +02:00
Jan Steemann 1719d3c993 fix destructuring of Externals in MERGE 2016-07-12 13:37:39 +02:00
Jan Steemann 233453bb42 ignore primary and edge indexes during cluster restore 2016-07-12 10:18:12 +02:00
Jan Steemann 3705a1d2f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 09:45:52 +02:00
Jan Steemann 6f3091e30a fix recovery issues 2016-07-12 09:45:45 +02:00
Jan Steemann 94bd64d9ab fix complaining about null keys 2016-07-12 09:42:32 +02:00
Jan Christoph Uhde 4f357502b0 fix: add missing mutex 2016-07-12 09:30:49 +02:00
Max Neunhoeffer 7571a16c9d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-07-11 23:46:12 +02:00
Max Neunhoeffer 869a820275 Use babies in handler for arangorestore. 
This fixes bad performance and corresponding errors due to timeouts
in the cluster case with synchronous replication in the restored
collections.
 2016-07-11 23:37:38 +02:00
Jan Steemann 2d7faa795a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-11 18:39:18 +02:00
Jan Steemann 10db618129 fix recovery 2016-07-11 18:36:00 +02:00
Jan Steemann fe25732635 ignore document not found on recovery 2016-07-11 15:40:42 +02:00
Jan Steemann fe845d4b7a respond with better error message 2016-07-11 13:42:14 +02:00
Frank Celler 36a9b7852e Merge branch 'devel' into HLC 2016-07-11 07:03:49 +00:00
Michael Hackstein 9f60536584 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-11 08:58:59 +02:00
Jan Steemann cb14a63778 pass UDF name into UDF call via this argument 2016-07-08 14:31:14 +02:00
Andreas Streichardt 256d5b818d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-07 18:50:24 +02:00
jsteemann ba8a8a8afe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-07 16:56:17 +02:00
jsteemann 3c536d6aff do not make options hidden 2016-07-07 16:56:07 +02:00
Max Neunhoeffer a98916d755 Merge branch 'devel' into HLC 2016-07-07 15:23:24 +02:00
Jan Steemann 351f800eb1 fix upsert 2016-07-07 15:15:43 +02:00
Jan Steemann 3e50e06140 fixed comment 2016-07-07 15:15:42 +02:00
Jan Steemann 664cf840e7 fix assertion failure 2016-07-07 13:24:07 +02:00
Jan Steemann f8b61c6723 added tests 2016-07-07 12:22:24 +02:00
Jan Christoph Uhde b2e29c4353 fix: createResponse -> setResponseCode; remove delete 
remove delete _response in RestEdgesHandler
 2016-07-07 08:54:41 +00:00
Jan Christoph Uhde d5a64253ec fix: add missing mutex 2016-07-07 09:01:43 +02:00
Jan Christoph Uhde 7996b2c152 fix: RestAqlHandler - use getVpackOptionsForDump 2016-07-07 08:56:22 +02:00
Michael Hackstein 768177518f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-06 22:42:52 +02:00
Michael Hackstein b285cd26a3 Internal cleanup of TraversalOptions. Now the options know the the expressions not the traverser any more. Preparation to use other indexes 2016-07-06 22:42:46 +02:00
jsteemann a7b5bb60fd fixed issue #1929 2016-07-06 21:34:39 +02:00
Andreas Streichardt 7bb0740c4e remove bogus includes 2016-07-06 18:18:01 +02:00
Max Neunhoeffer 02a5e5cc8f Merge branch 'devel' into HLC 2016-07-06 11:03:41 +02:00
Jan Steemann 617a833040 handle "isSystem" somewhat smarter 2016-07-06 10:23:37 +02:00
Max Neunhoeffer 200d47a0bc Fix revision id bug. 2016-07-06 10:02:26 +02:00
Max Neunhoeffer 1a04b0112f Fix lastRevision in collection to use revision. 2016-07-06 09:38:20 +02:00
Max Neunhoeffer f441fceed8 More fixes for new revision timestamps. 2016-07-06 09:15:48 +02:00
Jan Steemann 2fa2487081 fixed "Could not extract custom attribute" issue 2016-07-06 08:44:22 +02:00
Jan Steemann 373aaffa20 Revert "don't update if there's nothing to do" 
This reverts commit 7455ef20ef.
 2016-07-06 07:56:48 +02:00
Jan Steemann d8ead99c72 penalize backwards sorting 2016-07-06 07:41:18 +02:00
Jan Steemann 7455ef20ef don't update if there's nothing to do 2016-07-06 07:41:08 +02:00
Jan Steemann f9bafa4b14 slightly penalize index type 2016-07-06 07:41:01 +02:00
Max Neunhoeffer 41c5451168 Extract conversion _rev string <-> rid into functions. 
Also fixes another place where this conversion was wrong.
 2016-07-05 23:52:30 +02:00
Max Neunhoeffer ae1a9497c6 Fix extractRevision again. 2016-07-05 22:18:09 +02:00
Max Neunhoeffer bbfeafe830 Fix compilation. 2016-07-05 21:57:37 +02:00
Max Neunhoeffer bf3a6de760 Fix extractRevision for new revision format. 2016-07-05 21:55:42 +02:00
Max Neunhoeffer 7fe9fcc00e Use hybrid logical clock for _rev entries. 2016-07-05 21:15:32 +02:00
Jan Christoph Uhde 6963c70dc8 fix unittest http_server 2016-07-05 15:36:31 +02:00
jsteemann c5dbfd7c7b honor presence of persistent index for sorting 2016-07-05 13:04:38 +02:00
Jan Steemann ca86704086 beautify handling of optimizer rules 2016-07-05 11:21:04 +02:00
Michael Hackstein b39785ab3f Fixed an VPackExternal error in Cluster Traverser. 2016-07-05 10:33:45 +02:00
Jan Christoph Uhde 5805758cee make it compile - more ugly casts 2016-07-05 09:56:50 +02:00
Jan Christoph Uhde 4aa7222d98 Merge remote-tracking branch 'origin/devel' into FHM 
* origin/devel:
  Start adding a hybrid logical clock.
  Handle replicationFactor and numberOfShards in arangorestore.
  upgrade script for homebrew
  Fix namespace stuff for VC++
  Use standard GNU install dirs
 2016-07-05 08:09:08 +02:00
Jan Christoph Uhde 41ecd18fc1 Merge branch 'devel' into FHM 
* devel:
  add: VPackValidator to RestVocbaseBaseHandler
  add tags to .gitignore and add .editorconfig
 2016-07-05 08:06:12 +02:00
Max Neunhoeffer bc82322353 Start adding a hybrid logical clock. 2016-07-05 00:28:04 +02:00
Max Neunhoeffer b7e957664f Handle replicationFactor and numberOfShards in arangorestore. 
This adds an option --default-replication-factor to arangorestore and
makes it more convenient to specify the number of shards for restored
collections.
 2016-07-05 00:10:20 +02:00
Andreas Streichardt 32a77560d9 Fix namespace stuff for VC++ 2016-07-04 18:44:04 +02:00
Frank Celler d5bb7687f3 removed unecessary prefix 2016-07-04 17:44:35 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Jan Steemann 8617a8f82d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-04 16:47:35 +02:00
Jan Steemann 1769299e95 make optimizer not skip "use-indexes-rule", even if enough plans have been created already 2016-07-04 16:31:14 +02:00
Michael Hackstein c19df03649 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-04 16:26:08 +02:00
Michael Hackstein 12011060c0 Removed now obsolete code 2016-07-04 16:25:59 +02:00
Michael Hackstein d273b387f8 Improved Traversal internal API. It now does less copying and creates less objects. Also it is way simpler to understand. 2016-07-04 16:16:58 +02:00
jsteemann 9593ac122d dont include unused StringBuffer 2016-07-04 15:00:08 +02:00
Jan Christoph Uhde ed789ce397 add: VPackValidator to RestVocbaseBaseHandler 2016-07-04 14:09:28 +02:00
Jan Steemann 7b62d71c63 added --skip-lines for import 2016-07-04 11:18:15 +02:00
Kaveh Vahedipour 4ead4f0ed7 compaction bug fixed for followers 2016-07-01 11:27:33 +02:00
Kaveh Vahedipour 8d9e636779 fixing follower agency compaction 2016-07-01 10:36:54 +02:00
Kaveh Vahedipour 204a57940d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-01 09:33:45 +02:00
Kaveh Vahedipour afbddb643b compaction bug on followers 2016-07-01 09:33:34 +02:00
jsteemann 0aaf58837b babify cluster import 2016-06-30 18:29:04 +02:00
Jan Steemann b4159ade4e always adjust tick values when loading collections and when modifying documents with _rev value specified 2016-06-30 18:04:03 +02:00
jsteemann f145c79f10 initialize variable 2016-06-30 15:41:41 +02:00
Frank Celler 89a6419b4b fixed periodic jobs: only one instance should be running 2016-06-30 14:57:50 +02:00
Kaveh Vahedipour 7dcee21432 bug fixes agancy backported from devel 2016-06-30 14:04:26 +02:00
Kaveh Vahedipour bfbc89f4f9 bug fixes agancy backported from devel 2016-06-30 14:00:52 +02:00
Kaveh Vahedipour 07bba4a9a9 bug fixes agancy backported from devel 2016-06-30 13:50:12 +02:00
Jan Steemann 6c2f9148cc increase max. number of collections to 256 2016-06-30 13:44:31 +02:00
Jan Steemann 3016fad94c issue #1915 2016-06-30 13:44:25 +02:00
Jan Steemann b05d4f7681 issue #1914: fix unterminated buffer 2016-06-30 13:15:10 +02:00
jsteemann 42b83af963 micro optimizations 2016-06-29 23:34:58 +02:00
jsteemann 77e19df7c7 reuse operation cursors for const expressions 2016-06-29 22:56:42 +02:00
jsteemann e554f5463a primary index and cursor optimizations 2016-06-29 22:13:24 +02:00
jsteemann aa4591193a removed unused Json include 2016-06-29 22:01:36 +02:00
jsteemann 10367c1de4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-29 17:44:29 +02:00
jsteemann dd92e97c03 speed up primary index lookups 2016-06-29 17:44:03 +02:00
Kaveh Vahedipour 29acdad6bf unnecessary double condition 2016-06-29 17:42:41 +02:00
Jan Steemann 4642d2932e do not use revision id comparisions for compaction, but marker addresses 2016-06-29 15:59:35 +02:00
Kaveh Vahedipour e922909d6d empty arrays handled wrong 2016-06-29 15:39:51 +02:00
Kaveh Vahedipour 4c8ae6e5c5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-29 14:59:16 +02:00
Kaveh Vahedipour 1baf2050c6 waitForCommited bug in agency fixed 2016-06-29 14:54:05 +02:00
Michael Hackstein 712e495fe2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-29 13:08:13 +02:00
Michael Hackstein 59dd29e760 Improved OperationCursor. It now uses unique instead of shared ptr. It was never shared anyways. Also many more places now use direct MasterPointers in favor of OperationResults. Also added a generic IndexIterator nextBabies function. 2016-06-29 13:08:07 +02:00
jsteemann 9db548ff40 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-29 12:53:24 +02:00
jsteemann 4a5b75b485 escape Unicode characters in JSON dumps 2016-06-29 12:53:08 +02:00
Jan Steemann 0fea8cc711 add write collections before read collections 2016-06-29 11:10:27 +02:00
Jan Steemann 71c778e0bb Visual Studio 2016-06-29 09:53:42 +02:00
Jan Steemann eea20e5fa2 fix VS warnings 2016-06-28 17:23:49 +02:00
Jan Steemann 8002607b67 prevent VS warnings 2016-06-28 17:16:48 +02:00
Kaveh Vahedipour 516127aeb2 checking and documenting 2016-06-28 14:39:17 +02:00
Michael Hackstein 433d89b2d7 Removed unused imports 2016-06-28 14:07:15 +02:00
Michael Hackstein 12dc78450f Removed dead code. 2016-06-28 13:40:09 +02:00
Kaveh Vahedipour ff0fed4d37 some additional checking of vector bounds and assertions 2016-06-28 11:02:10 +02:00
Kaveh Vahedipour 363556bbf6 some additional checking of vector bounds and assertions 2016-06-28 11:01:50 +02:00
Kaveh Vahedipour 4c41193796 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-28 11:00:43 +02:00
Kaveh Vahedipour 2152566d29 some additional checking of vector bounds and assertions 2016-06-28 11:00:36 +02:00
jsteemann b6fd7d0c23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-28 10:45:46 +02:00
jsteemann 664788eb75 make usage of SimpleAttributeEqualityMatcher consistent 2016-06-28 10:45:25 +02:00
Kaveh Vahedipour 5fd847c2e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-28 10:45:23 +02:00
Kaveh Vahedipour 811275889f too ambitious minimum election time in agency for wait-for-sync 2016-06-28 10:45:13 +02:00
jsteemann 07571f45c0 micro optimizations 2016-06-28 10:22:34 +02:00
Kaveh Vahedipour e06a5bc70f some additional checking of vector bounds and assertions 2016-06-28 09:26:33 +02:00
Kaveh Vahedipour 72045d3021 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-27 17:11:29 +02:00
Kaveh Vahedipour 2f4fcba0c8 supervision missed a leadership change while getting unique ids 2016-06-27 17:11:18 +02:00
Michael Hackstein 65c82ee38e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-27 16:57:54 +02:00
Michael Hackstein 808cb97707 Fixed a bug in SHORTEST_PATH using a distance attribute. In some cases the computed path was not correct. 2016-06-27 16:57:47 +02:00
Kaveh Vahedipour e6ccc76d36 bogus matching entries warnings 2016-06-27 13:42:54 +02:00
Kaveh Vahedipour 5326e35b3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-27 13:37:11 +02:00
Kaveh Vahedipour 58e1b8fe0d agency will hold back responses until such time that leader has been elected 2016-06-27 13:37:04 +02:00
Max Neunhoeffer c1ea48b699 Fix a deadlock in the Constituent. 2016-06-27 13:35:11 +02:00
Max Neunhoeffer 5a6b5af02a Ensure that Store::_agent is set when first used. 
This fixes a data race at startup.
 2016-06-27 12:13:25 +02:00
jsteemann b56cf9f903 optimized away an unneeded shared_ptr 2016-06-25 23:48:09 +02:00
jsteemann e340b2d710 more index optimizations 2016-06-25 19:34:18 +02:00
jsteemann f65610ba23 more index optimizations 2016-06-25 18:26:08 +02:00
jsteemann 71a0ebb24a optimizations for edge index lookups 2016-06-25 15:55:11 +02:00
jsteemann 96e2473ae2 fixed "collection is a nullptr" issue when starting a traversal from a transaction 2016-06-25 15:54:14 +02:00
jsteemann c18ec8589b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-24 17:24:00 +02:00
jsteemann 50cbf416b3 optimizations for primary index lookups 2016-06-24 17:23:43 +02:00
Wilfried Goesgens b126df61c2 Improve error handling for invalid graph definitions 2016-06-24 17:18:10 +02:00
Max Neunhoeffer 23fe65688f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-24 16:55:59 +02:00
Kaveh Vahedipour 37d5956bec Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-24 16:52:42 +02:00
Max Neunhoeffer fe4a8e4695 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-24 16:38:11 +02:00
Kaveh Vahedipour 1043af68f7 agency will hold back responses until such time that leader has been elected 2016-06-24 16:37:57 +02:00
Max Neunhoeffer b1395ce1bd No longer use return value of next() method of ArrayIterator. 2016-06-24 16:37:49 +02:00
jsteemann 4bfc58b8a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-24 16:24:49 +02:00
jsteemann c0a716e28d performance optimizations for primary index lookup 2016-06-24 16:24:39 +02:00
Kaveh Vahedipour 6d1d1e6b0b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-24 15:37:08 +02:00
Kaveh Vahedipour bbade806c3 more agency tests 2016-06-24 15:36:57 +02:00
jsteemann 274801b7b6 issue #1891: renamed to OUTERSECTION 2016-06-24 14:07:41 +02:00
jsteemann 04b29e9c34 optimize handling of `[*]` operator in case no projection, no filter and no offset/limit values are used 2016-06-24 14:04:30 +02:00
jsteemann daf6d42683 optimize away some more filter parts of type `"const" IN collection.attribute 2016-06-24 14:03:58 +02:00
Kaveh Vahedipour a54c66ea2f vectorized arrays in key-value-store 2016-06-24 12:17:40 +02:00
jsteemann 6769130f33 enable import API for cluster 2016-06-24 10:53:00 +02:00
Kaveh Vahedipour 0a7decc303 this is the end of CommLock as we know it ... 2016-06-24 10:48:10 +02:00
jsteemann 50c3aa93a9 issue #1891: added AQL function `DIFFERENCE` to return the symmetric difference of its input arguments 2016-06-24 10:35:49 +02:00
Kaveh Vahedipour 761b16e407 added 'in'-check for agency precondition 2016-06-23 17:17:03 +02:00
Kaveh Vahedipour f673b5c5cc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-23 15:51:06 +02:00
Kaveh Vahedipour f510275562 added 'in'-check for agency precondition 2016-06-23 15:50:58 +02:00
Kaveh Vahedipour d125d21912 added 'in'-check for agency precondition 2016-06-23 15:49:06 +02:00
jsteemann 8f0991e18e potential performance optimizations 
simplifications

small optimizations
 2016-06-23 14:47:44 +02:00
Wilfried Goesgens dd5e2b1c1b Fix warning message - the algorithm adds dashes, no need to do this here. 2016-06-23 13:15:50 +02:00
Kaveh Vahedipour cd9175a409 this is the end of CommLock as we know it ... 2016-06-23 13:09:58 +02:00
Kaveh Vahedipour 9003a50537 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-23 12:51:38 +02:00
Kaveh Vahedipour cf685fa444 no more agency locks in cluster info 2016-06-23 12:51:05 +02:00
jsteemann 7496fa2c67 issue #1894: make list of edge collections unique in traversal 2016-06-23 12:17:04 +02:00
Kaveh Vahedipour 1a8636c34c removing more locks from cluster-agency communication 2016-06-23 11:14:21 +02:00
Kaveh Vahedipour ab0b3fc321 agency test waits exactly for the leader election to have ended 2016-06-23 10:52:43 +02:00
Kaveh Vahedipour b40e5a3d24 agency test waits exactly for the leader election to have ended 2016-06-23 10:48:26 +02:00
Kaveh Vahedipour d55c85f8fa no commlockers in ClusterFeature anymore 2016-06-22 18:19:12 +02:00
Kaveh Vahedipour 11a36db83c getting rid of locks in cluster comm 2016-06-22 16:42:43 +02:00
Kaveh Vahedipour 34aed57a6d adding IN operator to kv-store 2016-06-22 14:44:43 +02:00
Kaveh Vahedipour 4f6f22928b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-22 13:15:44 +02:00
Kaveh Vahedipour a6d5c61029 forward in removing locks in AgencyComm 2016-06-22 13:15:36 +02:00
Jan Steemann 992da3d4f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-22 11:15:18 +02:00
Jan Steemann 4038c21c10 reserve buffer ahead of time 2016-06-22 11:14:50 +02:00
Kaveh Vahedipour 48832c2d52 fix agency test error 2016-06-22 10:14:00 +02:00
Kaveh Vahedipour dcc2b257e3 fix agency test error 2016-06-22 10:02:30 +02:00
Max Neunhoeffer 0dc3b7dd45 Small change in getResponsibleServer to silence warnings. 
If getResponsibleServer finds an entry _DBServer001 it simply waits
for half a second and checks again in the agency. This is the right
reaction to a planned leader change.
 2016-06-21 22:55:46 -07:00
Jan Steemann 91f806ef2b match collections by either id or name 2016-06-21 17:21:59 +02:00
jsteemann ae2d8b8394 micro optimizations 2016-06-21 16:01:31 +02:00
Jan Steemann 6b23e9fee9 next attempt 2016-06-21 09:58:16 +02:00
Jan Steemann f362dc5e21 attempt to fix Visual Studio complaints 2016-06-21 09:52:42 +02:00
Jan Steemann a00cdb8cfd define RESTSERVER earlier, to avoid false results 2016-06-21 09:52:04 +02:00
jsteemann 55fce39574 optimizations for neighbors queries 2016-06-20 18:37:46 +02:00
Kaveh Vahedipour 7f326d362a vs compilation problems 2016-06-20 15:02:14 +02:00
Kaveh Vahedipour 6e13e454f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-20 10:24:57 +02:00
Kaveh Vahedipour b22b826862 documenting code mode 2016-06-20 10:13:00 +02:00
Max Neunhoeffer 8adf1ac3b6 Fix a typo in an error message. 2016-06-18 08:08:08 -07:00
jsteemann c46abcdf16 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-18 01:59:09 +02:00
jsteemann ea197fbf79 fixed assertion failure 2016-06-18 01:58:54 +02:00
Max Neunhoeffer 6df59cd509 Fix the fix: if there is cluster internal communication problems... 2016-06-17 14:36:00 -07:00
Max Neunhoeffer 4710059bd7 Fix crash if cluster internal communication does not work and no shardId comes back. 2016-06-17 13:49:16 -07:00
Max Neunhoeffer 66e24b2093 Use old version of Plan when building the new version. 2016-06-17 11:55:12 -07:00
jsteemann 6862f8fb9e micro optimizations 2016-06-17 17:55:06 +02:00
jsteemann 5b915d179c optimized away a Builder object 2016-06-17 17:24:15 +02:00
jsteemann 205cb4545a micro optimization 2016-06-17 17:10:15 +02:00
jsteemann 43574e509e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-17 16:28:04 +02:00
jsteemann 1e8ce63e01 optimizations for traversal 2016-06-17 16:27:37 +02:00
Jan Steemann 46df1f6a79 optimization for documents 2016-06-17 15:50:45 +02:00
Kaveh Vahedipour 62b905d558 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-17 13:28:15 +02:00
jsteemann 1eff077480 small changes 2016-06-16 18:06:51 +02:00
Andreas Streichardt 76b89776fb Allow aborting cluster task startup...CTRL-C will now do a hard abort during startup 2016-06-16 16:00:43 +02:00
Kaveh Vahedipour 844a6430be Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-16 15:33:10 +02:00
Kaveh Vahedipour 1578d0df13 adding IN operator to kv-store 2016-06-16 15:33:03 +02:00
jsteemann 2b223f6757 fixed errors in cluster traversal 2016-06-16 13:51:37 +02:00
jsteemann ca4edc60e0 small optimizations for traversal 2016-06-16 13:26:46 +02:00
jsteemann 0e4d0610c7 removed unused property 2016-06-16 09:57:03 +02:00
jsteemann e9033e56c9 removed unused code 2016-06-16 09:49:13 +02:00
jsteemann 6683bc02a7 small traversal optimizations 2016-06-16 09:44:24 +02:00
Max Neunhoeffer d0fe9f6d81 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-15 21:29:20 -07:00
Max Neunhoeffer dac508da27 Fix nasty bug with local system collections on DBServers. 
There are 3: _statistics, _statisticsRaw and _statistics15.
They need _id attributes in their documents which store the local
collection ID, and collection name lookup must consider this case.
 2016-06-15 21:26:04 -07:00
Max Neunhoeffer 4168cd32e7 Add more optional debugging output for AQL queries. 2016-06-15 21:23:16 -07:00
jsteemann 289a25bf5f no benefit from moving 2016-06-15 23:53:08 +02:00
jsteemann 2e417e08d6 fixed includes 2016-06-15 23:23:38 +02:00
jsteemann f6268f5c9d sort collection names 2016-06-15 23:18:04 +02:00
jsteemann 174bbab03a less work when packing search values for documentFastPath() 2016-06-15 22:23:14 +02:00
jsteemann 94d3959008 use alignas 2016-06-15 21:55:24 +02:00
jsteemann c3581c21aa fixed typo 2016-06-15 21:45:47 +02:00
jsteemann e536051af9 return prefab string 2016-06-15 20:48:39 +02:00
jsteemann e7be7730d2 fixed wrong assertion 2016-06-15 20:34:26 +02:00
jsteemann 2d5816dbb6 allow switching args for IS_SAME_COLLECTION 2016-06-15 20:34:06 +02:00
jsteemann f6cd7c67eb constify method 2016-06-15 19:22:16 +02:00
jsteemann f21561b25f use nullptr, don't include Thread.h when unnecessary 2016-06-15 19:21:53 +02:00
Kaveh Vahedipour 09e6fc810e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-15 16:08:26 +02:00
Kaveh Vahedipour 9ea023acb1 store documentation 2016-06-15 16:08:17 +02:00
Jan Steemann f3b4a8cee3 properly delete .tmp files 2016-06-15 15:50:53 +02:00
Kaveh Vahedipour 132788a205 agency raft voting logging demoted from INFO to DEBUG 2016-06-15 14:38:52 +02:00
Kaveh Vahedipour 7bb896be3a moveshard looks if toserver already in list else failes 2016-06-15 14:19:15 +02:00
Wilfried Goesgens 2a5103c13e Fatal exit if we find an old database version. 2016-06-15 13:19:32 +02:00
Kaveh Vahedipour e4556bb766 fixed seldom race in election pulled back from 3.0 2016-06-15 12:35:40 +02:00
jsteemann 766f79baa3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-15 09:54:17 +02:00
jsteemann fc34a53b14 speed up 2016-06-15 09:38:45 +02:00
jsteemann f7ece88b35 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 17:37:55 +02:00
Kaveh Vahedipour 66e6315113 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 17:14:00 +02:00
Kaveh Vahedipour 0f66a110de fixed max_elements bug in job transactions 2016-06-14 17:13:52 +02:00
jsteemann b397ec9b17 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:54:19 +02:00
Frank Celler 03079b2b67 3.0 fixes for paths 2016-06-14 16:51:48 +02:00
jsteemann 470919bf67 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:43:12 +02:00
Jan Steemann 24ee67eda7 try to fix potential crashes 2016-06-14 16:41:00 +02:00
Kaveh Vahedipour a3694e7a01 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:39:17 +02:00
Kaveh Vahedipour 1b77bc7a83 ageny tests 2016-06-14 16:39:07 +02:00
jsteemann 83466c2342 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:14:21 +02:00
jsteemann 34877186dd make user-defined AQL functions throw again 2016-06-14 16:14:02 +02:00
Max Neunhoeffer 3e1b745f64 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 15:59:45 +02:00
Max Neunhoeffer 127a642943 Wait for 2 DBServers or 30s before running cluster bootstrap. 2016-06-14 15:40:11 +02:00
Kaveh Vahedipour 2f3c86dd1d error handling in rest handling and random generator in constituent 2016-06-14 14:53:33 +02:00
Kaveh Vahedipour ab593bfa94 error handling in rest handling and random generator in constituent 2016-06-14 14:51:48 +02:00
Frank Celler e8a5f4b8aa fixed random issue 2016-06-14 14:25:44 +02:00
Frank Celler 37dc4ae54e fixed random issue 2016-06-14 14:22:43 +02:00
Andreas Streichardt f46096d693 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 13:04:30 +02:00
Andreas Streichardt 60377dfd1b Throw exception when calling cluster methods in non-cluster mode 2016-06-14 13:04:03 +02:00
Kaveh Vahedipour 3f0b5c1a36 minor optimisations 2016-06-14 12:20:22 +02:00
Kaveh Vahedipour 658a2a8f3d clean up code, document 2016-06-14 12:00:34 +02:00
jsteemann e952d2f08b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-13 22:38:45 +02:00
jsteemann a7fa0c0544 fixed uniqueness issue for breadth-first traversal in cluster 2016-06-13 21:00:13 +02:00
Kaveh Vahedipour 1709d66841 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-13 19:32:56 +02:00
Kaveh Vahedipour df93c72bd0 optimised key-value store for speed and readability 2016-06-13 19:32:50 +02:00
Andreas Streichardt 040959e83b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-13 19:12:47 +02:00
Andreas Streichardt d9d30d6bdc Throw exception when not running in cluster 2016-06-13 19:11:29 +02:00
Frank Celler 4576ec4f5c fixed return code 2016-06-13 17:20:17 +02:00
jsteemann fc53bbec02 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-13 15:17:02 +02:00
jsteemann b898333162 fix SSL options 2016-06-13 15:16:31 +02:00
Kaveh Vahedipour d130743a73 shrinkCluster tests 2016-06-13 15:15:10 +02:00
Kaveh Vahedipour cf338d0158 shrinkCluster tests 2016-06-13 14:45:29 +02:00
Max Neunhoeffer 2a7f4684f4 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-13 13:55:30 +02:00
Max Neunhoeffer 1f926fc24b Fix synchronous replication: use shard name instead of ID. 
Explanation: Different replicas of the same shard will have different
local collection IDs. Therefore we have to use the shard name
(collection name) to indentify collections in synchronous replication.
 2016-06-13 13:54:32 +02:00
jsteemann 9abb3d6e72 do not count filtered values twice 2016-06-13 13:33:55 +02:00
jsteemann 6a9a45de2f make it compile on Visual Studio 2016-06-13 13:21:30 +02:00
jsteemann c580ac9b91 make it compile on Visual Studio 2016-06-13 13:18:57 +02:00
jsteemann f09b91813d pacify Visual Studio 2016-06-13 13:16:35 +02:00
jsteemann f3edd6ef5d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-13 12:59:37 +02:00
jsteemann 85d8e84e2a fixed endless looping 2016-06-13 12:15:30 +02:00
jsteemann 365a70643e use std::move 2016-06-13 10:28:39 +02:00
jsteemann 0d2274edef Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-12 16:58:18 +02:00
Frank Celler c192c41c21 fixed typo 2016-06-12 12:25:10 +02:00
Frank Celler 2dce30ac21 clang-format 2016-06-12 12:19:37 +02:00
Frank Celler ed01dcec8f secure-installation will remove all users except root 2016-06-12 12:19:37 +02:00
Michael Hackstein 614c52d5c6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-10 21:34:53 +02:00
Michael Hackstein 7baee88d23 Removed Code that is now obsolete do to replacement of Neighbors by Pattern Matching traversal 2016-06-10 21:33:46 +02:00
Michael Hackstein d7a710593a Fixed some minor bugs in breadth-first-search for AQL traversal. Also added another test case for it. 2016-06-10 21:00:38 +02:00
Andreas Streichardt 7a6c00506e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-10 19:28:23 +02:00
Kaveh Vahedipour dfa2d31410 we can shrink cluster 2016-06-10 19:28:06 +02:00