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

42 Commits

Author SHA1 Message Date
Jan Christoph Uhde 9e366d2193 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  slightly adjust error messages
  Fixing jslint errors
  Add changelog from 3.1
  Properly generate an error message during import
  Fixed scannedIndex values in traverser tests. It did not report the correct number of lookups required after modification for new Storage-Engine
  fixed issue #2429
  issue #2427: change while into an if
  don't fail when non-array, but simply ignore it
 2017-04-18 13:21:54 +02:00
Jan Christoph Uhde a02e816598 add reset function to RocksDBTransactionState 2017-04-18 13:14:15 +02:00
jsteemann 031e9adb3c slightly adjust error messages 2017-04-18 12:43:21 +02:00
Jan Christoph Uhde e690e7fc80 Merge remote-tracking branch 'origin/feature/engine-api/edgeindex-report-as-single-index' into engine-api 
* origin/feature/engine-api/edgeindex-report-as-single-index:
  change mmfiles indexes to work with slightly changed API
  fix rocksdb engine index reporting but break report for mmfiles engine
  update error messages
 2017-04-13 08:46:54 +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
Simon Grätzer df7e7d3749 Forgotten code 2017-04-12 15:22:30 +02:00
Simon Grätzer d9510eee0b Fixing count 2017-04-12 15:22:18 +02:00
Jan Christoph Uhde afd5d92f19 update error messages 2017-04-12 09:25:59 +02:00
Jan Christoph Uhde d67aa33fe3 limit transaction size and work on intermediate commits 2017-04-12 09:01:13 +02:00
Simon Grätzer bcea7b62b0 Fixing transaction-no-commit 2017-04-11 14:01:50 +02:00
Dan Larkin b030cdb347 Fixed an edge index iterator bug. 2017-04-10 20:12:15 -04: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
Dan Larkin eaac6c013c Fixed issue with cache transactions. 2017-04-07 16:58:22 -04:00
jsteemann 2b0673c3fe removed type "Index" 2017-04-07 12:05:56 +02:00
Dan Larkin c066b5c84c Fixed bug in document update code. 2017-04-06 18:34:11 -04:00
Simon Grätzer 8366400e27 Fixed counters 2017-04-06 17:27:14 +02:00
jsteemann e5d733867e make more tests pass 2017-04-05 14:57:18 +02:00
jsteemann 6480d56b7e fix memleak 2017-04-05 13:24:01 +02:00
Simon Grätzer 7afcac9ed7 Fixing some issues 2017-04-03 14:24:58 +02:00
Simon Grätzer cf4294c9ca Integrated counters with collections 2017-04-03 13:24:22 +02:00
jsteemann 07cdc49504 transaction-specific count tracking 2017-03-31 14:57:21 +02:00
jsteemann 794cace842 initial implementation of count() 2017-03-31 14:05:44 +02:00
jsteemann 81dcfbbe3d pass trx into numberDocuments 2017-03-31 11:33:16 +02:00
Dan Larkin e689bdce05 Set snapshot in transaction and read options. 2017-03-30 16:42:24 -04:00
Dan Larkin 3966c83730 Fix merge conflicts. 2017-03-30 16:11:58 -04:00
Dan Larkin 079c5764e8 Added cache support to RocksDBPrimaryIndex. 2017-03-30 16:09:40 -04:00
Jan Christoph Uhde b83ae2ab82 refactor some code to make use of arangodb::Result 2017-03-30 09:39:21 +02:00
Jan Christoph Uhde 796c32a341 improve error handling in some places 2017-03-29 11:04:04 +02:00
jsteemann f4ce81f2e3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 17:59:32 +02:00
jsteemann a221d30b8f added savepoints 2017-03-28 17:55:25 +02:00
Simon Grätzer b1f010e33c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBTransactionState.h
 2017-03-28 17:23:38 +02:00
Simon Grätzer 913b60c983 Fix usleep 2017-03-28 17:15:05 +02:00
Jan Christoph Uhde 7b48e45fa2 add readOptions to transaction 2017-03-28 16:59:39 +02:00
jsteemann e9e0d3a46c remove unused attribute 2017-03-28 13:25:10 +02:00
jsteemann 9276d82578 remove debug log messages 2017-03-27 11:20:43 +02:00
jsteemann 2c54a6ac1e added some basic transaction handling 2017-03-24 17:23:32 +01:00
jsteemann 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
Jan Christoph Uhde 68bb668f1b add more empty implementations for RocksDB Storage engine 2017-03-21 10:53:13 +01:00
Jan Christoph Uhde db8202fd50 Add empty RocksDBTransactionState implemenation 2017-03-20 16:48:39 +01:00