Michael Hackstein
bc16cfae86
Merge remote-tracking branch 'origin/devel' into sharding
...
Conflicts:
Documentation/InstallationManual/Installing.md
arangosh/CMakeLists.txt
2014-02-11 15:52:49 +01:00
Frank Celler
c6ce5c7406
made module loader more node compatible, added coffee script support
2014-02-11 13:26:11 +01:00
Michael Hackstein
9f3479f5b6
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
utils/Makefile.files
2014-01-10 17:41:52 +01:00
Jan Steemann
5b965b2a21
added initialised() method
2014-01-07 17:50:52 +01:00
Jan Steemann
91c52a3a2e
fixed potential deadlock in global context execution
2014-01-03 13:47:11 +01:00
Jan Steemann
7980a51e26
moved cluster JS functions to its own files
2014-01-02 13:49:00 +01:00
Jan Steemann
44b3237882
moved server-only tests to js/server/tests
...
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work
make logfile path accessible
2013-12-04 22:05:00 +01:00
Jan Steemann
c3f004dd3f
rtrim the path
2013-12-04 17:40:19 +01:00
Jan Steemann
920d08d855
removed redundant startup options
2013-11-20 01:50:27 +01:00
Jan Steemann
c46d6b99f4
add users when creating a database
2013-11-06 16:48:18 +01:00
Jan Steemann
984e3c4853
added const
2013-11-05 10:58:33 +01:00
Jan Steemann
4f50b98c45
removed second logger implementation
2013-10-30 00:38:25 +01:00
Jan Steemann
72a2a487d3
some fixes for issue #642
2013-10-28 14:34:37 +01:00
Jan Steemann
0a6148f2d6
fixed some VS complaints
2013-10-16 17:27:35 +02:00
Jan Steemann
473a9fca97
directory creation on startup
2013-10-16 16:00:49 +02:00
Jan Steemann
cd5d228e77
moved path checks from --upgrade to server start and database creation
2013-10-16 15:30:13 +02:00
Jan Steemann
88f3830c53
refuse to start if no app path is set
2013-10-09 14:07:47 +02:00
Jan Steemann
729bbc44f0
use per-database directories for Foxx apps
2013-09-30 10:57:29 +02:00
Jan Steemann
106fedd615
several errors fixed
2013-09-26 09:44:50 +02:00
Jan Steemann
7c3781daad
fixed a leak in MRServer shutdown
2013-09-16 17:47:51 +02:00
Jan Steemann
0bdae05b96
changed reference counting for cursors
2013-09-16 13:51:33 +02:00
Jan Steemann
2155ca5574
fix crash in HTTP server mode
2013-09-13 19:12:47 +02:00
Jan Steemann
b97e4c014a
reset vocbase earlier in requests
2013-09-13 15:29:05 +02:00
Jan Steemann
6ff314de0e
runtime addition and removal of endpoints
2013-09-12 18:07:39 +02:00
Jan Steemann
6bbfb65f7c
prevent usage of db._useDatabase() in HTTP requests
2013-09-12 11:13:47 +02:00
Jan Steemann
42441b208f
refactoring of multiple databases, intermediate commit
2013-09-11 11:42:34 +02:00
Jan Steemann
41acd59698
added _createDatabase(), _listDatabases()
2013-09-02 10:55:41 +02:00
Jan Steemann
0aca109a89
removed html/admin, / now redirects to /_admin/aardvark by default
2013-08-29 12:59:56 +02:00
Jan Steemann
d9c0d588f9
added internal.adminDirectory
2013-06-20 15:47:48 +02:00
a-brandt
21f9da2104
moved database version check to VocbaseManager
2013-06-04 13:05:06 +02:00
a-brandt
1c0578c2b5
Merge branch 'devel' into multiple_databases
...
Conflicts:
arangod/RestServer/ArangoServer.cpp
arangod/VocBase/vocbase.c
lib/HttpServer/ApplicationEndpointServer.cpp
lib/HttpServer/ApplicationEndpointServer.h
lib/HttpServer/HttpCommTask.h
lib/HttpServer/HttpHandlerFactory.cpp
lib/HttpServer/HttpHandlerFactory.h
lib/Rest/HttpRequest.cpp
lib/Rest/HttpRequest.h
2013-06-03 17:05:01 +02:00
Jan Steemann
7e1a107aa8
fixed typo
2013-05-22 19:13:49 +02:00
Jan Steemann
c59f00efa8
fixed handling of --temp-path
2013-05-15 15:55:48 +02:00
Jan Steemann
650419ed37
fix wrong message
2013-05-13 09:18:33 +02:00
Jan Steemann
ebad0130ea
updated docs
2013-05-10 12:26:15 +02:00
a-brandt
7a0a9ff3b4
Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases
2013-04-22 14:53:33 +02:00
a-brandt
8f52b8916b
vocbase handling
2013-04-22 14:52:46 +02:00
Frank Celler
bab92e9c04
fixed help messages
2013-04-21 22:12:58 +02:00
Frank Celler
d2ea4e9bd2
added SlowBuffer from node
2013-04-21 21:32:32 +02:00
a-brandt
fcae2b2961
added RequestContext
2013-04-17 16:56:48 +02:00
a-brandt
0a44b019db
Merge branch 'devel' into multiple_databases
2013-04-12 14:16:25 +02:00
a-brandt
aa216c2edb
changes for multiple databases
2013-04-12 14:15:06 +02:00
Frank Celler
142cc08704
replaced more deprecated calls
2013-04-11 13:55:33 +02:00
Jan Steemann
884806ee9e
complain about non-existing paths
2013-04-05 14:41:07 +02:00
Jan Steemann
ed10d9b6aa
AQL user functions
2013-04-05 12:50:44 +02:00
Jan Steemann
67984f06a0
clean shutdown for --upgrade
2013-04-03 18:00:03 +02:00
Frank Celler
661b222dab
fixed help
2013-03-28 23:04:55 +01:00
Frank Celler
2ed6b0145f
changed app-path and dev-app-path to be just one directory
2013-03-28 21:48:52 +01:00
Frank Celler
8eeb59cb71
fixed log output
2013-03-27 16:28:41 +01:00
Frank Celler
7a6cdcf9b1
changing to app-id
2013-03-27 15:05:08 +01:00
Frank Celler
be971602f2
added install and uninstall of FOXX apps
2013-03-27 11:32:39 +01:00
Jan Steemann
071144ecc0
temporary file functons
2013-03-24 14:32:09 +01:00
Frank Celler
a8d5a06f57
added resetEngine
2013-03-22 18:09:01 +01:00
Frank Celler
38a5cf6a2d
added development-mode
2013-03-22 17:33:25 +01:00
Frank Celler
213e5ab214
added missing HandleScope
2013-03-22 15:15:02 +01:00
Frank Celler
12f0c901e5
Merge branch 'devel' of github.com:triAGENS/ArangoDB into feature/v8cleanup
...
Conflicts:
arangod/V8Server/v8-vocbase.cpp
arangosh/V8Client/arangosh.cpp
2013-03-22 14:47:17 +01:00
Frank Celler
1aa5109fa3
updated disclaimer
2013-03-13 17:03:18 +01:00
Jan Steemann
0fb397eabd
adjusted startup output to be more compact, less verbose
2013-03-06 19:05:17 +01:00
Frank Celler
dfd20cd4e2
use TRI_AddGlobalVariableVocbase
2013-03-05 14:49:19 +01:00
Oreste Panaia
fc5e1ba623
merge conflicts with devel
2013-02-28 19:42:58 +08:00
Oreste Panaia
a48696ec28
network modifications required for windows
2013-02-28 17:43:39 +08:00
Frank Celler
85d2e87154
added new package option
2013-02-25 18:15:32 +01:00
Frank Celler
7072fab0f1
fixed merge error
2013-02-15 13:10:46 +01:00
Frank Celler
cf2888b4fc
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
...
Conflicts:
CHANGELOG
Documentation/Manual/Upgrading12.md
Installation/Linux/rc.arangod.OpenSuSE
2013-02-15 12:59:16 +01:00
Frank Celler
45c815b7eb
fixed issue #403 : Usage of exit() etc.
2013-02-15 12:19:09 +01:00
Frank Celler
069dcdfc94
changed logging of fatal errors
2013-02-14 16:47:35 +01:00
Jan Steemann
0f8dc061cb
comments
2013-02-12 16:30:13 +01:00
Jan Steemann
afbc5da1de
issue #395
2013-02-12 12:05:04 +01:00
Jan Steemann
e02333a053
issue #395
2013-02-12 12:01:20 +01:00
a-brandt
4daf9d618b
added "v8::V8::LowMemoryNotification()" before "while (!v8::V8::IdleNotification())" to trigger V8 GC
2013-02-08 14:20:12 +01:00
a-brandt
f34b0c14a4
added "v8::V8::LowMemoryNotification()" before "while (!v8::V8::IdleNotification())" to trigger V8 GC
2013-02-08 14:19:52 +01:00
Jan Steemann
81dc83b8df
de-globalised aql
2013-01-24 14:49:55 +01:00
Frank Celler
159f613169
more cleanup
2013-01-17 18:24:58 +01:00
Frank Celler
3c21a87366
more cleanup
2013-01-17 16:01:15 +01:00
Jan Steemann
2058700697
issue #353
2013-01-15 14:35:05 +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
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
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
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
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
Oreste Panaia
83ded3fc1f
windows fixes
2012-12-20 17:17:30 +08:00
Oreste Panaia
857b66c490
windows version
2012-12-06 20:44:01 +08:00
Jan Steemann
1811ce9186
fixed some issues found by cppcheck
2012-12-04 18:21:29 +01:00
Jan Steemann
42ba0502f0
changed upgrade procedure
...
removed arango-upgrade script, replaced it with --upgrade server option
adjusted documentation & start scripts
2012-12-03 13:02:59 +01:00
Jan Steemann
a2b404123a
load monkeypatches on all occasions
2012-11-20 16:50:15 +01:00
Jan Steemann
744618fbe0
fixed some escape routes in version check
2012-11-20 09:31:09 +01:00
Jan Steemann
3d70b85734
fix g++ warning
2012-11-20 08:59:53 +01:00
Jan Steemann
85a8f56a34
complain about non-expected database directory versions
2012-11-20 01:41:41 +01:00
Jan Steemann
f483e9c41c
added threadNumber global variable
2012-11-12 09:45:38 +01:00
Jan Steemann
8d6c2e38bd
issue #251 : added --javascript.v8-options command line argument
2012-10-22 10:17:57 +02:00
Frank Celler
7f33ac5519
added autoload for modules
...
Conflicts:
CHANGELOG
js/server/js-server.h
2012-10-20 22:07:50 +02:00
Oreste Panaia
aac17f7b55
wrapper for memory mapped files add
2012-10-05 18:31:13 +08:00
Frank Celler
e9b1e1c58f
Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
...
Conflicts:
3rdParty/mruby/include/mrbconf.h
3rdParty/mruby/include/mruby.h
3rdParty/mruby/include/mruby/array.h
3rdParty/mruby/include/mruby/khash.h
3rdParty/mruby/include/mruby/object.h
3rdParty/mruby/include/mruby/variable.h
3rdParty/mruby/mrblib/error.rb
3rdParty/mruby/mrblib/print.rb
3rdParty/mruby/src/array.c
3rdParty/mruby/src/cdump.c
3rdParty/mruby/src/class.c
3rdParty/mruby/src/codegen.c
3rdParty/mruby/src/error.c
3rdParty/mruby/src/gc.c
3rdParty/mruby/src/init.c
3rdParty/mruby/src/kernel.c
3rdParty/mruby/src/math.c
3rdParty/mruby/src/numeric.c
3rdParty/mruby/src/object.c
3rdParty/mruby/src/parse.y
3rdParty/mruby/src/pool.c
3rdParty/mruby/src/proc.c
3rdParty/mruby/src/range.c
3rdParty/mruby/src/sprintf.c
3rdParty/mruby/src/state.c
3rdParty/mruby/src/string.c
3rdParty/mruby/src/struct.c
3rdParty/mruby/src/symbol.c
3rdParty/mruby/src/time.c
3rdParty/mruby/src/variable.c
3rdParty/mruby/src/vm.c
3rdParty/mruby/src/y.tab.c
3rdParty/mruby/test/assert.rb
3rdParty/mruby/test/t/array.rb
3rdParty/mruby/test/t/exception.rb
3rdParty/mruby/test/t/kernel.rb
3rdParty/mruby/test/t/math.rb
3rdParty/mruby/test/t/module.rb
3rdParty/mruby/test/t/string.rb
3rdParty/mruby/test/t/struct.rb
3rdParty/mruby/test/t/time.rb
3rdParty/mruby/tools/mirb/mirb.c
3rdParty/mruby/tools/mruby/mruby.c
Doxygen/arango-html.doxy
Doxygen/arango.template
Makefile.am
Makefile.in
UnitTests/HttpInterface/api-http-spec.rb
aclocal.m4
arangod/RestHandler/RestDocumentHandler.cpp
arangod/RestServer/ArangoServer.cpp
arangod/V8Server/ApplicationV8.cpp
arangod/V8Server/ApplicationV8.h
arangod/V8Server/v8-actions.cpp
arangod/V8Server/v8-query.cpp
arangod/V8Server/v8-vocbase.cpp
arangod/V8Server/v8-vocbase.h
arangod/VocBase/compactor.c
arangod/VocBase/compactor.h
arangod/VocBase/shadow-data.c
arangod/VocBase/simple-collection.c
arangod/VocBase/simple-collection.h
arangod/VocBase/synchroniser.c
arangod/VocBase/vocbase.c
arangoirb/MRClient/arangoirb.cpp
config/compile
config/depcomp
config/install-sh
config/missing
configure
js/actions/demo/geo.js
js/actions/demo/hallo-world.js
js/actions/system/api-collection.js
js/actions/system/api-edges.js
js/actions/system/api-system.js
js/actions/system/documents.js
lib/BasicsC/locks-posix.c
lib/BasicsC/operating-system.h
lib/HttpServer/HttpCommTask.cpp
lib/HttpServer/HttpCommTask.h
lib/MRuby/MRLineEditor.cpp
lib/MRuby/mr-utils.c
m4/Makefile.doxygen
m4/all-in-one.mruby
2012-09-20 16:39:59 +02:00
Frank Celler
88b72adea4
more actions example, reloadCache added
2012-09-17 18:08:28 +02:00
Jan Steemann
9bc99b7c9d
renamed document collection to primary collection
2012-09-14 10:19:41 +02:00
Jan Steemann
d670fbca5b
issue #150 , issue #188
2012-09-12 09:32:25 +02:00
Jan Steemann
c365468e26
fixed thread race condition on shutdown
2012-09-11 18:10:57 +02:00
Jan Steemann
9660404328
enforce a minimum gc frequency of 1 second, not less
2012-09-11 12:59:59 +02:00
Jan Steemann
b1395cb1ad
add V8 version to trace output
2012-09-07 10:08:53 +02:00
Jan Steemann
b4f5cd6aa2
simplified code for issue #188
2012-09-06 14:10:00 +02:00
Jan Steemann
37914fcf34
issue #188 , issue #150 : introduce periodic garbage collection for V8 contexts, fix issue with server-side cursor refcounts
2012-09-06 11:37:01 +02:00
Jan Steemann
ff03b3c63f
issue #150 comments
2012-09-04 23:58:37 +02:00
Jan Steemann
39dbfbff7c
fix for issue #150 patch
2012-09-04 23:04:13 +02:00
Jan Steemann
a667f633d5
issue #150
2012-09-04 22:30:44 +02:00
Frank Celler
39f4a8f833
cleanup directory structure and init file handling
...
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00
Frank Celler
041eb53b10
Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1
...
Conflicts:
Makefile.in
arangod/RestServer/ArangoServer.cpp
arangoirb/MRClient/arangoirb.cpp
lib/GeneralServer/GeneralServer.h
lib/HttpServer/ApplicationHttpServer.cpp
lib/HttpServer/HttpCommTask.cpp
lib/HttpServer/HttpHandler.cpp
lib/HttpServer/HttpHandlerFactory.cpp
lib/HttpServer/HttpHandlerFactory.h
lib/HttpsServer/ApplicationHttpsServer.cpp
2012-07-24 22:19:46 +02:00
Frank Celler
1df2799005
added --javascript.script
...
renamed --unit-tests to --javascript.unit-tests
2012-07-15 00:50:05 +02:00
Frank Celler
479cb7b8b8
fixed shutdown
2012-07-01 14:10:01 +02:00
Frank Celler
ab66d178ed
fixed comment
2012-06-24 21:16:42 +02:00
Frank Celler
af60ebe612
fixed doc errors
2012-06-24 16:43:20 +02:00
Frank Celler
4e6f4a74a6
fixed memory leaks
2012-06-22 13:38:55 +02:00
Frank Celler
84ab9cdf3b
fixed cleanup
2012-06-22 09:10:22 +02:00
Frank Celler
b16d5e20ca
fixed console
2012-06-21 23:02:12 +02:00
Frank Celler
94c954b8fd
application v8
2012-06-21 22:40:11 +02:00
Frank Celler
ea1243d3ce
feature V8
2012-06-21 00:44:25 +02:00