1
0
Fork 0
Commit Graph

4692 Commits

Author SHA1 Message Date
Jan Steemann 999d8ffd1d small optimizations 2014-10-08 16:10:27 +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
James d2b86de370 fixed tyopo in comment 2014-10-08 10:55:58 +01:00
James 2ec03d57e3 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-08 10:26:19 +01:00
James 2ed7fb13b2 DistributeBlock getOrSkipSome done as far as possible. 2014-10-08 10:26:04 +01:00
Jan Steemann fe6ea548db fixed reading run lengths with empty values 2014-10-07 14:04:12 +02:00
Jan Steemann c2f0265d7d fixed optimizer rule remove-unnecessary-remote-scatter 2014-10-07 13:21:05 +02:00
Jan Steemann aef384da1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-07 12:36:36 +02:00
Jan Steemann e5d8414865 fixed more queries 2014-10-07 12:36:17 +02:00
James e17a43f66e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-07 11:19:25 +01:00
Jan Steemann 4ff58364f1 fixed cloning of plans 2014-10-07 12:00:37 +02:00
James 4a8ef130f5 DistributeBlock getOrSkipSome method minus the hard part. 2014-10-07 10:33:37 +01:00
Jan Steemann a62d83603e fixed missing register planning 2014-10-06 18:43:50 +02:00
Jan Steemann 0f83d8132f fixed some transaction threading errors 2014-10-06 18:39:01 +02:00
Willi Goesgens 7dac9d8cc7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-06 14:16:39 +02:00
Willi Goesgens 48c5ff938e If we clone an ExecutionNode for the same AST we also have to copy the evaluation members, but we don't need a deep-copy. 2014-10-06 14:15:41 +02:00
James 5af60d121e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-06 12:57:17 +01:00
James 95fd279a52 distribution node/block declarations etc. 2014-10-06 12:57:09 +01:00
Willi Goesgens 8f74eeff97 Assert whether we have a varoverview. 2014-10-06 13:20:31 +02:00
Willi Goesgens 287b6dfb37 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-06 11:55:27 +02:00
Willi Goesgens c01e31c404 when de-serializing nodes don't create new variables, but look up the ones we already have. 2014-10-06 11:55:11 +02:00
Willi Goesgens 4509a0f2b0 call findVarUsage before serialising the json, and not after deserializing it. 2014-10-06 11:53:23 +02:00
James 032e5d085e reset _initializeCursorOrShutdown in shutdown method, renaming test file. 2014-10-06 10:35:50 +01:00
James aee0605742 better initialiseCursor and shutdown for ScatterBlock 2014-10-06 10:30:28 +01:00
Jan Steemann 577593ed55 shutdown transactions 2014-10-06 11:23:39 +02:00
Jan Steemann bf31161ef5 activated if-statement 2014-10-06 10:40:04 +02:00
Jan Steemann 5959a5e6da fixed segfaults during node cloning 2014-10-06 10:31:15 +02:00
James 029e443b12 removing debug output 2014-10-04 12:21:34 +01:00
James 8bd3a9718c undistributeRemoveAfterEnumColl now more or less works for REMOVE x._key in coll 2014-10-03 11:32:40 +01:00
James c6c0387e50 undistributeRemoveAfterEnumColl optmizer rule now working 2014-10-03 10:13:11 +01:00
James 5a070a4e0a remove const-qualified types in VarInfo struct to allow compilation. 2014-10-03 09:27:35 +01:00
Jan Steemann 0e103d33dc added assertion 2014-10-03 01:37:04 +02:00
Jan Steemann d8934a025f make parseDocumentId more strict again 2014-10-03 01:23:07 +02:00
Jan Steemann 4d488b3734 don't fail on forced shutdown 2014-10-03 00:50:05 +02:00
Jan Steemann 7a4c8f69db speed up parseDocumentId 2014-10-03 00:49:46 +02:00
Jan Steemann 81ec1a2754 indentation 2014-10-03 00:12:00 +02:00
Willi Goesgens e1efab6fb5 Fix cloning to other ASTs - dereference pointers to IDs and look up the items on the new lists 2014-10-02 18:41:13 +02:00
Jan Steemann a2e9fadc7d moved assignment into constructor 2014-10-02 18:38:36 +02:00
Jan Steemann 66d2fc570f move register assignment into constructor 2014-10-02 18:27:53 +02:00
Jan Steemann f44599644c moved register assignment into constructor 2014-10-02 17:52:45 +02:00
Jan Steemann 31005892d2 assign register in constructor 2014-10-02 17:35:43 +02:00
Jan Steemann eae877b1be return variables on explain 2014-10-02 17:34:59 +02:00
Jan Steemann 573d837561 off-by-one fix 2014-10-02 17:06:12 +02:00
Jan Steemann 873d8291db fixed race condition in getCurrentDBServers 2014-10-02 15:50:04 +02:00
Jan Steemann 1d1ce39d50 fixed warning 2014-10-02 15:35:43 +02:00
Jan Steemann 24be855c8d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-02 15:34:57 +02:00
Jan Steemann e28ad821b0 fixed spuriously occurring "database not found" error 2014-10-02 15:34:38 +02:00
Willi Goesgens b8491932db Command the cluster node not to do optimizations. 2014-10-02 14:45:10 +02:00
Willi Goesgens 97e83b491d Try to stop the transaction when catching an exception 2014-10-02 14:44:38 +02:00
Willi Goesgens dc6dba1ef4 Cluster Communication: serialize a global set of the currently available variables. 2014-10-02 13:15:02 +02:00
Willi Goesgens d7d6ce65db Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-02 11:08:02 +02:00
Willi Goesgens 6f4e5c4fd7 When creating the copy for the clusternodes we also need to copy the properties. 2014-10-02 11:07:31 +02:00
James 16d54d6694 snapshot 2014-10-02 10:06:45 +01:00
James 8e8c5c9934 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-02 10:03:28 +01:00
James 2f887e197e adding remainingForShard to ScatterBlock 2014-10-02 10:03:08 +01:00
Jan Steemann ef15f1bb5d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-02 10:41:20 +02:00
Willi Goesgens f63e90e08b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-02 10:41:12 +02:00
Willi Goesgens bc627dda7b Also copy the varoverview to the clone. 2014-10-02 10:40:09 +02:00
Jan Steemann 67873e5edd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-02 10:34:33 +02:00
Jan Steemann 992bc5264b debug output 2014-10-02 10:34:27 +02:00
Jan Steemann 7f9da1c397 asserts 2014-10-02 10:34:08 +02:00
Max Neunhoeffer d021bcf720 Sort out shardId for ScatterBlock and HTTP API. 2014-10-02 10:24:47 +02:00
Max Neunhoeffer a59d1e4448 Start to sort out ScatterBlock's special API. 2014-10-02 09:55:15 +02:00
Max Neunhoeffer 25d588b858 Set _varUsageValid flag in Json constructor. 2014-10-02 09:28:00 +02:00
Max Neunhoeffer 8a0d5c021a Start adapting RestAqlHandler to ScatterBlock. 2014-10-02 00:34:32 +02:00
Max Neunhoeffer e043deb13b Rename StaticAnalysisDebugger into RegisterPlanningDebugger. 2014-10-02 00:13:49 +02:00
Max Neunhoeffer be07d39457 Rename staticAnalysis -> planRegisters. 2014-10-02 00:11:15 +02:00
Jan Steemann 5b0b1f0af5 indenting 2014-10-01 19:06:29 +02:00
Jan Steemann 38d43a2fb3 print error message in cases AqlHandler fails 2014-10-01 17:47:43 +02:00
Jan Steemann f2c115fa25 do not crash when using an index 2014-10-01 16:16:38 +02:00
Jan Steemann d381031972 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-01 15:35:26 +02:00
Jan Steemann 0d9cdfc87c struct Index 2014-10-01 15:35:16 +02:00
Willi Goesgens 6df55bcb0a Don't reuse "empty" json objects, they are undefined after first use. 2014-10-01 15:00:02 +02:00
Willi Goesgens 4b399236f1 Make the Transaction a smart pointer living inside of Query. 2014-10-01 14:30:53 +02:00
Jan Steemann 49237ef55a fixed some cluster internal communication 2014-10-01 14:06:00 +02:00
Jan Steemann 98733660c8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-01 12:21:45 +02:00
Jan Steemann f8cf3d1951 fixed memleak 2014-10-01 12:21:37 +02:00
James 7a34d065b5 cleaning up and registering undistributeRemoveAfterEnumColl. 2014-10-01 10:43:54 +01:00
James 3569bfdebf Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-01 10:18:00 +01:00
James 2fd8c2b185 prelim version of undistributeRemoveAfterEnumColl 2014-10-01 10:17:36 +01:00
Willi Goesgens eb2f815d26 Add json de/serialization of new ExecutionNode members. 2014-10-01 09:59:50 +02:00
Jan Steemann ee49d712a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-09-30 23:46:36 +02:00
Jan Steemann 672d540609 removed some debug output 2014-09-30 23:46:17 +02:00
Max Neunhoeffer a688636ce1 Merge branch 'verpflanzung' into devel 2014-09-30 23:31:30 +02:00
Max Neunhoeffer 993a89fea2 Fix compilation again. 2014-09-30 23:30:55 +02:00
Max Neunhoeffer 4b21832bba Take out unnecessary friend class declarations. 2014-09-30 23:23:46 +02:00
Max Neunhoeffer 8bffb3daa3 Finish transplantation. 2014-09-30 23:20:51 +02:00
Jan Steemann 03790a75f2 hold logs for slightly shorter time 2014-09-30 23:20:43 +02:00
Max Neunhoeffer 5676e82872 Make it compile using friend classes. 2014-09-30 20:14:39 +02:00
Max Neunhoeffer 40d7dec7bc Snapshot. 2014-09-30 16:49:12 +02:00
Max Neunhoeffer 5dbcac8efe Start transplantation of _varOverview to ExecutionNodes. 2014-09-30 16:44:01 +02:00
Jan Steemann f50f041bda Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Aql/ExecutionEngine.cpp
	arangod/Aql/Query.cpp
2014-09-30 15:50:28 +02:00
Jan Steemann c4ce98a442 fixed some bugs in distributed plan instanciation 2014-09-30 15:19:44 +02:00
Willi Goesgens 22f2753d62 Properly generate the new plan with the new query 2014-09-30 14:50:31 +02:00
Jan Steemann b78f54d94e lookup function for keys 2014-09-30 14:47:58 +02:00
Willi Goesgens 3f566f6289 Enable node* clone functions to produce deep copies which live on a specified query. 2014-09-30 14:09:12 +02:00
James 1d6637eedf Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-30 10:10:13 +01:00
James 22597af5ac version of removeUnnecessaryRemoteScatter which changes the plan in place. 2014-09-30 10:10:03 +01:00
Willi Goesgens 60dd21802b Clone the query, move the memory kept in the AST over to the query so all memory is kept in one location. 2014-09-30 10:18:13 +02:00
James 3daaaad855 fixing last 2014-09-30 08:48:29 +01:00
James 301ccddf83 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-30 08:29:36 +01:00
James d204ce4019 adding registration of the remove unnecessary remote scatter optimizer rule. 2014-09-30 08:29:21 +01:00
Jan Steemann 3a2e13b910 pass queryId to remote servers 2014-09-29 17:35:10 +02:00
Jan Steemann f3186fa065 cppcheck 2014-09-29 17:02:40 +02:00
Jan Steemann f3015bd70a fixed indentation 2014-09-29 16:52:45 +02:00
Jan Steemann b31987fea7 pass data to RemoteNode 2014-09-29 16:36:52 +02:00
Jan Steemann 691e9f315c cas adjustment for @mchacki 2014-09-29 16:09:45 +02:00
Jan Steemann ec1e6552ca clone plan for DBServers 2014-09-29 15:57:53 +02:00
Jan Steemann db0fdf24ec less string operations during batch request header parsing 2014-09-29 13:56:45 +02:00
Jan Steemann ec02ed2ccf nullptr 2014-09-29 13:56:37 +02:00
Jan Steemann 3ac25ad56f fixed some issues with remote queries 2014-09-29 12:14:03 +02:00
Jan Steemann 643ffa104d moved isCoordinator to function of its own 2014-09-29 09:38:15 +02:00
Jan Steemann 188fe0c43c accidently committed local modifications. revert 2014-09-29 09:31:27 +02:00
Jan Steemann 0d075dca3f pass queryRegistry into the AQL functions 2014-09-29 09:30:32 +02:00
Jan Steemann d177bc110c comments 2014-09-29 09:06:06 +02:00
Jan Steemann 166179c6d5 fixed compile warnings 2014-09-29 09:05:15 +02:00
Max Neunhoeffer 8fbe9bda98 Remove some unnecessary and fatal destructors. 2014-09-29 08:42:30 +02:00
James d53da7ce4a Optimiser rule to get rid of a RemoteNode->ScatterNode combination 2014-09-27 16:43:08 +01:00
James bfd8ff5f3a finished looking at ExecutionBlock destructors. 2014-09-27 15:06:09 +01:00
James 5264fa2612 remove unnecessary and incorrect renewal of ourLessThan. 2014-09-27 14:32:34 +01:00
James 8c1f9f5095 fixed arithmetic in GatherBlock::skipSome 2014-09-27 14:27:56 +01:00
James 4d0b3360cb fixing arithmetic in available in GatherBlock. 2014-09-27 14:14:03 +01:00
James 75df1bff15 destructor for SubqueryBlock, deletes private data 2014-09-27 13:19:58 +01:00
James b0ff6d1712 destructor for CaluculationBlock, deletes local data. 2014-09-27 13:17:45 +01:00
James 0c98677b16 destructor fo EnumerateListBlock, deletes local data 2014-09-27 13:13:30 +01:00
James 144ee7a8f0 destructor for IndexRangeBlock, deletes private data 2014-09-27 13:10:14 +01:00
James ae5b96bc5d destructor for EnumCollBlock that deletes local data. 2014-09-27 13:04:59 +01:00
James 1c52127cc1 destructor for GatherBlock, deletes _gatherBlockBuffer 2014-09-27 12:53:27 +01:00
James 68f48d0cd4 proper initializeCursor method for GatherBlock. 2014-09-27 12:48:48 +01:00
James dd716301ab moving _sortRegisters from initCursor to initialize. 2014-09-27 12:41:59 +01:00
James f04b25f3ea correcting comment. 2014-09-27 12:37:27 +01:00
James bcebeb4dd0 comments for ScatterBlock and some reordering 2014-09-27 12:31:12 +01:00
James 69f2cfd5a5 cleaning up, and comments in .cpp for GatherBlock 2014-09-27 12:12:50 +01:00
James 14eaac044c comments before GatherBlock in header, renamed _buffer, _pos which are
non-standard
2014-09-27 12:03:55 +01:00
Max Neunhoeffer 45b900913c Some adjustments to code in GatherBlock.
Finish first version of RemoteBlock.
2014-09-27 01:45:05 +02:00
Jan Steemann f229253e24 fixed redundant if / else if 2014-09-26 21:26:26 +02:00
Jan Steemann 9e47f3ca27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Aql/ExecutionNode.h
2014-09-26 20:23:52 +02:00
Jan Steemann c3ce45e0dd added block instanciation for coordinator, v0.0.0 2014-09-26 20:17:42 +02:00
Max Neunhoeffer 5f5cf84641 Refactor getSome for RemoteBlock. 2014-09-26 16:49:26 +02:00
Max Neunhoeffer dbed62392f Implement skipSome method for RemoteBlock. 2014-09-26 16:30:30 +02:00
Max Neunhoeffer d2a9632710 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-26 16:20:17 +02:00
Max Neunhoeffer 046d4f524d Implement getSome for RemoteBlock. 2014-09-26 16:19:25 +02:00
Max Neunhoeffer 865d513dd0 Add skipSome to HTTP API and to ExecutionEngine. 2014-09-26 16:18:47 +02:00
Willi Goesgens d003eecac1 We need to pass a reference since we want to return values onto this; and return const references to not duplicate the memory. 2014-09-26 15:22:41 +02:00
Max Neunhoeffer 5f24e603fe Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-26 14:51:14 +02:00
Max Neunhoeffer 95264a82ab initializeCursor and shutdown methods for HTTP API for queries. 2014-09-26 14:50:52 +02:00
Max Neunhoeffer 25ee17c075 initializeCursor and shutdown methods for ExecutionEngine. 2014-09-26 14:50:28 +02:00
Jan Steemann 578d22c95b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-09-26 13:58:16 +02:00
Jan Steemann f462c5f620 add database and collection info to gather nodes 2014-09-26 13:58:02 +02:00
Willi Goesgens 41fb15d462 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-26 13:44:16 +02:00