1
0
Fork 0

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding

Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
This commit is contained in:
Jan Steemann 2014-01-24 14:50:09 +01:00
commit ea2af50683
147 changed files with 961 additions and 193 deletions

View File

@ -1,6 +1,8 @@
v1.5.0 (XXXX-XX-XX)
-------------------
* issue #748: add vertex filtering to AQL's TRAVERSAL[_TREE]() function
* allow direct access from the `db` object to collections whose names start
with an underscore (e.g. db._users).
@ -9,8 +11,6 @@ v1.5.0 (XXXX-XX-XX)
to access such collections from these places was via the `db._collection(<name>)`
workaround.
* issue #738: added __dirname, __filename pseudo-globals. Fixes #733. (@by pluma)
* allow `\n` (as well as `\r\n`) as line terminator in batch requests sent to
`/_api/batch` HTTP API.
@ -115,7 +115,17 @@ v1.5.0 (XXXX-XX-XX)
currently only implemented for hash indices and skiplist indices.
v1.4.6 (XXXX-XX-XX)
v1.4.7 (2014-01-23)
-------------------
* issue #744: Add usage example arangoimp from Command line
* issue #738: added __dirname, __filename pseudo-globals. Fixes #733. (@by pluma)
* mount all Foxx applications in system apps directory on startup
v1.4.6 (2014-01-20)
-------------------
* issue #736: AQL function to parse collection and key from document handle
@ -154,6 +164,7 @@ v1.4.5 (2014-01-15)
* added override file "arangod.conf.local" (and co)
v1.4.4 (2013-12-24)
-------------------

View File

@ -59,3 +59,5 @@ web interface.
@CLEARPAGE
@anchor UserManagementReload
@copydetails JSF_reloadUsers
@BNAVIGATE_DbaManualAuthentication

View File

@ -46,3 +46,5 @@ You can configure the durability behavior on a per collection basis.
Use the ArangoDB shell to change these properties.
@copydetails JS_PropertiesVocbaseCol
@BNAVIGATE_DbaManualBasics

View File

@ -79,3 +79,5 @@ If you answer `Y`, the corrupted entry will be removed.
If you see a corruption in a datafile (and not a journal), then something is
terrible wrong. These files are immutable and never changed by ArangoDB. A
corruption in such a file is an indication of a hard-disk failure.
@BNAVIGATE_DbaManualDatafileDebugger

View File

@ -14,3 +14,5 @@ ArangoDB's DBA Manual (@VERSION){#DbaManual}
@CHAPTER_REF{DbaManualAuthentication}
@CHAPTER_REF{DbaManualDatafileDebugger}
@CHAPTER_REF{DbaManualEmergencyConsole}
@BNAVIGATE_DbaManual

View File

@ -23,3 +23,5 @@ client/server communication.
However, it is very likely that you never need the emergency console
unless you are an ArangoDB developer.
@BNAVIGATE_DbaManualEmergencyConsole

View File

@ -140,3 +140,5 @@ Database Methods {#HandlingIndexesDatabaseMethods}
@CLEARPAGE
@anchor HandlingIndexesDbDelete
@copydetails JSF_ArangoDatabase_prototype__dropIndex
@BNAVIGATE_HandlingIndexes

View File

@ -15,3 +15,5 @@ Accessing BitArray Indexes from the Shell{#IndexBitArrayShell}
@anchor IndexBitArrayShellEnsureBitarray
@copydetails JS_EnsureBitarrayVocbaseCol
@BNAVIGATE_IndexBitArray

View File

@ -36,3 +36,5 @@ Accessing Cap Constraints from the Shell{#IndexCapShell}
@anchor IndexCapShellEnsureCapConstraint
@copydetails JS_EnsureCapConstraintVocbaseCol
@BNAVIGATE_IndexCap

View File

@ -18,3 +18,5 @@ Accessing Fulltext Indexes from the Shell{#IndexFulltextShell}
@anchor IndexFulltextShellEnsureFulltextIndex
@copydetails JS_EnsureFulltextIndexVocbaseCol
@BNAVIGATE_IndexFulltext

View File

@ -41,3 +41,5 @@ Accessing Geo Indexes from the Shell{#IndexGeoShell}
@CLEARPAGE
@anchor IndexGeoShellWithin
@copydetails JSF_ArangoCollection_prototype_within
@BNAVIGATE_IndexGeo

View File

@ -23,3 +23,5 @@ Accessing Hash Indexes from the Shell{#IndexHashShell}
@CLEARPAGE
@anchor IndexHashShellEnsureHashIndex
@copydetails JS_EnsureHashIndexVocbaseCol
@BNAVIGATE_IndexHash

View File

@ -23,3 +23,5 @@ Accessing Skip-List Indexes from the Shell{#IndexSkiplistShell}
@CLEARPAGE
@anchor IndexSkiplistShellEnsureSkiplist
@copydetails JS_EnsureSkiplistVocbaseCol
@BNAVIGATE_IndexSkiplist

View File

@ -5,3 +5,5 @@ Error codes and meanings{#ImplementorManualArangoErrors}
@EMBEDTOC{ImplementorManualArangoErrorsTOC}
@copydetails ArangoErrors
@BNAVIGATE_ImplementorManualArangoErrors

View File

@ -245,3 +245,4 @@ controlled environments. Thus the default value for this option is `false` (no m
overriding allowed). You need to enable it explicitly if you want to use this
feature.
@BNAVIGATE_Communication

View File

@ -32,3 +32,4 @@ be accessed directly, but only via the dedicated interfaces.
@anchor HttpAqlFunctionsList
@copydetails JSF_get_api_aqlfunction
@BNAVIGATE_HttpAqlFunctions

View File

@ -95,3 +95,5 @@ part request failed (with status code 404), the `x-arango-errors`
header of the overall response is `1`:
@verbinclude api-batch-fail-response
@BNAVIGATE_HttpBatch

View File

@ -108,3 +108,5 @@ Modifying a Collection {#HttpCollectionChanging}
@CLEARPAGE
@anchor HttpCollectionRotate
@copydetails JSF_put_api_collection_rotate
@BNAVIGATE_HttpCollection

View File

@ -93,3 +93,4 @@ Accessing Cursors via HTTP {#HttpCursorHttp}
@anchor HttpCursorDelete
@copydetails JSF_delete_api_cursor
@BNAVIGATE_HttpCursor

View File

@ -117,3 +117,5 @@ applications until they are explicitly installed for the particular database.
@copydoc GlossaryDatabaseName
@copydoc GlossaryDatabaseOrganisation
@BNAVIGATE_HttpDatabase

View File

@ -42,3 +42,4 @@ Managing Endpoints via HTTP {#HttpEndpointHttp}
@anchor HttpEndpointGet
@copydetails JSF_get_api_endpoint
@BNAVIGATE_HttpEndpoint

View File

@ -70,3 +70,5 @@ HTTP Interface for Graphs {#HttpGraph}
@CLEARPAGE
@anchor A_JSF_POST_graph_vertex_edges
@copydetails JSF_post_graph_vertex_edges
@BNAVIGATE_HttpGraph

View File

@ -136,3 +136,5 @@ and that these contain references to existing collections.
Please also note that it is not possible to create a new edge collection on the
fly using the `createCollection` parameter.
@BNAVIGATE_HttpImport

View File

@ -125,3 +125,4 @@ fulltext query.
@anchor IndexFulltextHttpFulltext
@copydetails JSA_put_api_simple_fulltext
@BNAVIGATE_HttpIndex

View File

@ -103,3 +103,4 @@ Managing Async Results via HTTP {#HttpJobHttp}
@anchor HttpJobGet
@copydetails triagens::admin::RestJobHandler::getJob
@BNAVIGATE_HttpJob

View File

@ -18,3 +18,4 @@ This is an overview of ArangoDB's HTTP interface for miscellaneous functions.
@anchor HttpMiscEcho
@copydetails JSF_get_admin_echo
@BNAVIGATE_HttpMisc

View File

@ -17,3 +17,5 @@ inspect it and return meta information about it.
@CLEARPAGE
@anchor HttpQueryPost
@copydetails JSF_post_api_query
@BNAVIGATE_HttpQuery

View File

@ -130,3 +130,5 @@ Other Replication Commands {#HttpReplicationOtherCommands}
@anchor HttpReplicationServerId
@copydetails triagens::arango::RestReplicationHandler::handleCommandServerId
@BNAVIGATE_HttpReplication

View File

@ -81,3 +81,5 @@ dispose the server-side cursor afterwards.
@CLEARPAGE
@anchor HttpSimpleLast
@copydetails JSA_put_api_simple_last
@BNAVIGATE_HttpSimple

View File

@ -50,3 +50,4 @@ monitoring of the server.
@anchor HttpSystemAdminDescriptionShardingHEAD
@copydetails JSF_sharding_test_HEAD
@BNAVIGATE_HttpSystem

View File

@ -29,3 +29,4 @@ Executing Transactions via HTTP {#HttpTransactionsHttp}
@anchor HttpTransactionsPost
@copydetails JSF_post_api_transaction
@BNAVIGATE_HttpTransactions

View File

@ -25,3 +25,4 @@ Executing Traversals via HTTP {#HttpTraversalsHttp}
@anchor HttpTraversalsPost
@copydetails JSF_post_api_traversal
@BNAVIGATE_HttpTraversals

View File

@ -40,3 +40,5 @@ Please note that user operations are not included in ArangoDB's replication.
@CLEARPAGE
@anchor HttpUserDocument
@copydetails JSF_get_api_user
@BNAVIGATE_HttpUser

View File

@ -29,3 +29,5 @@ ArangoDB for API Implementors (@VERSION) {#ImplementorManual}
@if LATEX
@CHAPTER_REF{Glossary}
@endif
@BNAVIGATE_ImplementorManual

View File

@ -119,3 +119,4 @@ following attribute naming constraints are not violated:
{ "a" : 1, "b": 4 }
@BNAVIGATE_NamingConventions

View File

@ -119,3 +119,5 @@ Working with Documents using REST {#RestDocumentHttp}
@CLEARPAGE
@anchor RestDocumentReadAll
@copydetails triagens::arango::RestDocumentHandler::readAllDocuments
@BNAVIGATE_RestDocument

View File

@ -101,3 +101,5 @@ See @ref RestDocument for details.
@anchor RestEdgeEdges
@copydetails JSF_get_edges
@BNAVIGATE_RestEdge

View File

@ -293,3 +293,5 @@ to the error messages file, which is converted to js and C header files using
Python. You will need Python 2 or 3 for this. Furthermore, this option enables
additional test cases to be executed in a `make unittests` run. You also need to
install the Boost test framework for this.
@BNAVIGATE_Compiling

View File

@ -10,3 +10,5 @@ ArangoDB's Installation Manual (@VERSION) {#InstallManual}
@CHAPTER_REF{Installing}
@CHAPTER_REF{Compiling}
@endif
@BNAVIGATE_InstallManual

View File

@ -309,3 +309,5 @@ method.
Please note that ArangoDB uses UTF-8 as its internal encoding and that the
system console must support a UTF-8 codepage (65001) and font. It may be
necessary to manually switch the console font to a font that supports UTF-8.
@BNAVIGATE_Installing

View File

@ -3,8 +3,8 @@ TOC {#InstallingTOC}
- @ref Installing
- @ref InstallingLinux
- @ref InstallingLinuxPackageManager
- @ref InstallingDebian
- @ref InstallingLinuxPackageManager
- @ref InstallingDebian
- @ref InstallingMacOSX
- @ref InstallingMacOSXHomebrew
- @ref InstallingMacOSXAppStore

View File

@ -307,7 +307,7 @@ latex: Doxygen/.setup-directories Doxygen/arango-latex.doxy $(DOXYGEN)
.PHONY: man
man: Doxygen/.setup-directories
for section in 1 8; do for i in `ls Documentation/man$$section`; do sed -f Documentation/Scripts/man.sed -e "s/\<SECTION\>/$$section/" -e "s/\<COMMAND\>/$$i/g" -e "s/DATE/`date`/g" Documentation/man$$section/$$i > Doxygen/man/man$$section/$$i.$$section; done; done
for section in 1 8; do for i in `ls Documentation/man$$section`; do sed -f Documentation/Scripts/man.sed -e "s/\<SECTION\>/$$section/" -e "s/\<COMMAND\>/$$i/g" -e "s/DATE/`date`/g" Documentation/man$$section/$$i > Doxygen/man/man$$section/$$i.$$section; cp "Doxygen/man/man$$section/$$i.$$section" "Documentation/man/man$$section/$$i.$$section"; done; done
## -----------------------------------------------------------------------------
## --SECTION-- EXAMPLES

View File

@ -46,3 +46,5 @@ Glossary {#GlossaryIntro}
@copydoc GlossaryIndexSkiplist
@copydoc GlossaryKeyGenerator
@BNAVIGATE_Glossary

View File

@ -412,3 +412,4 @@ ArangoDB 1.1 adds the option `--default-language` to select a locale for
sorting and comparing strings. The default locale is set to be the system
locale on that platform.
@BNAVIGATE_NewFeatures11

View File

@ -462,3 +462,5 @@ already compiled binary.
Usage is:
> arangod --server.disable-statistics true ...
@BNAVIGATE_NewFeatures12

View File

@ -284,3 +284,5 @@ Miscelleanous changes{#NewFeatures13Misc}
The result will now contain an attribute `attributes` with a sub-attribute `count`.
This value provides the number of different attributes that are or have been used
in the collection.
@BNAVIGATE_NewFeatures13

View File

@ -507,3 +507,4 @@ The following command-line options have been added for _arangoimp_ in 1.4:
* `--server.database`: allows specifying the database name for the connection
@BNAVIGATE_NewFeatures14

View File

@ -341,3 +341,5 @@ In 1.0, there was an API to manage user and session for the GUI
administraion interface. In 1.1 the user management is part of the
database (not just the front-end). There the calls to
`_admin/user-manager` where removed.
@BNAVIGATE_Upgrading11

View File

@ -457,3 +457,4 @@ ArangoDB 1.2 in favor of managing users via `arangosh` or `arangod` directly.
Please refer to @ref Upgrading12Troubleshooting for more information on how
to manage users in ArangoDB 1.2.
@BNAVIGATE_Upgrading12

View File

@ -184,3 +184,4 @@ startup option
Please also check the logfile written by ArangoDB for further errors messages.
@BNAVIGATE_Upgrading13

View File

@ -525,3 +525,5 @@ properly with ArangoDB 1.4:
in development mode using the `--javascript.dev-app-path` option. This will
either print or log (depending on configuration) errors occurring in Foxx
applications.
@BNAVIGATE_Upgrading14

View File

@ -20,3 +20,5 @@ If anything goes wrong during or shortly after the upgrade:
- Start the "old" version again
It is not supported to use datafiles created or modified by a newer version of ArangoDB with an older ArangoDB version. For example, it is unsupported and is likely to cause problems when using 1.4 datafiles with an ArangoDB 1.3 instance.
@BNAVIGATE_UpgradingGeneral

View File

@ -900,3 +900,4 @@ will result in the URL being accessible via all supported HTTP methods (e.g.
HTTP `HEAD` only, with all other HTTP methods being disabled. Calling a URL
with an unsupported or disabled HTTP method will result in an HTTP 501 error.
@BNAVIGATE_UserManualActions

View File

@ -5,3 +5,5 @@ Error codes and meanings{#RefManualArangoErrors}
@EMBEDTOC{RefManualArangoErrorsTOC}
@copydetails ArangoErrors
@BNAVIGATE_RefManualArangoErrors

View File

@ -50,3 +50,5 @@ ArangoDB Result Generators {#JSModuleActionsArangoDB}
@CLEARPAGE
@anchor JSModuleActionsResultException
@copydetails JSF_resultException
@BNAVIGATE_JSModuleActions

View File

@ -195,3 +195,5 @@ String substitution patterns, which can be used in @FA{format}.
- `%%d`, `%%i` integer
- `%%f` floating point number
- `%%o` object hyperlink
@BNAVIGATE_JSModuleConsole

View File

@ -44,3 +44,5 @@ The implementation follows the CommonJS specification
@CLEARPAGE
@anchor JSModuleFsRemove
@copydetails JS_Remove
@BNAVIGATE_JSModuleFs

View File

@ -200,3 +200,5 @@ Edge Methods{#JSModuleGraphEdge}
@CLEARPAGE
@anchor JSModuleGraphEdgeSetProperty
@copydetails JSF_Edge_prototype_setProperty
@BNAVIGATE_JSModuleGraph

View File

@ -49,3 +49,5 @@ Assume that your file live in a directory called `lib`. Use
to create a copy of the JavaScript files with coverage information. Start the
ArangoDB with these files and use @FN{jsunity.runCoverage} instead of
@FN{jsunity.runTest}.
@BNAVIGATE_jsUnity

View File

@ -211,3 +211,5 @@ versa.
In order to flush the modules cache of the JavaScript shell, you should use
arangosh> require("internal").flushModuleCache()
@BNAVIGATE_JSModules

View File

@ -12,3 +12,5 @@ ArangoDB's Reference Manual (@VERSION) {#RefManual}
@CHAPTER_REF{UserManualActions}
@CHAPTER_REF{RefManualReplication}
@CHAPTER_REF{RefManualArangoErrors}
@BNAVIGATE_RefManual

View File

@ -436,3 +436,4 @@ event that is neither a ocument/edge operation nor a `transaction commit` event)
should abort the ongoing transaction and discard all buffered operations. It can then
consider the current transaction as failed.
@BNAVIGATE_RefManualReplication

View File

@ -115,10 +115,13 @@ def generate(l, h):
if prev == "":
print 'ALIASES += "NAVIGATE_%s=@NAVIGATE_FIRST{%s,%s}"' % (entry,home,next)
print 'ALIASES += "BNAVIGATE_%s=@BNAVIGATE_FIRST{%s,%s}"' % (entry,home,next)
elif next == "":
print 'ALIASES += "NAVIGATE_%s=@NAVIGATE_LAST{%s,%s}"' % (entry,prev,home)
print 'ALIASES += "BNAVIGATE_%s=@BNAVIGATE_LAST{%s,%s}"' % (entry,prev,home)
else:
print 'ALIASES += "NAVIGATE_%s=@NAVIGATE{%s,%s,%s}"' % (entry,prev,home,next)
print 'ALIASES += "BNAVIGATE_%s=@BNAVIGATE{%s,%s,%s}"' % (entry,prev,home,next)
generate(books, None)
generate(chapters, homes)

View File

@ -67,4 +67,5 @@ with these attributes:
Document data for a collection will be saved in files with name pattern
`<collection-name>.data.json`. Each line in a data file is a document insertion/update or
deletion marker, alongside with some meta data.
@BNAVIGATE_DumpManual

View File

@ -174,3 +174,5 @@ documents can `_from` and `_to` and that their values point to existing document
Finally you should make sure that all other attributes in the import file do not
start with an underscore - otherwise they might be discarded.
@BNAVIGATE_ImpManual

View File

@ -128,3 +128,4 @@ After that, run the following command:
unix> arangorestore --collection mycopyvalues --server.database mycopy --input-directory "dump"
@BNAVIGATE_RestoreManual

View File

@ -33,3 +33,4 @@ running ArangoDB server instance. _arangodump_ will write all its output into a
directory that needs to be specified when invoking it. _arangorestore_ will read
files from a directory that was formerly created by invoking _arangodump_.
@BNAVIGATE_ToolsManual

View File

@ -1433,8 +1433,17 @@ Example calls:
traversal path
- `followEdges`: an optional list of example edge documents that the traversal will
expand into. If no examples are given, the traversal will follow all edges. If one
or many edge examples are given. The traversal will only follow an edge if it matches
or many edge examples are given, the traversal will only follow an edge if it matches
at least one of the specified examples.
- `filterVertices`: an optional list of example vertex documents that the traversal will
treat specially. If no examples are given, the traversal will handle all encountered
vertices equally. If one or many vertex examples are given, the traversal will exclude
the vertex from the result and/or descend into it.
- `vertexFilterMethod`: only useful in conjunction with `filterVertices`. If specified,
it will influence how vertices are handled that don't match the examples in `filterVertices`:
- `[ "prune" ]`: will include non-matching vertices in the result but not descend into them
- `[ "exclude" ]`: will not include non-matching vertices in the result but descend into them
- `[ "prune", "exclude" ]`: will neither include non-matching vertices in the result nor descend into them
The result of the TRAVERSAL function is a list of traversed points. Each point is a
document consisting of the following properties:
@ -1459,6 +1468,15 @@ Example calls:
followEdges: [ { type: "knows" }, { state: "FL" } ]
})
TRAVERSAL(friends, friendrelations, "friends/john", "outbound", {
strategy: "breadthfirst",
order: "preorder",
itemOrder: "forward",
followEdges: [ { type: "knows" }, { state: "FL" } ],
filterVertices: [ { isActive: true } ],
vertexFilterMethod: [ "prune", "exclude" ]
})
- @FN{TRAVERSAL_TREE(@FA{vertexcollection}, @FA{edgecollection}, @FA{startVertex}, @FA{direction}, @FA{connectName}, @FA{options})}:
traverses the graph described by @FA{vertexcollection} and @FA{edgecollection},
starting at the vertex identified by id @FA{startVertex} and creates a hierchical result.
@ -1844,3 +1862,5 @@ operator is again a list.
In the above example, the attribute `name` is accessed for each element in the
list `u.friends`. The result is a flat list of friend names, made available as
the attribute `friendNames`.
@BNAVIGATE_Aql

View File

@ -686,3 +686,4 @@ For example, to get the 3 `ageGroup`s with the most users in them:
To increase readability, the repeated expression `LENGTH(group)` was put into a variable
`numUsers`. The `FILTER` on `numUsers` is the SQL HAVING equivalent.
@BNAVIGATE_AqlExamples

View File

@ -147,3 +147,4 @@ JavaScript code. If you want any variables in the global scope to survive, you n
omit the `var` keyword for them. Otherwise the variables will only be visible inside
the script itself, but not outside.
@BNAVIGATE_UserManualArangosh

View File

@ -337,3 +337,5 @@ Command-Line Options for Random Numbers {#CommandLineRandom}
@anchor CommandLineRandomGenerator
@copydetails triagens::rest::ApplicationServer::_randomGenerator
@BNAVIGATE_CommandLine

View File

@ -82,3 +82,4 @@ To get an overview of which functions are currently registered, the
@copydetails JSF_aqlfunctions_toArray
@BNAVIGATE_ExtendingAql

View File

@ -582,3 +582,5 @@ Use `--help` to get a list of command-line options:
--server.password <string> password to use when connecting (leave empty for prompt)
--server.request-timeout <double> request timeout in seconds (default: 300)
--server.username <string> username to use when connecting (default: "root")
@BNAVIGATE_FirstStepsArangoDB

View File

@ -1008,3 +1008,5 @@ Here are the individual steps to carry out:
More information on how to deploy applications from different sources can be
found in the @ref UserManualFoxxManager "Foxx Manager manual".
@BNAVIGATE_UserManualFoxx

View File

@ -378,3 +378,5 @@ To most relevant `arangosh` options to pass to the `foxx-manager` will be:
These options allow you to use the foxx-manager with a different database or with another
than the default user.
@BNAVIGATE_UserManualFoxxManager

View File

@ -4,3 +4,4 @@ Graphs {#Graphs}
@NAVIGATE_Graphs
@EMBEDTOC{JSModuleGraphTOC}
@BNAVIGATE_Graphs

View File

@ -126,3 +126,5 @@ Database Methods {#HandlingCollectionsDatabaseMethods}
@CLEARPAGE
@anchor HandlingCollectionsTruncateDb
@copydetails JSF_ArangoDatabase_prototype__truncate
@BNAVIGATE_HandlingCollections

View File

@ -98,3 +98,4 @@ applications until they are explicitly installed for the particular database.
@copydoc GlossaryDatabaseOrganisation
@BNAVIGATE_HandlingDatabases

View File

@ -131,3 +131,5 @@ Database Methods {#HandlingDocumentsDatabaseMethods}
@CLEARPAGE
@anchor HandlingDocumentsDbRemove
@copydetails JS_RemoveVocbase
@BNAVIGATE_HandlingDocuments

View File

@ -33,3 +33,5 @@ Working with Edges{#HandlingEdgesShell}
@CLEARPAGE
@anchor HandlingEdgesOutEdges
@copydetails JS_OutEdgesQuery
@BNAVIGATE_HandlingEdges

View File

@ -46,3 +46,4 @@ Configuring and Removing Endpoints {#HandlingEndpointsShell}
@anchor HandlingEndpointsRemove
@copydetails JSF_ArangoDatabase_prototype__removeEndpoint
@BNAVIGATE_HandlingEndpoints

View File

@ -241,3 +241,5 @@ will be undefined which of the matching documents will get removed/modified.
@anchor SimpleQueryUpdateByExample
@copydetails JSF_ArangoCollection_prototype_updateByExample
@BNAVIGATE_SimpleQueries

View File

@ -577,3 +577,5 @@ It is legal to not declare read-only collections, but this should be avoided if
possible to reduce the probability of deadlocks and non-repeatable reads.
Please refer to @ref TransactionsLocking for more details.
@BNAVIGATE_Transactions

View File

@ -774,3 +774,4 @@ To set up the collections and populate them with initial data, the following scr
db.e.save("v/capital-yaounde", "v/country-cameroon", { type: "is-in" });
db.e.save("v/capital-zagreb", "v/country-croatia", { type: "is-in" });
@BNAVIGATE_Traversals

View File

@ -44,3 +44,5 @@ ArangoDB's User Manual (@VERSION) {#UserManual}
@CHAPTER_REF{CommandLine}: All the command-line options
@CHAPTER_REF{Glossary}: The obvious definitions
@BNAVIGATE_UserManual

View File

@ -619,3 +619,5 @@ be turned off.
Transactions are logged to the event log on the master as an uninterrupted sequence.
While a transaction is written to the event log, the event log is blocked for other
writes. Transactions should thus be as small as possible.
@BNAVIGATE_UserManualReplication

View File

@ -147,3 +147,4 @@ The *API* tab provides an overview of ArangoDB's built-in HTTP REST API, with
documentation and examples. It should be consulted when there is doubt about API
URLs, parameters etc.
@BNAVIGATE_UserManualWebInterface

View File

@ -72,6 +72,12 @@
top: -69px;
}
#content div.arangodb div.bottom-navigate {
position: relative;
text-align: right;
top: 10px;
}
/* ************************************************************************** */
/* table of contents */
/* ************************************************************************** */
@ -223,4 +229,4 @@ a.anchor {
padding-top: 80px;
width: 0;
font-size: 0;
}
}

View File

@ -1,4 +1,4 @@
.TH arangob 1 "So 30. Sep 01:36:14 CEST 2012" "" "ArangoDB"
.TH arangob 1 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
arangob - the ArangoDB benchmark and test tool
.SH SYNOPSIS
@ -32,35 +32,41 @@ complexity value for test case (meaning depends on test case)
.IP "--server.endpoint <string>"
server endpoint to connect to, consisting of protocol, ip address and port
.IP "--server.database <string>"
database name to use when connection (default: "_system")
database name to use when connection (default: "_system")
.IP "--server.username <string>"
username to use when connecting (default "root")
.IP "--server.password <string>"
password to use when connecting. Leave empty for a password prompt
password to use when connecting. Don't specify this option to get a password prompt
.IP "--server.disable-authentication <boolean>"
disable the password prompt and authentication when connecting to the server
.SH EXAMPLES
.EX
shell> arangob
starts arangob with the default user and server endpoint
.EE
.EX
shell> arangob --server.username fuchsia
starts arangob with a specific user. Password prompt will follow
.EE
.EX
shell> arangob --server.username fuchsia --server.password "abcd@34"
starts arangob with a specific user and password given on command line
shell> arangob --test-case version --requests 1000 --concurrency 1
runs the 'version' test case with 1000 requests, without concurrency
.EE
.EX
shell> arangob --server.endpoint tcp://192.168.173.13:8529
starts arangob connecting to a specific server
.EE
.EX
shell> arangob --server.endpoint ssl://192.168.173.13:8530
starts arangob connecting to a specific server using an SSL connection
shell> arangob --test-case document --requests 1000 --concurrency 2
runs the 'document' test case with 2000 requests, with concurrency 2
.EE
.EX
shell> arangob --test-case document --requests 1000 --concurrency 2 --async true
runs the 'document' test case with 2000 requests, with concurrency 2, with async requests
.EE
.EX
shell> arangob --test-case document --requests 1000 --concurrency 2 --batch-size 10
runs the 'document' test case with 2000 requests, with concurrency 2, using batch requests
.EE

View File

@ -1,4 +1,4 @@
.TH arangodump 1 "Fr 6. Sep 02:19:07 CEST 2013" "" "ArangoDB"
.TH arangodump 1 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
arangodump - a tool to create logical dumps of an ArangoDB database
.SH SYNOPSIS
@ -51,7 +51,9 @@ database name to use when connection (default: "_system")
.IP "--server.username <string>"
username to use when connecting (default "root")
.IP "--server.password <string>"
password to use when connecting. Leave empty for a password prompt
password to use when connecting. Don't specify this option to get a password prompt
.IP "--server.disable-authentication <boolean>"
disable the password prompt and authentication when connecting to the server
.SH EXAMPLES
.SH AUTHOR

View File

@ -1,4 +1,4 @@
.TH arangoimp 1 "So 30. Sep 01:36:14 CEST 2012" "" "ArangoDB"
.TH arangoimp 1 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
arangoimp - a bulk importer for the ArangoDB database
.SH SYNOPSIS
@ -32,12 +32,29 @@ set to "json", "tsv" or "csv", depending on the input file format
.IP "--server.endpoint <string>"
server endpoint to connect to, consisting of protocol, ip address and port
.IP "--server.database <string>"
database name to use when connection (default: "_system")
database name to use when connection (default: "_system")
.IP "--server.username <string>"
username to use when connecting (default "root")
.IP "--server.password <string>"
password to use when connecting. Leave empty for a password prompt
password to use when connecting. Don't specify this option to get a password prompt
.IP "--server.disable-authentication <boolean>"
disable the password prompt and authentication when connecting to the server
.SH EXAMPLES
.EX
shell> arangoimp --file heroes.json --type json --collection superheroes --create-collection true
imports JSON data from file heroes.json into collection superhoeres. creates the collection if it does not exist
.EE
.EX
shell> arangoimp --file export.csv --type csv --collection mydata
imports CSV data from export.csv into existing collection mydata
.EE
.EX
shell> arangoimp --file values.json --collection mydata --server.endpoint tcp://127.0.0.1:8529 --server.database mydb
imports JSON data from file values.json into collection mydata, using a different server endpoint and database
.EE
.SH AUTHOR
Copyright triAGENS GmbH, Cologne, Germany

View File

@ -1,4 +1,4 @@
.TH arangorestore 1 "Fr 6. Sep 02:19:07 CEST 2013" "" "ArangoDB"
.TH arangorestore 1 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
arangorestore - a data restore tool for the ArangoDB database
.SH SYNOPSIS
@ -42,7 +42,9 @@ database name to use when connection (default: "_system")
.IP "--server.username <string>"
username to use when connecting (default "root")
.IP "--server.password <string>"
password to use when connecting. Leave empty for a password prompt
password to use when connecting. Don't specify this option to get a password prompt
.IP "--server.disable-authentication <boolean>"
disable the password prompt and authentication when connecting to the server
.SH EXAMPLES
.SH AUTHOR

View File

@ -1,4 +1,4 @@
.TH arangosh 1 "So 30. Sep 01:36:14 CEST 2012" "" "ArangoDB"
.TH arangosh 1 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
arangosh - the ArangoDB shell
.SH SYNOPSIS
@ -13,6 +13,8 @@ online manual, available at http://www.arangodb.org/
The most important startup options are:
.IP "--audit-log <string>"
log input and output to audit log file <string>
.IP "--configuration <string>"
read configuration from file <string>
.IP "--log.level <string>"
@ -20,32 +22,38 @@ set the log level (possible values: "fatal", "error", "warning", "info", "debug"
.IP "--server.endpoint <string>"
server endpoint to connect to, consisting of protocol, ip address and port
.IP "--server.database <string>"
database name to use when connection (default: "_system")
database name to use when connection (default: "_system")
.IP "--server.username <string>"
username to use when connecting (default "root")
.IP "--server.password <string>"
password to use when connecting. Leave empty for a password prompt
password to use when connecting. Don't specify this option to get a password prompt
.IP "--server.disable-authentication <boolean>"
disable the password prompt and authentication when connecting to the server
.SH EXAMPLES
.EX
shell> arangosh
starts arangosh with the default user and server endpoint
.EE
.EX
shell> arangosh --server.username fuchsia
starts arangosh with a specific user. Password prompt will follow
starts arangosh with a specific user. Password prompt will follow if --server.disable-authentication is true.
.EE
.EX
shell> arangosh --server.username fuchsia --server.password "abcd@34"
starts arangosh with a specific user and password given on command line
.EE
.EX
shell> arangosh --server.endpoint tcp://192.168.173.13:8529
starts arangosh connecting to a specific server
.EE
.EX
shell> arangosh --server.endpoint ssl://192.168.173.13:8530
starts arangosh connecting to a specific server using an SSL connection

View File

@ -1,4 +1,4 @@
.TH arango-dfdb 8 "So 30. Sep 01:36:14 CEST 2012" "" "ArangoDB"
.TH arango-dfdb 8 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
arango-dfdb - a datafile debugger for ArangoDB
.SH SYNOPSIS

View File

@ -1,4 +1,4 @@
.TH arangod 8 "So 30. Sep 01:36:14 CEST 2012" "" "ArangoDB"
.TH arangod 8 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
arangod - the ArangoDB database server
.SH SYNOPSIS
@ -30,6 +30,8 @@ log to file <string>
set the log level (possible values: "fatal", "error", "warning", "info", "debug", "trace")
.IP "--server.endpoint <string>"
listen endpoint for client requests, consisting of protocol, ip address and port
.IP "--server.disable-authentication <boolean>"
disable authentication for all clients
.IP "--database.directory <string>"
path to the database directory
.SH EXAMPLES

View File

@ -1,4 +1,4 @@
.TH foxx-manager 8 "Fr 26. Jul 22:41:49 CEST 2013" "" "ArangoDB"
.TH foxx-manager 8 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
foxx-manager - a Foxx application manager for ArangoDB
.SH SYNOPSIS
@ -9,8 +9,14 @@ ArangoDB database server. Foxx applications can be installed and
uninstalled.
More specific instructions are displayed when the program is invoked.
.SH OPTIONS
.IP "--server.database <string>"
database name to use when connection (default: "_system")
.IP "--server.username <string>"
username to use when connecting (default "root")
.IP "--server.password <string>"
password to use when connecting. Don't specify this option to get a password prompt
.IP "--server.disable-authentication <boolean>"
disable the password prompt when connecting to the server
disable the password prompt and authentication when connecting to the server
.SH EXAMPLES
.EX
shell> foxx-manager search "foobar"

View File

@ -1,4 +1,4 @@
.TH rcarangod 8 "So 30. Sep 01:36:14 CEST 2012" "" "ArangoDB"
.TH rcarangod 8 "Do 23. Jan 09:57:20 CET 2014" "" "ArangoDB"
.SH NAME
rcarangod - control script for the ArangoDB database server
.SH SYNOPSIS

View File

@ -42,12 +42,12 @@ disable the password prompt and authentication when connecting to the server END
EXAMPLES
EXAMPLE COMMAND
starts COMMAND with the default user and server endpoint ENDEXAMPLE
EXAMPLE COMMAND --server.username fuchsia
starts COMMAND with a specific user. Password prompt will follow ENDEXAMPLE
EXAMPLE COMMAND --server.username fuchsia --server.password "abcd@34"
starts COMMAND with a specific user and password given on command line ENDEXAMPLE
EXAMPLE COMMAND --server.endpoint tcp://192.168.173.13:8529
starts COMMAND connecting to a specific server ENDEXAMPLE
EXAMPLE COMMAND --server.endpoint ssl://192.168.173.13:8530
starts COMMAND connecting to a specific server using an SSL connection ENDEXAMPLE
EXAMPLE COMMAND --test-case version --requests 1000 --concurrency 1
runs the 'version' test case with 1000 requests, without concurrency ENDEXAMPLE
EXAMPLE COMMAND --test-case document --requests 1000 --concurrency 2
runs the 'document' test case with 2000 requests, with concurrency 2 ENDEXAMPLE
EXAMPLE COMMAND --test-case document --requests 1000 --concurrency 2 --async true
runs the 'document' test case with 2000 requests, with concurrency 2, with async requests ENDEXAMPLE
EXAMPLE COMMAND --test-case document --requests 1000 --concurrency 2 --batch-size 10
runs the 'document' test case with 2000 requests, with concurrency 2, using batch requests ENDEXAMPLE
AUTHOR

View File

@ -40,4 +40,10 @@ password to use when connecting. Don't specify this option to get a password pro
OPTION "--server.disable-authentication <boolean>"
disable the password prompt and authentication when connecting to the server ENDOPTION
EXAMPLES
EXAMPLE COMMAND --file heroes.json --type json --collection superheroes --create-collection true
imports JSON data from file heroes.json into collection superhoeres. creates the collection if it does not exist ENDEXAMPLE
EXAMPLE COMMAND --file export.csv --type csv --collection mydata
imports CSV data from export.csv into existing collection mydata ENDEXAMPLE
EXAMPLE COMMAND --file values.json --collection mydata --server.endpoint tcp://127.0.0.1:8529 --server.database mydb
imports JSON data from file values.json into collection mydata, using a different server endpoint and database ENDEXAMPLE
AUTHOR

View File

@ -248,6 +248,60 @@ pack-winXX-cmake:
cd Build$(BITS) && cpack -G NSIS
################################################################################
### @brief cmake build
################################################################################
.PHONY: cmake-setpup
cmake-setup:
test -d Build || mkdir Build
cd Build && cmake \
-D "CMAKE_INSTALL_PREFIX=${prefix}" \
-D "ETCDIR=${sysconfdir}" \
-D "VARDIR=${localstatedir}" \
\
-D ARANGODB_VERSION=${VERSION} \
-D USE_MRUBY=${tr_MRUBY} \
\
-D ICU_INCLUDE= \
-D ICU_LIB_PATH= \
-D ICU_LIBS= \
-D ICU_VERSION= \
\
-D LIBEV_INCLUDE= \
-D LIBEV_LIB_PATH= \
-D LIBEV_LIBS= \
-D LIBEV_VERSION= \
\
-D MRUBY_INCLUDE= \
-D MRUBY_LIB_PATH= \
-D MRUBY_LIBS= \
-D MRUBY_VERSION= \
\
-D OPENSSL_INCLUDE= \
-D OPENSSL_LIB_PATH= \
-D OPENSSL_LIBS= \
-D OPENSSL_VERSION= \
\
-D READLINE_INCLUDE= \
-D READLINE_LIB_PATH= \
-D READLINE_LIBS= \
-D READLINE_VERSION= \
\
-D V8_INCLUDE= \
-D V8_LIB_PATH= \
-D V8_LIBS= \
-D V8_VERSION= \
\
-D ZLIB_INCLUDE= \
-D ZLIB_LIB_PATH= \
-D ZLIB_LIBS= \
-D ZLIB_VERSION= \
\
..
## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE
## -----------------------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show More