Oreste Panaia
081ad862a6
CAS modifications
2013-03-18 19:52:53 +08:00
Oreste Panaia
8333858eac
CAS modifications
2013-03-18 19:11:18 +08: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
c501d2e0b4
fixed rollback
2013-03-12 14:26:16 +01:00
Frank Celler
1803f409b2
fixed skip list index
...
Conflicts:
arangod/SkipLists/skiplistIndex.c
2013-03-12 11:13:22 +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
Jan Steemann
99630450c2
removed checks for TRI_HAVE_ICU because ICU is a prerequisite for using ArangoDB
2013-03-08 16:03:54 +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
Oreste Panaia
83ded3fc1f
windows fixes
2012-12-20 17:17:30 +08:00
Jan Steemann
669fe4275a
cppcheck
2012-12-18 16:44:06 +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
Jan Steemann
242a16d6f5
proper naming of ICU functions
2012-12-06 12:27:22 +01:00
Jan Steemann
21fa3ed616
small stuff, oom handling etc.
2012-12-04 21:21:26 +01:00
Jan Steemann
aaf34f44f4
fixed lots of compile warnings
2012-11-22 21:20:22 +01:00
Oreste Panaia
4d8d78e880
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
...
Conflicts:
VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
arangod/Actions/RestActionHandler.cpp
arangod/RestServer/ArangoServer.cpp
lib/ApplicationServer/ApplicationServer.cpp
2012-10-22 21:04:12 +08:00
Oreste Panaia
aad73db128
various changes for windows
2012-10-22 20:51:31 +08:00
Jan Steemann
9d18171d18
added TODO marker
2012-10-15 16:48:28 +02:00
a-brandt
fe7f2f8079
ICU changes
2012-09-24 11:40:06 +02:00
Jan Steemann
9bc99b7c9d
renamed document collection to primary collection
2012-09-14 10:19:41 +02:00
Oreste Panaia
d632fb820b
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2012-09-03 17:09:00 +08:00
Oreste Panaia
b7d239f629
draft index interface
2012-09-03 17:05:39 +08:00
Jan Steemann
9301fce3bd
unified capitalization of todo markers
2012-08-07 10:02:55 +02:00
Oreste Panaia
cd5ed3ac67
added http support for bitarray idnex creation
2012-07-24 14:30:38 +08:00
Frank Celler
af60ebe612
fixed doc errors
2012-06-24 16:43:20 +02:00
Oreste Panaia
9949c9e75c
renamed sl-operator.c and sl-operator.h to index-operator.c and index-operator.h respectively
2012-06-14 10:04:41 +08:00
Frank Celler
313c3c31ed
Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
...
Conflicts:
arangod/RestServer/ArangoServer.cpp
arangosh/V8Client/arangosh.cpp
2012-06-08 15:13:01 +02:00
Frank Celler
d2c758d663
the great rename
2012-06-08 15:01:25 +02:00