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

1297 Commits

Author SHA1 Message Date
jsteemann f5a595f464 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:52:07 +02:00
jsteemann eac7eafc4e fix collection creation 2016-09-06 18:33:08 +02:00
Andreas Streichardt 7b4a383877 Fix resilience tests 2016-09-06 16:49:54 +02:00
jsteemann caba67dafb Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 10:49:54 +02:00
jsteemann ffa00e26a0 some index cleanup 2016-09-06 10:49:40 +02:00
Michael Hackstein abd0161adc Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:55:20 +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
Max Neunhoeffer 49d7cf345f Improve version handling in ClusterInfo. 2016-09-05 16:03:28 +02:00
Michael Hackstein decb4b69a3 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-05 11:04:12 +02:00
Michael Hackstein e5e28f9c08 Added a try catch in loadPlan. If the agency for some reason contains invalid collection information the coordinator will not break down, instead it will ignore the invalid collection and continue. 2016-09-05 11:03:59 +02:00
jsteemann 4492409d5f Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-02 15:23:15 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
Kaveh Vahedipour b3b7d7c907 failed servers are excluded from new shard creation 2016-09-02 12:37:53 +02:00
jsteemann 5524b25800 removed VocbaseCollectionInfo 2016-09-02 09:41:36 +02:00
Michael Hackstein 3c851f8687 Added proper error handling for collection not found in V8 2016-09-01 17:42:27 +02:00
jsteemann 6c2bb5513e Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 16:06:22 +02:00
Frank Celler 04a82b919f added --cluster.system-replication-factor 2016-09-01 15:59:02 +02:00
Michael Hackstein ba460f3675 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-01 14:12:00 +02:00
Michael Hackstein 092c3ef573 ClusterInfo get collection now throws NOT_FOUND if the collection is not found instead of nullptr. 2016-09-01 14:11:52 +02:00
jsteemann 68ae8d2945 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 12:02:50 +02:00
Michael Hackstein 36804cc30a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-01 11:42:31 +02:00
Michael Hackstein 81bc1c67e7 Fixed filtered edges for an empty list of expressions. 2016-09-01 11:40:48 +02:00
Michael Hackstein f53a308c4d Improved callbacks in Cluster when creating indexes. It will now only register the callback if the index is actually trying to be created. 2016-09-01 11:39:42 +02:00
Andreas Streichardt 3bcd9f1cc8 try...catch in heartbeat...heartbeat must be running 2016-09-01 11:23:49 +02:00
jsteemann fa21e70256 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:54 +02:00
Andreas Streichardt a14935aca3 Handle 503 answer from dbservers properly 2016-08-31 11:24:23 +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 baad30fdb7 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:47:35 +02:00
Jan Steemann 226ed6d17a slighty improved error handling in import API 2016-08-30 16:33:44 +02:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
Michael Hackstein e444332def Removed all references to _info in TRI_collection_t. This commit does not start. Constructor is broken. 2016-08-29 10:44:31 +02:00
jsteemann c44649da00 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:29:45 +02:00
Jan Christoph Uhde 3b3f33d74f Merge branch 'obi-velocystream' into engine-vs-velocystream 
* obi-velocystream:
  add note about potential performance issues
  fix usage of unique_ptr
  rename HttpServerJob -> GeneralServerJob
  improve error handling
  improve error handling
 2016-08-26 13:09:48 +02:00
Jan Christoph Uhde 77262f064d add note about potential performance issues 2016-08-26 10:20:24 +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
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 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
jsteemann c5f847a912 fix figures and volatile collection counts 2016-08-24 14:35:55 +02:00
Andreas Streichardt 6fa9bab7d0 Fix the logspam 2016-08-24 13:51:23 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde 4873a9be71 finish ContentType enum 2016-08-23 15:02:55 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +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
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 f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +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
Michael Hackstein 5f807900d7 Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode 2016-08-19 11:14:23 +02:00