From 97bdcb7b19cabc67c72e1ba36d31479d5bdb8f6d Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 2 Dec 2013 09:12:48 +0100 Subject: [PATCH 01/11] fixed typos in config files --- etc/arangodb/arangob.conf.in | 2 +- etc/arangodb/arangodump.conf.in | 2 +- etc/arangodb/arangorestore.conf.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/arangodb/arangob.conf.in b/etc/arangodb/arangob.conf.in index 170ad09433..10614f687d 100644 --- a/etc/arangodb/arangob.conf.in +++ b/etc/arangodb/arangob.conf.in @@ -3,4 +3,4 @@ progress = true [server] endpoint = tcp://localhost:8529 -disable-authentcation = true +disable-authentication = true diff --git a/etc/arangodb/arangodump.conf.in b/etc/arangodb/arangodump.conf.in index adeccdaef1..977eb10949 100644 --- a/etc/arangodb/arangodump.conf.in +++ b/etc/arangodb/arangodump.conf.in @@ -2,4 +2,4 @@ progress = true [server] endpoint = tcp://localhost:8529 -disable-authentcation = true +disable-authentication = true diff --git a/etc/arangodb/arangorestore.conf.in b/etc/arangodb/arangorestore.conf.in index adeccdaef1..977eb10949 100644 --- a/etc/arangodb/arangorestore.conf.in +++ b/etc/arangodb/arangorestore.conf.in @@ -2,4 +2,4 @@ progress = true [server] endpoint = tcp://localhost:8529 -disable-authentcation = true +disable-authentication = true From 71bc10e811ae3836f8f54d22cc8a58adb3ad20b2 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 2 Dec 2013 09:13:25 +0100 Subject: [PATCH 02/11] fixed typos in configuration files --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 1b2a70cfa0..758a204e0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +v1.4.x (XXXX-XX-XX) +------------------- + +* fixed typos in configuration files + + v1.4.3 (2013-11-25) ------------------- From 9f72a28aca174e01526be1d25b7ee788f4101957 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 2 Dec 2013 09:53:49 +0100 Subject: [PATCH 03/11] fixed issue #701: ArangoStatement undefined in arangosh --- CHANGELOG | 2 ++ js/apps/system/aardvark/frontend/js/client/client.js | 6 ++++++ js/client/client.js | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 758a204e0b..e30141b24b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ v1.4.x (XXXX-XX-XX) ------------------- +* fixed issue #701: ArangoStatement undefined in arangosh + * fixed typos in configuration files diff --git a/js/apps/system/aardvark/frontend/js/client/client.js b/js/apps/system/aardvark/frontend/js/client/client.js index 6772ae4c33..170d904dc7 100644 --- a/js/apps/system/aardvark/frontend/js/client/client.js +++ b/js/apps/system/aardvark/frontend/js/client/client.js @@ -108,6 +108,12 @@ var arango = require("org/arangodb").arango; var fm = require("org/arangodb/foxx/manager"); +//////////////////////////////////////////////////////////////////////////////// +/// @brief global 'ArangoStatement' +//////////////////////////////////////////////////////////////////////////////// + +var ArangoStatement = require("org/arangodb/arango-statement").ArangoStatement; + //////////////////////////////////////////////////////////////////////////////// /// @brief global 'Buffer' //////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/client.js b/js/client/client.js index 6772ae4c33..170d904dc7 100644 --- a/js/client/client.js +++ b/js/client/client.js @@ -108,6 +108,12 @@ var arango = require("org/arangodb").arango; var fm = require("org/arangodb/foxx/manager"); +//////////////////////////////////////////////////////////////////////////////// +/// @brief global 'ArangoStatement' +//////////////////////////////////////////////////////////////////////////////// + +var ArangoStatement = require("org/arangodb/arango-statement").ArangoStatement; + //////////////////////////////////////////////////////////////////////////////// /// @brief global 'Buffer' //////////////////////////////////////////////////////////////////////////////// From 08846a810e152401e949ae2305e2e9107c29683b Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 2 Dec 2013 13:19:59 +0100 Subject: [PATCH 04/11] fixed unreadable swagger documentation --- js/actions/api-traversal.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/js/actions/api-traversal.js b/js/actions/api-traversal.js index 6fa558462a..08222eff20 100644 --- a/js/actions/api-traversal.js +++ b/js/actions/api-traversal.js @@ -91,34 +91,45 @@ function notFound (req, res, code, message) { /// - `Array` -> containing any combination of the above. /// If there is at least one `"exclude"` or `"prune"` respectivly /// is contained, it's effect will occur. +/// /// - `minDepth` (optional, ANDed with any existing filters): /// visits only nodes in at least the given depth +/// /// - `maxDepth` (optional, ANDed with any existing filters): /// visits only nodes in at most the given depth +/// /// - `visitor` (optional): body (JavaScript) code of custom visitor function /// function signature: (config, result, vertex, path) -> void /// visitor function can do anything, but its return value is ignored. To /// populate a result, use the `result` variable by reference +/// /// - `direction` (optional): direction for traversal /// - *if set*, must be either `"outbound"`, `"inbound"`, or `"any"` /// - *if not set*, the `expander` attribute must be specified +/// /// - `init` (optional): body (JavaScript) code of custom result initialisation function /// function signature: (config, result) -> void /// initialise any values in result with what is required +/// /// - `expander` (optional): body (JavaScript) code of custom expander function /// *must* be set if `direction` attribute is *not* set /// function signature: (config, vertex, path) -> array /// expander must return an array of the connections for `vertex` /// each connection is an object with the attributes `edge` and `vertex` +/// /// - `strategy` (optional): traversal strategy /// can be `"depthfirst"` or `"breadthfirst"` +/// /// - `order` (optional): traversal order /// can be `"preorder"` or `"postorder"` +/// /// - `itemOrder` (optional): item iteration order /// can be `"forward"` or `"backward"` +/// /// - `uniqueness` (optional): specifies uniqueness for vertices and edges visited /// if set, must be an object like this: /// `"uniqueness": {"vertices": "none"|"global"|path", "edges": "none"|"global"|"path"}` +/// /// - `maxIterations` (optional): Maximum number of iterations in each traversal. This number can be /// set to prevent endless loops in traversal of cyclic graphs. When a traversal performs /// as many iterations as the `maxIterations` value, the traversal will abort with an From 78aced208e3977536c9e45f91f060e46e2978c00 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 4 Dec 2013 10:18:56 +0100 Subject: [PATCH 05/11] new CSS from Claudius --- Documentation/arangodb.css | 107 ++++++++++++------------------------- 1 file changed, 35 insertions(+), 72 deletions(-) diff --git a/Documentation/arangodb.css b/Documentation/arangodb.css index d408693f30..de4dc5bff7 100644 --- a/Documentation/arangodb.css +++ b/Documentation/arangodb.css @@ -6,6 +6,9 @@ /* ************************************************************************** */ /* global */ /* ************************************************************************** */ +.page-id-1410 #wrapper { + margin-top: 75px; +} #content div.arangodb { background: none repeat scroll 0 0 transparent; @@ -15,7 +18,7 @@ font-size: 16px; font-weight: 300; line-height: 1.4em; - margin: 0; + margin: 0px 0px 0px 0px; padding: 0px; vertical-align: baseline; } @@ -45,8 +48,8 @@ border-bottom: 1px solid #EFECE9; font-family: Rockwell,Georgia,"Times New Roman",Times,serif; font-size: 2em; - margin-bottom: 38px; - padding: 14px 0 3px; + margin-bottom: 40px; + padding: 3px 0 3px; } #content div.arangodb h2 { @@ -58,21 +61,15 @@ padding: 14px 0 3px; } -#content div.arangodb h3 { - margin-top: 20px; - margin-bottom: 14px; - border-bottom: 1px solid #EFECE9; -} - /* ************************************************************************** */ /* navigation bar */ /* ************************************************************************** */ #content div.arangodb div.navigate { - height: 0px; - position: relative; + height: 0px; + position: relative; text-align: right; - top: -70px; + top: -69px; } /* ************************************************************************** */ @@ -82,8 +79,9 @@ #content div.arangodb div.toc { border-width: thin; border-style: solid; - background-color: #E7F3C5; + background-color: #F8F8F8; margin-bottom: 14px; + padding: 4px; } #content div.arangodb div.toc ul { @@ -92,12 +90,7 @@ } #content div.arangodb ul ul { - margin-top: 14px; - margin-bottom: 14px; -} -#content div.arangodb ul { - margin-top: 14px; - margin-bottom: 14px; + margin-bottom: 0px; } /* ************************************************************************** */ @@ -105,12 +98,7 @@ /* ************************************************************************** */ #content div.arangodb div.functionsignature { - font-size: 14px; - font-weight: bold; font-family: monospace,fixed; - border: 2px dotted; - background-color: #F8F8F8; - padding: 10px; margin-top: 14px; margin-bottom: 14px; } @@ -131,48 +119,18 @@ /* ************************************************************************** */ /* rest call */ /* ************************************************************************** */ -.space-before { - margin-top: 14px; -} + #content div.arangodb div.restheader { - font-size: 14px; - font-weight: bold; + font-size: 18px; font-family: monospace,fixed; - border: 2px dotted; - background-color: #F8F8F8; - padding: 10px; - margin-top: 14px; + border-bottom: 1px dotted; margin-bottom: 14px; } + #content div.arangodb div.restheaderremark { - float: right; -} -#content div.arangodb div.restbodyparam { + font-size: 18px; + float: right; font-family: "Helvetica",sans-serif; - font-size: 16px; - margin-bottom: 14px; -} - -#content div.arangodb div.resturlparameters { - font-weight: bold; - margin-top: 14px; - margin-bottom: 14px; -} - -#content div.arangodb div.resturlparam { - font-style: italic; - margin-top: 14px; - margin-bottom: 14px; -} - -#content div.arangodb div.restheaderparameters { - font-weight: bold; - margin-top: 14px; - margin-bottom: 14px; -} - -#content div.arangodb div.restheaderparam { - font-style: italic; } #content div.arangodb div.restqueryparameters { @@ -194,14 +152,11 @@ #content div.arangodb div.restreturncodes { font-weight: bold; margin-top: 14px; - margin-bottom: 0px; -} -#content div.arangodb div.restreturncodes p { - margin: 0px; + margin-bottom: 14px; } + #content div.arangodb div.restreturncode { font-style: italic; - display: inline; } /* ************************************************************************** */ @@ -220,11 +175,12 @@ #content div.arangodb pre { background-color: #FBFCFD !important; - border: 0px; + border: 1px solid #C4CFE5 !important; font-family: monospace,fixed; + font-size: 105%; font-size: 15px; line-height: 21px; - margin: 4px 8px 24px 36px; + margin: 4px 8px 24px 2px; overflow: auto; padding: 4px 6px; word-wrap: break-word; @@ -232,15 +188,15 @@ #content div.arangodb div.fragment { background-color: #FBFCFD !important; - border: 0px; + border: 1px solid #C4CFE5 !important; font-family: monospace,fixed; + font-size: 105%; font-size: 15px; - line-height: 11px; - margin: 4px 8px 24px 36px; + line-height: 21px; + margin: 4px 8px 24px 2px; overflow: auto; padding: 4px 6px; word-wrap: break-word; - white-space: pre; } #content div.arangodb code { @@ -259,5 +215,12 @@ /* ************************************************************************** */ #content hr { - margin-bottom: 2px; + margin-top: 15px; + margin-bottom: 2px; } + +a.anchor { + padding-top: 80px; + width: 0; + font-size: 0; +} \ No newline at end of file From 7da102506fe6c1cd853ff8c19be262492e715c45 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 4 Dec 2013 20:37:30 +0100 Subject: [PATCH 06/11] allow references as function parameters --- arangod/Ahuacatl/ahuacatl-functions.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arangod/Ahuacatl/ahuacatl-functions.c b/arangod/Ahuacatl/ahuacatl-functions.c index 34c203bb04..b3160be91d 100644 --- a/arangod/Ahuacatl/ahuacatl-functions.c +++ b/arangod/Ahuacatl/ahuacatl-functions.c @@ -150,6 +150,10 @@ static bool CheckArgumentType (TRI_aql_node_t const* parameter, const param_t* const allowed) { param_t found = InitParam(); + if (parameter->_type == TRI_AQL_NODE_REFERENCE) { + return true; + } + if (parameter->_type == TRI_AQL_NODE_PARAMETER) { // node is a bind parameter char* name = TRI_AQL_NODE_STRING(parameter); From c63655b64c19a155095c41ecae67cd3f7b17b145 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 4 Dec 2013 20:38:07 +0100 Subject: [PATCH 07/11] make test more reliable --- js/server/tests/compaction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/server/tests/compaction.js b/js/server/tests/compaction.js index 05f106f865..f48eb196e4 100644 --- a/js/server/tests/compaction.js +++ b/js/server/tests/compaction.js @@ -180,7 +180,7 @@ function CompactionSuite () { assertTrue(0 <= fig["dead"]["size"]); assertTrue(0 <= fig["dead"]["deletion"]); assertTrue(0 <= fig["journals"]["count"]); - assertTrue(0 < fig["datafiles"]["count"]); + assertTrue(0 <= fig["datafiles"]["count"]); // wait for compactor to run require("console").log("waiting for compactor to run"); From 16264f992d19cc4c40fc30f756d71b74dca6aa46 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 4 Dec 2013 20:39:51 +0100 Subject: [PATCH 08/11] better clone some objects returned by AQL user-defined functions --- js/server/modules/org/arangodb/ahuacatl.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/server/modules/org/arangodb/ahuacatl.js b/js/server/modules/org/arangodb/ahuacatl.js index bf6687aa59..be450f4580 100644 --- a/js/server/modules/org/arangodb/ahuacatl.js +++ b/js/server/modules/org/arangodb/ahuacatl.js @@ -261,13 +261,17 @@ function FIX_VALUE (value) { } if (type === 'object') { + var result = { }; for (i in value) { if (value.hasOwnProperty(i)) { - value[i] = FIX_VALUE(value[i]); + if (typeof value[i] === 'function') { + continue; + } + result[i] = FIX_VALUE(value[i]); } } - return value; + return result; } return null; From 30ed6ac8d0280e6da94d650814c2aa4ca0cfc874 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Fri, 6 Dec 2013 14:52:27 +0100 Subject: [PATCH 09/11] fixed wrong path in install script --- CMakeLists.txt | 9 +++------ Installation/MacOSX/Bundle/arangodb-cli.sh | 3 +-- arangod/CMakeLists.txt | 4 ++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12f755042e..a1c5ec70cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,18 +137,15 @@ endif () file(TO_NATIVE_PATH "${VARDIR_NATIVE}" VARDIR_NATIVE) +FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/var/lib/arangodb") +FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/var/lib/arangodb-apps") + ################################################################################ ### @brief TRI_BINDIR ################################################################################ set(TRI_BINDIR "${CMAKE_INSTALL_PREFIX}/bin") -################################################################################ -### @brief database directory -################################################################################ - -FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/var/lib/arangodb") - ################################################################################ ### @brief apps directory ################################################################################ diff --git a/Installation/MacOSX/Bundle/arangodb-cli.sh b/Installation/MacOSX/Bundle/arangodb-cli.sh index f9ff9e27e6..482a468a1f 100755 --- a/Installation/MacOSX/Bundle/arangodb-cli.sh +++ b/Installation/MacOSX/Bundle/arangodb-cli.sh @@ -13,8 +13,7 @@ for script in $SCRIPTS; do echo "#!/bin/bash" echo echo "export ARANGODB_ROOT=\"${ARANGODB_ROOT}Contents/MacOS/\"" - echo "export DATABASEDIR=\"\${ARANGODB_ROOT}opt/arangodb/var/lib/arangodb\"" - echo "export LOGDIR=\"\${ARANGODB_ROOT}opt/arangodb/var/log/arangodb\"" + echo "export LOCALSTATEDIR=\"\${ARANGODB_ROOT}opt/arangodb/var\"" echo "export PKGDATADIR=\"\${ARANGODB_ROOT}opt/arangodb/share/arangodb\"" echo if [ "$base" == "arango-dfdb" ]; then diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt index f2f654753f..7ece5a9c35 100644 --- a/arangod/CMakeLists.txt +++ b/arangod/CMakeLists.txt @@ -208,6 +208,10 @@ install( DIRECTORY ${PROJECT_BINARY_DIR}/var/lib/arangodb DESTINATION ${VARDIR_INSTALL}/lib) +install( + DIRECTORY ${PROJECT_BINARY_DIR}/var/lib/arangodb-apps + DESTINATION ${VARDIR_INSTALL}/lib) + ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE ## ----------------------------------------------------------------------------- From eaa980f05ab285a7a710e209940cf44f2110cd04 Mon Sep 17 00:00:00 2001 From: Ferhat Date: Fri, 6 Dec 2013 04:19:43 +0100 Subject: [PATCH 10/11] Update README.md Interesting and useful for researchers. --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 22ed3dd22d..6c82e3f98f 100644 --- a/README.md +++ b/README.md @@ -92,3 +92,14 @@ You can use the Google group for improvements, feature requests, comments http://www.arangodb.org/connect + +Citing ArangoDB +--------------- +Please kindly cite ArangoDB in your publications if it helps your research: + +@misc{Jan13ArangoDB, + Author = {Jan Steeman, Michael Hackstein}, + Title = { {ArangoDB}: An Open Source multi-purpose database supporting flexible data models for documents, graphs, and key-values.}, + Year = {2013}, + Howpublished = {\url{http://arangodb.org/} +} From cb7a1561c40d75e3c607c1fdd20ebec175563307 Mon Sep 17 00:00:00 2001 From: Ferhat Date: Fri, 6 Dec 2013 18:01:31 +0100 Subject: [PATCH 11/11] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6c82e3f98f..31c9e6d9b4 100644 --- a/README.md +++ b/README.md @@ -97,9 +97,11 @@ Citing ArangoDB --------------- Please kindly cite ArangoDB in your publications if it helps your research: -@misc{Jan13ArangoDB, - Author = {Jan Steeman, Michael Hackstein}, +```bibtex +@misc{ArangoDB2013, + Author = {ArangoDB}, Title = { {ArangoDB}: An Open Source multi-purpose database supporting flexible data models for documents, graphs, and key-values.}, Year = {2013}, Howpublished = {\url{http://arangodb.org/} } +```