Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,923 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1093 Commits

Author SHA1 Message Date
Michael Hackstein efaccccb4e The Shortest path is now able to handle graphs with several vertex collections, but only one edge collection. 2015-05-10 20:38:25 -07:00
Michael Hackstein 3cbac8ae25 The Neighbors can now be requested distinct. However this is not introduced to AQL due to missing options parameter, would change API 2015-05-07 17:17:18 -07:00
Michael Hackstein 323d34f629 The new CPP neighbors now take all three directions 2015-05-07 16:33:05 -07:00
Michael Hackstein b70cce0353 Use cpp neighbors in AQL 2015-05-06 16:29:50 -07:00
Michael Hackstein aef5432d31 Allowed he neighbors function to switch between data and ids only 2015-05-06 16:00:35 -07:00
Michael Hackstein b89c28e141 Now allows the new CPP traversal to contain the vertex data. Edgedata is yet to come 2015-05-05 22:49:37 -07:00
Michael Hackstein 4c7b9459d5 The cpp shortest path now returns _id instead of _key. First implementation of cpp neighbors. Returns only vertexIds now. 2015-05-03 00:13:30 -07:00
Michael Hackstein ca0de62aa3 Moved all v8 context sensitive parts into from V8Traverser v8-vocbase 2015-05-02 21:46:54 -07:00
Jan Steemann 0099fe260a return value optimization for AQL 2015-04-30 23:38:27 +02:00
Michael Hackstein 7f3a9fbcae Included the CPP Shortest path into AQL. Only under certain conditions 2015-04-26 22:17:23 -07:00
Michael Hackstein 6f81b0add1 Further implementation of Shortest Path. The Shortest path is found in cpp conversion to JS not yet working 2015-04-25 21:35:40 -07:00
Michael Hackstein 9f1830b4c5 Started implementing the Expander function. Not et finished does not compile but i am moving over to a new machine 2015-04-25 21:34:41 -07:00
Michael Hackstein 85c13802d4 First commit. Started implementing dijkstra in C++. Got all the transaction stuff up and running now. Time to write down the algorithm. 2015-04-25 21:34:40 -07:00
Jan Steemann e2000f571f try to satisfy scan-build 2015-04-16 15:04:11 +02:00
Max Neunhoeffer bd0724add6 Fix retry behaviour in some places of cluster code. 2015-04-13 13:03:40 +02:00
Jan Steemann 80a99ab23e refactored cursor API 2015-03-30 14:58:51 +02:00
Frank Celler 4c5d57f1b8 merged Exceptions.h and Exception.h 2015-03-23 14:05:19 +01:00
Jan Steemann d63f47e840 added possibility to kill JS traversals 2015-03-20 23:05:41 +01:00
Jan Steemann f035ea1c3b kill AQL queries 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2015-03-12 15:00:14 +01:00
Jan Steemann 64d77cbe24 added query tracking feature 2015-03-12 13:02:13 +01:00
Max Neunhoeffer 134aa7fce8 Add breakpoint facility via console for JavaScript code in server. 2015-02-07 21:34:20 +01:00
Jan Steemann d534a41e21 recovery tests 
Conflicts:
	arangod/Wal/LogfileManager.cpp

Conflicts:
	arangod/Wal/LogfileManager.cpp
 2015-01-19 18:14:03 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Jan Steemann 399176cf67 fixed cursor ttl issue 
Conflicts:
	CHANGELOG
 2014-12-05 09:18:32 +01:00
Jan Steemann 4ef82239a3 added optimizer statistics 2014-12-03 11:38:56 +01:00
Jan Steemann a71bf1819c issue #1099: do not fail if general-graph.remove is used inside a transaction 2014-11-17 15:47:39 +01:00
Jan Steemann b0de1bb226 leaner and meaner error messages 2014-11-07 10:53:00 +01:00
Jan Steemann 2fe79a65a4 speed up AQL queries with V8 expressions 2014-11-05 16:59:57 +01:00
Jan Steemann e5abbe92e9 fixed broken cursors if cursor size > batchSize 2014-11-05 12:19:36 +01:00
Willi Goesgens bab1762ee9 Directly route results to v8-objects instead of going via a json object when calling AQL from a V8 context 2014-11-05 10:56:10 +01:00
Jan Steemann 26c3b0174f fixed tests 2014-10-31 19:58:20 +01:00
Jan Steemann a5e7b26c81 added comment [skip ci] 2014-10-31 17:31:40 +01:00
Jan Steemann 4f68960ed7 removed Ahuacatl [skip ci] 2014-10-31 17:31:00 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Willi Goesgens 91e04e3230 Implement outputting of splitted plans which are to be distributed to the db servers 2014-10-24 17:14:13 +02:00
Jan Steemann 2b68d83072 added enterContext and exitContext to Query 2014-10-17 12:01:50 +02:00
Jan Steemann 0aa02a696b pass ApplicationV8 to queries 2014-10-17 10:35:02 +02:00
Jan Steemann dcb9427b6f rewrote transaction contexts 2014-10-16 15:53:28 +02:00
Jan Steemann 6cdaaa1b85 fixes for Visual Studio 2014-10-09 10:45:31 +02:00
Jan Steemann ff80fafba5 fixed cached lookups of collections on the server, which may have caused spurious problems after collection rename operations 2014-10-08 14:59:02 +02:00
Jan Steemann e28ad821b0 fixed spuriously occurring "database not found" error 2014-10-02 15:34:38 +02:00
Jan Steemann c4ce98a442 fixed some bugs in distributed plan instanciation 2014-09-30 15:19:44 +02:00
Jan Steemann 0d075dca3f pass queryRegistry into the AQL functions 2014-09-29 09:30:32 +02:00
Jan Steemann 9fe3fedb45 unique_ptr 2014-09-24 17:14:37 +02:00
Jan Steemann f8599b0f0f removed unused instance variable 2014-09-23 13:14:53 +02:00
Jan Steemann 76aaed94a0 make interface more user-friendly 2014-09-19 12:44:29 +02:00
Jan Steemann 6f4e799ccc added `profile` option 2014-09-19 01:02:39 +02:00
Jan Steemann e5e2cfe4da Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-17 11:50:42 +02:00
Jan Steemann d3f4f05df1 issue #1020 2014-09-17 11:42:01 +02:00
Frank Celler c577193ae4 added log of exception 2014-09-15 23:18:10 +02:00
Jan Steemann 5a1dc63946 fixed tons of compile errors in VS 2014-09-15 12:04:49 +02:00
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Willi Goesgens ae6956b6b5 AQL_EXECUTEJSON: parse the options similar to AQL_EXPLAIN & AQL_EXECUTE. 2014-09-12 12:09:41 +02:00
Jan Steemann 611ef2b73c removed "old" AQL function AQL_EXPLAIN 2014-09-11 14:12:01 +02:00
Jan Steemann 672eec350e removed "old" AQL function 2014-09-11 13:56:15 +02:00
Jan Steemann cb4c60a36f explain tests 2014-09-11 09:54:59 +02:00
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
 2014-09-09 22:18:52 +02:00
Jan Steemann 428865f3b5 issue #1014: WITHIN function returns wrong distance 
added attribute setters for ShapedJson so document attributes can be updated

Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-09 19:58:27 +02:00
Jan Steemann 41375624d2 optionally make AQL_EXPLAIN return all generated plans 2014-09-09 15:42:22 +02:00
Jan Steemann 7d500b7234 speed up instanciation of v8 ShapedJson objects 
now a static buffer is used to create multiple string values
such as `_id`, `_key`, `_rev`, `_from` and `_to`.
this saves a few memory allocations per document

Conflicts:
	arangod/Utils/CollectionNameResolver.h
	arangod/V8Server/v8-vocbase.cpp
 2014-08-30 01:47:58 +02:00
Jan Steemann c90777738d speed up instanciation of v8 ShapedJson objects 
now a static buffer is used to create multiple string values
such as `_id`, `_key`, `_rev`, `_from` and `_to`.
this saves a few memory allocations per document
 2014-08-30 01:32:20 +02:00
Jan Steemann 1367a016cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-29 20:38:30 +02:00
Jan Steemann 9530a12472 AQL_EXECUTE 2014-08-29 17:39:23 +02:00
Jan Steemann 3b2cf352ad added functionality to activate/deactivate optimizer rules 2014-08-29 16:31:07 +02:00
Thomas Schmidts 3a695c15fd Added text to documentation 2014-08-29 14:09:49 +02:00
Jan Steemann dcfa59806e more C++11 2014-08-23 00:51:13 +02:00
Jan Steemann 2b27957546 added AQL_EXPLAIN() 2014-08-22 09:51:48 +02:00
Jan Steemann f7737e3b62 added stats 2014-08-21 12:36:30 +02:00
Jan Steemann 1442b9ebeb pass ExecutionEngine to ExecutionBlock, added stats for ExecutionEngine 2014-08-21 12:33:13 +02:00
Jan Steemann 1aeed2152c fixed de-serialization 2014-08-21 10:02:30 +02:00
Willi Goesgens d295bacb51 Json: add HTTP-Entrypoint into Javascript deserialisation. 2014-08-20 17:08:06 +02:00
Jan Steemann 97fd5a55ba renamed variable 2014-08-15 18:12:58 +02:00
Thomas Schmidts 415fefdafa Fixed small formatation error 2014-08-15 11:01:56 +02:00
Jan Steemann cfefe17a15 fixed types 2014-08-14 17:29:58 +02:00
James 6292cafa52 fixed bugs in last. 2014-08-14 17:17:37 +02:00
James eb6cf43efc added additional options to JS_ExecuteAql. 2014-08-14 17:00:20 +02:00
James 392c1db4c3 JS_ExecuteAql now returns a cursor. 2014-08-14 15:20:52 +02:00
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
 2014-08-13 16:29:57 +02:00
Jan Steemann 277290fc0e unification with aql2 code 2014-08-13 16:22:17 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
Frank Celler 7a6d5413a1 database version is now AABBCC, where AA = major, BB = minor, CC = patch 2014-08-12 09:58:42 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
Willi Goesgens 6522df2e52 v8-vocbase split: clean up includes - more includes to get rid of. 2014-08-08 13:48:28 +02:00
Jan Steemann d30914afb2 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionBlock.h
	arangod/Aql/ExecutionEngine.cpp
 2014-08-07 17:25:37 +02:00
Willi Goesgens bfdc940450 v8-vocbase split: clean up includes 
- Move includes from Types .h -> .cpp
 - Move forward Declerations to their respective headers.
 2014-08-07 16:17:40 +02:00
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Willi Goesgens ba5365d9e9 v8-vocbase split: clean up includes. 2014-08-07 11:55:22 +02:00
Willi Goesgens b068fa92ed v8-vocbase splitting: fix initialisation. 2014-08-06 12:49:59 +02:00
Willi Goesgens a7d241cdd8 Split v8-vocbase.cpp into handy bits. 2014-08-05 18:59:40 +02:00
Jan Steemann ae04cb95d9 fixed compile errors 2014-08-05 15:04:42 +02:00
James 1d912648cd removing previous use of queryResult.json in JS_ExecuteAql. 2014-08-05 14:43:51 +02:00
James fbc6ae2267 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 14:37:29 +02:00
James 6772762c60 preparing json return value for queryResult. 2014-08-05 14:37:08 +02:00
Max Neunhoeffer 5cbbd8a4c4 Fix barrier and documentCollection access in Expressions. 
Still does not link.
 2014-08-05 14:33:54 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00
Jan Steemann 932aac9d06 added method signature 2014-08-05 10:58:58 +02:00
Jan Steemann 4603d2a1dd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 17:54:41 +02:00
Max Neunhoeffer 390f0fe605 Implement distributeShardsLike 2014-08-01 17:05:04 +02:00
Jan Steemann 2881409527 renaming 2014-08-01 11:46:31 +02:00
Max Neunhoeffer 5bf0ff1a7c Rename files ExecutionPlan -> ExecutionNode 2014-08-01 11:26:09 +02:00
Jan Steemann 2574982771 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-31 18:18:08 +02:00
Jan Steemann d7429d3c6c removed parameter 2014-07-31 16:04:43 +02:00
Jan Steemann 1ff3d44e88 removed AQL_PENG 2014-07-31 12:30:16 +02:00
Max Neunhoeffer 98d82de6fb Create generic recursive walk functionality for Plans/Blocks. 2014-07-31 10:31:45 +02:00
Max Neunhoeffer 2ef0095797 Start static analysis of variables in ExecutionBlocks. 2014-07-30 23:50:03 +02:00
Max Neunhoeffer 22dc301745 Change signature of RootPlan. 2014-07-30 17:05:38 +02:00
Max Neunhoeffer d09f2690da Get rid of _nrVars in ExecutionPlans. 2014-07-30 17:00:38 +02:00
Jan Steemann f4e8775ddc nicer parser error messages 2014-07-30 12:30:06 +02:00
Max Neunhoeffer e690185bf5 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-29 16:27:39 +02:00
Max Neunhoeffer 57560108e0 Peng mit shared_ptr. 2014-07-29 16:27:25 +02:00
Jan Steemann 6bbc3eaf49 fixed expand nodes 2014-07-29 15:51:51 +02:00
Max Neunhoeffer 65b477ddbd Snapshot, compiles, does not work. 2014-07-29 13:40:54 +02:00
Max Neunhoeffer bf3af53d10 Add a lineend. 2014-07-29 11:21:07 +02:00
Max Neunhoeffer 43ac089187 Seems to work. 2014-07-28 16:55:45 +02:00
Max Neunhoeffer 5684bb5b65 Add RootBlock and stuff. 2014-07-28 16:26:24 +02:00
Jan Steemann 765e44e80b execution v0.0000001 2014-07-28 15:51:38 +02:00
Jan Steemann cc43d1190c inject bind parameters 2014-07-28 12:30:55 +02:00
Jan Steemann 1be0fa6ee2 dump AST 2014-07-25 18:18:40 +02:00
Jan Steemann 33215ca194 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-25 16:57:12 +02:00
Jan Steemann 062b6f1dcf parser! 2014-07-25 16:56:53 +02:00
Jan Steemann 2ee0390e10 reordered attribute names 2014-07-24 13:44:57 +02:00
Jan Steemann cdf9ce0002 renaming 2014-07-24 11:45:59 +02:00
Jan Steemann 5e2ac40608 copied query error 2014-07-24 11:18:20 +02:00
Jan Steemann b7b5c661a7 cxx 2014-07-24 09:43:08 +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
Frank Celler e436ecfa40 if a cancelation has occured, flush the module cache 2014-07-08 11:54:53 +02:00
Thomas Schmidts 1a78807a67 Fixed a few @startDocuBlock errors 2014-07-07 16:15:50 +02:00
Jan Steemann ddb26d76f8 wrote documentation for WAL 2014-07-06 18:31:41 +02:00
Jan Steemann 08654635f1 fixed examples 2014-07-06 13:53:45 +02:00
Jan Steemann c12df38eb2 fixed broken examples 2014-07-06 02:25:19 +02:00
Jan Steemann cb76a38bf1 added separate logfile remover thread 2014-07-05 16:41:15 +02:00
Jan Steemann 6f4ab77d9b fixed WAL collector moving markers 2014-07-04 13:52:31 +02:00
Jan Steemann 599176d1e3 do not delete foxx apps on replay 2014-07-03 11:42:16 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Jan Steemann 28965618d1 handle renaming of collections 2014-07-02 10:28:43 +02:00
Thomas Schmidts 55aa1645ac Changes in the code documentation 2014-07-02 09:51:26 +02:00
Jan Steemann ac2f6e61de added "insert" method as an alias for "save" 2014-07-02 00:34:33 +02:00
Max Neunhoeffer 2f784c7e4d Add a WAL flush for the cluster to flush the WAL on all DBservers. 2014-07-01 17:00:05 +02:00
Jan Steemann c28b672fe5 fixed test 2014-07-01 11:35:57 +02:00
Jan Steemann d55626c038 xxx 2014-06-30 19:00:36 +02:00
Jan Steemann d6a93a5535 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 13:07:56 +02:00
Jan Steemann bda2db16da recovery and replication 2014-06-30 13:07:48 +02:00
Thomas Schmidts c263b2a5e1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-29 03:34:42 +02:00
Thomas Schmidts c2cb0d5a10 Some changes to the comments in the code 2014-06-29 03:34:22 +02:00
Jan Steemann eabc3f8138 VS 2014-06-27 19:32:16 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
Jan Steemann 07d244488d changed crud signatures 2014-06-26 12:37:01 +02:00
Jan Steemann 723a0ab265 fixed some memory errors 2014-06-26 11:52:37 +02:00
Thomas Schmidts 45f27782e0 More changes in the documentation code 2014-06-25 17:27:12 +02:00
Thomas Schmidts a43e8e065d Some changes in the documentation code 2014-06-25 16:29:17 +02:00
Thomas Schmidts 4d7b22b05a Some changes in the documentation code 2014-06-25 15:17:51 +02:00
Thomas Schmidts f7be757b0b Some changes in the code documentation 2014-06-25 14:57:29 +02:00
Thomas Schmidts 34e1addcfb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 17:23:54 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
Thomas Schmidts f4c6c97488 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 16:09:27 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
Thomas Schmidts 0bf957ddd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 14:28:50 +02:00
Thomas Schmidts 0d969e6814 Changes in the gitbook, also bug fixing in code 2014-06-24 14:28:30 +02:00
Jan Steemann 303378d8e2 honor `--server.disable-statistics` 2014-06-24 12:06:47 +02:00
Jan Steemann 4f282cbe02 removed startup option `--database.remove-on-drop` 2014-06-24 11:54:32 +02:00
Jan Steemann 98f87b1f80 write-throttling 2014-06-24 10:55:05 +02:00
Jan Steemann cc041c4851 typecasts 2014-06-24 08:20:35 +02:00
Jan Steemann 5ce280b5f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 00:38:33 +02:00
Jan Steemann d56719ae4d simplification of signatures 2014-06-24 00:32:40 +02:00
Thomas Schmidts 8d4527a8c9 Changed Documentation in code 2014-06-24 00:01:27 +02:00
Jan Steemann e89e390cda re-added replication applier 2014-06-23 17:55:08 +02:00
Jan Steemann f72ccde9cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 17:46:25 +02:00
Jan Steemann 13e061bd76 fixed tests 2014-06-23 17:46:00 +02:00
Thomas Schmidts 03881bf63c Made Examples instead of verbinclude 2014-06-23 17:16:19 +02:00
Thomas Schmidts 19bd94b967 Added line to Makefiles.files for code examples 2014-06-23 17:00:36 +02:00
Thomas Schmidts af1805b627 Fixed small spelling errors 2014-06-23 15:15:50 +02:00
Thomas Schmidts 10a5b782fd Some changes in the documentation code 2014-06-23 14:55:14 +02:00
Jan Steemann c930740862 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:22:56 +02:00
Thomas Schmidts 7b11a3e9f3 Changed some comments in code 2014-06-23 13:22:02 +02:00
Jan Steemann ebb7e61045 removed code for special handling of _trx and _replication 2014-06-23 09:03:42 +02:00
Thomas Schmidts 06e033c0c8 Some improvements in the python script 2014-06-23 08:55:47 +02:00
Jan Steemann fc823938c0 nullptr 2014-06-21 03:27:38 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Frank Celler 4dcf5dc817 updated disclaimer 2014-06-20 16:40:35 +02:00
Thomas Schmidts 90ad06833f Change some comments in the code 2014-06-20 15:10:16 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +02:00
Jan Steemann b952c6724d recovery 2014-06-17 18:19:04 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Frank Celler f794ee8368 fixed datafile debugger 
Conflicts:
	CHANGELOG
 2014-06-17 09:22:56 +02:00
Jan Steemann a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Jan Steemann b54b89d68d key generator rework 2014-06-14 00:33:40 +02:00
Jan Steemann 47999865d6 read-only mode 2014-06-13 15:32:13 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann 101b5ac95f Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 11:29:08 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28:48 +02:00
Max Neunhoeffer ed1a588baa Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 10:39:13 +02:00
Max Neunhoeffer 82ab5bc0ac More checks for protected getShaper accesses. 
Also: Make arangodump possible using fake trx objects.
 2014-06-12 10:38:39 +02:00
Jan Steemann bca5b999d9 removed fcall 2014-06-12 10:26:53 +02:00
Jan Steemann 1cc46c4626 copy WAL documents 2014-06-12 10:26:24 +02:00
Jan Steemann cc115a2766 removed outdated upgrade methods 2014-06-11 17:38:49 +02:00
Jan Steemann b802973273 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Wal/CollectorThread.cpp
 2014-06-11 11:33:48 +02:00
Jan Steemann 7e6750c397 wal flush w/ collection unload 2014-06-11 11:33:02 +02:00
Max Neunhoeffer f0bef2496f Make _shaper private and use getter/setter. 2014-06-11 11:18:22 +02:00
Max Neunhoeffer c2bddb1c19 Let TRI_document_collection_t inherit from TRI_collection_t. 2014-06-11 10:51:47 +02:00
Jan Steemann 5a8cdb0ec5 wal flush 2014-06-11 09:32:20 +02:00
Jan Steemann 7c599ef893 barriers 2014-06-10 16:42:15 +02:00
Jan Steemann ede9c634c3 assert 2014-06-10 15:42:39 +02:00
Jan Steemann da9f8247fb barriers are now created automatically by transactions 2014-06-10 11:56:40 +02:00
Jan Steemann d9653bc462 DML for AQL 2014-06-10 09:30:27 +02:00
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
Jan Steemann ca959cab9d simplified usage of transactions 2014-06-06 23:28:34 +02:00
Jan Steemann 3f6cb4d9ed fixed update policy 2014-06-06 22:53:59 +02:00
Jan Steemann 368091d7c3 function cleanup 2014-06-06 21:35:34 +02:00
Jan Steemann c6b8bb7313 do not create _trx collection 2014-06-06 17:06:07 +02:00
Jan Steemann a289a7ac89 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-06 17:00:56 +02:00
Jan Steemann 7b9e3af0f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/voc-shaper.cpp
 2014-06-06 17:00:49 +02:00
Max Neunhoeffer fd2c99443f Introduce TRI_doc_mptr_copy_t for copies of master pointers. 
Did not yet run through all occurrences of TRI_doc_mptr_t to see
whether they have to be TRI_doc_mptr_copy_t.
 2014-06-06 16:59:32 +02:00
Frank Celler 315232f2c8 fixed order of checks 2014-06-06 15:10:27 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Esteban Lombeyda b848ff00b5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 10:55:11 +02:00
Jan Steemann 8da6824d15 added TRI_ASSERT and TRI_ASSERT_EXPENSIVE 2014-06-06 10:32:20 +02:00
Jan Steemann cb5bb4eb0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Makefile.files
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/voc-shaper.cpp
 2014-06-05 22:58:49 +02:00
Jan Steemann 6344bb5a1e merge 2014-06-05 22:28:19 +02:00
Jan Steemann 17981a92c2 more barriers 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-06-05 22:23:48 +02:00
Esteban Lombeyda 78e8b56117 cleaning 2014-06-05 16:01:58 +02:00
Frank Celler 2cfb2e0577 fixed issue #883: arango 2.1 - when starting multi-machine cluster, UI web does not change to cluster overview 
Conflicts:
	CHANGELOG
	lib/ShapedJson/shape-accessor.cpp
	lib/ShapedJson/shape-accessor.h
 2014-06-05 15:58:19 +02:00
Max Neunhoeffer 4de7e852f9 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.cpp
 2014-06-05 12:07:48 +02:00
Max Neunhoeffer 2776dc78fa Make TRI_doc_mptr_t a C++ struct. 2014-06-05 12:03:57 +02:00
Jan Steemann 7783bc6687 made function private 2014-06-05 01:14:13 +02:00
Jan Steemann 3bda98a28c Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/Wal/DocumentOperation.h
 2014-06-04 17:36:00 +02:00
Jan Steemann 7b7f42118e fixed some unique constraint violation handling 2014-06-04 17:28:06 +02:00
Max Neunhoeffer a7792a5306 Looked through TRI_EXTRACT_MARKER_KEY for protection. 2014-06-04 15:40:09 +02:00
Max Neunhoeffer a32bf12f2f Looked at all _dataptr dereferences. 2014-06-04 15:18:25 +02:00
Max Neunhoeffer 13541cf4ec Rename component _data -> _dataptr in master pointer. 2014-06-03 22:27:08 +02:00
Jan Steemann 8ea7fa5e4a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 17:18:02 +02:00
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +02:00
Esteban Lombeyda 3ec823c804 Error string for remove, replace, update modified 2014-06-03 14:35:06 +02:00
Jan Steemann a9a12e42c8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	Makefile.am
 2014-06-03 10:18:08 +02:00
Jan Steemann 07e2fce6b8 fixed keepNull in cluster 2014-06-03 10:13:19 +02:00
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
 2014-06-02 09:52:05 +02:00
Frank Celler 8db4667755 cleanup of version-check, added option check-version 2014-06-01 13:37:21 +02:00
Jan Steemann d4dd58b264 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
Jan Steemann ed6a55abb9 specialized primary index for faster comparisons and less datafile lookups 2014-05-29 03:35:37 +02:00
Jan Steemann 350e8fc8fe fast path for named property access 2014-05-28 21:35:42 +02:00
Esteban Lombeyda a4a4d770b6 more documentation 2014-05-28 10:29:10 +02:00
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
 2014-05-26 17:28:16 +02:00
Frank Celler d097755324 cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/_resizing.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/statistics.js
 2014-05-25 23:10:10 +02:00