1
0
Fork 0
Commit Graph

413 Commits

Author SHA1 Message Date
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
2014-02-21 15:28:21 +01:00
Jan Steemann 211b0da24b moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
Max Neunhoeffer a58e261f16 Repair windows executeExternal. 2014-02-19 15:46:16 +01:00
Max Neunhoeffer 074ef1cb31 Unify process startup between Windows and not. 2014-02-19 15:01:37 +01:00
Max Neunhoeffer bc99b765d0 Add wait argument to statusExternal.
Windows version untested.
2014-02-17 16:40:11 +01:00
Max Neunhoeffer 3d27a9f0ad Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-14 14:44:45 +01:00
Max Neunhoeffer 076bc6e723 Cleanup socket abstraction for different OSes. 2014-02-14 14:44:27 +01:00
Frank Celler 6269c61aa7 Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 14:21:59 +01:00
Esteban Lombeyda d6094cf5de Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 16:41:38 +01:00
Esteban Lombeyda 6ccfa1aad2 starting and killing of windows process was implemented 2014-02-13 16:30:31 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
2014-02-13 11:07:01 +01:00
Frank Celler 7a3176ac8d use new readline per default for mac 2014-02-13 11:03:48 +01:00
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
Max Neunhoeffer 650343a650 Fix download using different ports than 80.
Handle errors better in SYS_TEST_PORT
2014-02-11 09:51:36 +01:00
Esteban Lombeyda dbc4ef79eb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-07 16:33:52 +01:00
Esteban Lombeyda 8ab6290d65 Bug fix: tabulators work correct under microsoft windows. Needs 49ee3f0d0fc80cce300427a2ddbf519c61a7cb24
of ArangoDB-Windows
2014-02-07 16:30:04 +01:00
Max Neunhoeffer 340549624b Redirect on 307 as well if requested. 2014-02-06 09:14:27 +01:00
Max Neunhoeffer 6e08a96795 Fix bug with empty argument in makeAbsolute. 2014-02-04 11:50:21 +01:00
Max Neunhoeffer 0c8de8a3ae Add fs.makeAbsolute needed by kickstarter. 2014-02-04 11:36:28 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Frank Celler 988bd0b891 added port test 2014-01-31 18:38:02 +01:00
Frank Celler 29f075cfce added external processes 2014-01-31 15:55:51 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Frank Celler 973f9aa2fb added linenoise 2014-01-30 17:23:24 +01:00
Jan Steemann 5f8a59d696 all() sharded 2014-01-29 13:51:12 +01:00
Jan Steemann 2ced0f6a21 fixed terminal reset 2014-01-27 16:54:48 +01:00
Jan Steemann 1b08bc6582 start up the HTTP server when starting ArangoDB in console mode 2014-01-27 09:45:26 +01:00
Jan Steemann d8b5c60351 fixed segfault 2014-01-24 13:08:33 +01:00
Jan Steemann 481cd2d1be added collection._dbName 2014-01-16 11:10:37 +01:00
Jan Steemann 9c63246d1c added TRI_SHARDING_COLLECTION_NOT_IMPLEMENTED macro 2014-01-14 14:04:29 +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 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Max Neunhoeffer 11e018e6b2 Make global ArangoClusterComm object in each thread. 2014-01-07 11:50:05 +01:00
Max Neunhoeffer bbf28e3501 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/Cluster/v8-cluster.cpp
2014-01-07 11:45:43 +01:00
Jan Steemann 3183e6d402 created global cluster object variables 2014-01-07 11:34:42 +01:00
Max Neunhoeffer 33d063d6d6 Start to move ClusterComm to JavaScript. 2014-01-06 16:18:24 +01:00
Jan Steemann d1bee4cf58 added functions to query the server state 2014-01-02 15:13:44 +01:00
Max Neunhoeffer 3415e3c0c8 Some cleanup in asyncRequest setup. 2013-12-30 10:22:21 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
2013-12-20 15:35:50 +01:00
Frank Celler f7bf96846b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-19 09:33:02 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups
Conflicts:
	CHANGELOG
2013-12-13 16:08:58 +01:00
Jan Steemann 1010d515bb added detailed HTTP request statistics
Conflicts:
	CHANGELOG
2013-12-13 16:00:02 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Jan Steemann 5e5a5fb32b added JS bindings for agency 2013-12-11 09:56:54 +01:00
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Jan Steemann e79134799c mini optimisations for shaping 2013-11-22 02:41:39 +01:00
Frank Celler 01532b024e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-20 13:50:14 +01:00
Frank Celler 6e293d9dce fixed wrong error message on parse error 2013-11-20 13:50:08 +01:00
Jan Steemann cf219d92d3 added debugSegfault 2013-11-20 13:15:45 +01:00
Jan Steemann 920d08d855 removed redundant startup options 2013-11-20 01:50:27 +01:00
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes
Conflicts:
	arangod/VocBase/document-collection.c
2013-11-14 01:01:24 +01:00
Jan Steemann 54abc6bd1d fix Windows path name comparison 2013-11-11 20:30:51 +01:00
Jan Steemann 60526230ab fix Windows path name comparison 2013-11-11 20:06:50 +01:00
Jan Steemann d30ca7b658 added `/_api/database/user` method 2013-11-06 09:34:44 +01:00
Jan Steemann 978c12815a share basic shape types 2013-11-05 20:21:48 +01:00
Jan Steemann 90e7ea3f97 typecasts 2013-11-05 10:19:21 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Jan Steemann e1382dd255 added detailed HTTP request statistics 2013-10-31 16:39:59 +01:00
Jan Steemann bcf6eabce7 fixed --javascript.check option for arangosh 2013-10-30 18:35:08 +01:00
Jan Steemann bc57a0c468 fixed --javascript.check option for arangosh 2013-10-30 18:33:42 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 43b4f78b62 issue #620 2013-10-28 19:38:19 +01:00
Jan Steemann 21d25d0ccc removed resourceholder 2013-10-17 10:43:07 +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 46a295ba43 fixed some Windows warnings 2013-10-08 12:39:47 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann 9155b16252 caching for db[...] 2013-09-21 00:12:35 +02:00
Jan Steemann 3e6daf63d2 fixed typos in comments 2013-09-20 23:12:22 +02:00
Jan Steemann 9f8de8fb4f fixed shaped-json debugging 2013-09-19 10:57:11 +02:00
Jan Steemann 8a996c5b60 less dependency on regex.h, also fixes some speed problems for key validation 2013-09-19 08:20:35 +02:00
Jan Steemann a9a746b676 less tasks run when initialising a new database 2013-09-17 08:38:11 +02:00
Jan Steemann 0bdae05b96 changed reference counting for cursors 2013-09-16 13:51:33 +02:00
Jan Steemann 9c95582703 fixed leak in completions generator 2013-09-16 10:33:42 +02:00
Jan Steemann f99dde5f2e reload routing after dropping database 2013-09-13 10:28:28 +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 435e949462 fixed redirections in web interface 2013-09-04 15:58:41 +02:00
Jan Steemann 2556b0714f fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
Jan Steemann efcca7ab90 54 => 64 2013-08-29 13:53:20 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann 3871fb7af3 improved error messages 2013-08-20 11:48:08 +02:00
Jan Steemann 78601319fb updated replication API 2013-07-30 18:40:35 +02:00
Jan Steemann cc5ae9d1bc added purge() 2013-07-26 23:57:00 +02:00
Frank Celler d4ead84f15 better error output 2013-07-26 14:42:31 +02:00
Jan Steemann 80362ec82f fixed issues reported by cppcheck 2013-07-11 10:02:27 +02:00
Jan Steemann fd2a83123c renamed method 2013-07-11 09:23:13 +02:00
Jan Steemann 3f718ef0fa fixed some issues in replication 2013-07-10 18:08:18 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann d2eae10fb2 check for invalid values 2013-07-02 17:08:10 +02:00
Jan Steemann 703edda54e typos 2013-06-24 20:55:31 +02:00
Jan Steemann 191d389e8c a few mallocs less 2013-06-24 20:55:12 +02:00
Jan Steemann 8063ade2be fixed issues reported by cppcheck 2013-06-21 19:40:57 +02:00
Jan Steemann 2f8d8caf20 fixed a memleak in internal.download() 2013-06-21 10:58:36 +02:00
Jan Steemann 1691cf4036 fixed issues reported by Valgrind 2013-06-21 10:26:48 +02:00
Jan Steemann b1f243d296 fixed segfault for too big shapes, make shape collection filesize adaptive 2013-06-20 19:14:14 +02:00
Jan Steemann 9dfb7483ff "doCompact" attribute for collections 2013-06-19 16:51:16 +02:00
Jan Steemann 74d2a00737 test internal.download() 2013-06-13 15:05:08 +02:00
Jan Steemann a76c9e0142 post body in internal.download() 2013-06-13 12:53:37 +02:00
a-brandt d9fc2a6c60 Merge branch 'devel' into multiple_databases
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/primary-collection.c
2013-06-11 11:17:41 +02:00
Jan Steemann f5326828c6 added flag to force writing of body even in case of HTTP errors for internal.download() 2013-06-07 13:38:13 +02:00
a-brandt 793dc6077d Merge branch 'devel' into multiple_databases 2013-06-05 17:29:34 +02:00
Jan Steemann fb33638b91 documentation fixes 2013-06-05 00:31:08 +02:00
Jan Steemann af7866f238 made internal.download() function more flexible
required by @mchacki
can now send custom headers and use non-GET method
2013-06-05 00:25:36 +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 ed77c19e16 added derived file 2013-05-17 15:59:58 +02:00
Jan Steemann 7ec9cb5eb6 fixed leak in fs.getTempPath() 2013-05-16 21:43:33 +02:00
Jan Steemann c59f00efa8 fixed handling of --temp-path 2013-05-15 15:55:48 +02:00
Jan Steemann c51f70de05 removed hard-coded groups from statistics web interface
now all statistics are dynamic
removed redundant code in statistics web interface
2013-05-14 02:36:01 +02:00
Jan Steemann 6740db7207 fix different resident set size report units 2013-05-08 19:10:49 +02:00
Frank Celler 49b5507b73 fixed issue #489: Bug in aal.install
Conflicts:
	Makefile.in
2013-05-05 21:10:14 +02:00
Jan Steemann 911084a3ad removed now superfluous comment 2013-05-03 16:57:42 +02:00
Jan Steemann 83b525c5d6 changed name of value in statistics 2013-05-03 12:09:57 +02:00
Jan Steemann eef611b1da fixed some compiler & jslint warnings 2013-05-03 11:09:45 +02:00
a-brandt 43aec7e76b Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-30 10:05:53 +02:00
Oreste Panaia c42c0bf565 sync dev for windows 2013-04-29 21:49:28 +08:00
Oreste Panaia 532c7eae8e windows dev update 2013-04-29 21:24:57 +08:00
a-brandt 6839fe7701 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-24 17:46:36 +02:00
Oreste Panaia ee339ffd9f windows 1.3 changes 2013-04-23 19:03:08 +02:00
Frank Celler fb8d8799c3 moved document of console to JSModuleConsole, added packages and node 2013-04-23 18:39:25 +02:00
a-brandt 234b1460f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-23 09:55:08 +02:00
Frank Celler cbc2ab93ba fixed _shallowCopy, fixed creating of unknown attributes 2013-04-22 16:48:36 +02:00
a-brandt 7a0a9ff3b4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-22 14:53:33 +02:00
Jan Steemann b61aac7879 higher precision for statistics values, added "sum" attribute for statistics 2013-04-22 13:24:08 +02:00
Jan Steemann c9f3bdac33 added TODO 2013-04-22 08:41:12 +02:00
Frank Celler bab92e9c04 fixed help messages 2013-04-21 22:12:58 +02:00
Frank Celler a75736a148 added Buffer from node 2013-04-21 21:45:39 +02:00
Frank Celler d2ea4e9bd2 added SlowBuffer from node 2013-04-21 21:32:32 +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 2135e2633e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-11 13:55:43 +02:00
Frank Celler 142cc08704 replaced more deprecated calls 2013-04-11 13:55:33 +02:00
a-brandt 3e80cb0071 fixed typo 2013-04-11 09:04:35 +02:00
Frank Celler f373615268 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/V8Server/v8-actions.cpp
2013-04-10 21:47:51 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
a-brandt 012f4eab35 added cookie keys 2013-04-10 17:43:32 +02:00
Frank Celler c567f0a81d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-06 21:58:05 +02:00
Frank Celler 0600cc852e fixed mem error 2013-04-06 21:57:58 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	lib/Basics/StringUtils.cpp
2013-04-06 10:19:09 +02:00
Frank Celler 97e61c77d5 added escape check 2013-04-05 14:47:58 +02:00
Frank Celler 553ccf099c remove addtogroup blocks 2013-04-03 18:20:37 +02:00
Frank Celler 0ba6329a12 added trace 2013-04-03 16:32:04 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 717dd6e289 safer string building 2013-04-02 18:01:32 +02:00