Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,041 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

28 Commits

Author SHA1 Message Date
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
Oreste Panaia 5f95545dc2 attempt to remove compile warning message 2013-02-22 20:43:56 +08:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 21fa3ed616 small stuff, oom handling etc. 2012-12-04 21:21:26 +01:00
Jan Steemann 1811ce9186 fixed some issues found by cppcheck 2012-12-04 18:21:29 +01:00
Oreste Panaia b798b1d53f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
 2012-08-02 15:28:49 +08:00
Oreste Panaia 03cce62c3a bitarray index now support explicit values 2012-08-02 15:20:43 +08:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
 2012-07-26 12:03:03 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 2012-07-24 22:56:03 +02:00
Oreste Panaia 53e4fb7f12 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/BitIndexes/bitarrayIndex.c
 2012-07-24 14:56:04 +08:00
Oreste Panaia cd5ed3ac67 added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
Jan Steemann dc91c9fcac fixed clang warnings 2012-07-20 13:06:51 +02:00
Jan Steemann 0dd0245ac4 fixed clang compile warnings and errors 2012-07-20 13:00:28 +02:00
Frank Celler b1aac93853 fixed warnings 2012-07-14 23:18:33 +02:00
Oreste Panaia 224614f14a Bitarray index fixes 2012-07-06 12:02:08 +08:00
Oreste Panaia c72f44c949 Bitarray indexes update 2012-07-05 13:59:26 +08:00
Oreste Panaia 2e3b6531c8 Some fixes for bitarray indexes 2012-06-29 14:27:30 +08:00
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +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
Oreste Panaia d9f7ba28cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-15 16:46:48 +08:00
Oreste Panaia 2add774ffa Fixed function name problem 2012-06-15 16:45:56 +08:00
Heiko Kernbach 3c32dd4cbb result not used 2012-06-14 11:19:50 +02:00
Oreste Panaia 32911e7d38 added index iterators and started on the bitarray indexes 2012-06-14 15:09:47 +08: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