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

320 Commits

Author SHA1 Message Date
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
 2013-02-21 14:21:59 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Jan Steemann 53b41e7832 get rid of Valgrind warnings due to libev re-alloc behavior 2013-02-20 19:33:32 +01:00
Jan Steemann e1da2c45fd added TRI_ShutdownMemory() to free core reserve on clean shutdown 2013-02-20 19:11:33 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Jan Steemann 4f37fada0d some mini-modifications for slightly higher throughput 2013-02-19 09:54:36 +01:00
Frank Celler 2ac556d0f1 changed default 2013-02-18 10:06:36 +01:00
Frank Celler ced7b05cca added fix for TRI_ENABLE_LOGGING from Jan 2013-02-16 14:03:35 +01:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Frank Celler 7b92dcc9bc fixed issue #405: 1.2 compile warnings 2013-02-15 11:57:35 +01:00
Frank Celler cf9a942417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2013-02-15 11:52:53 +01:00
Frank Celler e4d1c8a6bd partly fix for issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:50:05 +01:00
Jan Steemann d321f32523 moved some const value out of loop 2013-02-15 11:35:48 +01:00
Jan Steemann 8b7a5d2649 slighty optimise duplicates check 2013-02-15 10:22:47 +01:00
Jan Steemann 637ed65e09 expose reserve function 2013-02-15 10:22:31 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 332da75bcb fixed invalid number to string conversion for edge cases 2013-02-13 11:35:34 +01:00
Jan Steemann 8365c4294c small mods 2013-02-12 18:16:23 +01:00
a-brandt 6147a1d9c0 unset the escape codes for windows 2013-02-08 15:39:52 +01:00
Jan Steemann f16f88a2e6 added docs for CONTAINS(), added LIKE() 2013-02-06 11:40:45 +01:00
Jan Steemann 3fd6373c2f removed error 1520, replaced with standard error 1203 2013-02-04 23:04:37 +01:00
Jan Steemann 621f0dbb2c test remove 2013-02-01 10:49:18 +01:00
Jan Steemann ca0074f3c0 test add 2013-02-01 10:48:25 +01:00
Jan Steemann a36805857b test remove 2013-02-01 10:47:59 +01:00
Jan Steemann 089ac0a7b7 test add 2013-02-01 10:46:45 +01:00
Jan Steemann 5c55f6bf97 test remove 2013-02-01 10:46:09 +01:00
Jan Steemann e489c7380c test 2013-02-01 10:43:56 +01:00
Jan Steemann 8330f2d12a test 2013-02-01 10:33:24 +01:00
Jan Steemann 767c4fb3bb test 2013-02-01 10:31:28 +01:00
Jan Steemann 4f4e0e7a9a test 2013-02-01 10:27:28 +01:00
Jan Steemann 8b523873d5 test 2013-02-01 10:26:24 +01:00
Jan Steemann 8927da8020 test 2013-02-01 10:24:53 +01:00
Jan Steemann 424d284961 test 2013-02-01 10:20:25 +01:00
Jan Steemann 98e8e24604 test 2013-02-01 10:18:59 +01:00
Jan Steemann d9b572bfb0 test 2013-02-01 10:16:21 +01:00
Jan Steemann e9ff3b7749 test 2013-02-01 10:14:59 +01:00
Jan Steemann bae7bfd588 test 2013-02-01 10:14:01 +01:00
Jan Steemann ee3c534b7f test 2013-02-01 10:12:28 +01:00
Jan Steemann 9b7245373f test commit 2013-02-01 09:26:22 +01:00
Jan Steemann d43e9b89ca issue #381: lifted restrictions on usernames 2013-01-31 13:20:39 +01:00
Oreste Panaia 741510e8cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 17:33:36 +08:00
Jan Steemann 2d7f0a7979 removed an unnecessary file 2013-01-31 10:33:16 +01:00
Jan Steemann 8d501f75e4 test commit hook 2013-01-31 10:30:43 +01:00
Jan Steemann 2c82dae6d8 test commit hook 2013-01-31 10:30:19 +01:00
Oreste Panaia 95f6b0dc9c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 16:22:41 +08:00
Jan Steemann 843453a76c test for infinite values to prevent endless while loops in number value printing 2013-01-30 19:26:43 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Jan Steemann fe74508299 return a hard-coded string in case no error message is known for a particular error 2013-01-30 16:44:25 +01:00
Jan Steemann 47ad5e1139 removed dead configure option for 1.2 2013-01-30 13:19:20 +01:00
Jan Steemann 9773a88cf9 prevent endless loops for inf double values being appended to string buffer 2013-01-29 12:07:30 +01:00
Jan Steemann ac12e98480 wrong type for thread id. this caused potentially wrong thread ids on 32 bits... 2013-01-26 01:35:40 +01:00
Jan Steemann 17530a5e45 added number of shapes in return value of figures() 2013-01-25 10:19:02 +01:00
Jan Steemann 5d093576e2 fix a few -pedantic errors 2013-01-23 08:58:54 +01:00
Oreste Panaia bb54d606ad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-22 23:06:39 +08:00
Oreste Panaia c4f6465ee7 attempt to link icu libraries into arango 2013-01-22 23:04:16 +08:00
Jan Steemann 376c264281 take precautions to prevent issue #365 2013-01-22 11:58:08 +01:00
Jan Steemann f1fbb4796e fixed anonymous mmap for MacOS 2013-01-16 12:32:28 +01:00
Jan Steemann a20cb437e1 some macros for zone debug 2013-01-16 01:58:41 +01:00
Jan Steemann 6fde7e2f27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 16:45:54 +01:00
Jan Steemann 7a6db16241 added db._version() 2013-01-15 16:44:48 +01:00
Frank Celler 244d258fe7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 15:51:32 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
 2013-01-15 15:50:47 +01:00
Jan Steemann 4712e1637e optionally do not check element equality when inserting into the associative multi index 
this might speed up insertion a lot if we know that the same element cannot be in the index already
 2013-01-15 15:11:16 +01:00
Jan Steemann 682d22bfb0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 14:35:19 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
a-brandt c1fec4c5b0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-10 14:48:26 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Oreste Panaia afa0268e70 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2013-01-09 22:23:46 +08:00
Oreste Panaia 9baae9c129 windows bug fixes 2013-01-09 22:23:35 +08:00
a-brandt 00a3d87bc4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-08 10:43:28 +01:00
a-brandt 8f9e2e51f9 libicu is mandatory now 2013-01-08 10:39:19 +01:00
Jan Steemann 876cda6ce1 cppcheck 2013-01-07 22:37:52 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 2013-01-05 11:16:50 +01:00
Jan Steemann 51305de692 in-memory collections, seem to work now 
documentation and some helper functions are still missing
 2013-01-04 17:04:15 +01:00
Jan Steemann 0471ee8a0d memory collections, intermediate commit 2013-01-04 15:50:29 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 
Conflicts:
	js/common/bootstrap/modules.js
 2013-01-03 18:57:18 +01:00
Frank Celler 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Jan Steemann 63805cf84c a few small fixes for logging 2013-01-03 14:47:16 +01:00
Jan Steemann 132143289d a few small fixes for logging 2013-01-03 14:45:56 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler 9917ece449 added missing padding for 32bit 2013-01-02 16:17:38 +01:00
Jan Steemann 459f935d00 intptr_t to uintptr_t conversion 2013-01-02 15:00:59 +01:00
Jan Steemann 74f9ced94e issue #335 2013-01-02 14:37:46 +01:00
Jan Steemann 19f459331d issue #335 2013-01-02 14:25:19 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Oreste Panaia fa3f3a41c8 windows binaries 2012-12-20 21:14:13 +08:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 2012-12-20 11:11:47 +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
Frank Celler 621e4409bc Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	.gitignore
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	Installation/epm/arangodb.list
	Makefile.in
	README
	README.md
	VERSION
	aclocal.m4
	arangod/HashIndex/hasharray.c
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	config/config.guess
	config/config.sub
	config/depcomp
	configure
	configure.ac
	html/admin/js/master.js
	js/server/arango-password.js
	js/server/version-check.js
	lib/BasicsC/files.c
	lib/BasicsC/logging.c
	utils/Makefile.files
 2012-12-18 13:37:34 +01:00
Jan Steemann 697d09a558 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-12-18 12:57:39 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 473aaa8fd4 fixed typos 2012-12-11 18:57:50 +01:00
Jan Steemann bfb6398110 added (intentional) compile error for Windows 2012-12-10 15:51:48 +01:00
Jan Steemann 8e201eba20 added #error markers for Windows 2012-12-10 15:50:02 +01:00