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

446 Commits

Author SHA1 Message Date
Jan Steemann 19f667c1d6 fixed incompatible replication API responses 2016-09-19 12:32:29 +02:00
Michael Hackstein 93bf48cc6e Reverted usage of VPP in cluster internal replication. 2016-09-08 16:55:15 +02:00
jsteemann cb3d2eb6b9 Merge branch 'obi-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-08 13:58:36 +02:00
Jan Christoph Uhde 2d1fbfb291 more vpp changes for restReplicationHandler 2016-09-07 12:07:07 +02:00
jsteemann 13a3470087 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 11:44:54 +02:00
jsteemann 9eedec00b2 remove some unused assignments 2016-09-06 14:46:48 +02:00
jsteemann 1018bad5c3 removed many unnecessary try...catch blocks 2016-09-06 13:27:17 +02:00
Jan Christoph Uhde 4c473753b7 begin to fix RestReplicationHandler 2016-09-05 16:39:42 +02:00
jsteemann df808cd665 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +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 397cff4417 fix compile warning 2016-09-01 16:15:33 +02:00
Jan Christoph Uhde ee10949dcf fix cursor test for vpp 2016-09-01 12:12:28 +02:00
Jan Christoph Uhde 5092c08e6d fix requests where nobody is available 2016-09-01 11:28:46 +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 1bc8ce1060 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:28:11 +02:00
Michael Hackstein 8bced11a07 Potential assertion fix on planId 2016-08-30 16:27:54 +02:00
jsteemann 7223179b7f Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:07:44 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
Michael Hackstein 277953489c Fixed now false checks on planId == 0 for SingleServer case. This is not true any more 2016-08-30 15:37:26 +02:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
Michael Hackstein 82edb8707a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 10:12:36 +02:00
Michael Hackstein 7cf7b89c6d Removed more usage of VocbaseCollectionInfo and replaced it by LogicalCollection. It's getting better now. State still not green. 2016-08-29 18:44: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 e8c8f286cb cleanup 2016-08-29 08:53:23 +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 396ab41736 allow dropping system collections in some rare cases 2016-08-25 12:47:06 +02:00
jsteemann 3469b63449 fixed a replication test 2016-08-25 11:29:47 +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
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
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
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +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 680042b062 moved compaction info into StorageEngine 2016-08-15 18:35:22 +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
jsteemann 95ac01313b privatization 2016-08-04 17:06:51 +02:00
jsteemann 9677210e57 refactoring 2016-08-02 15:00:25 +02:00
jsteemann 3664511e36 privatize vocbase methods 2016-08-02 13:49:22 +02:00
jsteemann d92f15aeed entirely removed TRI_document_collection_t 2016-07-29 17:48:51 +02:00
jsteemann 59ed0a902c refactoring 2016-07-29 17:07:16 +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 329b733090 moved dropCollection into TRI_vocbase_t 2016-07-28 13:14:12 +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