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

284 Commits

Author SHA1 Message Date
Jan Steemann adb5d32918 allow using of non-loaded collections when referring to them from an edge collection 2013-01-16 17:15:39 +01:00
Jan Steemann 4b15da54ba removed assertion 2013-01-16 11:15:05 +01:00
Jan Steemann 3fef8b6451 reserve full capacity of result set 2013-01-16 01:39:17 +01:00
Jan Steemann 7a6db16241 added db._version() 2013-01-15 16:44:48 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
Jan Steemann 4818f22b21 fixes 2013-01-14 02:58:19 +01:00
Jan Steemann 975ef80e99 fixed 1.1 to 1.2 upgrade for big document ids 2013-01-13 10:58:44 +01:00
Frank Celler 4d4c4abe3f fixed null check 2013-01-11 10:40:50 +01:00
Frank Celler 33e3031380 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	VERSION
	arangod/V8Server/v8-query.cpp
	build_posix.h
	configure
	configure.ac
 2013-01-10 18:00:25 +01:00
Jan Steemann 819f6775d7 fixed comment 2013-01-10 16:31:18 +01:00
Frank Celler 03f85fae23 added 'any' call for collections 2013-01-10 10:39:43 +01:00
Jan Steemann 485d10ad51 added collection.revision() method 2013-01-10 02:02:32 +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
Jan Steemann 187d8ecc69 some transaction rework 2013-01-08 17:26:16 +01:00
Frank Celler 99b42b90b7 updated documentation for deployment and removeByExample 2013-01-08 11:02:14 +01:00
Jan Steemann 07aa2a3b68 re-added missing function 2013-01-07 22:32:40 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Frank Celler 3826a4603e removed print.js 2013-01-06 00:23:40 +01:00
Frank Celler 337cee7606 fixed jslint warnings 2013-01-05 23:59:44 +01:00
Frank Celler 7be1c01bda removed linked in JavaScript code, separate files for 'fs' and 'console' 2013-01-05 23:24:10 +01:00
Frank Celler 51779b4a3e fixed more jslint warnings 2013-01-05 17:13:13 +01:00
Frank Celler e3c1aeec53 fixed typo in documentation 2013-01-05 16:20:46 +01:00
Frank Celler aa0d9d4e3e Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	js/server/server.js
 2013-01-05 12:38:09 +01:00
Frank Celler 24fc2d371e moved methods to ArangoCollection 2013-01-05 11:46:33 +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
Jan Steemann 8128a6377d memory-collections, intermediate commit 2013-01-04 12:12:46 +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 8564443078 delete is remove 2013-01-03 17:14:03 +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 f188357f83 added padding for 32bit 2013-01-02 17:07:44 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01: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 229b902a12 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-12-18 14:56:37 +01:00
Jan Steemann 96637435ab fulltext: more query operators, more tests, more controlled memory usage and statistics 2012-12-18 14:56: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 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 0a9ed409ab fixed wrong memory zone and wrong documentation 2012-12-11 18:58:42 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann cbaa57a1bd cleanup of fulltext indexes, resizing etc. 2012-12-07 18:00:01 +01:00
Jan Steemann 63b4c94b0f fulltext resizing, halfway 2012-12-07 13:50:29 +01:00
Jan Steemann 0b001b7a87 fixed memory leaks, added newest code by Richard 2012-12-06 16:43:33 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 895be759ac removed debug message 2012-12-06 09:29:27 +01:00