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

10899 Commits

Author SHA1 Message Date
Jan Christoph Uhde 2b5a0f1eec shorten code 2016-08-21 00:57:07 +02:00
Kaveh Vahedipour bb70ed3b8f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-19 18:00:21 +02:00
Kaveh Vahedipour 7c706ecdc8 weekend edition 2016-08-19 17:59:58 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Andreas Streichardt 66e1bf7e4a Introduce --agency.my-address 2016-08-19 16:20:10 +02:00
jsteemann 1b0d40eff2 cppcheck 2016-08-19 15:27:47 +02:00
jsteemann ff45c3fd07 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 15:19:51 +02:00
jsteemann 9f424553ca stub implementation for engine-specific collections 2016-08-19 15:19:23 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
 2016-08-19 14:35:05 +02:00
Kaveh Vahedipour 168431b6ba dumb warnings 2016-08-19 14:29:57 +02:00
Jan Christoph Uhde e2cc11e22a better reporting of errors 2016-08-19 14:23:11 +02:00
Kaveh Vahedipour 761b986312 warnings and correct handling of pool size 2016-08-19 14:19:56 +02:00
jsteemann eadf5ac842 use anonymous namespace 2016-08-19 13:55:57 +02:00
Jan Christoph Uhde 85a7d98b88 Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  fixed namespace
 2016-08-19 13:53:12 +02:00
Jan Christoph Uhde 5a236bbade fix number of payloads 2016-08-19 13:52:46 +02:00
jsteemann 59e65b060c cppcheck 2016-08-19 13:51:48 +02:00
Kaveh Vahedipour 4570320a5b dumb warnings 2016-08-19 13:44:01 +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
Mark 6da481ac47 fixed namespace 2016-08-19 12:43:58 +02:00
jsteemann c5e578917c removed useless include 2016-08-19 12:42:45 +02:00
jsteemann f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +02:00
Frank Celler d17f42379b fix errors during shutdown 2016-08-19 12:27:01 +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 6580131731 Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-19 12:19:05 +02:00
Michael Hackstein 9e0d8ab477 Fixed another failed nullptr handling in LogicalCollection cluster case. 2016-08-19 11:27:44 +02:00
Michael Hackstein 68faea4ce2 Fixed undefined behaviour in rest error creation 2016-08-19 11:15:08 +02:00
Michael Hackstein 5f807900d7 Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode 2016-08-19 11:14:23 +02:00
Kaveh Vahedipour b865f3a41c pool size default 2016-08-19 11:13:25 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Kaveh Vahedipour 4177f6bef0 gossipping logs move from debug to trace 2016-08-19 10:59:26 +02:00
Kaveh Vahedipour 93995eba84 agency startup changed to bootstrapping 2016-08-19 10:45:52 +02:00
Kaveh Vahedipour fc67a7783f shutdown fixed 2016-08-19 10:26:57 +02:00
Michael Hackstein 82bc34db4d The logical colleciton now knows it's journalSize 2016-08-19 10:21:15 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream 
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-19 09:58:27 +02:00
Michael Hackstein 3f01c4680d Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again. 2016-08-19 09:51:42 +02:00
Kaveh Vahedipour d8cb8a33ac pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
Jan Christoph Uhde 104b71fa6f fix bug when trying to copy member form nullptr request 
response is generated by simple error so there is no request available
 2016-08-19 09:07:00 +02:00
Kaveh Vahedipour d54c090a01 missing source file added 2016-08-19 08:41:19 +02:00
Kaveh Vahedipour b3ba9be57f we have a bootstrapping agency 2016-08-19 06:05:33 +02:00
Kaveh Vahedipour 0bdfdc7cb6 votes are processed correctly again 2016-08-19 05:11:52 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Kaveh Vahedipour 11776faa54 correct persistence after agency activation 2016-08-18 18:23:20 +02:00
Michael Hackstein efce89e3f4 Fixed database/collection lookup in cluster. It did not get the correct vocbase when using a Database other than _system 2016-08-18 17:39:25 +02:00
jsteemann 1b11096060 remove Json/JsonHelper/TRI_json_t 2016-08-18 17:28:43 +02:00
Kaveh Vahedipour c4bff54771 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-18 17:25:24 +02:00
Kaveh Vahedipour 15d2e9285c it seems as if the bootstrap is good to go 2016-08-18 17:24:32 +02:00
jsteemann 21dd73074a cppcheck 2016-08-18 16:57:55 +02:00
jsteemann d7b2141da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:22:00 +02:00
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