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

39372 Commits

Author SHA1 Message Date
Michael Hackstein 07075b6805 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-28 17:40:27 +02:00
Michael Hackstein 3b364897a1 Made replication-static test aware of MMFiles and gnore their options. 2017-04-28 17:40:13 +02:00
Simon Grätzer f38b203f94 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 17:37:42 +02:00
Simon Grätzer 018cf68e06 Added index ID to WAL 2017-04-28 17:37:37 +02:00
Max Neunhoeffer 1684676924 Agency improvement: track ongoing transactions for inquire. 2017-04-28 17:24:30 +02:00
Max Neunhoeffer 8e755309c5 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-28 17:22:13 +02:00
Max Neunhoeffer 09ff77cce2 Make Windows VS compiler a bit happier. 2017-04-28 17:18: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
jsteemann 68bc8f46d8 make tests more robust 2017-04-28 16:26:36 +02:00
Michael Hackstein 42ade94f3d Fixed number type asserts in RocksDBValue 2017-04-28 15:42:13 +02:00
Jan Christoph Uhde a9d2b4dc7e redo: remove unnecessary code 2017-04-28 14:59: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
Jan Christoph Uhde 5874b4d997 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  erroneous .25 wait before each agency transaction
  added more assertions
  added assertions for transaction states
  fix reading of initial tick values from RocksDB
  Moved tests for indexBuckets to MMFilesEngine only in dump_authentication. Not needed in RocksDB
  disable optimization
  optimizations for read-only transactions
  optimizations for empty transactions
  try to fix non-deterministic behavior in test
 2017-04-28 14:44:47 +02:00
jsteemann df3c6abb21 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 14:44:14 +02:00
Jan Christoph Uhde cb868d36a9 remove unnecessary code 2017-04-28 14:44:04 +02:00
Simon Grätzer 96f347ce73 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 14:41:45 +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
Kaveh Vahedipour f331947a33 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 14:37:56 +02:00
Kaveh Vahedipour 311bda2af7 erroneous .25 wait before each agency transaction 2017-04-28 14:37:46 +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
Michael Hackstein 3b3b3e9f52 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-28 14:25:43 +02:00
Michael Hackstein 9ec440d0c2 Moved tests for indexBuckets to MMFilesEngine only in dump_authentication. Not needed in RocksDB 2017-04-28 14:25:35 +02:00
Jan Christoph Uhde d76e85efea be more verbose in test 2017-04-28 14:23:16 +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 12df8249b3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 14:15:37 +02:00
Michael Hackstein fef0528b95 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-28 14:13:58 +02:00
Michael Hackstein 8efaed6232 Adapted recplication-ruby test removed tests for system indexes and compatibility tests. 2017-04-28 14:13:49 +02:00
jsteemann 2375542e48 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 13:55:16 +02:00
jsteemann 037310b60d disable optimization 2017-04-28 13:55:10 +02:00
Kaveh Vahedipour 0d322dc113 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 13:51:02 +02:00
jsteemann 5ab204751c optimizations for read-only transactions 2017-04-28 13:29:49 +02:00
jsteemann 9183f9da8e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 13:13:49 +02:00
jsteemann ebd95ce7df optimizations for empty transactions 2017-04-28 13:13:41 +02:00
jsteemann a52a0f0a47 try to fix non-deterministic behavior in test 2017-04-28 13:13:30 +02:00
Michael Hackstein 10b212b5a3 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-28 13:11:45 +02:00
Michael Hackstein 77c05cff09 Fixed Dump. It tried to insert contains of a builder into itself 2017-04-28 13:10:27 +02:00
Andreas Streichardt fd3f8e6ad9 Remove rocksdb linking (implicitly done via arangoserver!) 2017-04-28 12:09:02 +02:00
Kaveh Vahedipour cb2420d7f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 11:57:28 +02:00