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

3359 Commits

Author SHA1 Message Date
Mark c366fa55e3 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 14:53:06 +02:00
Mark 4fb57e4c27 fixed compile errors (visual studio) 2016-09-07 14:52:52 +02:00
Michael Hackstein 08428fcb5f Added a special handling for EDGE_INDEX ... again ... Fixes crash in 9cd3b7a4f5. 2016-09-07 14:03:55 +02:00
Michael Hackstein c046c9a06a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-07 13:38:23 +02:00
Michael Hackstein 9cd3b7a4f5 Modified interna of LookupInfo used in traverser. It should now properly name the attribute that has to be adjusted with new _from / _to values. However this is a bug somewhere still. This commit crashes. 2016-09-07 13:37:57 +02:00
jsteemann 98dc073774 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 10:01:49 +02:00
Jan Steemann a79c8360d4 fixed issue #2039 2016-09-07 09:59:41 +02:00
Michael Hackstein 4f50911c88 Fixed a bug in Traversal Explainer. Also fixed undefined behaviour when directly checking for an attribute omitting == true in early traversal filter. 2016-09-06 18:46:40 +02:00
jsteemann 733de3b5f0 initialize some pointer variables 2016-09-06 14:47:09 +02:00
Michael Hackstein e22014a272 Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:33:23 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
jsteemann 4839d65b36 moved things out of TRI_collection_t 2016-09-02 11:56:48 +02:00
jsteemann 002f503dac don't use c_str() 2016-09-02 09:14:34 +02:00
jsteemann a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +02:00
jsteemann b2eadbd179 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:07:50 +02:00
Jan Steemann b7be5d5cfb fixed issue #2026 2016-08-30 15:14:16 +02:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
jsteemann b9f8709104 renamed GeoIndex2 to GeoIndex 2016-08-29 13:02:07 +02:00
Michael Hackstein 0985e7fc88 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 12:52:41 +02:00
jsteemann 8a6d054642 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 12:37:07 +02:00
Jan Steemann 0392ba9b1a throw OOM error in case no buffer can be allocated 2016-08-26 11:00:05 +02:00
Michael Hackstein b01a7ac0d5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 08:02:54 +02:00
Michael Hackstein e75567dae5 Further fixes for tests: Fixed unitialized count. Fixed some false CORRUPTED_COLLECTION states. 2016-08-26 08:02:34 +02:00
jsteemann c6efe26198 cppcheck 2016-08-25 14:04:23 +02:00
Michael Hackstein 1f3dabc8e1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:08:39 +02:00
Michael Hackstein 2af30f056d Moved index creation to use LogicalCollection instead of TRI_collection_t. Involved changes of the constructor, all can now be created using iid and Slice. Removed specialized functions to create/find indixes in v8-voc index. Also the iteration is modified. This commit compiles but tests will fail. Merge commit. 2016-08-25 09:57:36 +02:00
jsteemann 1dab450622 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:35:10 +02:00
jsteemann 04f5fbbdb2 fixed issue #2018 2016-08-24 17:33:49 +02:00
jsteemann f92815b09b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
Wilfried Goesgens 6934baa6a4 Attempt not to bypass error handling so we hopefully get some more information on issue #2011 2016-08-23 17:02:28 +02:00
Jan Christoph Uhde 5be5030983 Merge branch 'obi-velocystream-enums' into engine-vs-velocystream 
* obi-velocystream-enums:
  clean up - remove enumToEnum magic
  finish ResponseCode enum
  finish  ProtocolVersion, ProtocolType and ConnectionType
  finish ContentType enum
  preapre move of ContentTypes
  finish RequestType enum
  prepare replacement of request types
  even more error messages
  slightly better error messages
  better exceptions form event loop
  mark len constexpr

Conflicts:
	arangod/Agency/Inception.cpp
 2016-08-23 16:01:58 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
jsteemann 5f06a5c025 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:13:08 +02:00
Jan Steemann 57fa55921c fix execution of AQL traversal expressions when there are multiple conditions that refer to variables set outside the traversal 2016-08-23 10:48:08 +02:00
Jan Steemann b296468a18 more optimizations 2016-08-22 17:36:04 +02:00
Michael Hackstein 635641d4e5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-19 13:15:48 +02:00
jsteemann c5e578917c removed useless include 2016-08-19 12:42:45 +02:00
Michael Hackstein 96f11c7e9f Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-19 12:26:07 +02:00
jsteemann e9866698aa removed JsonHelper 2016-08-19 12:24:12 +02:00
jsteemann 1b11096060 remove Json/JsonHelper/TRI_json_t 2016-08-18 17:28:43 +02:00
jsteemann 21dd73074a cppcheck 2016-08-18 16:57:55 +02:00
jsteemann 1cfee8059a remove TRI_json_t remainders 2016-08-18 16:13:52 +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
jsteemann 370093d37f removed unused method 2016-08-18 11:47:27 +02:00
jsteemann a2085066e0 use VPack 2016-08-18 10:36:52 +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
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
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 d2c1d75705 make unary minus and plus being executed in native C++ 2016-08-15 18:07:28 +02:00
jsteemann 1ec14d0bba privatize attributes 2016-08-15 15:47:39 +02:00
jsteemann 209c108c59 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-15 14:34:01 +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
Michael Hackstein e8ff84c8da cppcheck fixes and dead code cleanup. 2016-08-11 11:15:38 +02:00
Michael Hackstein 3a95244599 Fixed ALL== and NONE== tests for graph traversals. SingleServer and cluster 2016-08-10 17:10:25 +02:00
Michael Hackstein 773e9971b7 First draft of optimization ALL== NONE==. Not yet complete. 2016-08-10 14:05:25 +02:00
Michael Hackstein ec31db017d The TraverserEngine now honors variables in conditions properly 2016-08-09 16:28:07 +02:00
Michael Hackstein 42b8d44785 Fixed transfering of Vertex Filter Conditions in Cluster Traverser. Yet Missing if the filter needs a variable. 2016-08-09 13:54:34 +02:00
Michael Hackstein 72f127135b Removed dead code 2016-08-08 17:41:34 +02:00
Michael Hackstein 68fb94821a Fixed initialisation of TraverserEngines 2016-08-08 16:47:51 +02:00
Michael Hackstein 34b124d2a4 Traverser Engines are now created on ALL servers in the cluster. Even though some of them may not be responsible for anything. 2016-08-08 16:28:26 +02:00
Michael Hackstein 1447d6901f If a collection is not known to a Cluster Traversal. It will now throw an exception to prevent dead-locks and undefined behaviour. 2016-08-08 09:41:27 +02:00
Michael Hackstein 1ebb19d1da Fixed potential dead-lock situation when using AQL Traversals in Cluster with late-modify of Vertex Collection. 2016-08-05 13:20:46 +02:00
Michael Hackstein cb48f04cf7 Removed 'THROW' from destructor 2016-08-05 11:20:21 +02:00
Michael Hackstein 11c831aaee First Draft of injecting all Collections in Query into TraverserEngines 2016-08-05 11:05:16 +02:00
Michael Hackstein f68162bd93 Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-05 09:35:46 +02:00
Michael Hackstein 9a7fed8247 Fixed creation of TraverserEngines Coordinator side. Now always the correct size of edge collections is transferred, even if the DBServer is only responsible for Vertex Collections. 2016-08-04 15:15:34 +02:00
Michael Hackstein 92342f3bed Fixed cloning of TraversalNodes. It now maintains the list of collections 2016-08-04 14:14:53 +02:00
jsteemann bc6633e4c0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 13:33:10 +02:00
jsteemann 8a200f754c WG beautification 2016-08-04 12:36:14 +02:00
Michael Hackstein 8cb670595b Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-04 09:09:25 +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
Michael Hackstein 0867e2bb55 The TraversalNode now takes responsibility to clean up traversal engines on DBServers. 2016-08-02 14:05:35 +02:00
Michael Hackstein 81a21aaea0 Now initializing the Query when injecting the transaction. 2016-08-02 12:43:19 +02:00
Michael Hackstein 07a9924354 Added vertex collections to traversal node in GRAPH case. Also fixed a bug in TravOption serialisation. 2016-08-01 16:51:38 +02:00
Michael Hackstein 994a99e31f Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-01 16:50:54 +02:00
Michael Hackstein f663f5da69 Fixed a bug with ANY when copying the plan 2016-08-01 16:08:16 +02:00
Michael Hackstein c6b7a703db Firstattempt to implemenet correct locking in Cluster Traversal. It is not yet fully connected to execution plan. 2016-08-01 15:36:11 +02:00
jsteemann 71bd7deace Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-01 09:04:17 +02:00
Frank Celler 51683dbda0 added a panic interrupt of memory gets low 2016-07-31 12:58:27 +02:00
jsteemann d92f15aeed entirely removed TRI_document_collection_t 2016-07-29 17:48:51 +02:00
Michael Hackstein 5ee93a8d6c Fixed responsibility for Traversal Options. Now the TraversalNode is always responsible for all options and has to free them. All others just use these. In Cluster case each DBServer get's it's own TraverserEngine which is initialized with a copy of the Options. 2016-07-29 17:07:40 +02:00
Michael Hackstein 207d978afc Internal cleanup. Moved traversal options to a central place and removed the AQL-only version which was mostly redundant. This is preperation for Cluster initialisation. 2016-07-29 14:46:11 +02:00
Michael Hackstein b388fc3e87 Fixed bad access bugs from last commit. 2016-07-28 17:33:13 +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
Michael Hackstein 64d7f690da Removed AqlTransaction wherever possible. Added an InjectTransaction for the aql query, used by TraverserEngine. Also fixed TraverserEngine from/to velocypack functions. 2016-07-28 17:05:00 +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 45f775e56f removed unused consts 2016-07-28 12:04:03 +02:00
jsteemann b71e12f6a0 some vocbase refactoring 2016-07-28 11:06:21 +02:00
jsteemann 5d6cd9ef71 moved query id generation 2016-07-27 17:44:31 +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 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
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
Michael Hackstein 1d6afd1c67 Created a TraverserEngineRegistry which is a singleton feature. Right now it is empty. TODO Implement functionallity 2016-07-26 11:29:12 +02:00
Michael Hackstein 2a9c8ddc77 Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-07-26 09:43:48 +02:00
Michael Hackstein 990a0dddff Finally variables can be used in path based filtering again. They are evaluated once before the execution starts (for every start vertex) 2016-07-25 17:38:52 +02:00
jsteemann 2d293261cc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 16:54:12 +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
Michael Hackstein db4746f85e Now V8 conditions in Graph Traversals are not optmized any more. 2016-07-25 10:16:43 +02:00
Michael Hackstein 2d22afd4ea Fixed tests in Traversal. SingleServer all simple conditions are working and optimized. It does not yet work if one of the conditions requires v8 or a Variable. 2016-07-25 09:49:48 +02:00
Michael Hackstein 6fcad1f39a Fixes in newest Traversal implementation. The new conditions are now actually executed correctly. Most tests green, one suite still fails. 2016-07-22 15:19:38 +02:00
Jan Steemann 2aa1ae7db2 added read/write context info 2016-07-22 10:00:46 +02:00
Michael Hackstein 9b43dd30f0 Traversals now use Expressions to execute filter conditions. Right now V8 based conditions are non-functional. Also AqlValues do not work with base type of Transactions and do not need AqlTransactions. And so do expressions. Also allowed NARY_AND/NARY_OR in Expression nodes to be evaluated. 2016-07-21 16:38:32 +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
Michael Hackstein fff0ee4b38 Fixed access to Index Iterator in Traversal. Also fixed Path Edge Uniqueness check. Still todo: Evaluate conditions on edges / vertices that are not covered by index. Cluster 2016-07-20 17:40:12 +02:00
Michael Hackstein b166c031ab Fixed TraversalNode -> Json -> Node path. 2016-07-20 11:42:33 +02:00
Jan Steemann 8369f652a4 fixed issue #1950 2016-07-20 09:38:25 +02:00
Michael Hackstein ee4bbc5bf4 First Traversal over non edge Index. Yay. Still extremly Fragile and most tests fill fail. Cluster non functional. 2016-07-19 15:03:44 +02:00
Michael Hackstein aa1dc2a083 Intermediate State: Moved Traversals to use Slices above Strings to compare. Also Preperation to use different indexes. This state compiles but is not functional. 2016-07-19 10:54:37 +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 06bd01695a removed: body() from GeneralRequest 2016-07-19 09:16:07 +02:00
Jan Steemann a0ff5e9dc3 remove unused JsonHelper includes 2016-07-18 13:52:08 +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
Michael Hackstein 5b1e1b7496 Now the Traverser Node figures out the correct index handle. Next Up: SingleServerTraverser needs to use indexScan for this condition. Traversal Still out of function. 2016-07-15 17:14:03 +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
Michael Hackstein 36d579e20e Started rebuilding the traversal Condition. About to delete the TraverserExpression and entirely replacing it by AQL-Conditions. NOTE: This commit is not functional 2016-07-15 11:15:17 +02:00
Michael Hackstein b56a08bb6c Fixed some failures in ConditionFinder 2016-07-14 15:18:13 +02:00
Jan Steemann a1c2b7cc63 fixed issue #1941 2016-07-14 10:08:17 +02:00
jsteemann f5608449b2 fixed issue #1942 2016-07-13 20:32:59 +02:00
Michael Hackstein 248b8884bd Added a helper function that can rewrite a path matching condition to use a temporary variable instead of p.*. Used for optimization of FILTERS. 2016-07-13 16:34:28 +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
Jan Steemann 403ba8a30c fixed issue #1937 2016-07-12 15:57:19 +02:00
Michael Hackstein daeef23761 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 14:46:35 +02:00
Jan Steemann 1719d3c993 fix destructuring of Externals in MERGE 2016-07-12 13:37:39 +02: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
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 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
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 7455ef20ef don't update if there's nothing to do 2016-07-06 07:41:08 +02:00