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
jsteemann
13335d4cf9
bugfixes
2016-02-03 01:06:27 +01:00
jsteemann
095b60ed7f
added missing files
2016-02-03 00:28:54 +01:00
jsteemann
60d9364e1f
added derived files
2016-02-03 00:28:29 +01:00
jsteemann
b962c5a9e8
array comparison operators
2016-02-03 00:28:03 +01:00
jsteemann
791e61d522
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators
2016-02-02 21:40:27 +01:00
jsteemann
d9de65acf8
remove now useless casts when invoking logger
2016-02-02 21:38:01 +01:00
Jan Steemann
fc909486c2
parser adjustments for array operators, not yet working
2016-02-02 18:05:39 +01:00
Richard Parker
0e3ce44885
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2016-02-02 14:54:54 +00:00
Richard Parker
35973ae675
Detect invalid lat/longitude on remove and searches
2016-02-02 14:52:08 +00:00
Michael Hackstein
92c69d2039
Implemented To_Array for VPack
2016-02-02 15:37:05 +01:00
Jan Steemann
bfd5d6614a
fixed namespace usage
2016-02-02 15:10:44 +01:00
Kaveh Vahedipour
ecfec58a6c
Pulled up to devel
2016-02-02 15:08:51 +01:00
Kaveh Vahedipour
eb94d0a0d1
Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification
2016-02-02 15:05:00 +01:00
Michael Hackstein
fd7d7e0c5a
Started implementing some Cxx AQL functions to use VPack AqlValues. Right now there is a compile-time switch to enable/disable VPack as it now adds overhead
2016-02-02 14:57:48 +01:00
Jan Steemann
11736660d8
removed namespace
2016-02-02 14:41:34 +01:00
Jan Steemann
5eb9687e21
turn off deadlock detection in cluster
2016-02-02 14:02:28 +01:00
Jan Steemann
48f1ce865b
don't swallow detailed return codes
2016-02-02 14:01:26 +01:00
Jan Steemann
bc6fce75d4
removed some unnecessary explicits
2016-02-02 12:13:21 +01:00
Kaveh Vahedipour
79079b318c
Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification
2016-02-02 11:51:00 +01:00
Jan Steemann
45d9745756
fixed display of Traversals in AQL explain
2016-02-02 11:24:51 +01:00
Andreas Streichardt
e5ec93223f
Oops ... fix signature
2016-02-01 19:05:05 +01:00
Andreas Streichardt
b8204d0f3c
initialize cluster structure
2016-02-01 18:59:01 +01:00
Kaveh Vahedipour
7129e15d8f
cmake builds on ubuntu
2016-02-01 16:48:39 +00:00
Kaveh Vahedipour
a10c5d13e0
Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification
2016-02-01 16:23:15 +00:00
Michael Hackstein
93d0508259
Created a temporary type for VPack-based AqlValues. Also started implementing new AQL Functions with this new AqlValue.
2016-02-01 17:09:54 +01:00
Kaveh Vahedipour
3a6ce7bc03
Merge branch 'cmakification' of https://github.com/arangodb/arangodb into cmakification
2016-02-01 14:24:22 +01:00
Kaveh Vahedipour
749e765535
Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification
2016-02-01 14:22:43 +01:00
Kaveh Vahedipour
6194a83437
making progress building unix versions
2016-02-01 13:06:06 +00:00
Jan Steemann
22df27632a
added helper method
2016-02-01 13:30:47 +01:00
jsteemann
3aed47d8e2
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-02-01 13:15:05 +01:00
Michael Hackstein
197292a230
Merge branch 'devel' of github.com:arangodb/arangodb into vpack
2016-02-01 13:02:49 +01:00
Kaveh Vahedipour
99b0ca712e
Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification
2016-02-01 13:02:15 +01:00
Max Neunhoeffer
daf2afe71a
Merge branch 'devel' into ClustUp2
2016-02-01 12:30:45 +01:00
Jan Steemann
b7abf5a40d
attempt to fix Windows build
2016-02-01 12:04:28 +01:00
Kaveh Vahedipour
22cc984f84
Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification
2016-02-01 11:02:31 +00:00
Max Neunhoeffer
0be190d85d
Merge branch 'devel' into ClustUp2
2016-02-01 11:43:00 +01:00
Max Neunhoeffer
bee1fd9eae
Fix followerInfo.
2016-02-01 11:42:26 +01:00
Michael Hackstein
e0455850fc
Replaced doc_mptr_copy with doc_mptr which is the correct type in this case.
2016-02-01 11:40:18 +01:00
Max Neunhoeffer
93400bfdcc
Implement followerInfo.
2016-02-01 11:38:10 +01:00
Michael Hackstein
8fad43282d
Asserted the length of the traversal condition.
2016-02-01 11:36:08 +01:00
Michael Hackstein
4e139f1865
Added an additional nullptr check.
2016-02-01 11:17:06 +01:00
Michael Hackstein
b85d5d4a26
Merge branch 'devel' of github.com:arangodb/arangodb into vpack
2016-02-01 09:49:29 +01:00
Michael Hackstein
9ea8e3ea0c
Started to write merge of two slices. This is not yet working for null means delete, works for all other merges.
2016-02-01 09:49:19 +01:00
jsteemann
54c796b6e8
fixed issues identified by `-fsanitize=undefined`
2016-01-31 23:30:41 +01:00
jsteemann
349a6d9754
more logging
2016-01-31 21:48:59 +01:00
jsteemann
745493763b
fixed filename order in Makefile
2016-01-31 19:36:44 +01:00
jsteemann
b635983d9c
removed unused functions and headers
2016-01-31 19:08:39 +01:00
jsteemann
ae25d2b53b
removed `using namespace std`
2016-01-31 18:22:00 +01:00
jsteemann
4e94803ad7
honor results of clang-test, clang-tidy and clang-modernize
2016-01-31 15:56:18 +01:00
jsteemann
13481bbebc
fix or annotate problems identified by clang-check
2016-01-31 03:32:31 +01:00
jsteemann
d59595f1bf
fixed leak
2016-01-31 02:22:15 +01:00
jsteemann
2d7323a560
fixed warnings shown by clang-3.7
2016-01-31 02:17:36 +01:00
jsteemann
ac634b9dab
fixed compile error in non-maintainer-mode
2016-01-30 14:38:31 +01:00
jsteemann
353c9732b7
removed last LOG_xxx macros
2016-01-30 04:03:18 +01:00
jsteemann
dbd5c500cb
remove TRI_ENABLE_LOGGING
2016-01-30 00:46:40 +01:00
jsteemann
9482ee1cca
use Logger
2016-01-30 00:08:35 +01:00
jsteemann
00a68113b5
more files using the Logger
2016-01-29 23:45:10 +01:00
jsteemann
ff21453255
logger transition: all files in arangod exception transactions.cpp
2016-01-29 23:28:44 +01:00
jsteemann
dad0de602b
preparation for logging changes
2016-01-29 23:06:44 +01:00
Jan Steemann
828f46c76b
shut up compiler
2016-01-29 19:19:06 +01:00
Jan Steemann
cd4cbae6ce
ported fixes to devel
2016-01-29 19:05:27 +01:00
Michael Hackstein
e0f0a6f1a8
Merge branch 'devel' of github.com:arangodb/arangodb into vpack
2016-01-29 14:18:05 +01:00
Max Neunhoeffer
09f974d660
Fix a merge.
2016-01-29 14:10:35 +01:00
Michael Hackstein
436c377cb5
Merge branch 'devel' of github.com:arangodb/arangodb into vpack
2016-01-29 14:01:53 +01:00
Max Neunhoeffer
238937128a
Merge branch 'devel' into ClustUp2
2016-01-29 13:59:11 +01:00
Max Neunhoeffer
dcf4ed8bca
Sort out FollowerInfo.
2016-01-29 13:56:37 +01:00
Michael Hackstein
0b583d756a
Duplicated static helper functions in AQLFunctions to be able to hadle VPack. Added a dummy for AqlValue->VPack. We have to clarify the data responsibilites before continuing here.
2016-01-29 13:42:15 +01:00
Andreas Streichardt
9850058d01
Merge branch 'devel' into waitforagency
2016-01-29 11:27:35 +01:00
Jan Steemann
2112d7c1f8
added override and final specifiers
2016-01-29 11:10:46 +01:00
Jan Steemann
b82e9c692a
removed unnecessary block
2016-01-29 11:10:24 +01:00
jsteemann
c3fc7e1aa7
don't lock in destructor
...
we have a global instance of the query cache and its destruction is
called during static deinitialization after main. if we use locks in
the dtor then we will use locks during static deinitialization (which
is fine in general, but prevents us from tracking the lock usage by
threads using thread-local storage)
2016-01-29 01:12:59 +01:00
jsteemann
04d459a5db
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-01-29 00:51:14 +01:00