Jan Steemann
c5e9538547
Merge remote-tracking branch 'origin/devel' into inline-shapes
...
Conflicts:
arangod/VocBase/document-collection.c
2013-11-14 01:01:24 +01:00
Max Neunhoeffer
e257f9dd92
Add the option to return numUsed for each index in getIndexes.
...
This is currently implemented only for skip list indices and hash
indices, but not for full text, geo or bitarray, since these do not
export or even count this number.
2013-11-13 12:49:23 +01:00
Jan Steemann
978c12815a
share basic shape types
2013-11-05 20:21:48 +01:00
Jan Steemann
0a6148f2d6
fixed some VS complaints
2013-10-16 17:27:35 +02:00
Jan Steemann
8a996c5b60
less dependency on regex.h, also fixes some speed problems for key validation
2013-09-19 08:20:35 +02:00
Jan Steemann
64cfc7ccae
fixed compiler warnings
2013-06-28 17:10:42 +02:00
Jan Steemann
cdb7705380
issue #481
2013-04-21 12:12:51 +02:00
Jan Steemann
cd17f1ef44
issue #481
2013-04-21 11:37:46 +02:00
Frank Celler
f810711a79
FreeBSD port
2013-04-02 18:43:10 +02:00
Frank Celler
57e7224494
fixed ordering
2013-03-23 17:54:35 +01:00
Jan Steemann
228f273bc0
added isRollback hints to index insert/remove functions
2013-03-22 11:18:44 +01:00
Jan Steemann
69db58a154
index cleanup
2013-03-22 10:38:47 +01:00
Jan Steemann
51d8638164
typos
2013-03-15 18:16:47 +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
Jan Steemann
88c2bcb6f5
removed unused variable
2013-03-12 12:56:39 +01:00
Frank Celler
deee332a3d
fixed geo-index remove
2013-03-12 12:50:05 +01:00
Frank Celler
8787bb7f00
replaced index update by remove/insert
...
Conflicts:
arangod/HashIndex/hash-index.c
arangod/VocBase/index.c
2013-03-11 14:23:23 +01:00
Jan Steemann
206681159f
fixed memory zone mismatches
2013-03-11 11:10:08 +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