1
0
Fork 0
Commit Graph

157 Commits

Author SHA1 Message Date
Jan Steemann cdde47f589 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/CMakeLists.txt
	arangod/Makefile.files
2014-07-28 12:32:02 +02:00
Jan Steemann cc43d1190c inject bind parameters 2014-07-28 12:30:55 +02:00
Max Neunhoeffer 487ebd4bb8 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/CMakeLists.txt
	arangod/Makefile.files
2014-07-28 09:42:15 +02:00
Max Neunhoeffer f2b135ef36 Start infrastructure for execution engine. 2014-07-28 09:41:19 +02:00
Jan Steemann 9369763309 added AstNode.cpp 2014-07-28 09:03:59 +02:00
Jan Steemann adbda1462a added AST 2014-07-24 17:16:51 +02:00
Jan Steemann 5d79df9e2f re-added scopes 2014-07-24 16:39:16 +02:00
Jan Steemann 0496b06cf9 error reporting 2014-07-24 14:39:59 +02:00
Jan Steemann e1c7843ecb parser 2014-07-24 14:00:13 +02:00
Jan Steemann a2cb09b82c Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Makefile.files
2014-07-24 11:54:38 +02:00
Jan Steemann 010ae07265 added Parser 2014-07-24 11:53:38 +02:00
Max Neunhoeffer 934c1df189 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Makefile.files
2014-07-24 11:50:48 +02:00
Max Neunhoeffer 97071bcabb Start ExecutionPlan infrastructure. 2014-07-24 11:50:13 +02:00
Jan Steemann cdf9ce0002 renaming 2014-07-24 11:45:59 +02:00
Jan Steemann d3720fe6ba cxx 2014-07-24 11:22:01 +02:00
Jan Steemann 5e2ac40608 copied query error 2014-07-24 11:18:20 +02:00
Frank Celler cf81e3ff00 generate .cpp file instead of .c file 2014-07-10 19:13:12 +02:00
Jan Steemann cb76a38bf1 added separate logfile remover thread 2014-07-05 16:41:15 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Max Neunhoeffer f7e5e28780 Create thread global transaction protection assertions. 2014-06-10 11:31:07 +02:00
Jan Steemann 3f6cb4d9ed fixed update policy 2014-06-06 22:53:59 +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
Frank Celler c8fc7f00c3 splitted arangod into prog and lib 2014-06-05 16:11:38 +02:00
Jan Steemann 7501fad516 removed VocBase/marker.h and VocBase/marker.cpp 2014-06-02 18:06:50 +02:00
Jan Steemann c6388411ef removed unused test thread 2014-06-02 17:56:43 +02:00
Jan Steemann e39e39b524 removed synchroniser 2014-06-02 16:04:56 +02:00
Jan Steemann bccd6f3112 update sealedInfo 2014-06-02 15:45:51 +02:00
Jan Steemann 8ba93e25a2 use marker protectors 2014-06-02 11:00:05 +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 adfaf9b760 garbage collection 2014-05-26 16:06:18 +02:00
Jan Steemann 06a56a7d36 removed MRuby for arangod 2014-05-21 18:11:59 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 9d948618f3 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 11:31:08 +02:00
Max Neunhoeffer 786ea250ba Snapshot. 2014-05-21 11:20:03 +02:00
Jan Steemann b10ef2335c split Marker.h 2014-05-21 10:28:24 +02:00
Max Neunhoeffer 2cdcd24a59 First step to move ahuacatl to C++ 2014-05-21 08:58:49 +02:00
Jan Steemann 1de19b7b0e deactivated files 2014-05-19 11:25:01 +02:00
Jan Steemann 168fdcf6ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	UnitTests/Basics/bson-test.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Basics/BsonHelper.h
2014-05-19 11:21:58 +02:00
Jan Steemann 579a46220e added one-shot tasks 2014-05-14 21:04:37 +02:00
Jan Steemann d0bcb02015 generate/validate keys 2014-04-11 16:19:00 +02:00
Jan Steemann 86398d7cde insert standalone marker 2014-04-11 13:01:00 +02:00
Jan Steemann 54244aa50b transactions 2014-04-09 18:03:10 +02:00
Jan Steemann 7ef1f92ab9 added Context and WorkUnit 2014-04-09 14:10:49 +02:00
Jan Steemann 2d2b119e2a transaction interface 2014-04-08 17:10:41 +02:00
Jan Steemann c18fb05525 added operations container 2014-04-08 09:45:10 +02:00
Jan Steemann 9a6cab4386 cpp 2014-04-07 14:30:51 +02:00
Jan Steemann 182344f7d3 renamed 2014-04-07 12:02:04 +02:00