1
0
Fork 0
Commit Graph

7833 Commits

Author SHA1 Message Date
Jan Steemann dad000b883 use std::string to avoid potential leaks 2016-02-11 10:13:49 +01:00
Max Neunhoeffer fc3f9f2b99 Merge branch 'devel' into ClustUp2 2016-02-11 09:27:28 +01:00
Jan Steemann 49767bb95a replicate transaction marker 2016-02-11 09:26:47 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Max Neunhoeffer 8b98ae5ef5 Snapshot for merging. 2016-02-11 09:11:00 +01:00
jsteemann bee34da616 make replace-or-with-in rule fire in more cases 2016-02-10 23:07:24 +01:00
Michael Hackstein 30547cb696 Further implementation if list functions in VPack variant. Also fixed a bug in FIRST 2016-02-10 21:56:09 +01:00
Michael Hackstein a3cccc14cf Added implementation for VPack variant of POP and APPEND 2016-02-10 18:55:28 +01:00
Michael Hackstein acbc7cdad2 Added more VPackStyle functions: firstDocument firstArray push. 2016-02-10 18:14:13 +01:00
Jan Steemann c619935874 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-10 16:49:45 +01:00
Jan Steemann 23dfbeee46 optionally restrict logger-follow to a single collection 2016-02-10 16:49:22 +01:00
Frank Celler 0852c941a9 trying to fix stuch SSL connect 2016-02-10 16:33:17 +01:00
Jan Steemann f50ddf030b fix collapsing of conditions 2016-02-10 12:58:58 +01:00
Jan Steemann f3107bc25f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 11:34:40 +01:00
Jan Steemann 5ba2432d78 remove sort in more cases 2016-02-10 11:23:11 +01:00
Max Neunhoeffer 88074e52cc Activate _docColls. 2016-02-10 08:38:08 +01:00
Kaveh Vahedipour 6fe2dd2465 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-09 16:59:39 +01:00
Michael Hackstein 7976903c43 Added VPack implementations for Math functions. 2016-02-09 16:51:04 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Max Neunhoeffer fb17ac372b Report new follower to agency. 2016-02-09 15:51:58 +01:00
Jan Steemann 53ba1deb55 remove unnecessary code 2016-02-09 11:37:12 +01:00
Jan Steemann 39c3d3d2a2 wait until applier has started 2016-02-09 10:54:37 +01:00
Kaveh Vahedipour 5acf990e8f Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-09 09:57:33 +01:00
Frank Celler 0e3ec4fa6a fixed TRI_doc_mptr_t 2016-02-08 23:38:41 +01:00
Kaveh Vahedipour 8e07620109 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-08 17:10:37 +00:00
Jan Steemann 4bc33cafaf fixed leak 2016-02-08 18:06:11 +01:00
Jan Steemann 0d4d5f5f93 fixed stringification of query states 2016-02-08 17:06:28 +01:00
Jan Steemann 82a84054ba fixed leak 2016-02-08 16:29:09 +01:00
Kaveh Vahedipour b99970ef72 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-08 16:17:36 +01:00
Kaveh Vahedipour c626ecc59b First successful OSX build 2016-02-08 16:17:10 +01:00
Jan Steemann e6ff2a5100 disable copy construction 2016-02-08 16:14:22 +01:00
Jan Steemann f552d61f26 added test 2016-02-08 12:00:21 +01:00
Jan Steemann b7941f3142 added assertions 2016-02-08 09:57:11 +01:00
Jan Steemann 15c5dcf6ac change barrier type 2016-02-07 19:54:10 +01:00
Jan Steemann 42c4bdbebb ported from 2.8 2016-02-07 19:47:37 +01:00
Jan Steemann 7ecf38cc38 fixed leak 2016-02-07 17:37:27 +01:00
jsteemann 0c39095037 pass Json by const reference 2016-02-07 10:07:34 +01:00
jsteemann 7cdd48c48f fix init order fiasco 2016-02-07 10:07:14 +01:00
jsteemann 63595cd740 forward port from 2.8 2016-02-07 00:35:02 +01:00
jsteemann 79cc85debd fixed leak 2016-02-07 00:23:57 +01:00
jsteemann a02e2b563f fixed issue #1707: 2.8.1 crashes
the crash was due to a required variable being removed from the execution plan.
this happened when there were multiple execution plans, and a certain transformation
was made in one of them. the transformation modified an element that was shared by
all plans, but it should have made a copy so only the current plan is affected
2016-02-07 00:23:34 +01:00
jsteemann 6acd2e83b6 report an error when "the impossible" (tm) happens 2016-02-07 00:23:11 +01:00
jsteemann a5c23fe0fe fix parsing forward ticks, fix line numbers in some error messages 2016-02-06 12:32:14 +01:00
jsteemann f28fb0c198 allow enclosing identifiers in forward ticks, too 2016-02-06 01:48:33 +01:00
jsteemann be5d6fe756 remove obsolete functionality 2016-02-06 01:13:36 +01:00
jsteemann 371a9fd046 prevent lock from being moved from one thread to another 2016-02-06 00:37:32 +01:00
Jan Steemann 206dddc701 fixed potential leak 2016-02-05 21:32:26 +01:00
Jan Steemann 040b09f303 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-05 19:47:29 +01:00
Jan Steemann 16df093e8f added barrier query API 2016-02-05 18:20:21 +01:00
Jan Steemann a0cb3b1832 replication changes 2016-02-05 18:06:39 +01:00
Michael Hackstein f5d93fb872 Implemented AQL EDGES as a VPack Variant. 2016-02-05 16:18:21 +01:00
Michael Hackstein dcd275181f Added VPack Variant of DOCUMENT() 2016-02-05 14:37:33 +01:00
Jan Steemann 1e7b43b3df make initial synchronization fail when master is restarted in the middle and no progress can be made 2016-02-05 14:00:49 +01:00
Michael Hackstein 17abd440aa Further implementation of AQL Functions VPack variants. 2016-02-05 13:55:18 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Jan Steemann abd382bf19 replication cleanup 2016-02-05 13:08:12 +01:00
Jan Steemann d63fa1ad81 use dedicated REPLICATION log channel 2016-02-05 11:01:39 +01:00
Jan Steemann 321230599b stringification of unlimit rlimit values 2016-02-05 10:43:40 +01:00
Michael Hackstein ba9d3566e9 Implemented Geo Functions in VPack variant. Also simplified the code. 2016-02-05 10:22:15 +01:00
Michael Hackstein 96b75d3733 Added a VPack Implementation for AQL Neighbors. This involved modification of Traverser and ExampleMather to understand VPack as well 2016-02-05 08:45:20 +01:00
Jan Steemann 3b1c3cd37d prevent compile warning with clang 2016-02-04 19:31:44 +01:00
Jan Steemann 94990da5f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-04 19:18:43 +01:00
Jan Steemann 8584a2a7af treat unlimited rlimit values specially 2016-02-04 18:34:39 +01:00
Jan Steemann a71f65f873 potential fix 2016-02-04 18:05:48 +01:00
Jan Steemann 35a57a194e removed unused variable 2016-02-04 17:05:51 +01:00
Jan Steemann 437160f921 minor datafile statistics correction 2016-02-04 16:54:10 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 8b6f4b8bec removed DEV_APP_PATH 2016-02-04 16:38:20 +01:00
Jan Steemann 56c3274749 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 15:29:24 +01:00
Jan Steemann 34c402cb05 attempt to fix assertion in Cluster 2016-02-04 15:29:02 +01:00
Michael Hackstein edf7f6b9d9 Further implementation of AQL functions for VPack. UNIQUE UNIQUE_SORTED UNION UNION_DISTINCT 2016-02-04 15:23:26 +01:00
Wilfried Goesgens e68f483177 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-02-04 15:12:13 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
2016-02-04 15:11:34 +01:00
Jan Steemann 699b2435ca fix unnecessary increase of reference counter 2016-02-04 15:07:23 +01:00
Michael Hackstein 84b1f9055d Further implementation of VPackAqlValue functions. This included VALUES and ATTRIBUTES. These functions by accident had an ordering in TRI_json_t which they do not have any more in VelocyPack. Clarified Documentation. 2016-02-04 13:49:59 +01:00
m0ppers 8f96fc3d94 Merge pull request #1704 from m0ppers/initializecluster
Initializecluster
2016-02-04 13:43:56 +01:00
Andreas Streichardt 63b2cdbe1b fix code review comments 2016-02-04 13:40:15 +01:00
Jan Steemann 3269c59a06 fixed some compile warnings 2016-02-04 12:38:51 +01:00
Andreas Streichardt 40b844c7b0 Merge branch 'devel' of github.com:arangodb/arangodb into initializecluster 2016-02-04 12:33:28 +01:00
Frank Celler b44385d9ef fixed deprecated options 2016-02-04 12:08:23 +01:00
Andreas Streichardt 9e7beb9a6e Change LOG WARNING and ERROR 2016-02-04 11:43:10 +01:00
Jan Steemann 6bac50d372 don't compact in one special case 2016-02-04 11:37:46 +01:00
Andreas Streichardt f096580706 Merge remote-tracking branch 'upstream/devel' into initializecluster 2016-02-04 11:37:02 +01:00
Andreas Streichardt adce528373 Proper initialization
Also find a fitting spot for our role
2016-02-04 11:29:43 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Jan Steemann 657ac8d50f fixes for Windows 2016-02-04 09:36:29 +01:00
Jan Steemann a01e52f4cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 09:07:57 +01:00
Jan Steemann b7fddb15ad handle compile warnings 2016-02-04 09:07:36 +01:00
Max Neunhoeffer 048f523714 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-04 09:00:43 +01:00
Max Neunhoeffer 391c03e68a Fix initial value of HTTP response code in ClusterComm. 2016-02-04 09:00:23 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Jan Steemann ac0446faf2 fixed potential truncation of master pointer list when rolling back update operations 2016-02-03 18:51:22 +01:00
Michael Hackstein 14c33024c4 Added more functions for VelocyPack variabt of AqlValue 2016-02-03 14:51:17 +01:00
Michael Hackstein cff759183a Rearranged VPack-AQL-Functions. Preperation for removal of old Functions 2016-02-03 10:53:15 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
Michael Hackstein f478411bb8 Included a backward transformation AqlValueVPack -> AqlValueJson. This allows to use the new VPack Functions without modification after switch. They return AqlValueVPack. 2016-02-03 10:48:08 +01:00
Michael Hackstein 6eeb686287 Added dummy to collect a shared VPackBuilder from a query object. Has to be properly implemented as soon as VelocyPack is the default AqlValue format 2016-02-03 10:40:51 +01:00
Kaveh Vahedipour a4623a395d Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-03 09:33:25 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
Max Neunhoeffer 300d2b68e9 Another snapshot. 2016-02-03 08:54:27 +01:00