1
0
Fork 0
Commit Graph

496 Commits

Author SHA1 Message Date
Jan Steemann eaa49b11c6 rename file 2015-04-17 17:48:34 +02:00
Jan Steemann 6e23c5330f added restrictions for export API 2015-04-17 00:24:43 +02:00
Jan Steemann 92fcdd3e56 issue #1298: Bulk import if data already exists
This change extends the HTTP REST API for bulk imports as follows:

When documents are imported and the `_key` attribute is specified for them, the import can be
used for inserting and updating/replacing documents. Previously, the import could be used for
inserting new documents only, and re-inserting a document with an existing would have failed
with a *unique key constraint violated* error.

The above behavior is still the default. However, the API now allows controlling the behavior
in case of a unique key constraint error via the optional URL parameter `onDuplicate`.

This parameter can have one of the following values:

- `error`: when a unique key constraint error occurs, do not import or update the document but
  report an error. This is the default.

- `update`: when a unique key constraint error occurs, try to (partially) update the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. Only the attributes present in the import data will be
  updated and other attributes already present will be preserved. The number of updated documents
  will be reported in the `updated` attribute of the HTTP API result.

- `replace`: when a unique key constraint error occurs, try to fully replace the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. The number of replaced documents will be reported in the
  `updated` attribute of the HTTP API result.

- `ignore`: when a unique key constraint error occurs, ignore this error. There will be no
  insert, update or replace for the particular document. Ignored documents will be reported
  separately in the `ignored` attribute of the HTTP API result.

The result of the HTTP import API will now contain the attributes `ignored` and `updated`, which
contain the number of ignored and updated documents respectively. These attributes will contain a
value of zero unless the `onDuplicate` URL parameter is set to either `update` or `replace`
(in this case the `updated` attribute may contain non-zero values) or `ignore` (in this case the
`ignored` attribute may contain a non-zero value).
2015-04-14 11:44:33 +02:00
Jan Steemann 0f1244f72d better export API cleanup 2015-03-31 18:44:51 +02:00
Jan Steemann 80a99ab23e refactored cursor API 2015-03-30 14:58:51 +02:00
Jan Steemann be713c0a0e bumped version number 2015-03-26 11:38:10 +01:00
Jan Steemann 6e3cf20876 higher timeout 2015-03-19 10:36:07 +01:00
Michael Hackstein 711712fef3 Another improvement of query test 2015-03-13 13:58:06 +01:00
Michael Hackstein 50257a2d5d Made the api-query-anaylsis test more relyable 2015-03-13 13:43:59 +01:00
Michael Hackstein 6e893826dc Further tests for api query analysis 2015-03-12 16:05:46 +01:00
Michael Hackstein 7eb685a5aa Added a test for the new query analysis api. 2015-03-12 16:05:40 +01:00
Michael Hackstein f70b8c66af Fixed the Web interface reachability test 2015-03-10 10:32:34 +01:00
Jan Steemann 6d016abc3b issue #1258: added tests for HTTP pipelining 2015-03-03 15:00:57 +01:00
Jan Steemann ded5b67264 added test 2015-02-24 11:40:15 +01:00
Frank Celler 6190bb7994 Merge branch 'devel' of github.com:arangodb/arangodb into 2.5 2015-02-18 21:50:33 +01:00
Jan Steemann f29591135a adjusted geo index API 2015-02-18 14:59:46 +01:00
Frank Celler 15fb7131f1 Merge remote-tracking branch 'origin/devel' into 2.5
Conflicts:
	Documentation/Examples/CollectionUnload.generated
	Documentation/Examples/HttpGharialAddEdge.generated
	Documentation/Examples/HttpGharialAddEdgeCol.generated
	Documentation/Examples/HttpGharialAddVertex.generated
	Documentation/Examples/HttpGharialAddVertexCol.generated
	Documentation/Examples/HttpGharialCreate.generated
	Documentation/Examples/HttpGharialEdgeDefinitionRemove.generated
	Documentation/Examples/HttpGharialGetEdge.generated
	Documentation/Examples/HttpGharialGetGraph.generated
	Documentation/Examples/HttpGharialGetVertex.generated
	Documentation/Examples/HttpGharialList.generated
	Documentation/Examples/HttpGharialModifyVertex.generated
	Documentation/Examples/HttpGharialPatchEdge.generated
	Documentation/Examples/HttpGharialPutEdge.generated
	Documentation/Examples/HttpGharialRemoveVertexCollection.generated
	Documentation/Examples/HttpGharialReplaceEdgeCol.generated
	Documentation/Examples/HttpGharialReplaceVertex.generated
	Documentation/Examples/RestAdminStatistics1.generated
	Documentation/Examples/RestBatchMultipartHeader.generated
	Documentation/Examples/RestCollectionCreateCollection.generated
	Documentation/Examples/RestCollectionCreateKeyopt.generated
	Documentation/Examples/RestCollectionDeleteCollectionIdentifier.generated
	Documentation/Examples/RestCollectionDeleteCollectionName.generated
	Documentation/Examples/RestCollectionGetAllCollections.generated
	Documentation/Examples/RestCollectionGetCollectionChecksum.generated
	Documentation/Examples/RestCollectionGetCollectionChecksumNoRev.generated
	Documentation/Examples/RestCollectionGetCollectionCount.generated
	Documentation/Examples/RestCollectionGetCollectionFigures.generated
	Documentation/Examples/RestCollectionGetCollectionIdentifier.generated
	Documentation/Examples/RestCollectionGetCollectionName.generated
	Documentation/Examples/RestCollectionGetCollectionRevision.generated
	Documentation/Examples/RestCollectionIdentifierLoad.generated
	Documentation/Examples/RestCollectionIdentifierPropertiesSync.generated
	Documentation/Examples/RestCollectionIdentifierRename.generated
	Documentation/Examples/RestCollectionIdentifierTruncate.generated
	Documentation/Examples/RestCollectionIdentifierUnload.generated
	Documentation/Examples/RestCursorCreateCursorForLimitReturn.generated
	Documentation/Examples/RestCursorCreateCursorForLimitReturnSingle.generated
	Documentation/Examples/RestCursorDelete.generated
	Documentation/Examples/RestCursorForLimitReturnCont.generated
	Documentation/Examples/RestDatabaseGetInfo.generated
	Documentation/Examples/RestDocumentHandlerDeleteDocument.generated
	Documentation/Examples/RestDocumentHandlerDeleteDocumentIfMatchOther.generated
	Documentation/Examples/RestDocumentHandlerDeleteDocumentUnknownHandle.generated
	Documentation/Examples/RestDocumentHandlerPatchDocument.generated
	Documentation/Examples/RestDocumentHandlerPatchDocumentMerge.generated
	Documentation/Examples/RestDocumentHandlerPostAccept1.generated
	Documentation/Examples/RestDocumentHandlerPostCreate1.generated
	Documentation/Examples/RestDocumentHandlerPostCreate2.generated
	Documentation/Examples/RestDocumentHandlerPostWait1.generated
	Documentation/Examples/RestDocumentHandlerReadDocument.generated
	Documentation/Examples/RestDocumentHandlerReadDocumentAllKey.generated
	Documentation/Examples/RestDocumentHandlerReadDocumentAllPath.generated
	Documentation/Examples/RestDocumentHandlerReadDocumentHead.generated
	Documentation/Examples/RestDocumentHandlerReadDocumentIfNoneMatch.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocument.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOther.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOtherLastWriteWins.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocumentRevOther.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocumentUnknownHandle.generated
	Documentation/Examples/RestEdgeCreateEdge.generated
	Documentation/Examples/RestEdgesReadEdgesAny.generated
	Documentation/Examples/RestEdgesReadEdgesIn.generated
	Documentation/Examples/RestEdgesReadEdgesOut.generated
	Documentation/Examples/RestEndpointGet.generated
	Documentation/Examples/RestExplainAllPlans.generated
	Documentation/Examples/RestExplainOptimizerRules.generated
	Documentation/Examples/RestExplainOptions.generated
	Documentation/Examples/RestGraphChangeEdge.generated
	Documentation/Examples/RestGraphChangeVertex.generated
	Documentation/Examples/RestGraphChangepEdge.generated
	Documentation/Examples/RestGraphChangepVertex.generated
	Documentation/Examples/RestGraphCreateEdge.generated
	Documentation/Examples/RestGraphCreateVertex.generated
	Documentation/Examples/RestGraphGetEdge.generated
	Documentation/Examples/RestGraphGetEdges.generated
	Documentation/Examples/RestGraphGetGraph.generated
	Documentation/Examples/RestGraphGetGraphs.generated
	Documentation/Examples/RestGraphGetVertex.generated
	Documentation/Examples/RestGraphGetVertexEdges.generated
	Documentation/Examples/RestGraphGetVertexVertices.generated
	Documentation/Examples/RestGraphGetVertexVertices2.generated
	Documentation/Examples/RestGraphGetVertices.generated
	Documentation/Examples/RestGraphPostGraph.generated
	Documentation/Examples/RestIndexAllIndexes.generated
	Documentation/Examples/RestIndexCreateGeoLatitudeLongitude.generated
	Documentation/Examples/RestIndexCreateGeoLocation.generated
	Documentation/Examples/RestIndexCreateNewCapConstraint.generated
	Documentation/Examples/RestIndexCreateNewFulltext.generated
	Documentation/Examples/RestIndexCreateNewHashIndex.generated
	Documentation/Examples/RestIndexCreateNewSkiplist.generated
	Documentation/Examples/RestIndexCreateNewUniqueConstraint.generated
	Documentation/Examples/RestIndexCreateSparseHashIndex.generated
	Documentation/Examples/RestIndexCreateSparseSkiplist.generated
	Documentation/Examples/RestIndexDeleteUniqueSkiplist.generated
	Documentation/Examples/RestReplicationApplierStart.generated
	Documentation/Examples/RestReplicationApplierStateNotRunning.generated
	Documentation/Examples/RestReplicationApplierStateRunning.generated
	Documentation/Examples/RestReplicationApplierStop.generated
	Documentation/Examples/RestReplicationDump.generated
	Documentation/Examples/RestReplicationInventory.generated
	Documentation/Examples/RestReplicationInventoryIndexes.generated
	Documentation/Examples/RestReplicationLoggerFollowBufferLimit.generated
	Documentation/Examples/RestReplicationLoggerFollowEmpty.generated
	Documentation/Examples/RestReplicationLoggerFollowSome.generated
	Documentation/Examples/RestReplicationLoggerStateActive.generated
	Documentation/Examples/RestReplicationServerId.generated
	Documentation/Examples/RestSimpleAllBatch.generated
	Documentation/Examples/RestSimpleAllSkipLimit.generated
	Documentation/Examples/RestSimpleAny.generated
	Documentation/Examples/RestSimpleByExample.generated
	Documentation/Examples/RestSimpleByExample2.generated
	Documentation/Examples/RestSimpleByExample3.generated
	Documentation/Examples/RestSimpleFirst.generated
	Documentation/Examples/RestSimpleFirstExample.generated
	Documentation/Examples/RestSimpleFirstSingle.generated
	Documentation/Examples/RestSimpleFulltext.generated
	Documentation/Examples/RestSimpleLast.generated
	Documentation/Examples/RestSimpleLastSingle.generated
	Documentation/Examples/RestSimpleNear.generated
	Documentation/Examples/RestSimpleNearDistance.generated
	Documentation/Examples/RestSimpleRange.generated
	Documentation/Examples/RestSimpleWithin.generated
	Documentation/Examples/RestSimpleWithinDistance.generated
	Documentation/Examples/RestSimpleWithinRectangle.generated
	Documentation/Examples/RestTasksCreate.generated
	Documentation/Examples/RestTasksListAll.generated
	Documentation/Examples/RestTasksListOne.generated
	Documentation/Examples/RestTasksPutWithId.generated
	Documentation/Examples/RestTraversalAny.generated
	Documentation/Examples/RestTraversalBackwardItemOrder.generated
	Documentation/Examples/RestTraversalDepthFirst.generated
	Documentation/Examples/RestTraversalEdgeUniqueness.generated
	Documentation/Examples/RestTraversalFilterExclude.generated
	Documentation/Examples/RestTraversalFilterPrune.generated
	Documentation/Examples/RestTraversalInbound.generated
	Documentation/Examples/RestTraversalMaxDepth.generated
	Documentation/Examples/RestTraversalMinDepth.generated
	Documentation/Examples/RestTraversalOutbound.generated
	Documentation/Examples/RestTraversalPostorder.generated
	Documentation/Examples/RestTraversalVisitorCountAndList.generated
	Documentation/Examples/RestTraversalVisitorExpander.generated
	Documentation/Examples/RestVersion.generated
	Documentation/Examples/RestVersionDetails.generated
	Documentation/Examples/SaveEdgeCol.generated
	Documentation/Examples/collectionAll.generated
	Documentation/Examples/collectionAllNext.generated
	Documentation/Examples/collectionByExample.generated
	Documentation/Examples/collectionByExampleNext.generated
	Documentation/Examples/collectionClosedRange.generated
	Documentation/Examples/collectionDatabaseCollectionName.generated
	Documentation/Examples/collectionDatabaseCreate.generated
	Documentation/Examples/collectionDatabaseCreateKey.generated
	Documentation/Examples/collectionDatabaseCreateProperties.generated
	Documentation/Examples/collectionDatabaseCreateSpecialKey.generated
	Documentation/Examples/collectionDatabaseDrop.generated
	Documentation/Examples/collectionDatabaseDropName.generated
	Documentation/Examples/collectionDatabaseName.generated
	Documentation/Examples/collectionDatabaseTruncate.generated
	Documentation/Examples/collectionDatabaseTruncateName.generated
	Documentation/Examples/collectionDrop.generated
	Documentation/Examples/collectionFigures.generated
	Documentation/Examples/collectionFirstExample.generated
	Documentation/Examples/collectionFulltext.generated
	Documentation/Examples/collectionLoad.generated
	Documentation/Examples/collectionNear.generated
	Documentation/Examples/collectionNearDistance.generated
	Documentation/Examples/collectionRange.generated
	Documentation/Examples/collectionRename.generated
	Documentation/Examples/collectionTruncate.generated
	Documentation/Examples/collectionWithin.generated
	Documentation/Examples/collectionsDatabaseName.generated
	Documentation/Examples/cursorHasNext.generated
	Documentation/Examples/cursorNext.generated
	Documentation/Examples/documentDocumentRemove.generated
	Documentation/Examples/documentDocumentRemoveConflict.generated
	Documentation/Examples/documentDocumentUpdate.generated
	Documentation/Examples/documentsCollectionFirst.generated
	Documentation/Examples/documentsCollectionFirstNull.generated
	Documentation/Examples/documentsCollectionInsert.generated
	Documentation/Examples/documentsCollectionLast.generated
	Documentation/Examples/documentsCollectionLastNull.generated
	Documentation/Examples/documentsCollectionName.generated
	Documentation/Examples/documentsCollectionRemove.generated
	Documentation/Examples/documentsCollectionRemoveConflict.generated
	Documentation/Examples/documentsCollectionRemoveSignature.generated
	Documentation/Examples/documentsCollectionReplace.generated
	Documentation/Examples/documentsCollectionReplaceHandle.generated
	Documentation/Examples/documentsCollectionUpdate.generated
	Documentation/Examples/documentsCollectionUpdateHandle.generated
	Documentation/Examples/documentsCollectionUpdateHandleArray.generated
	Documentation/Examples/documentsCollectionUpdateHandleKeepNull.generated
	Documentation/Examples/documentsDocumentName.generated
	Documentation/Examples/documentsDocumentReplace.generated
	Documentation/Examples/executeQuery.generated
	Documentation/Examples/executeQueryBatchSize.generated
	Documentation/Examples/generalGraphAbsBetweenness1.generated
	Documentation/Examples/generalGraphAbsBetweenness2.generated
	Documentation/Examples/generalGraphAbsBetweenness3.generated
	Documentation/Examples/generalGraphAbsCloseness1.generated
	Documentation/Examples/generalGraphAbsCloseness2.generated
	Documentation/Examples/generalGraphAbsEccentricity2.generated
	Documentation/Examples/generalGraphBetweenness2.generated
	Documentation/Examples/generalGraphBetweenness3.generated
	Documentation/Examples/generalGraphCloseness1.generated
	Documentation/Examples/generalGraphCloseness3.generated
	Documentation/Examples/generalGraphCommonNeighbors1.generated
	Documentation/Examples/generalGraphCommonNeighbors2.generated
	Documentation/Examples/generalGraphDistanceTo1.generated
	Documentation/Examples/generalGraphDropGraphKeep.generated
	Documentation/Examples/generalGraphEccentricity1.generated
	Documentation/Examples/generalGraphEccentricity2.generated
	Documentation/Examples/generalGraphEdgeCollectionRemove.generated
	Documentation/Examples/generalGraphEdgeCollectionReplace.generated
	Documentation/Examples/generalGraphEdgeCollectionSave1.generated
	Documentation/Examples/generalGraphEdgeCollectionUpdate.generated
	Documentation/Examples/generalGraphEdges1.generated
	Documentation/Examples/generalGraphEdges2.generated
	Documentation/Examples/generalGraphEdgesFiltered.generated
	Documentation/Examples/generalGraphEdgesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLEdgesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLEdgesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLEdgesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLFromVerticesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLInEdgesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLInEdgesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLInEdgesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLNeighborsFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLNeighborsUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLNext.generated
	Documentation/Examples/generalGraphFluentAQLNextRecreate.generated
	Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLOutEdgesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLPathNeighbors.generated
	Documentation/Examples/generalGraphFluentAQLPathSimple.generated
	Documentation/Examples/generalGraphFluentAQLRestricted.generated
	Documentation/Examples/generalGraphFluentAQLToArray.generated
	Documentation/Examples/generalGraphFluentAQLToVerticesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLToVerticesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLToVerticesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLUnfilteredEdges.generated
	Documentation/Examples/generalGraphFluentAQLUnfilteredVertices.generated
	Documentation/Examples/generalGraphFluentAQLUnrestricted.generated
	Documentation/Examples/generalGraphFluentAQLVerticesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLVerticesUnfiltered.generated
	Documentation/Examples/generalGraphGetFromVertex.generated
	Documentation/Examples/generalGraphGetToVertex.generated
	Documentation/Examples/generalGraphModuleAbsBetweenness1.generated
	Documentation/Examples/generalGraphModuleAbsBetweenness2.generated
	Documentation/Examples/generalGraphModuleAbsBetweenness3.generated
	Documentation/Examples/generalGraphModuleAbsCloseness1.generated
	Documentation/Examples/generalGraphModuleAbsCloseness2.generated
	Documentation/Examples/generalGraphModuleAbsCloseness3.generated
	Documentation/Examples/generalGraphModuleAbsEccentricity2.generated
	Documentation/Examples/generalGraphModuleBetweenness1.generated
	Documentation/Examples/generalGraphModuleBetweenness2.generated
	Documentation/Examples/generalGraphModuleCloseness1.generated
	Documentation/Examples/generalGraphModuleCommonNeighbors1.generated
	Documentation/Examples/generalGraphModuleCommonNeighbors2.generated
	Documentation/Examples/generalGraphModuleConnectingEdges1.generated
	Documentation/Examples/generalGraphModuleDistanceTo1.generated
	Documentation/Examples/generalGraphModuleDistanceTo2.generated
	Documentation/Examples/generalGraphModuleEccentricity2.generated
	Documentation/Examples/generalGraphModuleEccentricity3.generated
	Documentation/Examples/generalGraphModuleNeighbors1.generated
	Documentation/Examples/generalGraphModuleNeighbors2.generated
	Documentation/Examples/generalGraphModulePaths.generated
	Documentation/Examples/generalGraphModulePaths2.generated
	Documentation/Examples/generalGraphModuleShortestPaths1.generated
	Documentation/Examples/generalGraphModuleShortestPaths2.generated
	Documentation/Examples/generalGraphNeighbors1.generated
	Documentation/Examples/generalGraphNeighbors2.generated
	Documentation/Examples/generalGraphPaths.generated
	Documentation/Examples/generalGraphPaths2.generated
	Documentation/Examples/generalGraphShortestPaths1.generated
	Documentation/Examples/generalGraphTraversal1.generated
	Documentation/Examples/generalGraphTraversal2.generated
	Documentation/Examples/generalGraphTraversalTree1.generated
	Documentation/Examples/generalGraphTraversalTree2.generated
	Documentation/Examples/generalGraphVertexCollectionRemove.generated
	Documentation/Examples/generalGraphVertexCollectionReplace.generated
	Documentation/Examples/generalGraphVertexCollectionSave.generated
	Documentation/Examples/generalGraphVertexCollectionUpdate.generated
	Documentation/Examples/generalGraphVertices1.generated
	Documentation/Examples/generalGraphVertices2.generated
	Documentation/Examples/generalGraphVerticesFiltered.generated
	Documentation/Examples/generalGraphVerticesUnfiltered.generated
	Documentation/Examples/general_graph__deleteEdgeDefinition.generated
	Documentation/Examples/queryLimit.generated
	Documentation/Examples/querySkip.generated
	build.h
	configure
	configure.ac
	js/common/tests/shell-database.js
2015-02-17 15:31:33 +01:00
Michael Hackstein c6e9d98251 Added a force uninstall for foxx apps, to make sure they are removed from disk even if sth is unclear with mounting. Also created an error for foxx not found on file system has been added 2015-02-16 17:14:36 +01:00
Michael Hackstein 0c78629199 Merge branch 'foxx-pathes' of github.com:arangodb/arangodb into devel 2015-02-16 14:17:52 +01:00
Frank Celler 9053c16f37 fixed version 2015-02-16 11:46:29 +01:00
Michael Hackstein 11877983c8 Added an http spec to install a foxx app 2015-02-13 22:12:31 +01:00
Jan Steemann 924adc9e46 added tests for sparse indexes 2015-02-10 21:28:12 +01:00
Jan Steemann 39603ebaf4 added selectivity estimates for some index types 2015-01-30 23:04:46 +01:00
Jan Steemann 0ed3b03cbd added test case 2015-01-29 11:48:38 +01:00
Jan Steemann 63bf4c888a flush WAL status file after collection to shorten recovery 2015-01-18 21:06:57 +01:00
Jan Steemann abfb03b3f0 avoid deprecation warning 2015-01-16 12:34:12 +01:00
Jan Steemann 34c3ac0f56 fixed incompatibilies with newer rspec/ruby versions
Conflicts:
	UnitTests/HttpInterface/api-collection-spec.rb
2015-01-16 12:34:12 +01:00
Frank Celler ca16940c77 using 2.5.0-devel 2015-01-13 18:21:37 +01:00
Jan Steemann c31280331f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-19 14:01:07 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Frank Celler e37da76255 removed debug output 2014-12-19 13:42:22 +01:00
Jan Steemann 017f52c113 fixed for rspec 3 2014-12-17 17:47:16 +01:00
Frank Celler 9e3474d335 raised version 2014-12-17 09:31:55 +01:00
Jan Steemann d9a945e33a include or exclude system collections from replication 2014-12-05 14:58:43 +01:00
Willi Goesgens fa926a48a7 Add timecritical option to the unittests 2014-10-14 11:04:45 +02:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann c0463a1797 added `type` option for `GET /_api/document?collection=...`
Conflicts:
	CHANGELOG
2014-08-30 17:26:24 +02:00
Jan Steemann 3b9636c52b issue #1004 2014-08-28 08:55:02 +02:00
Jan Steemann 4760b3c921 once again: attempt to fix non-deterministic test 2014-08-27 22:44:14 +02:00
Jan Steemann 6e872111f0 hopefully fix random travis test 2014-08-27 11:45:14 +02:00
Jan Steemann 5a9c16eaad attempt to fix test 2014-08-20 16:26:43 +02:00
Jan Steemann cd575e073f fixed tests 2014-08-15 18:19:52 +02:00
Frank Celler e0db77b070 fixed tests, log can contain more entries 2014-08-13 12:17:37 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Frank Celler 0344573b5f use all available, non-cluster tests 2014-07-25 15:36:21 +02:00
Jan Steemann fbbea02c71 disabled non-deterministic test 2014-07-23 15:49:17 +02:00
Jan Steemann 8de45f0225 increase ttl for test 2014-07-22 15:18:02 +02:00
Jan Steemann 712358d069 added optional `ttl` attribute to specify result cursor expiration for HTTP API method `POST /_api/cursor`
The `ttl` attribute can be used to prevent cursor results from timing out too early.
2014-07-21 15:48:43 +02:00
Michael Hackstein 30f2a59511 Fixed cluster test in general graph 2014-07-17 09:02:45 +02:00
Michael Hackstein 871db072e7 Added tests for gharial error return codes. Fixed a bug pn false return code on the way 2014-07-16 11:04:39 +01:00
Michael Hackstein 5ccc4cb2c0 Fixed Cluster gharial tests 2014-07-09 10:15:07 +02:00
Michael Hackstein 3f6e1c3555 Unified gharial error responses with normal API 2014-07-08 10:46:18 +02:00
Michael Hackstein 72a9b7e5aa Added waitForSync support for creation of vertices and edges in gharial 2014-07-07 15:18:35 +02:00
Michael Hackstein 202deaae85 Fixed issues in gharial module. By default the do not wait for sync http codes are returned. You can now optionally send waitForSync true to all modifying endpoints 2014-07-03 10:53:18 +02:00
Jan Steemann acf6c688b7 fixed typo 2014-07-02 17:04:57 +02:00
Michael Hackstein 7b22c0c2a5 Added a correct 404 return code to gharial when trying to remove a vertex/edge which does not exists. Also added tests for return codes 2014-07-02 15:03:06 +02:00
Michael Hackstein d211b6eacd Fixed general graph spec. Error message is more specfic then expected 2014-07-01 17:08:55 +02:00
Max Neunhoeffer c36995c8b8 Fix gharial test if not mounted under /system. 2014-06-30 11:00:31 +02:00
Michael Hackstein ac014bbfe0 Fixed a bug in gharial which was not allowed to create orphan collections during graph creation 2014-06-24 17:27:47 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
Jan Steemann 53909c0dcd adjusted tests 2014-06-23 18:45:06 +02:00
Jan Steemann e51dcdb2cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	js/common/tests/shell-general-graph.js
2014-06-20 13:39:51 +02:00
Michael Hackstein 22d9be8903 Added short hand for graph creation for http api tests 2014-06-20 13:02:40 +02:00
Michael Hackstein 92b50b4d08 Added graph and edge collection tests for traversal API to execution script 2014-06-20 13:01:43 +02:00
Michael Hackstein 43edb7772a Added tests for traversal API using graphs instead of an edge collection. 2014-06-20 13:00:00 +02:00
Jan Steemann 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Jan Steemann 6fc48d2625 fixed failing test 2014-06-18 21:12:52 +02:00
Frank Celler dd9f81ec82 fixed version check 2014-06-18 19:14:14 +02:00
Jan Steemann 1d68586500 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
2014-06-18 16:37:28 +02:00
Michael Hackstein 02f1552b35 Fixed general graph api tests 2014-06-18 10:55:16 +02:00
Jan Steemann 85b92dbf21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 18:16:48 +02:00
Jan Steemann 0c5950507c fixed test 2014-06-13 17:50:44 +02:00
Michael Hackstein fdece972d0 Added tests for vertex and edge collection lists in http interface. Added docu for _list in general-graph module 2014-06-13 16:41:48 +02:00
Michael Hackstein 7541149200 Added functions to list all graphs and all vertex/edge collections of a specific graph to http-api 2014-06-13 15:11:59 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
Jan Steemann d592591a06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 11:31:59 +02:00
Michael Hackstein e9f161c061 Added a route to add an additional edge definition to the graph 2014-06-12 15:32:50 +02:00
Michael Hackstein 2198a03b49 Implemented edge crud in http-graph-module. TODO: Modify definitions 2014-06-12 14:43:21 +02:00
Michael Hackstein 3a0fddb901 Moved the unspecific route to the end of graph-http foxx, was matched too often 2014-06-12 13:15:25 +02:00
Michael Hackstein 25e97eafee Further implemented graph-http-module. Now offers complete vertex interaction. Tests for Vertex Interaction and Edge Interaction added 2014-06-12 08:09:37 +01:00
Jan Steemann 7e6750c397 wal flush w/ collection unload 2014-06-11 11:33:02 +02:00
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
scottashton 354371a8ab healed run-tests 2014-06-04 08:33:58 +02:00
scottashton 006eb3b61b calculation of measurements for graphs added and changed calculation of shortst paths to Floyd–Warshall algorithm 2014-06-03 16:25:13 +02:00
Jan Steemann 78185a60d7 fixed return code for async job cancellation 2014-05-08 18:27:46 +02:00
Jan Steemann 42809a20de removed debug output 2014-04-23 21:45:41 +02:00
Jan Steemann b6fa2971ed debug output 2014-04-22 22:35:36 +02:00
Jan Steemann 906d648df9 fixed test on faster computers 2014-04-22 11:30:38 +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
Jan Steemann a325df8982 fixed test 2014-04-03 13:50:21 +02:00
Max Neunhoeffer 92d28201e1 Fixes for traversal tests for the cluster. 2014-04-02 13:53:53 +02:00
Max Neunhoeffer ce8580bd8a Repair traversal tests for new edge index. 2014-04-02 11:12:24 +02:00
Jan Steemann 5a3f2aaa49 improved job API
* added REST API method HTTP GET `/_api/job/job-id` to query the status of an
  async job without potentially fetching it from the list of done jobs

* fixed non-intuitive behaviour in jobs API: previously, querying the status
  of an async job via the API HTTP PUT `/_api/job/job-id` removed a currently
  executing async job from the list of queryable jobs on the server.
  Now, when querying the result of an async job that is still executing,
  the job is kept in the list of queryable jobs so its result can be fetched
  by a subsequent request.
2014-03-21 21:19:45 +01:00
Jan Steemann dd594fe75a added NO_LOG option to disable rspec logging 2014-03-14 13:25:53 +01:00
Jan Steemann 469923ca26 fixed test 2014-03-03 09:17:55 +01:00
Jan Steemann b090276273 fixed tests 2014-02-28 20:00:51 +01:00
Jan Steemann d7c29386ef fixed replication test runner 2014-02-28 20:00:29 +01:00
Max Neunhoeffer 35db5983a9 Add the cluster test case. 2014-02-28 17:26:15 +01:00
Max Neunhoeffer 803d3789f1 Disable test with a bad timeout on cluster. 2014-02-28 17:22:51 +01:00
Max Neunhoeffer 8f701ee143 Forgot a file in previous commit. 2014-02-28 16:55:15 +01:00
Max Neunhoeffer 4913c7abf6 Split ruby transaction tests for cluster/noncluster. 2014-02-28 16:54:49 +01:00
Jan Steemann 65feb43294 adjusted test expectations 2014-02-28 09:29:52 +01:00
Jan Steemann 6243ec7310 split tests 2014-02-27 15:15:08 +01:00
Jan Steemann cefef13c42 fixed a failing test 2014-02-27 11:58:16 +01:00
Jan Steemann 8c04d6b12e fixed tests 2014-02-27 11:39:36 +01:00
Frank Celler e10bab8059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:16:02 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
2014-02-27 09:13:03 +01:00
Max Neunhoeffer e68a3e9c05 Rename test. 2014-02-26 15:04:25 +01:00
Max Neunhoeffer 57bf2292be Disable import test on cluster. 2014-02-26 12:44:56 +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 af96607fc1 fixed index tests 2014-02-25 11:19:51 +01:00
Jan Steemann 870f969933 added user validation API at POST `/_api/user/<username>` 2014-02-24 11:12:37 +01:00
Frank Celler 832254b7b7 fixed graph again 2014-02-21 23:12:37 +01:00
Max Neunhoeffer 3cb1784430 Reorganise unit tests.
In JS framework we now find the available test files by directory
listing. This means one can simply drop a file in the right
directory to add a test.

We use a naming convention for filenames which is explained
in the README files in the corresponding directories.

Old unit tests do not yet use this but do use the new names and
should still work as usual.
2014-02-21 11:24:31 +01:00
Max Neunhoeffer d2538cefeb Add http_server and ssl_server tests to js framework. 2014-02-20 12:52:03 +01:00
Max Neunhoeffer d55a4678f9 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-20 10:24:22 +01:00
Max Neunhoeffer 3d332ad01e Adjust paths to allow call with a different current dir. 2014-02-20 10:20:24 +01:00
Jan Steemann 29c09e1ef7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-20 10:04:43 +01:00
Jan Steemann a0c3a7fe56 improved users API 2014-02-20 10:04:13 +01:00
Jan Steemann 70aca15aa0 fixed test 2014-02-20 09:15:57 +01:00
Jan Steemann 66bc4c9a41 allow unique index creation on shard keys only 2014-02-19 10:30:41 +01:00
Jan Steemann f35b59ba16 updated tests 2014-02-18 15:49:12 +01:00
Heiko Kernbach 63e8a95f67 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-18 14:29:56 +01:00
Heiko Kernbach b69fad0381 merge origin/devel 2014-02-18 14:29:44 +01:00
Jan Steemann 29f3e17eef extract real error number 2014-02-18 14:27:32 +01:00
Jan Steemann dc8e590bca inedges, outedges, edges 2014-02-18 13:46:09 +01:00
Jan Steemann 39584f0735 adjusted user result structure 2014-02-18 12:05:05 +01:00
Jan Steemann 682e00245b fulltext 2014-02-18 10:14:52 +01:00
Jan Steemann 6c3c4b5dce near/within 2014-02-18 09:47:33 +01:00
Jan Steemann 9f16760359 simple query range 2014-02-17 16:41:10 +01:00
Jan Steemann 5c13019522 added tests 2014-02-17 11:37:49 +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
scottashton 80768b564b fixed waitForSync in graph api, adjusted documentation, delete tests in api-http-spec.rb due to change in ruby lib 2014-02-10 17:53:21 +01:00
scottashton 6617683cff fixed waitForSync in graph api, adjusted documentation, delete tests in api-http-spec.rb due to change in ruby lib 2014-02-10 17:47:32 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Jan Steemann 10eb807366 fixed HTTP CRUD operations 2014-02-05 17:19:45 +01:00
Jan Steemann 7a397ac985 renamed tests 2014-02-05 15:20:19 +01:00
Jan Steemann 58b3e0f99d splitted a few tests 2014-02-05 15:15:51 +01:00
Jan Steemann 7f240a1625 fixed segfault in import API 2014-01-27 16:12:39 +01:00
Jan Steemann 57ca73f463 fixed segfault in import API 2014-01-27 16:12:10 +01:00
Jan Steemann df1ce45e15 issue #751: Create database through API should return HTTP status code 201 2014-01-27 08:54:36 +01:00
a-brandt 62d81cee14 added HAS and HAS_NOT 2014-01-24 14:59:49 +01:00
a-brandt 041b7f5daa added HAS and HAS_NOT 2014-01-24 14:49:50 +01:00
Jan Steemann 30b866405e issue #732: Rest API GET revision number 2014-01-13 17:30:17 +01:00
Jan Steemann d52aaf8340 issue #732: Rest API GET revision number 2014-01-13 17:23:39 +01:00
Frank Celler abe0722e77 do not verify ssl 2013-11-23 23:06:47 +01:00
Frank Celler 3de7ee06dd do not verify ssl 2013-11-23 23:06:27 +01:00
Frank Celler 80604b8d65 fixed typo 2013-11-23 22:28:29 +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