1
0
Fork 0
Commit Graph

397 Commits

Author SHA1 Message Date
Jan Christoph Uhde a0ad27499d Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream
* origin/engine-vs-velocystream:
  added unload() functionality for indexes (untested)
  Adding Foxx access to agenc
2016-08-26 14:02:46 +02:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
Jan Christoph Uhde b5cd47e579 rename HttpServerJob -> GeneralServerJob 2016-08-26 09:04:06 +02:00
jsteemann 817fa1cdf4 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:04:31 +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
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 c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +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
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +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
jsteemann d7b2141da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:22:00 +02:00
Wilfried Goesgens a89e612723 Work on the NSIS client package 2016-08-18 15:58:13 +02:00
Kaveh Vahedipour 6edc1ff5fa AgentConfiguration needed to handle its own read/write locks 2016-08-18 15:54:42 +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
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
jsteemann a957963222 "privatize" compactor thread 2016-08-16 12:11:14 +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
Kaveh Vahedipour 39ca341097 trying to rebuild agency 2016-08-10 17:10:01 +02:00
jsteemann 9677210e57 refactoring 2016-08-02 15:00:25 +02:00
jsteemann 10341eafdb Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 09:42:17 +02:00
jsteemann d92f15aeed entirely removed TRI_document_collection_t 2016-07-29 17:48:51 +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
Jan Christoph Uhde 3f57335fe4 with error 2016-07-27 11:48:21 +02:00
Wilfried Goesgens c6a1bcc226 Cleanup buildsystem
- add RPM support
  - move macros in own file
  - cleanup sequence
  - add CMAKE switch "-DPACKAGING=[DEB|RPM|DARWIN]" that prepares package building
2016-07-26 16:13:34 +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
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 6c2d927e01 refactoring 2016-07-22 15:44:23 +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 5ee344b685 added greetings feature 2016-07-18 18:32:27 +02:00
jsteemann 53f77017fb moved SERVER away from DatabasePathFeature 2016-07-18 17:33:11 +02:00
jsteemann f373a2c327 removed TRI_vocbase_defaults_t 2016-07-18 16:55:25 +02:00
jsteemann 904868d996 renamed DatabaseServerFeature to DatabasePathFeature 2016-07-18 15:41:10 +02:00
jsteemann 073cfb15e7 moved index threads into a feature of its own 2016-07-18 15:23:25 +02:00
jsteemann 807f287868 moved server id detection and pagesize detection into their own features 2016-07-18 14:37:12 +02:00
jsteemann 30d32bb70e factored out lock-file handling into LockFileFeature 2016-07-15 14:44:06 +02:00
jsteemann 7742e709a3 storage engine selection at server start 2016-07-15 12:26:40 +02:00
jsteemann bff23ecd06 added stub for storage engine 2016-07-15 10:54:37 +02:00
jsteemann 18c4ca3f53 renamed ReadCacheChunk to GlobalReadCacheChunk 2016-07-14 17:19:45 +02:00
jsteemann 49275ac898 added stub for CollectionRevisionCache 2016-07-14 17:12:39 +02:00
jsteemann 3be664ca56 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-14 09:29:21 +02:00
jsteemann 5672171c11 initial commit for rc implementation 2016-07-13 17:33:17 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00