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

203 Commits

Author SHA1 Message Date
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
Simon Grätzer 0a00a7eb67 Fixed broken JSON output 2017-04-28 14:28:34 +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
Michael Hackstein 10b212b5a3 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-28 13:11:45 +02:00
Max Neunhoeffer 170942da4f Reduce maximal timeout in exponential backoff when waiting for a lock. 2017-04-28 11:38:17 +02:00
Michael Hackstein 435d990e4b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-28 11:10:01 +02:00
Michael Hackstein 360d2b3b99 Fixed restoreIndox for RocksDB. Also removed Primary and EdgeIndexes from Inventory, which is identical to MMFiles 2017-04-28 11:09:53 +02:00
Jan Christoph Uhde 8df6e1c289 update ticks after parsing wal 2017-04-28 11:04:06 +02:00
Simon Grätzer ddf7ae60cf WAL tailing 2017-04-27 17:38:02 +02:00
Simon Grätzer c10f5abfc0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBLogValue.cpp
#	arangod/RocksDBEngine/RocksDBLogValue.h
 2017-04-26 23:44:28 +02:00
Dan Larkin da30cf862e Updated document markers. 2017-04-26 16:25:12 -04:00
Dan Larkin cc92d280f6 Added document insert/remove markers. 2017-04-26 16:14:15 -04:00
Dan Larkin f8efe6e627 Added create index and change collection marker creation. 2017-04-26 15:23:25 -04:00
Simon Grätzer 37cbb80d50 Fixed startup exception 2017-04-26 20:35:20 +02:00
Simon Grätzer b93c294c41 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBLogValue.cpp
 2017-04-26 18:58:29 +02:00
Simon Grätzer 29286a9c1b RocksDB WAL entries for transactions 2017-04-26 18:54:55 +02:00
Michael Hackstein e423a5fde1 Added WAL MARKERS for CreateCollection, RenameCollection and DropIndex, also adjested WalMarkerType constructors. 2017-04-26 18:32:28 +02:00
jsteemann 861291da16 honor exclusive locks 2017-04-25 12:56:56 +02:00
jsteemann 4300c77d3e fixes for non-array IN lookups, added tests 2017-04-25 01:47:07 +02:00
Simon Grätzer 91fe0f01ea formatting 2017-04-24 15:55:21 +02:00
Simon Grätzer fe84b499c0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-04-24 15:45:39 +02:00
Simon Grätzer 7176d34169 Fixed incremental synced 2017-04-24 15:40:48 +02:00
Michael Hackstein 6cfa55ac6c Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-04-24 13:54:42 +02:00
jsteemann fcc61115d8 try to fix feature startup order (Scheduler vs. CacheManager vs. DatabaseFeature) 2017-04-24 13:17:21 +02:00
Simon Grätzer df57b291f8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 10:23:33 +02:00
jsteemann d0fae3cf7b savepoint optimizations 2017-04-21 18:23:47 +02:00
Simon Grätzer ff4f8181dd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 13:00:36 +02:00
Simon Grätzer 235f006a27 const collection CRUD methods 2017-04-21 13:00:30 +02:00
Simon Grätzer 064c51c731 Adding const statements 2017-04-21 12:59:20 +02:00
jsteemann 862ec7bae3 remove log garbage 2017-04-21 12:57:20 +02:00
Simon Grätzer b304d35ac2 Added rocksdb background thread 2017-04-20 18:50:52 +02:00
Simon Grätzer 502dc66697 Make some methods const 2017-04-20 16:39:18 +02:00
Simon Grätzer 388121158e Started inventory rest handler 2017-04-20 12:16:40 +02:00
Dan Larkin dfd1e78f35 Added objectId-to-database+collection mapping. 2017-04-19 13:56:17 -04:00
jsteemann 702e33759c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 21:03:08 +02:00
Dan Larkin 7ad0c75745 Fixed bug in index info persistence/recovery. 2017-04-18 14:55:58 -04:00
jsteemann dc5fb20b81 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 17:28:04 +02:00
jsteemann 69576ca79e preparations for locks 2017-04-18 17:27:37 +02:00
Jan Christoph Uhde c12bd6f2ed remove code that tracks size of index operations 
in RocksDBTransactions
 2017-04-18 16:58:44 +02:00
jsteemann 2f574a75be remove debug output 2017-04-18 15:06:22 +02:00
jsteemann 031e9adb3c slightly adjust error messages 2017-04-18 12:43:21 +02:00
Dan Larkin 97d525e9b7 Revert "Fixed primary index cluster bug." 
This reverts commit 8c4214625c.
 2017-04-17 17:06:23 -04:00
Dan Larkin 841ef8b1a0 Changed index VPack building to include forPersistence flag. 2017-04-17 17:04:50 -04:00
Dan Larkin 8c4214625c Fixed primary index cluster bug. 2017-04-13 21:44:51 -04:00
Dan Larkin 2e0fdbf666 Fixed some bugs. 2017-04-13 20:06:25 -04:00
Simon Grätzer 76b4c0b2c1 Fixed cluster startup 2017-04-13 14:32:55 +02:00
Simon Grätzer 3b3ee5f996 Counter fixes 2017-04-12 17:10:35 +02:00
Dan Larkin d435d274ea Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-12 09:35:19 -04:00
Jan Christoph Uhde d67aa33fe3 limit transaction size and work on intermediate commits 2017-04-12 09:01:13 +02:00
Dan Larkin b030cdb347 Fixed an edge index iterator bug. 2017-04-10 20:12:15 -04:00
Jan Christoph Uhde 8df9fe1d21 fix error in insert 2017-04-10 21:27:52 +02:00
Jan Christoph Uhde 60c4f27ec6 finish transaction limiting for truncate 2017-04-10 16:33:36 +02:00
Jan Christoph Uhde c82fadc863 prepare limitation of transaction size 2017-04-10 14:00:55 +02:00
Jan Christoph Uhde efb6d498f0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed issue with cache transactions.
  Fixing more recovery tests
 2017-04-10 09:28:54 +02:00
Jan Christoph Uhde b4b2ac0dbd work on counting bug 2017-04-10 09:23:35 +02:00
Dan Larkin 842a665ec5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-07 17:02:34 -04:00
Dan Larkin eaac6c013c Fixed issue with cache transactions. 2017-04-07 16:58:22 -04:00
Jan Christoph Uhde 9a079381b3 fix warning and make use of error code 2017-04-07 17:58:33 +02:00
jsteemann 4cf5fedca9 honor subcodes in rocksdb statuses 2017-04-07 14:55:55 +02:00
jsteemann 08cd4ced33 moved class around 2017-04-07 13:13:48 +02:00
jsteemann 742e5d17fd remove always-true asserts 2017-04-07 12:17:54 +02:00
jsteemann 940209001c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-07 12:06:04 +02:00
jsteemann 2b0673c3fe removed type "Index" 2017-04-07 12:05:56 +02:00
Simon Grätzer 42a79ed1ac Fixing counter WAL parsing 2017-04-07 11:26:52 +02:00
Dan Larkin c066b5c84c Fixed bug in document update code. 2017-04-06 18:34:11 -04:00
Simon Grätzer 4f4dcf58e7 Fixing counter key bounds 2017-04-06 15:16:52 +02:00
jsteemann a8f8587504 fix a test 2017-04-06 14:16:35 +02:00
Jan Christoph Uhde 5e63ba1e6f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  fix objectId handling
  Fixing windows build
  Fixing windows build
  Bugfix: we want the common _and_ the server tests.
  Conversion warnings
  Conversion errors
  Renaming test files
  fix windows build
  fix if clause
  exclude longrunning tests
  add slash here too.
  ...
 2017-04-06 11:20:32 +02:00
Jan Christoph Uhde cc39030042 move key options ot logical collection 2017-04-06 11:19:30 +02:00
jsteemann 0e98a32455 fix objectId handling 2017-04-06 11:19:27 +02:00
jsteemann e5d733867e make more tests pass 2017-04-05 14:57:18 +02:00
jsteemann 5880daf2a5 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 13:40:25 +02:00
jsteemann 1c43920bfc preparations for revision() 2017-04-05 13:40:18 +02:00
Simon Grätzer d61cdd23ee Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 13:38:47 +02:00
Simon Grätzer 5822e77843 invokeOnAllElements 2017-04-05 13:38:43 +02:00
jsteemann 79fc5224cb fix count() 2017-04-05 12:31:53 +02:00
Simon Grätzer 57b0aa4a3d Any iterator 2017-04-05 10:48:08 +02:00
jsteemann 8759ca3021 remove unused variable 2017-04-05 08:34:55 +02:00
Dan Larkin 872dd95ca8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-04 17:35:30 -04:00
Dan Larkin e303e2a51f Added RocksDB export functionality and some bug fixes. 2017-04-04 17:33:14 -04:00
Simon Grätzer 01ea3556b8 Added REST Wal handler 2017-04-04 18:27:19 +02:00
Simon Grätzer de388b10a0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 17:09:41 +02:00
Simon Grätzer b8ccfb72f8 Fill indexes 2017-04-04 17:09:35 +02:00
jsteemann 7fc2d97ae1 fix dropping of indexes 2017-04-04 16:41:05 +02:00
jsteemann 14921c6fba Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 15:27:32 +02:00
jsteemann b293668bb0 cppcheck 2017-04-04 15:27:28 +02:00
Simon Grätzer 96dc714139 Fixed some tests in shell_server 2017-04-04 15:10:17 +02:00
Simon Grätzer 464cf7dd40 Removing documents 2017-04-04 14:23:17 +02:00
Simon Grätzer 245b4b87ea Fixing comparator use 2017-04-04 14:11:14 +02:00
Simon Grätzer 046b768553 Fix renamed method 2017-04-04 13:40:03 +02:00
Simon Grätzer 244b034aeb Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 13:38:56 +02:00
Simon Grätzer 936945c714 Modified truncate 2017-04-04 13:38:51 +02:00
jsteemann 4196594130 fixed crash 2017-04-04 13:27:35 +02:00
Simon Grätzer d9d921ed6d Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 11:52:46 +02:00
jsteemann 48663a696a Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 11:40:56 +02:00
Simon Grätzer 3066a67005 Collection rename 2017-04-04 11:38:52 +02:00
Simon Grätzer c123ac3734 Fixed truncate 2017-04-04 10:48:37 +02:00
jsteemann 0c14c53633 dont fail on method that does nothing 2017-04-04 10:23:49 +02:00