1
0
Fork 0
Commit Graph

460 Commits

Author SHA1 Message Date
Esteban Lombeyda 7feb081a5f Merge branch 'refactoring' of github.com:triAGENS/ArangoDB into refactoring
Conflicts:
	lib/V8/V8LineEditor.cpp
2014-05-15 13:43:08 +02:00
Esteban Lombeyda e3ff0391a2 Refactoring LineEditor 2014-05-15 10:27:59 +02:00
Jan Steemann 9fa7fe20ea scan-build 2014-05-15 10:16:13 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Jan Steemann a02611fba1 case-insensitive completion 2014-05-14 18:43:01 +02:00
Jan Steemann 8a5c2438b9 removed tabs 2014-05-14 18:01:40 +02:00
Jan Steemann 9f7923ace3 fixed VS warnings 2014-05-13 13:39:42 +02:00
Jan Steemann 3f6d28de8d fixed VS warnings 2014-05-13 12:44:00 +02:00
Frank Celler 1048559dcf fixed percent 2014-05-12 00:38:03 +02:00
Jan Steemann dfec7b7f3c pass v8 handles by value, not by reference (as recommended in their manual) 2014-05-09 15:23:21 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Max Neunhoeffer 62ca0e9a30 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-07 16:47:06 +02:00
Max Neunhoeffer df68f47338 Use StringBuffer in SimpleHttpResult rather than stringstream. 2014-05-07 16:35:40 +02:00
Esteban Lombeyda 6385569dec manualy unification of JS_ProcessStatistics in devel and 2.0 2014-05-07 10:43:44 +02:00
Jan Steemann 02a532a122 added CURRENT_USER function for AQL 2014-05-02 12:00:39 +02:00
Jan Steemann 18302b3ab4 do not segfault on cancellation 2014-04-25 12:45:31 +02:00
Jan Steemann a4ee394d4b fixed AQL return codes in the face of cancellation 2014-04-23 19:07:34 +02:00
Frank Celler 6cdfa029c9 added more error information, fixed try catch
Conflicts:
	CHANGELOG
	arangod/V8Server/ApplicationV8.cpp
2014-04-21 13:35:06 +02:00
Frank Celler fc0ffd40b6 added missing figures 2014-04-10 11:48:35 +02:00
Jan Steemann fa391e0636 slight GC improvements 2014-03-24 16:12:59 +01:00
Jan Steemann 8d84c325f9 fix compile warning 2014-03-21 08:56:52 +01:00
Frank Celler e25945aaba fixed javascript.execute for coffee-script 2014-03-20 22:51:30 +01:00
Frank Celler ba63528b18 removed register 2014-03-17 15:44:09 +01:00
Jan Steemann ef45f43be9 fixed arango-dfdb issues 2014-03-13 20:56:45 +01:00
Jan Steemann 65f66ec6d9 changed expression to satisfy clang 2014-03-12 15:40:57 +01:00
Max Neunhoeffer 101486c6af Improve error handling in process startup in js testing framework. 2014-03-07 15:01:50 +01:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
Jan Steemann 3451c8a03e fixed createNonce call 2014-03-05 10:46:52 +01:00
Max Neunhoeffer 1cb38c6aca Fix compilation under windows. 2014-03-04 08:53:16 +01:00
Max Neunhoeffer e280ea9e91 First try to cleanup process startup for good.
Unix: compiles and works.
Windows: tried to cleanup, did not try to compile yet.
2014-03-03 17:02:16 +01:00
Jan Steemann 3478c8bc74 cppcheck 2014-03-03 09:12:34 +01:00
Frank Celler e0552606c3 added residentSizePercent 2014-03-01 18:16:58 +01:00
Frank Celler cdf635d5c6 added residentSizePercent 2014-03-01 18:14:14 +01:00
Frank Celler e70c9bed21 added total memory for mac 2014-03-01 17:16:10 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Jan Steemann 242b3d5bbf const 2014-02-26 11:08:21 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
2014-02-25 17:21:14 +01:00
Jan Steemann edfdda6d12 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 15:44:08 +01:00
Jan Steemann 0ac7ddaaf9 fix shell client test results 2014-02-25 15:43:57 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann b42f836202 prevent JSONification of cyclic objects 2014-02-24 14:50:47 +01:00
Jan Steemann 870f969933 added user validation API at POST `/_api/user/<username>` 2014-02-24 11:12:37 +01:00
Frank Celler a2fb92948e added better error reporting 2014-02-22 13:00:00 +01:00
Jan Steemann 00d8a9023f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:40:38 +01:00
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