1
0
Fork 0
Commit Graph

16 Commits

Author SHA1 Message Date
Jan Steemann 95d78faa3c fixed doxygen errors 2013-03-18 20:07:31 +01:00
Frank Celler 7908f2b26d cleanup of indexes, fix for compaction (hash, cap, geo, skiplist, pq, bit-array)
Conflicts:
	arangod/Ahuacatl/ahuacatl-tokens.c
	arangod/BitIndexes/bitarray.c
	arangod/BitIndexes/bitarray.h
	arangod/BitIndexes/bitarrayIndex.c
	arangod/BitIndexes/bitarrayIndex.h
	arangod/BitIndexes/masterblocktable.h
	arangod/GeoIndex/geo-index.c
	arangod/HashIndex/hash-index.c
	arangod/PriorityQueue/pqueueindex.c
	arangod/PriorityQueue/pqueueindex.h
	arangod/PriorityQueue/priorityqueue.c
	arangod/PriorityQueue/priorityqueue.h
	arangod/SkipLists/compare.h
	arangod/SkipLists/skiplist.c
	arangod/SkipLists/skiplist.h
	arangod/SkipLists/skiplistIndex.c
	arangod/SkipLists/skiplistIndex.h
	arangod/V8Server/v8-query.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/index.c
	arangod/VocBase/index.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/voc-shaper.c
	arangod/VocBase/vocbase.c
	lib/BasicsC/hashes.h
	lib/BasicsC/memory.c
	lib/ShapedJson/json-shaper.h
	lib/ShapedJson/shaped-json.h
	utils/cleanupCFiles
2013-03-15 15:45:39 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo)
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
2013-03-11 09:49:58 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann 6e781f9e1c cppcheck 2012-12-18 15:24:20 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
Oreste Panaia cd5ed3ac67 added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
2012-06-26 20:41:04 +08:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00