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

1031 Commits

Author SHA1 Message Date
Michael Hackstein 12f1a7c6f6 Fixed a bug where the IndexEstimator could get into undefined behaviour if the persisted estimate contains a size of 0. 2017-05-23 14:25:53 +02:00
Michael Hackstein 9055552c8b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-23 13:17:20 +02:00
Michael Hackstein 91e19071a9 The Cuckoo index estimator now uses 32bit counters instead of 16bit. It should be more relyable now. 2017-05-23 12:56:24 +02:00
Simon Grätzer 6c905c8d26 Missed some markers 2017-05-23 11:37:17 +02:00
Simon Grätzer 88977d204a Merge branch 'devel' of https://github.com/arangodb/arangodb into column-family 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBIndex.cpp
#	arangod/RocksDBEngine/RocksDBIndex.h
#	arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp
#	arangod/RocksDBEngine/RocksDBPrimaryIndex.h
 2017-05-23 11:17:30 +02:00
jsteemann 244e380f63 unintentionally broke the export 2017-05-23 10:57:31 +02:00
jsteemann 2f3e4d0ba0 fix init order 2017-05-23 08:57:39 +02:00
jsteemann ad5e58b050 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-23 08:53:26 +02:00
jsteemann a7b3839e6c renamed "getMore" to "next" 2017-05-23 08:53:13 +02:00
Simon Grätzer ddfa15b8cc Adding bound checking back 2017-05-22 19:09:32 +02:00
Simon Grätzer 6db35a93a0 Merge 2017-05-22 18:05:15 +02:00
jsteemann 79cda92a2a move common code into its own file 2017-05-22 17:46:12 +02:00
Simon Grätzer 9679aecf53 Adding bounds back 2017-05-22 17:39:19 +02:00
jsteemann 221583e9ca fix warning 2017-05-22 16:00:05 +02:00
jsteemann ee0ba4f377 inline functions 2017-05-22 15:58:27 +02:00
jsteemann c53126cebc added missing include 2017-05-22 15:58:07 +02:00
jsteemann c844db70b8 fixed invalid assertion 2017-05-22 15:54:25 +02:00
Simon Grätzer 67b9f75fec Merge branch 'devel' of https://github.com/arangodb/arangodb into column-family 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
 2017-05-22 11:16:26 +02:00
Simon Grätzer ad3da410b2 Pregel improvements 2017-05-22 11:10:28 +02:00
Michael Hackstein 71241e6048 Fixed usage of std::min on apple clang. It complains that size_t != uint64_t. Now both sides are uint64_t 2017-05-22 08:03:18 +02:00
Michael Hackstein 6f58815ccc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-22 07:50:06 +02:00
Michael Hackstein c9206ab218 The RocksDBEdgeIndexCache now can increase the values size it wants to cache, there is no hardcoded upperbound anymore. Also moved a lot of state out of the iterator. 2017-05-21 23:30:33 +02:00
Simon Grätzer 45d7c5c715 Various debugging changes 2017-05-20 17:44:28 +02:00
Simon Grätzer 552894fa97 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp
 2017-05-19 17:06:24 +02:00
Simon Grätzer bbb5f560ed Adding asserts 2017-05-19 17:05:43 +02:00
jsteemann 3459cbd15d re-activate fill_cache 2017-05-19 16:50:01 +02:00
Simon Grätzer a99611e7c0 Various changes 2017-05-19 16:43:00 +02:00
Simon Grätzer faac307f6e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-19 13:03:40 +02:00
jsteemann 6e5a9de0dc adjusted log messages 2017-05-19 11:33:43 +02:00
Simon Grätzer 7cd0bc3c62 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp
 2017-05-19 11:15:36 +02:00
jsteemann c34ebf8aa1 added Equal function to Comparator 
also don't fill block cache when using all/any iterators
 2017-05-19 09:58:19 +02:00
Simon Grätzer e73f446c5b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-18 22:08:39 +02:00
Simon Grätzer 2bd2a15cb3 Column family support 2017-05-18 22:08:34 +02:00
jsteemann f2a5a6473e try to fix ADL issue 2017-05-18 21:07:14 +02:00
jsteemann 0366fba276 try to fix thread joining for replication applier 2017-05-18 21:05:57 +02:00
jsteemann 46fb0f0e41 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-18 15:57:57 +02:00
Michael Hackstein e4050f9804 Temporary Commit, modifying some RocksDB Options and the EdgeIndex Cache size. This commit is used for NoSQL Performance Banchmark validation. 2017-05-18 15:45:49 +02:00
jsteemann 8bc6b3d3a1 removed default parameters 2017-05-18 15:06:19 +02:00
jsteemann b3c87b1f29 fix dropping indexes 2017-05-18 14:29:54 +02:00
jsteemann b68482bcaa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-18 00:17:55 +02:00
jsteemann 226920d7fa optimizations 2017-05-17 23:41:16 +02:00
Michael Hackstein b4d1664023 Disabled Collection Cache {_rev => doc} and PrimaryIndex Cache {_key => _rev}. This seems to not have a positive effect in our tests. 2017-05-17 17:50:15 +02:00
Dan Larkin e0465e0943 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-17 09:39:08 -04:00
Dan Larkin 8decc3c8b8 Fixed some uninitialized values. 2017-05-17 09:38:31 -04:00
Jan Christoph Uhde b91ffaecf6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  fixing deadlock
  Fixed SLPA
 2017-05-17 13:51:55 +02:00
Simon Grätzer 3b9e2c2f13 fixing deadlock 2017-05-17 13:44:43 +02:00
Jan Christoph Uhde 415cbfea60 fix figures and add tests 2017-05-17 12:22:43 +02:00
Simon Grätzer 0c6de98365 Fixed SLPA 2017-05-17 11:50:24 +02:00
Simon Grätzer a59d2ef457 GeoIndex performance improvements 2017-05-16 17:56:13 +02:00
Simon Grätzer 4b6035ff64 Fixed merge 2017-05-16 17:07:15 +02:00
Simon Grätzer e25f88ef4d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBCuckooIndexEstimator.h
#	arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
#	arangod/RocksDBEngine/RocksDBIndex.cpp
 2017-05-16 16:59:50 +02:00
Simon Grätzer 5265d2a063 intermediate commits 2017-05-16 16:21:39 +02:00
Andreas Streichardt c07c4b3181 fight visual studio warnings 2017-05-16 16:18:00 +02:00
Jan Christoph Uhde 9aab78a6e9 remove unused code 2017-05-16 13:06:33 +02:00
jsteemann a75271e1f9 optimizations for key bounds 2017-05-16 12:53:44 +02:00
jsteemann a8320e99dc don't force compaction after every collection drop operation 2017-05-16 12:22:30 +02:00
jsteemann 9607556e22 added missing copy constructor for RocksDBKeyBounds 
if the copy ctor was implicitly generated by the compiler,
query results were mostly undefined!
 2017-05-16 12:08:24 +02:00
jsteemann b9fbad02b7 fix MSVC compile warning 2017-05-16 12:04:20 +02:00
Michael Hackstein 5bb55b33e5 Put the release in countermanager into a TRI_DEFER for safety 2017-05-16 11:06:09 +02:00
Simon Grätzer b72243ab15 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-16 10:58:20 +02:00
Simon Grätzer df3eed2289 Various changes 2017-05-16 10:58:15 +02:00
Michael Hackstein dee84a1edb Added a forgotten release() after using a vocbase 2017-05-16 10:50:09 +02:00
jsteemann 572a2ea9e7 remove debug log message 2017-05-16 02:00:46 +02:00
Simon Grätzer 1e04f6ce72 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-15 18:01:39 +02:00
jsteemann baab846d9a remove unused variable 2017-05-15 17:38:33 +02:00
Simon Grätzer 6472d7cc94 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBCollection.cpp
 2017-05-15 17:36:09 +02:00
Simon Grätzer 70a1d27121 intermediate commits 2017-05-15 17:35:16 +02:00
Michael Hackstein d7d650e27d Implemented index estimates for RocksDB. Now the following indexes have 
a proper estimate:
* HashIndex
* SkiplistIndex / Persistent
* EdgeIndex
 2017-05-15 17:17:58 +02:00
jsteemann c423cf05a7 storage revisions in edge cache 2017-05-15 15:05:46 +02:00
jsteemann f49a32dff9 added missing casts 2017-05-15 14:39:27 +02:00
jsteemann 52ba50e281 micro optimizations for edge index 2017-05-15 12:06:27 +02:00
Simon Grätzer c4f19e5f91 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-15 10:42:33 +02:00
Simon Grätzer ead7ebcd7b Little changes for SLPA support 2017-05-15 10:42:25 +02:00
jsteemann c6d87e0060 ctor, then dtor, then others 2017-05-15 09:31:40 +02:00
jsteemann 51e8ee50c6 fix indentation 2017-05-15 09:31:08 +02:00
jsteemann 7c959cf81f fix indentation 2017-05-15 09:30:38 +02:00
jsteemann 4efbad5378 fix compile warnings 2017-05-15 09:29:10 +02:00
jsteemann 4470e7b1bb re-add geo index to supported indexes list 2017-05-15 08:41:52 +02:00
Frank Celler 0bf806bbd9 use maintainer guard 2017-05-13 14:34:23 +02:00
Simon Grätzer 49cc12e6a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-13 01:08:28 +02:00
Simon Grätzer fe0e296737 RocksDB: fixing WAL tailing issues 2017-05-13 01:08:22 +02:00
Max Neunhoeffer f614439416 Squashed commit of the following: 
commit 19a7210119cc284af64251b202f690ab62bf615c
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 23:20:10 2017 +0200

    Allow access to /_api/user/ without database check in VST as in HTTP.

    This is a try to fix #2465

commit f973c1335652540174bf6b78df42290bded357da
Merge: 30bdc4c 365de45
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 21:32:15 2017 +0200

    Merge remote-tracking branch 'origin/devel' into vst-cleanup

commit 30bdc4ca38e028d58cebea8268683d9f94e87ad7
Merge: 14acaea 086f6a2
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 14:52:23 2017 +0200

    Merge remote-tracking branch 'origin/devel' into vst-cleanup

commit 14acaea8cb5fff2c1c8c27eee32294bfd612f629
Merge: 5bd0e79 fb088d3
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 12:40:29 2017 +0200

    Merge remote-tracking branch 'origin/devel' into vst-cleanup

commit 5bd0e79ab053447f94f2fd959a33b1e15302b6a8
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 12:36:23 2017 +0200

    Fix bug in authentication in VST

commit 9a999ce5e629aee5816a4f61b194b086d11fd169
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 12:24:35 2017 +0200

    Open up endpoints /_open/* in VST without being authenticated

commit 32f62db42af6d5bfc24214ebb4ca7c1fb473b55e
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 12:11:31 2017 +0200

    Simplify logic by not using boost::optional.

commit 925ce2f7b890c6f14205fd3e98553939d89bec61
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 12:11:20 2017 +0200

    Add JWT case for authentication for VST

commit f1d7f67a9fc20c91ca000e9a4dad91e0f50f1652
Merge: 040ace3 7a9ccc9
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 08:58:51 2017 +0200

    Merge remote-tracking branch 'origin/devel' into vst-cleanup

commit 040ace3e9dce47ddea5f51d29f0153a70d257c9e
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 08:23:16 2017 +0200

    Write out chunk buffer using little endian uints

commit 66ad4c0e8d3bc94091664505986b00e7cff39f2f
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri May 12 08:12:38 2017 +0200

    Move maxChunkSize query to constructor, remove dead code

commit f7b4c26cc09c6d512362340c6bf6061bbaae61a9
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 17:57:14 2017 +0200

    Do not take protocolVersion from request for VST.

commit c76d6685f9507701715abf882f0ac0e192ead59f
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 13:20:58 2017 +0200

    Remove dead code for compression which did never work well.

commit b823765b7c041dc5d143f7ab2e13d92f5f42d3eb
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 13:09:53 2017 +0200

    Fix renaming to make compiler happy.

commit b327830012d146f4f4e2d0f0467dab351fbd3bd0
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 13:07:36 2017 +0200

    Rename _defaultPortVpp to _defaultPortVst.

commit 5eb98a9e64d702476e8ec098b7506b1a63145d64
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 13:06:28 2017 +0200

    Rename header guards VPP -> VST.

commit a3e96be26d49d6151898d8d757ede6225ac6abd2
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 13:05:55 2017 +0200

    Rename VppRequest and VppResponse files to Vst.

commit 1d5f6f196490c3cf9312be5927b967b4abc03b67
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 13:04:19 2017 +0200

    Change names of header guards VPP -> VST.

commit f004b25fbef75050b34bcd4eae4eb17b8b467230
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 13:03:19 2017 +0200

    Rename files VppNetwork.h and VstMessage.h

commit c04d3aec19e8f0a8a3b90cd48e7736bff037359d
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 12:59:15 2017 +0200

    Implement correct chunk header for sending out VelocyStream 1.1 messages.

commit 73aeedfbbef24d5929c44bd26c16343480514270
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 01:11:23 2017 +0200

    A lot more renaming VPP -> VST.

commit 2acedc77f16a82251bc4f9e39526184e2a6f0dec
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 00:49:20 2017 +0200

    Rename header guard.

commit 2ade43946aa5ea0048dab81eed5ffd931ce35ea8
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 00:48:01 2017 +0200

    Rename files VppCommTask.* to VstCommTask.*

commit 0ffcda02a51cbad35e5ec06117d397aac37323cd
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 00:46:31 2017 +0200

    Rename class VppCommTask to VstCommTask.

commit 9478c6c56c995b014b7a14408544b76fa676a317
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 00:30:47 2017 +0200

    Rename protocol versions to VST in ProtocolVersion enum.

commit 0b69b7add6d7b5155ac71b8257def282ab4a1637
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 00:29:29 2017 +0200

    Recognize incoming chunk headers in VST/1.1 format.

commit f40173c4fc6dc48613ae67ac3fd810d002c9b6cd
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 00:11:54 2017 +0200

    Recognise and remember VST/1.0 and VST/1.1 protocol versions.

commit 29c798dc1af2d650c41eb9ed06f635786faf10f6
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 11 00:11:23 2017 +0200

    Create protocol version VST/1.1 and disable vst+ prefix for endpoints.
 2017-05-12 23:22:22 +02:00
Jan Christoph Uhde 235a82a7dc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Add bye bye messages
  update rocksdb logging to error level
  protect vector of isolate data with a mutex
  avoid nullptr in Inception
  remove satelites
 2017-05-12 21:39:22 +02:00
Jan Christoph Uhde 4a85f93814 avoid search in cache when iterator was resumed 2017-05-12 21:38:29 +02:00
Simon Grätzer 9ac438ef0f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-12 18:19:35 +02:00
jsteemann 7ea6ba7ad3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-12 17:27:40 +02:00
jsteemann 257e3a05e3 update rocksdb logging to error level 2017-05-12 17:27:22 +02:00
Simon Grätzer 93e382fb06 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-12 16:54:41 +02:00
Jan Christoph Uhde b7ca835671 release findings sooner if they contain many entries 2017-05-12 16:09:12 +02:00
Jan Christoph Uhde d6c06e3672 exose cache hit rate for rocksdb caches 2017-05-12 15:59:26 +02:00
Simon Grätzer 2899fceeb1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-12 15:55:00 +02:00
Jan Christoph Uhde 227d6648a2 fix not advancing iterator in rocksdb edge index 2017-05-12 14:47:42 +02:00
Simon Grätzer 40f174710b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-12 14:07:34 +02:00
Simon Grätzer 958c19de35 stuff 2017-05-12 14:07:30 +02:00
Jan Christoph Uhde 07bb07de39 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/edge-index-cache 
* 'devel' of https://github.com/arangodb/arangodb:
  add debug output
  more unique ptrs
  fixed comment
  moved description into correct section
  remove unused options
  enable rocksdb logger
 2017-05-12 13:56:57 +02:00
Jan Christoph Uhde db38ef3522 more clean up for edge index 2017-05-12 13:51:05 +02:00
Jan Christoph Uhde a1454ce87c clean up RocksDBEdgeIndex code 2017-05-12 13:27:25 +02:00
Jan Christoph Uhde dd00e03010 fix2 2017-05-12 13:18:13 +02:00
Jan Christoph Uhde 3afdb2a666 fix 2017-05-12 12:35:35 +02:00
Simon Grätzer 8a3d7267d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-12 12:35:12 +02:00
jsteemann b1aae2efdd remove unused options 2017-05-12 12:12:09 +02:00
jsteemann b848030818 enable rocksdb logger 2017-05-12 12:03:54 +02:00
Simon Grätzer fd3bbdd043 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBTransactionState.cpp
 2017-05-12 10:55:51 +02:00
Simon Grätzer 5b79e77128 Begin work on transaction wrapper 2017-05-12 10:52:08 +02:00
Jan Christoph Uhde 7902d0e44e Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/edge-index-cache 
* 'devel' of https://github.com/arangodb/arangodb: (25 commits)
  Add footer to docs, unify slogan
  Docs: make graph traversal images hard copies (fixes Cygwin builds)
  Added documentation for RocksDB and hash cache options to manual.
  Changed default cache size to something reasonable.
  cppcheck
  added comments
  fix shutdown order
  Added document cache.
  fix some replication issues
  Invalidate current coordinators on every 2nd heartbeatrun
  Show timeout when failing
  Addding locking, fixing conversion warning
  Fixing locking error
  resync changelog to 3.1
  Fix jslint
  CHANGELOG: SIGHUP forwarding
  forward SIG_HUP from supervisor
  Allow removing dbnodes
  Rocksb: index locking issue
  Fix serverAlias map...this was ridiculous
  ...
 2017-05-12 10:37:24 +02:00
jsteemann abeae0a30d cppcheck 2017-05-11 21:21:58 +02:00
jsteemann 6dfeea53be added comments 2017-05-11 20:59:45 +02:00
jsteemann 68611a0a6a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-11 20:58:49 +02:00
Dan Larkin 787335929c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-11 14:39:06 -04:00
Dan Larkin 1fc3480a6b Added document cache. 2017-05-11 14:39:00 -04:00
jsteemann db19b4fdf3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-11 19:01:49 +02:00
jsteemann 422b06211f fix some replication issues 2017-05-11 19:00:32 +02:00
Jan Christoph Uhde 9e9faf7bbd hopefully fix the cache 2017-05-11 18:07:30 +02:00
Simon Grätzer e11ef2bf54 Addding locking, fixing conversion warning 2017-05-11 17:38:50 +02:00
Jan Christoph Uhde dce3250862 add more logging to edge index 2017-05-11 16:42:49 +02:00
Simon Grätzer 310166d3cf Fixing locking error 2017-05-11 15:55:06 +02:00
Jan Christoph Uhde ba3c797704 fix bug in edgeIndex 2017-05-11 15:20:39 +02:00
Simon Grätzer c21bd1eeb8 Rocksb: index locking issue 2017-05-11 15:12:05 +02:00
Simon Grätzer f101e21328 Geo index update, renaming 2017-05-11 13:19:51 +02:00
Jan Christoph Uhde c6fa6bb1ae add empty array slices in cache if no primary key for fromTo can be found 2017-05-11 13:13:15 +02:00
Jan Christoph Uhde 36d8b31335 decrease log level for edge index cache 2017-05-11 12:56:12 +02:00
Jan Christoph Uhde ee6e28a33d first tests pass for rocksdb index with cache 2017-05-11 12:11:00 +02:00
Jan Christoph Uhde e36d795dad crashing during lookup 2017-05-11 11:18:44 +02:00
Jan Christoph Uhde db7fdd2b7f add postprocessRemove for RocksDBEdgeIndex 2017-05-11 09:50:23 +02:00
Dan Larkin f43e342c47 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-10 19:57:27 -04:00
Dan Larkin 52711a2b00 Added proper truncation support for RocksDB indexes. 2017-05-10 19:57:22 -04:00
jsteemann 17e9ea3d39 fix figures 2017-05-11 00:25:20 +02:00
jsteemann 1e0ce29d5b remove debug log message 2017-05-10 23:36:51 +02:00
Dan Larkin ab815e6020 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-10 17:28:27 -04:00
Dan Larkin 9276890e92 Fixed key bounds to be compatible with prefix seek mode. 2017-05-10 13:07:01 -04:00
Jan Christoph Uhde e2b78d71b6 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/edge-index-cache 
* 'devel' of https://github.com/arangodb/arangodb:
  Fix abort conditions of FailedLeader
  removing unused and unimplemented methods
  cppcheck
  getting rid of exceptions in supervision
  change to sleep_until so older windows are pleased (and is a better fitting method anyway)
  "searching for culprit breaking ensureIndex in cluster through go driver"
  Fixing fulltext deduplication
 2017-05-10 19:00:19 +02:00
Jan Christoph Uhde ce515abbd9 report size of cache for rocksdb indexes 2017-05-10 18:44:01 +02:00
Jan Christoph Uhde 847dd3ad5d Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/edge-index-cache 
* 'devel' of https://github.com/arangodb/arangodb:
  geo index fixes
  adding transactions to the geo index
 2017-05-10 18:43:20 +02:00
Simon Grätzer 9950fa7245 removing unused and unimplemented methods 2017-05-10 18:25:41 +02:00
Simon Grätzer d8053a9bcf Fixing fulltext deduplication 2017-05-10 16:17:46 +02:00
Jan Christoph Uhde 3e25aec2f3 fix enabling of caches 2017-05-10 15:58:28 +02:00
Simon Grätzer 2c7190aa34 geo index fixes 2017-05-10 15:50:50 +02:00
Jan Christoph Uhde e5db579b25 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/edge-index-cache 
* 'devel' of https://github.com/arangodb/arangodb: (54 commits)
  attempt to fix races in replication
  grunt build
  use exclusive transaction in syncer
  change feature order around
  dashboard
  added api cluster api routes
  add selection of storage engine
  use some parallelism
  micro optimizations
  Fix truncate for geo
  added assertions
  remove unused include
  try to fix initial sync problem
  remove unnecessary includes
  Finally fix the error where suddenly an array of dbservers are being called
  Update queryView.js
  initialize bool variable
  remove debug output
  removed unused private field
  Wrong index number
  ...
 2017-05-10 15:14:08 +02:00
Simon Grätzer 5464763c8e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-10 14:54:46 +02:00
Simon Grätzer 5fa85761a2 adding transactions to the geo index 2017-05-10 14:54:39 +02:00
jsteemann d46d6e5f5f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-10 14:32:46 +02:00
Jan Christoph Uhde 4cfbe85e4a honor batch size && length limit for cache values 2017-05-10 14:01:10 +02:00
Jan Christoph Uhde 7ea4eaf774 fix index figures 2017-05-10 14:00:40 +02:00
jsteemann f534421c74 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-10 13:19:45 +02:00
jsteemann 7aac7de2e4 micro optimizations 2017-05-10 13:08:31 +02:00
Simon Grätzer 4b563744d8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-10 13:02:30 +02:00
Simon Grätzer cd344f9f14 Fix truncate for geo 2017-05-10 13:02:20 +02:00
jsteemann 12093e809f added assertions 2017-05-10 12:58:28 +02:00
jsteemann 0d39f68faf try to fix initial sync problem 2017-05-10 12:57:53 +02:00
jsteemann dc4ea0e580 initialize bool variable 2017-05-10 11:10:54 +02:00
jsteemann c5ef6652e4 remove debug output 2017-05-10 11:10:35 +02:00
jsteemann e85cadb90d removed unused private field 2017-05-10 11:04:03 +02:00
Jan Christoph Uhde e6d41cac9a clean up edge-index code - handling of invalidated caches still missing 2017-05-10 09:03:21 +02:00
jsteemann 1f6ac2965d fix updating of slice 2017-05-10 08:49:45 +02:00
Dan Larkin 9662b26002 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-09 18:44:15 -04:00
Dan Larkin ca91c0f7c9 Added some optimizations enabled by prefix extraction. 2017-05-09 18:36:12 -04:00
Simon Grätzer f82745b617 Oops 2017-05-09 23:02:16 +02:00
Simon Grätzer 42d230e4ae Fixing recovery for geo index 2017-05-09 22:29:29 +02:00
Jan Christoph Uhde 738989f9a3 add blacklisting for keys in rocksdb-edge-index on insert/remove 2017-05-09 18:33:05 +02:00
Your Name 7f92f80e59 fix windows warning 2017-05-09 16:49:51 +01:00
Simon Grätzer 3b7ef439c8 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/rocksdb-geoindex 2017-05-09 17:42:27 +02:00
Simon Grätzer dd584c0aa4 Swapping key format, fixing recovery 2017-05-09 17:28:08 +02:00
Jan Christoph Uhde e29db44af6 begin work on cache for edge index 2017-05-09 17:22:27 +02:00
Simon Grätzer c016c54320 Fixing AQL query-geo test 2017-05-09 15:44:19 +02:00
Simon Grätzer ce5f5c0c7d Fixed nullptr 2017-05-09 15:13:15 +02:00
Simon Grätzer df7e12d79b Working geo index + tests 2017-05-09 15:04:51 +02:00
Simon Grätzer b0bc75c93e Working geo index 2017-05-09 14:47:13 +02:00
jsteemann 488e4be485 preparation for RocksDB logger 2017-05-09 12:42:25 +02:00
jsteemann 587418fd1b constified 2017-05-09 02:13:51 +02:00
Dan Larkin e601e1efd9 Added prefix extractor. 2017-05-08 16:47:36 -04:00
jsteemann 12b46d2086 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 18:27:07 +02:00
jsteemann 7577fed6fb added logger 2017-05-08 18:24:40 +02:00
Dan Larkin f6a20e1f41 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-08 12:09:10 -04:00
Dan Larkin 284bb6fb51 Fixed some issues with RocksDB passthrough options. 2017-05-08 12:08:41 -04:00
Jan Christoph Uhde cc51a10da2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  fix race
  try to detect situations where we need to invalidate the windows build directory
  fixing the fix
  fix indentation
  remove unnecessary includes
  fixing the fix
  remove obsolete comment
  oops more
  ooops left debug output behind
  Fixed header parsing in SimpleHttpClient for wrongly advanced cursor position in readBuffer
  Possibly too ambitious timing
  Windows warnings
  Docs: Fix link between Manual and AQL book
  The rocksdb cluster dump now tests Fulltext index as well
 2017-05-08 18:00:39 +02:00
Simon Grätzer f62c99188c Seemingly functional geo index 2017-05-08 17:48:08 +02:00
Jan Christoph Uhde a4a04350a3 fix replication 2017-05-08 17:43:36 +02:00
Jan Christoph Uhde acee270075 fix small bugs revealed by tests 2017-05-08 15:43:09 +02:00
Andreas Streichardt 6474c952a2 Windows warnings 2017-05-08 15:21:23 +02:00
Jan Christoph Uhde 8ee0406c64 move last logger creation to engines 2017-05-08 15:18:19 +02:00
Simon Grätzer 9098776589 Added geo index CRUD functionality 2017-05-08 14:49:58 +02:00
Simon Grätzer a610d81e3d fixing compiler warnings 2017-05-08 14:14:23 +02:00
Jan Christoph Uhde cf333f3b0a move creation of tickranges and first ticks into storage engines 2017-05-08 14:11:41 +02:00
Simon Grätzer 2aef42231e Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/rocksdb-geoindex 2017-05-08 13:41:12 +02:00
Simon Grätzer 7142bf2cfc Intermediate commit 2017-05-08 13:41:00 +02:00
Jan Christoph Uhde 13f2cd4cb9 change rocksdbkey for geoindex 2017-05-08 12:34:53 +02:00
Jan Christoph Uhde 80eae61afd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Adding full text index to tests, and fixing some error handling
  fix wrong assertion
 2017-05-08 12:04:57 +02:00
Jan Christoph Uhde a8cc4c802d move logger state creation into engines 2017-05-08 12:04:31 +02:00
Simon Grätzer 31b87de7b3 Adding full text index to tests, and fixing some error handling 2017-05-08 11:41:12 +02:00
Jan Christoph Uhde 81a5a39e22 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/rocksdb-geoindex 
* 'devel' of https://github.com/arangodb/arangodb: (34 commits)
  remove unused files (with long filenames that produce problems on Windows checkouts)
  attempt to fix Windows test
  fix recovery tests
  Added more RocksDB passthrough options.
  Raise transaction replication timeout to adjust for sporadic RocksDB latencies.
  cleanup
  unified
  Fixing mem leak
  fixing small issue
  Fixed dump test
  Count fix & tests enabled
  Fixing parser bug
  RocksDB Fülltext index
  alphabetic order
  Fixing warnings and errors
  My friend ruby and his best pal openssl went into the windows bar for drinking...sad
  attempt at fixing occasional fatal errors accessing clustercomm instance on shutdown
  broke devel and fixed
  increase the size of the intermediate disk image
  osx fix on funny fail
  ...
 2017-05-08 11:22:20 +02:00
Jan Christoph Uhde 8a1c954b09 add GeoIndexValue to RocksDBTypes and Keys 2017-05-08 11:10:49 +02:00
jsteemann 1f5731461a fix recovery tests 2017-05-08 08:55:35 +02:00
Dan Larkin 9924fa1480 Added more RocksDB passthrough options. 2017-05-07 11:08:25 -04:00
Simon Grätzer f15b7032cb Fixing mem leak 2017-05-06 14:17:37 +02:00
Simon Grätzer 7d28844f21 fixing small issue 2017-05-06 03:42:28 +02:00
Simon Grätzer 59a514bb89 Count fix & tests enabled 2017-05-06 01:57:09 +02:00
Simon Grätzer 646979acce Fixing parser bug 2017-05-06 01:28:44 +02:00
Simon Grätzer dd0b0c6b28 RocksDB Fülltext index 2017-05-06 01:14:49 +02:00
Jan Christoph Uhde 577e702e20 geo index - (de)serialize RocksDBValues 2017-05-05 18:27:08 +02:00
Simon Grätzer 152a3b6d8d Fixing warnings and errors 2017-05-05 17:26:28 +02:00
Simon Grätzer 9f8ffe9136 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-05 15:44:20 +02:00
Simon Grätzer 6f69454c82 Added fulltext index 2017-05-05 15:44:15 +02:00
jsteemann 8c2be23d73 do not call SyncWAL() on Windows, as it does not work 2017-05-05 15:37:38 +02:00
jsteemann 6a30df3363 add some safety padding for WAL file deletion 2017-05-05 15:31:57 +02:00
Simon Grätzer 47b4f236c7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-05 13:58:15 +02:00
Simon Grätzer d9bff18814 Fulltext index 2017-05-05 13:58:11 +02:00
jsteemann ac7e0a225f fixed issues found by scan tool 2017-05-05 13:51:23 +02:00
Jan Christoph Uhde b42c6c0e45 add rocksdbgeoindex 2017-05-05 13:38:57 +02:00
Jan Christoph Uhde e9c680ec08 add rocksdb geo index implementation 2017-05-05 13:00:32 +02:00
Michael Hackstein 19133a0db0 Added a missing override. 2017-05-05 10:02:06 +02:00
jsteemann e79f9779b3 go on in case of errors 2017-05-04 23:32:17 +02:00
jsteemann d352794360 optimize away own transaction management for RocksDB engine 2017-05-04 23:16:53 +02:00
jsteemann 631dc8c414 whitespace 2017-05-04 22:01:48 +02:00
jsteemann aabfc764db remove unused file 2017-05-04 22:01:23 +02:00
Dan Larkin 037f3f38b9 Removed accidental log spam. 2017-05-04 15:30:09 -04:00
Dan Larkin d77efe38dc Added explicit WAL file lifecycle management to reduce space overhead from replication. 2017-05-04 15:16:24 -04:00
Simon Grätzer 804676ae65 Moving estimatedSize to memory() 2017-05-04 18:57:22 +02:00
Simon Grätzer cdbea139ce added replication client garbage collection 2017-05-04 18:40:55 +02:00
Simon Grätzer 4e35edc0a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-04 18:07:52 +02:00
Simon Grätzer 94e4437c3a Added some non transactional truncate logic 2017-05-04 18:07:47 +02:00
jsteemann f4911e262b improve error messages 2017-05-04 16:34:22 +02:00
jsteemann 0cad04bdb3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-04 15:09:39 +02:00
Simon Grätzer 9837fe3bb7 Added compaction after truncate 2017-05-04 14:00:21 +02:00
Simon Grätzer 40b8eb2824 Trigger compaction on drop and truncate 2017-05-04 13:45:30 +02:00
jsteemann 10c70ae857 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-04 13:18:21 +02:00
jsteemann d892f280ed fix cluster_sync test 2017-05-04 13:16:47 +02:00
Simon Grätzer 1c82d4448c Adding compaction and estimateSize method for rocksdb 2017-05-04 13:08:02 +02:00
Dan Larkin 1ea4dcc4fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-03 20:21:17 -04:00
Dan Larkin 6e2aab20c6 Added support for splitting MMFiles-style edge index definitions in RocksDB engine. 2017-05-03 20:19:51 -04:00
jsteemann 1e72f8ccdc allow configuration of use_fsync from the outside 2017-05-04 01:15:09 +02:00
jsteemann ff30754d50 disable dfdb in RocksDB 2017-05-04 01:15:02 +02:00
jsteemann 54be445171 adjusted error code produced in case an invalid index type is used 2017-05-04 00:41:01 +02:00
jsteemann f1763e491d fix db._engineStats() 2017-05-04 00:33:36 +02:00
jsteemann 060e875cd4 update tick values from numeric keys 2017-05-03 22:44:58 +02:00
Simon Grätzer a73df1aff3 Fixing test timeouts 2017-05-03 19:42:27 +02:00
Simon Grätzer 0faa1adac1 fixed unique contraints 2017-05-03 17:45:21 +02:00
Simon Grätzer 52e568a7a0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-03 16:07:36 +02:00
Simon Grätzer a2e2c00d62 fillIndex non transactional + tests 2017-05-03 16:07:29 +02:00
jsteemann 2e3d704d10 fix MSVC compile warnings 2017-05-03 15:47:45 +02:00
jsteemann 9a48bd3411 fix unintended change of option value 2017-05-03 15:18:44 +02:00
jsteemann c716fcacd3 write settings on shutdown 2017-05-03 15:18:17 +02:00
Simon Grätzer 5e9201e288 Reformatting v8functions 2017-05-03 12:31:32 +02:00
Simon Grätzer e62d82f1d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEngine.cpp
#	arangod/RocksDBEngine/RocksDBV8Functions.cpp
 2017-05-03 12:27:58 +02:00
Simon Grätzer b5df720870 Added rocksdb properties 2017-05-03 12:23:19 +02:00
Jan Christoph Uhde 74e82d15e9 remove exception and add some documentation to function 2017-05-03 11:16:13 +02:00
Jan Christoph Uhde 0356897536 fix exposed function name 2017-05-03 10:52:48 +02:00
Jan Christoph Uhde 53004f2a64 recaluclate count by collection scan on request 2017-05-03 10:42:58 +02:00
Jan Christoph Uhde c1cbc890d6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Fix ignoreDistributeShardsLikeErrors behaviour.
  Fixed logic bug preventing file deletions in RocksDB engine.
  Translate distributeShardsLike into collection name in dump.
  Revert "Unwurst results"
  Revert "Fail lint"
  Revert "Remove debug leftover"
  Enabled/fixed check for empty transactions to reduce WAL spam.
  Remove debug leftover
  Fail lint
  Unwurst results
 2017-05-03 09:47:36 +02:00
Max Neunhoeffer a347c57927 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-05-03 09:13:24 +02:00
Max Neunhoeffer 1b0e976a55 Fix ignoreDistributeShardsLikeErrors behaviour. 2017-05-03 09:13:03 +02:00
Dan Larkin 57606e3e18 Fixed logic bug preventing file deletions in RocksDB engine. 2017-05-02 17:00:45 -04:00
Dan Larkin ae1566fd7b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-02 13:03:08 -04:00
Dan Larkin 860dcbbf9a Enabled/fixed check for empty transactions to reduce WAL spam. 2017-05-02 13:03:00 -04:00
Jan Christoph Uhde 8e4d5b879b create transaction to get collection lock 2017-05-02 18:34:02 +02:00
Jan Christoph Uhde 381a266fcc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Fixing issues with the seek incremental sync optimization
  fixed typo
  debugging
 2017-05-02 17:55:07 +02:00
Jan Christoph Uhde b7f42f638e add empty impl for recalculating counts in rocksdb engine 2017-05-02 17:54:36 +02:00
Simon Grätzer 953b017d37 Fixing issues with the seek incremental sync optimization 2017-05-02 17:24:49 +02:00
Jan Christoph Uhde 3cb1cc7a52 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Fixing index markers
  exclusive locks for indexes
  better incremental sync
  grunt build
  Avoid log spam.
  Removed code paths that wrote objectIds into the Agency. This did break replication.
  WAL: honor tick end value
  WAL fiter after collection
  Reactivated client-side filtering of unnecessary markers
  Added an Assert when persisting an index it's objectId is not allowed to be 0
  The RestReplicationHandler now inserts new ObjectIds when replicating collections
  moved files
  add dependencies for TransactionManager
  fix include
  move engine-specific test into engine test
 2017-05-02 16:41:43 +02:00
Jan Christoph Uhde da02fd36c6 move engine specific syncer code into engines 2017-05-02 16:36:27 +02:00
Simon Grätzer 98c41423b3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-02 16:35:07 +02:00
Simon Grätzer 5f1880f839 Fixing index markers 2017-05-02 16:35:01 +02:00
jsteemann 45096dd503 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-02 16:09:35 +02:00
jsteemann f815f9e37a exclusive locks for indexes 2017-05-02 16:09:27 +02:00
Simon Grätzer 9f40893bfd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-02 15:08:13 +02:00
Simon Grätzer e335a29326 better incremental sync 2017-05-02 15:08:05 +02:00
Michael Hackstein cf12573507 Removed code paths that wrote objectIds into the Agency. This did break replication. 2017-05-02 14:59:19 +02:00
Simon Grätzer c55ce367eb WAL: honor tick end value 2017-05-02 13:55:19 +02:00
Simon Grätzer 39d8186e16 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-02 13:46:48 +02:00
Simon Grätzer 09de672ba1 WAL fiter after collection 2017-05-02 13:46:43 +02:00
Michael Hackstein 4fa2ef485d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-02 13:19:25 +02:00
Michael Hackstein 33d9e8af9d Added an Assert when persisting an index it's objectId is not allowed to be 0 2017-05-02 13:17:57 +02:00
Michael Hackstein b6bac742b1 The RestReplicationHandler now inserts new ObjectIds when replicating collections 2017-05-02 13:17:18 +02:00
jsteemann 910f5680b0 moved files 2017-05-02 12:34:28 +02:00
jsteemann 2aae4fc437 fix include 2017-05-02 11:32:15 +02:00
Dan Larkin b46ac15300 Fixed 2.8 dump compatibility and fixed a few more HTTP replication tests. 2017-04-28 16:50:39 -04:00
Dan Larkin e6611ddc4f Fixed ongoing replication bugs and split the test. 2017-04-28 16:01:29 -04:00
Dan Larkin 686d81e6f2 Fixed bug with drop index marker. 2017-04-28 14:35:50 -04:00
Dan Larkin 5e0a60406a Fixed recovery bug. 2017-04-28 14:02:49 -04:00
Simon Grätzer 86ad31124d Fixing some shell_replication tests 2017-04-28 18:14:03 +02:00
jsteemann 3e41c27632 fix segfault 2017-04-28 17:43:29 +02:00
Simon Grätzer 018cf68e06 Added index ID to WAL 2017-04-28 17:37:37 +02:00
Simon Grätzer 97681ab32a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
 2017-04-28 17:12:50 +02:00
Simon Grätzer 3f645f85ff fixing drop 2017-04-28 17:11:52 +02:00
jsteemann a99cc64bed minor fixes 2017-04-28 17:09:00 +02:00
Simon Grätzer 506e56aa72 Fixed remove 2017-04-28 16:50:40 +02:00
Simon Grätzer db26fe0061 Added tick value 2017-04-28 16:33:06 +02:00
Simon Grätzer fd7059f94c Added tax id 2017-04-28 16:31:20 +02:00
Simon Grätzer 51c8653cb2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 16:28:41 +02:00
Simon Grätzer 52058ac909 fixing replication errors 2017-04-28 16:28:35 +02:00
Michael Hackstein 42ade94f3d Fixed number type asserts in RocksDBValue 2017-04-28 15:42:13 +02:00
Simon Grätzer c9d310c5b4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 14:51:05 +02:00
Simon Grätzer 84ed7ec100 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp
 2017-04-28 14:40:17 +02:00
jsteemann fef62ecda6 added more assertions 2017-04-28 14:32:52 +02:00
jsteemann a2db9ad886 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 14:28:54 +02:00
jsteemann 81f1d3820f added assertions for transaction states 2017-04-28 14:28:45 +02:00
Simon Grätzer 0a00a7eb67 Fixed broken JSON output 2017-04-28 14:28:34 +02:00
jsteemann 502d3ee354 fix reading of initial tick values from RocksDB 2017-04-28 14:28:13 +02:00
Jan Christoph Uhde 9c3f9afa22 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Adapted recplication-ruby test removed tests for system indexes and compatibility tests.
  Fixed Dump. It tried to insert contains of a builder into itself
  Remove rocksdb linking (implicitly done via arangoserver!)
  ASAN runtime errors
  Reduce maximal timeout in exponential backoff when waiting for a lock.
  abort early
  Fixed restoreIndox for RocksDB. Also removed Primary and EdgeIndexes from Inventory, which is identical to MMFiles
  try to make task tests more robust and reliable
  lock unification
 2017-04-28 14:22:09 +02:00
Jan Christoph Uhde ce762fe872 add handleCommandDetermineOpenTransactions 2017-04-28 14:21:55 +02:00
jsteemann 037310b60d disable optimization 2017-04-28 13:55:10 +02:00