1
0
Fork 0
Commit Graph

26 Commits

Author SHA1 Message Date
Jan Steemann 61243ebb7b Merge branch 'devel' of https://github.com/arangodb/arangodb into array_indexing
Conflicts:
	arangod/HashIndex/hash-array-multi.cpp
	arangod/Indexes/HashIndex.cpp
2015-08-26 15:01:29 +02:00
Michael Hackstein 4a3b8007bd Fixed memory calculation of HashIndexMulti. And added index information for it 2015-08-26 14:38:23 +02:00
Michael Hackstein 4effa2291e Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-26 10:41:27 +02:00
Jan Steemann f4c542795c getIndexes(true) 2015-08-26 09:48:48 +02:00
Max Neunhoeffer 93caabb397 Fix fix. 2015-08-25 16:17:02 +02:00
Max Neunhoeffer 66498a56c3 Fix hash function for AssocMulti usage in hash-multi-index. 2015-08-25 16:13:43 +02:00
Max Neunhoeffer 7957df9215 Merge branch 'array_indexing' of ssh://github.com/ArangoDB/ArangoDB into array_indexing 2015-08-25 13:04:48 +02:00
Max Neunhoeffer 203e9a5195 Make hashcache in AssocMulti switchable-off. Does not work yet. 2015-08-25 12:46:47 +02:00
Michael Hackstein ba8264eada AssocUnique is now a templated index. Foundation to move primary index to use it 2015-08-24 16:41:16 +02:00
Max Neunhoeffer 1dce162b4b Merge branch 'array_indexing' of ssh://github.com/ArangoDB/ArangoDB into array_indexing
Conflicts:
	arangod/Indexes/HashIndex.cpp
2015-08-21 16:11:28 +02:00
Max Neunhoeffer 479f81f760 Buckets for hash-array, also C++-ize it. 2015-08-21 16:05:17 +02:00
Michael Hackstein 8491d84c96 Added forgotten header file for last commit 2015-08-20 15:27:49 +02:00
Michael Hackstein 4bb8508d82 Implemented a new improved version of the Array index insertion function. 2015-08-20 14:03:17 +02:00
Michael Hackstein 33c3c0474e Removed obsolte header file in old hashindex 2015-08-17 16:04:18 +02:00
Michael Hackstein e867181a72 Merge remote-tracking branch 'origin/eimerung_hashindex' into array_indexing 2015-08-17 15:58:53 +02:00
Max Neunhoeffer 6ac0913dbe Adapt to changed VocShaper. 2015-08-17 12:57:52 +02:00
Max Neunhoeffer dac7fb06e0 Finish change to hash index. Compiles, unit-tests still broken in one place. 2015-08-17 12:57:52 +02:00
Max Neunhoeffer 7217111192 First step for hashindex, this revision is broken.
Changes are only done half-way.
2015-08-17 12:57:52 +02:00
Michael Hackstein 8e3e2d547d Do not push <Class const> into vector. It does not work everywhere 2015-08-17 12:43:11 +02:00
Michael Hackstein 17a8f73a06 Now the input for indexes is parsed using the new attribute parser. This means the flags for expanded Attributes are set. Also introduced a transformation function to transform an attributeName list back into a string. 2015-08-17 12:43:07 +02:00
Michael Hackstein 8fbb2739b0 The indexes can now use the new AttributeName struct which contains a flag if the attribute should be Array-Indexed. Right now this flag is hard-coded to false in all cases and not persisted. 2015-08-17 12:43:05 +02:00
Jan Steemann 6d7ccd7699 move shaper to cxx 2015-07-28 17:38:31 +02:00
Jan Steemann 88198767dd logging 2015-05-29 09:49:22 +02:00
Jan Steemann 4b67c7a735 several fixes for indexes 2015-05-26 13:35:11 +02:00
Jan Steemann a9f2769ffa now compiles and links 2015-05-23 04:31:13 +02:00
Jan Steemann a5b6f00b7f moved indexes to cxx 2015-05-22 20:15:14 +02:00