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

1353 Commits

Author SHA1 Message Date
jsteemann 7ae36773ec moved implementation of `/_admin/wal` REST handlers to C++ 2016-09-07 13:48:52 +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
Michael Hackstein e22014a272 Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:33:23 +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
Jan Christoph Uhde e1fac75bbf changes in import handler 2016-09-05 10:48:51 +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 4ea15c7caf fix BatchHander for vpp by reporting that it is not implemented 2016-09-01 13:56:46 +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
Jan Christoph Uhde c98f83ede3 fix RestSimpleHandler 2016-08-31 18:52:58 +02:00
Jan Christoph Uhde 59ad47d717 make more efficient use of setPayload 2016-08-31 18:22:13 +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
jsteemann 5964ffce78 fixed some tests 2016-08-30 09:36:43 +02:00
Jan Christoph Uhde 8e38600369 fix RestExportHandler 2016-08-29 21:27:05 +02:00
Jan Christoph Uhde d8be2b4079 fix: RestcursorHandler 2016-08-29 20:33:37 +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
Jan Christoph Uhde 656ceb873d add vpack version of cursor.dump() 2016-08-29 14:20:42 +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 b196383b6d some preparation work for response generalization 2016-08-29 10:07:31 +02:00
jsteemann e8c8f286cb cleanup 2016-08-29 08:53:23 +02:00
Jan Christoph Uhde c31b93647a try to fix RestCursorHandler 2016-08-27 02:01:18 +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 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde a6f5fc97de finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +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
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 68faea4ce2 Fixed undefined behaviour in rest error creation 2016-08-19 11:15:08 +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
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
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +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 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
Andreas Streichardt 03b9d97e2f Implement proper cluster shutdown 2016-08-18 11:23:23 +02:00
Michael Hackstein 41d70c1df5 Fixed filename Typo 2016-08-18 10:28:27 +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
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
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +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
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +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 99aaf7de9b Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-02 08:43:34 +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
Jan Christoph Uhde af108e8fcd fix RestBatchHandler 2016-07-28 18:15:26 +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 deca131a58 fixed undefined behavior 2016-07-28 16:35:27 +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
jsteemann 31407c3561 refactoring 2016-07-27 17:15:52 +02:00
Michael Hackstein 3dac8c27ed Implemented infrastructure for the TraversalEngines. We can now create and delete these engines accross several requests/threads. Right now the engines are empty. 2016-07-27 10:08:45 +02:00
jsteemann 89e0c11b44 refactoring 2016-07-26 16:25:38 +02:00
jsteemann df4daf4122 CleanupThread is now derived from Thread 2016-07-26 12:54:08 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
Jan Christoph Uhde da81c32539 remove body() method from GeneralRequest 2016-07-25 16:46:53 +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 a92add0a9f renamed RestServerFeature to GeneralServerFeature 2016-07-23 14:16:10 +02:00
jsteemann 431262cc19 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-21 16:42:47 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00
jsteemann 2b4c3707e3 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-20 13:22:29 +02:00
Jan Christoph Uhde 06bd01695a removed: body() from GeneralRequest 2016-07-19 09:16:07 +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 807f287868 moved server id detection and pagesize detection into their own features 2016-07-18 14:37:12 +02:00
Jan Christoph Uhde 002a1e55cb add: payload/addPayload methods 2016-07-18 13:16: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
Jan Christoph Uhde a0dca93e65 complete: adding toVelocyPack() function that returns slice instead of builder 2016-07-16 21:33: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
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
Jan Christoph Uhde 682cf7a2f1 virtualize functions of request/response 2016-07-14 08:40:05 +02:00