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

174 Commits

Author SHA1 Message Date
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
Jan Steemann 6d8851d83c protect against some invalid cases 2012-12-10 15:43:51 +01:00
Jan Steemann 9a9e8c3214 added test case for absolute path 2012-12-10 15:39:57 +01:00
Jan Steemann b16f672902 fixed some log errors on startup & shutdown 2012-12-10 15:18:35 +01:00
a-brandt 1794ea49fa added new function for getting words 2012-12-07 13:09:16 +01:00
Jan Steemann ec9f72f227 return appropriate error codes 2012-12-07 10:49:06 +01:00
Jan Steemann 242a16d6f5 proper naming of ICU functions 2012-12-06 12:27:22 +01:00
Jan Steemann 0d952b6f50 factored out a function 2012-12-06 10:27:17 +01:00
Jan Steemann c7793f2620 switched to TRI_ malloc 2012-12-06 10:18:17 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Jan Steemann eb39af1e78 handle out of memory 2012-12-03 16:44:16 +01:00
a-brandt 32fbb4109c added tolower and toupper for utf8 2012-12-03 13:30:33 +01:00
Frank Celler cfe80c6b9c added generated files 2012-11-27 12:54:19 +01:00
Frank Celler 832be07319 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	lib/BasicsC/logging.c
	utils/arango-upgrade.in
 2012-11-27 12:37:41 +01:00
Frank Celler 6e94eeb36f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-11-27 12:35:12 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann ad6489c2b7 issue #295 2012-11-27 12:30:12 +01:00
Jan Steemann 1d98ab44fc issue #295 2012-11-27 12:23:26 +01:00
Jan Steemann bc94851026 fixed compile warnings 2012-11-23 13:18:00 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Jan Steemann b2faa016a6 fixed gcc compile warnings 2012-11-22 21:34:41 +01:00
Jan Steemann aaf34f44f4 fixed lots of compile warnings 2012-11-22 21:20:22 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Jan Steemann 55463a6c64 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-11-20 21:04:19 +01:00
Jan Steemann ace85c43c9 nesting transactions from v8-vocbase... 2012-11-15 18:55:52 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Jan Steemann 008ad959d5 fixed octal conversion, wrote tests 2012-11-08 15:07:48 +01:00
Jan Steemann e438108f90 moved and fixed hex conversion, wrote tests for hex conversion 2012-11-08 14:31:49 +01:00
Jan Steemann 85ea90afdb removed redundant conversion functions 2012-11-08 13:55:12 +01:00
Jan Steemann d2d5b439d5 added conversion functions for int8 and int16 2012-11-08 13:33:39 +01:00
Jan Steemann 16ee94def3 added in-place num-to-string conversions, added tests for conversions 2012-11-08 13:13:30 +01:00
Jan Steemann dacd2fb70c some cleanup 2012-11-06 19:24:27 +01:00
Jan Steemann 59791248bf some refactoring of v8-vocbase, trx integration 2012-11-06 19:02:09 +01:00
Jan Steemann 203560d30b moved transactions into javascript object 2012-11-06 14:42:52 +01:00
Jan Steemann 0ed1f985fe create private copies of other write transactions 2012-11-06 12:56:51 +01:00
Jan Steemann d9f8219bd6 added --enable-trx option 2012-10-31 11:21:06 +01:00
a-brandt 7daa018969 removed "reuseID" 2012-10-26 12:36:13 +02:00
Jan Steemann cb6c8c8e7e added bidirectional edges, fixup edges index 2012-10-25 17:18:54 +02:00
Jan Steemann c53cd0b408 added TRI_SizeFile() plus test 2012-10-24 18:37:40 +02:00
Jan Steemann 994a53b0b4 ifdef'd statistics 2012-10-23 11:55:24 +02: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