1
0
Fork 0
Commit Graph

2375 Commits

Author SHA1 Message Date
jsteemann 2eaf7196e2 fixed some tests 2016-09-01 09:41:11 +02:00
jsteemann 4cef5d86fb Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 09:06:15 +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 bdd9d1422e bugfixes 2016-08-30 13:45:54 +02:00
jsteemann 7dfaf0d3f4 remove superfluous _infoLock 2016-08-30 11:54:04 +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
jsteemann 31809ac283 fixes for revision id 2016-08-29 17:06:07 +02:00
jsteemann 9e708112a6 privatize some TRI_datafile_t internals 2016-08-29 15:43:03 +02:00
jsteemann b9f8709104 renamed GeoIndex2 to GeoIndex 2016-08-29 13:02:07 +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 5d3946a6ba removed obsolete comment 2016-08-29 10:07:15 +02:00
jsteemann e8c8f286cb cleanup 2016-08-29 08:53:23 +02:00
jsteemann f5972cc701 moved _keyGenerator 2016-08-26 16:34:21 +02:00
Jan Christoph Uhde 8e56b1df7d improve logging 2016-08-26 16:22:49 +02:00
Michael Hackstein d546d2acf0 Fixed index mathces definition, special cases. 2016-08-26 14:00:37 +02:00
Michael Hackstein 0985e7fc88 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 12:52:41 +02:00
Michael Hackstein 1c883a811c Potential fix for unload->load. Needs to be validated. 2016-08-26 12:35:33 +02:00
jsteemann 6150da7420 remove function pointers from TRI_datafile_t, added constructor and destructor 2016-08-26 09:08: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
Michael Hackstein 7d6402b15c Fixed soem crashes and undefined behaviuor. Server does not crash during tests, however a lot of them are still red 2016-08-25 14:51:03 +02:00
jsteemann 396ab41736 allow dropping system collections in some rare cases 2016-08-25 12:47:06 +02:00
Michael Hackstein e1ac5175b1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:09:11 +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
jsteemann f4aa60ed0d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:38:26 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +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
Wilfried Goesgens 1f162ac882 Implement scheme to more clever pass the directories from the build process to the run-time
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
2016-08-24 14:45:08 +02:00
jsteemann c5f847a912 fix figures and volatile collection counts 2016-08-24 14:35:55 +02:00
jsteemann fb4b3d0a3c Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-24 11:07:45 +02:00
jsteemann 7794b76b33 intermediate commit 2016-08-24 10:54:47 +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
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
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 5f807900d7 Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode 2016-08-19 11:14:23 +02:00
jsteemann 21dd73074a cppcheck 2016-08-18 16:57:55 +02:00
Michael Hackstein 793a157b16 Fixed Cluster constructor of logical collection. 2016-08-18 15:18:12 +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 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 b2cb551685 moved functionality from vocbase into DatabaseFeature 2016-08-18 09:24:26 +02:00
Michael Hackstein dce3cf412d Removed warnings. 2016-08-17 15:57:33 +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