Wilfried Goesgens
48505fba63
fix calculation of windows paths
2017-05-23 14:04:57 +02:00
Wilfried Goesgens
e08c09cbdb
fix calculation of windows paths
2017-05-23 13:33:22 +02:00
Wilfried Goesgens
c8b6d831ed
fix calculation of windows paths
2017-05-23 13:31:20 +02:00
jsteemann
bbdb191797
remove unused error code
2017-05-22 13:53:10 +02:00
jsteemann
a91c54f6b3
avoid double-copying of shared ptrs
2017-05-22 11:28:18 +02:00
jsteemann
7b924d8f33
pass by const reference to avoid copying
2017-05-22 11:27:55 +02:00
jsteemann
8858b81e2b
fixed issue #2490
2017-05-22 09:40:08 +02:00
Andreas Streichardt
9bfb16e4d5
Carrot fix to allow foreground logging on windows
2017-05-19 17:44:24 +02:00
Andreas Streichardt
d68aa00ed4
On windows do not allow standard input on external processes without pipes
...
dfdb test can now be executed on windows
2017-05-19 14:23:33 +02:00
jsteemann
adbe81d45d
fix adler32 function
2017-05-18 15:40:35 +02:00
jsteemann
61854bb73d
adjust error code from lock timeout to conflict
2017-05-18 10:34:41 +02:00
jsteemann
226920d7fa
optimizations
2017-05-17 23:41:16 +02:00
Andreas Streichardt
b5365c5003
Windows warning
2017-05-17 14:53:58 +02:00
Alan Plum
819a1194ba
Throw correct errors in Foxx management internals
2017-05-17 12:22:16 +02:00
Alan Plum
5d017d733c
Improve Foxx cluster resilience ( #2479 )
...
* Improve Foxx cluster resilience
Fixes #2083
Fixes #2384
Fixes #2408
Addresses #1892
* Port old Foxx API
* Implement single-file services
* Add console.errorStack/warnStack/infoStack helpers
* Simplify serviceInfo validation
* Extract github/upload logic into Aardvark and old FM API
* Move generator logic into Aardvark
* Move zip/js buffer logic into FM core
* Add Foxxmanager tests
* Send empty response when no README
* Disambiguate script arg format
Historically we allow passing an array of positional arguments or an arbitrary first argument.
This is surprising behaviour, so we should just always treat the value as a first argument.
* Rebuild bundle in development mode
* Nicer HTTP docs formatting
* Create Foxx HTTP docs
* Simplify service upload handling
* Remove inline swagger docs
* Implement public download route
* Consistency
* Rebuild aardvark
* Move bundle route into /_api/foxx/_local
* Rebuild Swagger API docs
* Add changes to CHANGELOG
* More docs
2017-05-16 17:41:29 +02:00
Andreas Streichardt
365de45f07
Add bye bye messages
2017-05-12 17:59:36 +02:00
jsteemann
b848030818
enable rocksdb logger
2017-05-12 12:03:54 +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
jsteemann
6a12272673
cppcheck
2017-05-10 18:24:34 +02:00
Simon Grätzer
d8053a9bcf
Fixing fulltext deduplication
2017-05-10 16:17:46 +02:00
jsteemann
488e4be485
preparation for RocksDB logger
2017-05-09 12:42:25 +02:00
jsteemann
1bfc52d800
suppress non-error warnings on shutdown
2017-05-09 12:40:45 +02:00
jsteemann
51b5dbbe57
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-05-09 10:25:53 +02:00
jsteemann
217d41f6f5
fix shutdown races
2017-05-09 10:24:40 +02:00
jsteemann
7db04133dd
move RocksDBLogger code into cpp file
2017-05-08 23:53:04 +02:00
Andreas Streichardt
6ffd2f6da2
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-05-08 20:33:20 +02:00
jsteemann
7577fed6fb
added logger
2017-05-08 18:24:40 +02:00
jsteemann
37a6dd2a81
remove unnecessary includes
2017-05-08 15:59:33 +02:00
jsteemann
5e5aa50bb7
remove obsolete comment
2017-05-08 15:57:20 +02:00
jsteemann
d47a506bcc
slightly improve error messages
2017-05-04 23:17:26 +02:00
Andreas Streichardt
f72b0eac05
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-05-03 23:32:02 +02:00
jsteemann
dae15d774c
honor unaligned memory access issues
2017-05-03 11:05:51 +02:00
jsteemann
e58dddd566
debugging
2017-05-02 17:19:38 +02:00
Kaveh Vahedipour
cb2420d7f5
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-28 11:57:28 +02:00
Kaveh Vahedipour
c51e144678
ASAN runtime errors
2017-04-28 11:57:20 +02:00
jsteemann
8d5248932b
lock unification
2017-04-28 09:12:31 +02:00
Jan Christoph Uhde
5fa2cffc63
fix warning
2017-04-27 15:51:19 +02:00
Jan Christoph Uhde
837763097a
fix windows warning
2017-04-27 15:12:30 +02:00
jsteemann
8b7fe79ebb
added isLocked() flag for ConditionLocker
2017-04-27 13:01:30 +02:00
Simon Grätzer
fa15b43088
Fixed typedefs
2017-04-26 19:27:11 +02:00
Simon Grätzer
29286a9c1b
RocksDB WAL entries for transactions
2017-04-26 18:54:55 +02:00
Frank Celler
33fda9275c
Merge pull request #2451 from arangodb/feature/ldap-auth
...
Feature/ldap auth
2017-04-26 14:12:32 +02:00
Simon Grätzer
d228a94462
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
# Conflicts:
# arangod/Replication/InitialSyncer.cpp
2017-04-26 11:06:09 +02:00
baslr
f45a7f07b1
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-26 10:52:50 +02:00
jsteemann
4289105eb3
fix shutdown issue
2017-04-25 16:09:01 +02:00
jsteemann
7344a03623
fix crashes
2017-04-25 15:47:11 +02:00
jsteemann
bd5737c5e7
try to fix shutdown issues when collection opening thread is waiting forever for scheduler to finish
2017-04-25 14:20:00 +02:00
baslr
579718ad37
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-25 11:18:07 +02:00
Frank Celler
f94df236a3
added 'x-content-type-options: nosniff' to avoid MSIE bug
2017-04-24 18:47:56 +02:00
baslr
9a78fc650b
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-24 15:37:18 +02:00
Kaveh Vahedipour
c9c4f6ccef
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-24 15:13:52 +02:00
Kaveh Vahedipour
ccc388a940
more dictributeShardsLike code mergedfrom 3.1
2017-04-24 15:13:40 +02:00
Wilfried Goesgens
ea3075e817
comment out the windows unhandled exception handler
2017-04-24 15:13:40 +02:00
Kaveh Vahedipour
c099c6daa9
more dictributeShardsLike code mergedfrom 3.1
2017-04-24 15:12:38 +02:00
baslr
3d9f58bb70
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-24 12:45:35 +02:00
jsteemann
1df46f8923
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-21 16:59:32 +02:00
Kaveh Vahedipour
1f81ce28b0
merge in cpp & js from 3.1.18 yet to do tests
2017-04-21 15:41:05 +02:00
jsteemann
c5854d050b
fix shutdown issue, modernize thread creation a bit
2017-04-19 16:57:53 +02:00
baslr
42ad1a8480
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-19 16:08:14 +02:00
jsteemann
bda09ab9bd
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-19 08:34:57 +02:00
jsteemann
5f8d9c4eb8
attempt to fix synchronization
2017-04-18 15:33:56 +02:00
Michael Hackstein
1087065ea5
Merge branch 'devel' of github.com:arangodb/arangodb into engine-api
2017-04-13 17:34:25 +02:00
baslr
d4ae94f937
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-10 17:14:37 +02:00
Jan Christoph Uhde
c82fadc863
prepare limitation of transaction size
2017-04-10 14:00:55 +02:00
Frank Celler
50cfd9883e
added missing nullptr check
2017-04-10 09:23:30 +02:00
Wilfried Goesgens
6ab23bd56d
better detect cygwin i/o
2017-04-07 14:00:35 +02:00
Wilfried Goesgens
2da0e41466
add detection for cygwin/ssh ttys
2017-04-06 18:57:19 +02:00
Jan Christoph Uhde
60956dc09c
fix windows build
2017-04-06 10:17:17 +02:00
Michael Hackstein
039c6fbd16
Moved all logic of lib/Basics/PathFinder into seperated files in arangod/Graph. Preparation to detemplatify this code as we need some arangodb interna in it for Slice mangement
2017-04-05 15:31:44 +02:00
jsteemann
9f330881a2
constify method
2017-04-05 09:00:06 +02:00
jsteemann
e0ec315d38
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-03 13:20:02 +02:00
baslr
d18428561d
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-03 13:12:50 +02:00
jsteemann
dd9ea4b781
fix parsing for URLs starting with ldap://
2017-04-03 13:06:31 +02:00
Jan Christoph Uhde
95007fe28e
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result
...
* 'engine-api' of https://github.com/arangodb/arangodb : (46 commits)
Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
fix handling of externals
fix toArray()
fix returning documents
Added hash-, skip list, persistent indexes
harmonize filtering - filter on full filename.
mini modifications
standardize starting of servers for replication tests
Edge index compliant with design doc
another fix for #2404
Moved „removeLargeRange“ method to commons
Added length byte to IndexValue keys.
fixed issue #2404
Added drop to primary index
Added drop() to indexes
Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
Fixed edge index
Expand on CORS documentation
Let ArangoDB handle the allow-credentials header
make the authentication tests run on directories
...
2017-03-30 19:46:17 +02:00
Jan Christoph Uhde
13d83da06f
improve arangodb::Result
2017-03-30 14:58:58 +02:00
baslr
f669fd4b9e
LDAP: more options
2017-03-30 11:03:13 +02:00
Jan Christoph Uhde
b83ae2ab82
refactor some code to make use of arangodb::Result
2017-03-30 09:39:21 +02:00
jsteemann
3ff4f15a19
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 17:50:55 +02:00
jsteemann
e73417aef1
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 17:50:49 +02:00
Simon Grätzer
cd9e9a13cf
Path based enumerator
2017-03-29 17:33:02 +02:00
baslr
352ad60589
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-29 15:56:56 +02:00
jsteemann
2a6eade215
added LDAP url parser
2017-03-29 15:34:49 +02:00
baslr
0713099acc
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-29 15:13:24 +02:00
jsteemann
bd4a2eb6b6
make @dothebart happier
2017-03-29 15:04:54 +02:00
jsteemann
f04f6e7cd4
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 12:53:26 +02:00
Jan Christoph Uhde
408d7cab12
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
...
* 'engine-api' of https://github.com/arangodb/arangodb :
fixed serialization bug
warn before we run out of file descriptors
updated CHANGELOG
slightly simplify logging
2017-03-29 11:22:18 +02:00
jsteemann
d99945e962
use ReadWriteLockCPP11 instead of ReadWriteLock
...
ReadWriteLock is now a typedef for ReadWriteLockCPP11
one of the classes will finally be removed when it is known which locking concept is superior
2017-03-29 11:13:50 +02:00
Jan Christoph Uhde
796c32a341
improve error handling in some places
2017-03-29 11:04:04 +02:00
jsteemann
bf6e3bddbe
fix MSVC warning
2017-03-29 10:11:46 +02:00
jsteemann
383239a14f
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 09:17:44 +02:00
jsteemann
f728fcdbb8
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 02:41:00 +02:00
jsteemann
e3ca787992
warn before we run out of file descriptors
2017-03-29 02:35:46 +02:00
jsteemann
f8a01fae54
comments
2017-03-29 01:06:47 +02:00
baslr
7f92c26774
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-29 00:29:16 +02:00
jsteemann
e1aef394d8
delete useless DEV_TIMERS, fix rwlockcpp11
2017-03-28 22:38:27 +02:00
mpv1989
4b8c880486
added OPTIONS to cors methods header
2017-03-28 16:18:53 +02:00
Simon Grätzer
1a50029592
Edge Index work
2017-03-28 00:55:59 +02:00
Dan Larkin
fcb3c2f91e
Added method to convert RocksDB Status to ArangoDB Result.
2017-03-24 13:19:34 -04:00
jsteemann
2aa2fd65a4
more startup
2017-03-24 14:20:51 +01:00
baslr
fef40e3c9d
merge with devel
2017-03-24 12:07:29 +01:00
baslr
e78da3d85f
LDAP: added additional errors
2017-03-23 23:51:48 +01:00
jsteemann
2eeccd5f09
small simplifications for error handling
2017-03-23 21:18:53 +01:00
jsteemann
02c0dcc689
properly report error locations
2017-03-23 20:18:33 +01:00
jsteemann
b87cc95038
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-23 19:42:10 +01:00
jsteemann
8e4e463239
don't call throwing functions in dtor
2017-03-23 19:40:13 +01:00
jsteemann
45da5ffe9c
more diagnostic output for "not implemented"
2017-03-23 14:10:00 +01:00
baslr
8c2b951884
LDAP: additional error codes
2017-03-23 01:26:51 +01:00
baslr
f593561438
introduce LDAP errors
2017-03-20 16:14:29 +01:00
baslr
90341c5efb
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-18 04:14:39 +01:00
baslr
bc14d53ff5
ldap authwork
2017-03-18 04:14:15 +01:00
jsteemann
fa26d8ca6c
this time fix the leak properly
2017-03-17 14:45:55 +01:00
jsteemann
650d1afad5
fix leaks during cleanup
2017-03-17 13:38:23 +01:00
jsteemann
e3d8ae142e
some fixes for view handling
2017-03-17 11:18:46 +01:00
jsteemann
67c1770f3e
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 09:29:03 +01:00
jsteemann
8a69f5716f
show collection load time in slow queries
2017-03-17 09:28:53 +01:00
Simon Grätzer
3f29cf356b
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-16 17:03:45 +01:00
Simon Grätzer
70401fe5db
Fixed JS_KillExternal
2017-03-16 17:03:29 +01:00
jsteemann
a87b8c4f25
generalize usleep argument
2017-03-16 16:27:40 +01:00
Simon Grätzer
876bbb98f9
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-13 23:27:11 +01:00
jsteemann
894a558367
try to un-mess windows build
2017-03-13 17:28:46 +01:00
Simon Grätzer
7b35f75b23
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
# Conflicts:
# arangod/CMakeLists.txt
# arangod/GeneralServer/GeneralServerFeature.cpp
2017-03-13 12:25:28 +01:00
jsteemann
94e1a92f6f
added comment
2017-03-09 16:32:27 +01:00
jsteemann
537757d9a3
added EnumIterator
2017-03-08 23:40:57 +01:00
Simon Grätzer
67066c64ad
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-08 18:20:44 +01:00
jsteemann
3e0969da37
fix memleak
2017-03-08 17:29:15 +01:00
Frank Celler
7eefdf547b
simplification: FileResult does only support ok, no additional result
...
header only, added FileResultString class for Result that return a string
2017-03-08 13:01:20 +01:00
Simon Grätzer
2c77f42486
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-07 15:08:06 +01:00
Wilfried Goesgens
a7e154b27e
improve error messages when trying to create indices
2017-03-06 19:10:46 +01:00
jsteemann
d55e60cb2e
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-06 17:17:02 +01:00
jsteemann
f6414b38ba
fixed constructors
2017-03-06 17:14:22 +01:00
jsteemann
39370aac2f
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-06 17:04:35 +01:00
Frank Celler
b14dbe6435
added base class Result and an example FileResult
2017-03-06 10:33:32 -05:00
jsteemann
e27cf1bc5e
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-06 15:55:00 +01:00
Simon Grätzer
c0a390aefe
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-06 15:53:43 +01:00
jsteemann
f7b819579d
attempt to fix clang build
2017-03-06 15:40:03 +01:00
jsteemann
aba8e423b0
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-06 14:59:46 +01:00
jsteemann
bbda3fa9f5
simplified some ostream kirmes
2017-03-06 14:44:56 +01:00
jsteemann
c7acebe3c0
Revert "another attempt to fix logger issues"
...
This reverts commit c6c9120e33
.
2017-03-06 14:30:42 +01:00
jsteemann
c6c9120e33
another attempt to fix logger issues
2017-03-06 14:20:45 +01:00
Simon Grätzer
dfd3cc3869
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
# Conflicts:
# arangosh/Import/ImportHelper.cpp
2017-03-04 02:08:27 +01:00
jsteemann
b3f11af7a4
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-03 17:42:22 +01:00
jsteemann
b4cdafaef9
cleanup
2017-03-03 16:53:48 +01:00
jsteemann
fa2c0c02f1
simplifications
2017-03-02 22:20:51 +01:00
Simon Grätzer
080048b080
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-01 15:05:25 +01:00
Simon Grätzer
27c617fe10
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
# Conflicts:
# 3rdParty/V8/v8
# arangod/Transaction/Methods.h
# arangod/Utils/UserTransaction.h
# arangod/V8Server/v8-collection.cpp
2017-03-01 14:52:35 +01:00
jsteemann
85468835d0
properly abort in ABORT macro
2017-03-01 12:50:36 +01:00
Kaveh Vahedipour
51b63027fe
should not overimplement LoggerStream. allows unified behaviour of std::cout and LOG_TOPIC(.,.)
2017-03-01 11:51:27 +01:00
jsteemann
cf5d20ddee
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-02-28 17:02:42 +01:00
jsteemann
b6a265068a
fix velocypack-over-HTTP responses
2017-02-28 17:01:59 +01:00
jsteemann
fd516e1e1b
give up waiting for V8 context after some time
2017-02-27 23:08:49 +01:00
jsteemann
e6c66ae26e
more performance logging
2017-02-27 23:08:18 +01:00
jsteemann
695d215b0c
ensure that JobGuards are started and ended in the same thread
2017-02-27 22:41:58 +01:00
jsteemann
5e0fd0c8b2
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-27 22:27:51 +01:00
jsteemann
b872aa59fd
simplified performance logging
2017-02-27 22:22:41 +01:00
jsteemann
d0df1952e8
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-24 17:51:59 +01:00
jsteemann
d4d3a00ff0
disable color escape sequences on Windows
2017-02-24 10:52:01 +01:00
jsteemann
6c4ecf28aa
also sanitize vpack custom types when sending vpack data to clients
2017-02-23 10:12:20 +01:00
jsteemann
eb293ba0d3
speedup for object comparisons
2017-02-21 17:21:25 +01:00
jsteemann
8941a3a177
simplifications for the ReadLocker
2017-02-21 12:06:44 +01:00
Jan Christoph Uhde
21cb8e3217
Merge branch 'engine-api' of github.com:arangodb/arangodb into obi-engine-api
...
* 'engine-api' of github.com:arangodb/arangodb:
Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways...
Moved pre-commit document modifications out of logical-collection into the physical collection. They are only relevant when actually writing to disc.
Moved useSecondaryIndexes check from Logical to MMFiles collection
Some cleanup in Logical collection imports
Moved index filling into the MMFiles collection
changelog
grunt build
css
ui: queries now using cursors api - issue #2065
remove crosscompile hack - it doesn't work anymore
updated CHANGELOG
add changlog entry for stacktrace log messages
clean up write lockers a bit
fix too early closing of sockets
Moved restoreIndex to Physical collection.
Fix a shell script used during build.
Lower log level to debug in shutdown message.
fix spelling
Moved saveIndex logic into the physical collection
fix potential deadlock
Conflicts:
arangod/MMFiles/MMFilesCollection.cpp
arangod/MMFiles/MMFilesCollection.h
arangod/VocBase/LogicalCollection.cpp
2017-02-18 19:10:45 +01:00
Jan Christoph Uhde
2d5e74f7f6
move journaize() to PhysicalCollection
...
MMFilesCollection ctor might be buggy
2017-02-17 20:06:47 +01:00
jsteemann
3e7432ccd6
clean up write lockers a bit
2017-02-16 15:44:45 +01:00
jsteemann
e7a0b181e6
fix potential deadlock
2017-02-16 12:04:36 +01:00
jsteemann
8a2e353f3d
move encoding functions into their own file
2017-02-14 12:57:15 +01:00
Simon Grätzer
3fd10aae34
Adding tryLock
2017-02-12 00:13:44 +01:00
Simon Grätzer
c2450b7913
Fix a bug in mutex locker
2017-02-11 22:17:23 +01:00
Frank Celler
1298c0eaf5
fixed include to include the file at the place where include is issued
2017-02-10 17:17:11 +01:00
jsteemann
d024a6d00a
remove logging for non-topics
2017-02-10 09:32:50 +01:00
Michael Hackstein
7de0142fc1
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-02-08 17:34:34 +01:00
Wilfried Goesgens
d8cd84872f
fix windows compile
2017-02-08 17:21:31 +01:00
Michael Hackstein
5dfd652d64
Merge branch 'devel' of github.com:arangodb/arangodb into engine-api
2017-02-08 15:57:30 +01:00
Wilfried Goesgens
a3ac94d3b2
fix locating of relative ICU files
2017-02-08 15:18:16 +01:00
Max Neunhoeffer
bde48d524d
Change undocumented behaviour in case of invalid rev in JS document ops.
...
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
2017-02-08 10:59:04 +01:00
jsteemann
0040bc91e1
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-08 01:07:00 +01:00
jsteemann
9d0a210545
prevent memleaks in C++ UnitTests
2017-02-07 17:30:30 +01:00
jsteemann
073b53b20f
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-07 14:50:46 +01:00
Wilfried Goesgens
0932d51904
Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule
2017-02-07 13:48:57 +01:00
jsteemann
a9057b2d12
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-07 11:58:56 +01:00
Wilfried Goesgens
540e4178aa
attempt to obtain a coredump on server shutdown hang
2017-02-07 10:27:31 +01:00
jsteemann
3c7b9998d8
simplify error message setup a bit - hopefully this will work with MSVC and clang
2017-02-06 23:45:41 +01:00
jsteemann
c8df58dcc6
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-06 23:35:12 +01:00
jsteemann
4a15c16550
replace expensive std::deques with much simpler RollingVectors
2017-02-06 23:23:18 +01:00
jsteemann
0fe96efb80
added TRI_ZeroMemory function
2017-02-06 17:45:49 +01:00
jsteemann
8dfb97c0bd
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-06 17:04:35 +01:00
Wilfried Goesgens
877c7eeb4b
fix syntax
2017-02-06 16:18:04 +01:00
Wilfried Goesgens
3a94a12370
retrieve windows error string
2017-02-06 16:08:25 +01:00
jsteemann
ab11410911
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-06 13:05:11 +01:00
jsteemann
e39a457e46
micro optimizations
2017-02-03 22:28:51 +01:00
jsteemann
b1c1a14fd4
fix resource leak
2017-02-02 10:15:21 +01:00
jsteemann
0156c5aec7
make database deletion more deterministic
2017-02-01 16:44:41 +01:00
jsteemann
fae1f7ba63
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-01 13:00:34 +01:00
jsteemann
5939ff249f
remove now unused files
2017-02-01 12:39:24 +01:00
jsteemann
5d9e8ef5f5
remove now-unused logging functionality
2017-02-01 11:44:09 +01:00
jsteemann
ded1550e0c
dirty attempt to fix MSVC compile errors
2017-02-01 10:58:09 +01:00
Wilfried Goesgens
b91a7c0621
Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule
2017-01-31 18:02:30 +01:00
jsteemann
c5f2f5e1e8
remove unused file-backed implementation
2017-01-31 18:02:00 +01:00
Wilfried Goesgens
bb80b5cf90
Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule
2017-01-31 16:34:42 +01:00
jsteemann
e825be35a1
prevent duplicate forward slashes in concatenated filenames
...
also prevent server start in case included config file cannot be found
2017-01-31 14:56:28 +01:00
jsteemann
37b7a18040
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-31 13:55:55 +01:00
Wilfried Goesgens
3408fb2445
Merge branch 'devel' of github.com:arangodb/ArangoDB into devel
2017-01-31 10:55:26 +01:00
Wilfried Goesgens
27b01aaebb
add ARMv6 detection; we won't run on cpus of that family
2017-01-31 10:55:16 +01:00
jsteemann
6598828449
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-31 00:33:42 +01:00
Dan Larkin
5b736dc319
Changed index-filling to dispatch batch insertion tasks to scheduler, obsoleted index-threads option.
2017-01-30 13:05:10 -05:00
Wilfried Goesgens
584f3120dd
Upgrade V8
...
- ICU now doesn't build the icudata library anymore
- ship the icu database on all platforms and all packages
- we now load the icu database file ourselves, and hand over the pointer to ICU.
- follow the V8 changes around Weak pointer handling
2017-01-30 12:30:07 +01:00
jsteemann
302e86723b
removed unused file
2017-01-26 16:25:01 +01:00
jsteemann
2709504d74
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-26 15:21:08 +01:00
Andreas Streichardt
bf541e71cf
Add distinct log messages
2017-01-26 15:03:13 +01:00
jsteemann
0f67a71350
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-25 17:50:51 +01:00
jsteemann
fdde284fe6
cleaned up macros a bit
2017-01-25 17:50:23 +01:00
jsteemann
617b3f2949
fix warning
2017-01-25 16:37:06 +01:00
jsteemann
02df10e901
added ctor that moves message
2017-01-25 11:58:51 +01:00
jsteemann
5120900bb2
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-24 12:10:30 +01:00
jsteemann
db80ce4d1b
fixed issues reported by coverity scan
2017-01-24 11:31:40 +01:00
jsteemann
c4d2ff3dce
renaming
2017-01-23 15:36:11 +01:00
Frank Celler
f12c38dc0b
added work context
2017-01-22 12:53:52 +01:00
Kaveh Vahedipour
d2760f4ef1
pushing avoidServers property
2017-01-20 15:15:03 +01:00
Wilfried Goesgens
d6a1d967af
blanks destroy documentation building regexes here
2017-01-20 10:08:22 +01:00
jsteemann
6f9927fea0
avoid constructing temporary lookup strings
2017-01-19 14:27:04 +01:00
Kaveh Vahedipour
ea7e16979a
agency bug in precondition and log handling fixed
2017-01-18 11:07:30 +01:00
Andreas Streichardt
4458f04e46
More specific error codes for the cluster
2017-01-11 17:54:45 +01:00
jsteemann
0590b98442
properly initialize variables...
2017-01-09 17:08:28 +01:00
jsteemann
a92b49d46e
fix races in VST response handling
2017-01-09 17:06:33 +01:00
jsteemann
fc1b913791
fixed some issues found by coverity build tool
2017-01-09 12:39:04 +01:00
jsteemann
63dc0ee5df
moved global function into translation unit
2017-01-06 21:10:10 +01:00
jsteemann
0481f5ec8b
added define for unaligned memory accesses
2017-01-06 21:09:53 +01:00
jsteemann
41cc216012
properly reset _nrCollisions
2017-01-06 14:55:50 +01:00
jsteemann
31375b25b9
removed debug output
2017-01-06 14:32:12 +01:00
jsteemann
213cda0462
more diagnostics
2017-01-06 13:27:45 +01:00
jsteemann
f89c6af178
debug output
2017-01-05 15:41:28 +01:00
jsteemann
d7246c1fdf
more diagnostic output
2017-01-05 12:16:45 +01:00
jsteemann
7359ac44b2
more style cleanup
2017-01-05 10:52:03 +01:00
jsteemann
3285a6032f
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-01-05 10:40:28 +01:00
jsteemann
b65ba4ef15
reduce heap usage on 32 bit systems
2017-01-05 10:40:01 +01:00
Wilfried Goesgens
2379db10d7
style cleanup
2017-01-05 10:09:49 +01:00
jsteemann
31472900a8
fix `--define` parameter passing
2017-01-04 18:08:21 +01:00
jsteemann
fca1a5431c
clean up macros a bit. hopefully clang and MSVC won't complain about this
2017-01-04 12:45:23 +01:00
jsteemann
668c097bb4
cheaper string construction
2016-12-28 21:34:30 +01:00
jsteemann
f77f2fb20b
fix function name
2016-12-20 17:34:34 +01:00
jsteemann
16e2881db1
better don't change mmap flags... instead let mapping a file fail when protection cannot be changed later on
2016-12-20 11:20:43 +01:00
jsteemann
0da02e2f4a
map memory-mapped datafiles/journals with PROT_READ | PROT_WRITE at the start
...
Previously, all datafiles/journals that were initially mapped were mapped with PROT_READ only, and later the memory protection was changed to PROT_READ | PROT_WRITE using mprotect().
However, on filesystems that are mounted with NOEXEC, changing the protection from PROT_READ to PROT_READ | PROT_WRITE later may fail. This has been reported in issue #2220 .
This change now maps all datafiles/journals with PROT_READ | PROT_WRITE in the beginning, and will later change the mapping to PROT_READ if no writes are required
2016-12-20 10:32:47 +01:00
jsteemann
9b42e9cee6
some improvements for memory management
...
added more memory diagnostics for memory usage:
- collection.figures() now returns a "readCache" attribute which contains the
number of and memory usage of entries in the document revisions cache for the
collection, and a "revisions" attribute with the number and memory usage
of entries in the storage engine's revision lookup table for the collection
- the default value for --database.revision-cache-target-size was changed from
75% of RAM to 30% of RAM
2016-12-15 15:30:28 +01:00
jsteemann
b96897e296
fixed some issues detected by coverity build tool
2016-12-12 15:41:54 +01:00
jsteemann
e68ba685d5
fix VS warning
2016-12-12 11:53:30 +01:00
jsteemann
f0a4d69b69
use bulk allocator for index elements
2016-12-09 21:40:49 +01:00
jsteemann
909335fc61
fix VS compile errors
2016-12-09 09:52:38 +01:00
jsteemann
350da367bd
fixes for Visual Studio
2016-12-08 17:32:46 +01:00
jsteemann
6920bb65f1
added IndexBucket.h
2016-12-08 17:31:54 +01:00
jsteemann
ce03d08e8b
added specialized fasthash version for uint64 input
2016-12-08 13:32:48 +01:00
Andreas Streichardt
82682f8d25
Wait for synchronous replication to settle
2016-12-07 18:38:15 +01:00
Jan Steemann
0ac353e109
fix solaris compile error
2016-12-07 11:44:04 +01:00
jsteemann
369b2c7bc6
added optional memory limit for AQL queries
2016-12-06 13:23:41 +01:00
jsteemann
e8a27f293c
cppcheck
2016-12-02 17:33:08 +01:00
jsteemann
20d8b91a93
added ARM port for fasthash64, added tests
2016-12-02 17:14:18 +01:00
jsteemann
aba74ae1f9
try to avoid unnecessary function calls
2016-12-01 14:02:59 +01:00
Michael Hackstein
c8db0eb2fe
Clang format fix
2016-12-01 10:38:15 +01:00
jsteemann
0ee7023085
remove usages of strerror_r
2016-11-29 10:47:02 +01:00
jsteemann
ddd0c0877b
cosmetics
2016-11-29 10:41:41 +01:00
jsteemann
fa45011ee7
code cleanup
2016-11-28 17:23:15 +01:00
jsteemann
1a4ab1d0be
hopefully fix NOATIME
2016-11-28 16:11:36 +01:00
jsteemann
2757fd91ae
handle OOM a bit more gracefully
2016-11-28 14:22:12 +01:00
jsteemann
b29f075f94
add intentionally failing operator new
2016-11-28 11:40:37 +01:00
jsteemann
17cf262d42
add NOATIME flag when opening datafiles
2016-11-28 11:25:49 +01:00
Michael Hackstein
ee4008cf2c
Fixed compile error on Mac systems in mmap files.
2016-11-25 15:23:20 +01:00
jsteemann
8c832273ba
fix wrong range size
2016-11-24 15:23:13 +01:00
jsteemann
13615a155d
experimental mlock flag
2016-11-24 10:02:51 +01:00
Michael Hackstein
90c646fc54
Added another smart graph error that disallows using system attributes for smart graphs
2016-11-22 17:54:12 +01:00
jsteemann
77e2cf5a65
fix passing of special chars in URLs in cluster
...
- this sets option CURLOPT_PATH_AS_IS to keep ".." and other special components in paths
- this also changes the behavior of StringUtils::urlEncode() to always encode the "."
character to "%2e"
2016-11-15 15:46:22 +01:00
jsteemann
68c15ebc9e
do not url-decode paths eagerly
2016-11-15 15:46:21 +01:00
Alan Plum
5788b2e3ca
Fix failing test
2016-11-13 15:08:40 +01:00
Alan Plum
c0a3f5a8a1
Better Foxx API error handling
2016-11-12 22:33:07 +01:00
Kaveh Vahedipour
1f10de105f
assembly fix relocation R_X86_64_32S against
2016-11-10 14:19:02 +01:00
Kaveh Vahedipour
a898aa03ce
assembly fix relocation R_X86_64_32S against
2016-11-10 12:36:23 +01:00
Jan Steemann
31bf14b6b7
fixed issue #2163
2016-11-10 08:56:27 +01:00
jsteemann
da2aa24703
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-11-09 14:46:56 +01:00
jsteemann
ab4933c994
performance optimizations
2016-11-09 14:46:50 +01:00
Max Neunhoeffer
6d5f70b6f4
Add a global DECODE_REV function in JS.
2016-11-08 10:25:35 +01:00
Kaveh Vahedipour
95c177c30c
Waiting for leader election in AgencyComm::sendWithFailover
2016-11-03 14:24:45 +01:00
jsteemann
68317bb4f2
added experimental `REGEX_REPLACE` AQL function
2016-11-03 00:40:19 +01:00
jsteemann
d5d23d381f
do not use readdir_r() anymore as it is not safe
...
...and also deprecated in newer versions of libc:
http://man7.org/linux/man-pages/man3/readdir_r.3.html
That man page recommends to use plain readdir() because it can be expected
to be thread-safe in reality, and newer versions of POSIX may require its
thread-safety formally, and in addition obsolete readdir_r() altogether
2016-11-02 22:53:25 +01:00
Frank Celler
7df02164ee
fixed supervisor startup
2016-11-02 19:37:49 +00:00
jsteemann
757085fbe4
remove structures.h (only needed by json.h)
2016-11-01 15:34:18 +01:00
jsteemann
31bbbb454f
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-11-01 15:23:49 +01:00
jsteemann
31350a5c14
micro optimizations
2016-11-01 15:23:28 +01:00
jsteemann
93cb35eac5
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-10-31 13:11:23 +01:00
Jan Steemann
afadad7ad4
don't create temporary strings
2016-10-31 13:09:52 +01:00
Michael Hackstein
8b763b8684
Fixed cluster hashing when only hashing by _key.
2016-10-31 12:53:43 +01:00
jsteemann
cf820e6530
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-10-31 10:12:45 +01:00
jsteemann
cfc9ecd198
fix Visual Studio complaints
2016-10-31 09:59:18 +01:00
Michael Hackstein
8f0a1f47f8
Fix for ShoretestPath in Cluster. Does only show up with > 1 shards. Adapterd tests to use 4 shards instead of 1.
2016-10-31 09:19:49 +01:00
jsteemann
0f06a219b6
added StringRef implementation file to implement operator<<
2016-10-28 16:03:53 +02:00
Jan Steemann
b71317bbbc
fix sanitation of externals
2016-10-26 17:02:23 +02:00
Mark
3d60934b9f
fixed windows compile errors
2016-10-26 16:39:06 +02:00
jsteemann
eed9c23796
performance optimization
2016-10-26 12:04:27 +02:00
Andreas Streichardt
82e784dcab
WINDOWS_LEAN_AND_MEAN so the min max stuff is finally fixed
2016-10-25 08:47:48 +02:00
jsteemann
de9dc289c0
Squashed commit of the following:
...
commit f14e88b6259212b33843653292d95a607ff894a3
Author: Frank Celler <frank@arangodb.com>
Date: Sun Oct 23 11:03:30 2016 +0200
clang does not like reinterpret_cast
commit 96920079514965e792bf9688cb51cdad944692f4
Author: Frank Celler <frank@arangodb.com>
Date: Sat Oct 22 13:52:47 2016 +0000
honor minimal
commit a460c3df878b9e8b544812f0fda471c1fe519458
Author: Frank Celler <frank@arangodb.com>
Date: Sat Oct 22 12:23:16 2016 +0000
added hidden options server.maximal-threads and server.minimal-threads
commit 38713a0a614550b38f4eb650ff62300732f90298
Author: jsteemann <jan@arangodb.com>
Date: Sat Oct 22 11:17:17 2016 +0200
fix test
commit 532d65e0d22fc6916b36d6fda23ab95cd34c1ac2
Author: jsteemann <jan@arangodb.com>
Date: Sat Oct 22 11:17:03 2016 +0200
re-added methods needed by EE
commit b7624580e7809baa0cdf9145e2102952e872346b
Author: jsteemann <jan@arangodb.com>
Date: Sat Oct 22 01:11:50 2016 +0200
cppcheck
commit da5e02351ec7872302840ca14f67aeda8ab3150b
Merge: e216800 d19beb6
Author: jsteemann <jan@arangodb.com>
Date: Sat Oct 22 01:04:51 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit e2168009bde63971d5c7a17653c26a6f9ae23c3c
Author: jsteemann <jan@arangodb.com>
Date: Sat Oct 22 01:04:30 2016 +0200
fix non-deterministic inserts into edge index
commit 6b131ee1143f17f5465a8423921b7a96c382013e
Merge: 8ebf7f0 285ddb8
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 21 12:23:53 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 8ebf7f043efcda7fd31e1e78c6a0da99cc461b89
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 21 12:23:36 2016 +0200
micro optimizations
commit ad32930b9e50ea52cb9821508912ddd80564193f
Merge: b40cfb4 fdb2104
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 21 09:10:31 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit b40cfb44dd4861471385d30f3777b17ba2995ef1
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 16:07:40 2016 +0200
share some context
commit 2411e59f2bcbd96889aac36e0a38ad62dca1ea65
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 15:48:05 2016 +0200
remove unused functions
commit c422037e97572605cce4895c5cdb4b8ffa30f287
Merge: 9e9a2f7 88ea314
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 15:31:14 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 9e9a2f7c9428f333fa3c7674bb82853574ea2f2c
Merge: cedced5 638ce07
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 15:30:27 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit cedced52c3dfcefdc8d5ca57924064b350e338e8
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 15:30:14 2016 +0200
experimental improvements
commit 455cb59bc641d8137d635d1ff6a137183c455b00
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 13:25:36 2016 +0200
pass argument by reference
commit b922a14d984dc82d55d54297552778342b6cea64
Merge: 8afd5d3 0883c49
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 13:19:59 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 8afd5d35d562de4596af5b5acf1909f3c232ed60
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 13:19:47 2016 +0200
micro optimizations for shortest path
commit e92edcc7f5dcb1429052d337eeb10b087f5dfac0
Merge: eb2d774 084961a
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 11:50:42 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit eb2d7747d81bc0105579ad2e6f19a4743bd217a8
Merge: 146d3e3 b376769
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 11:30:14 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 146d3e3b90304897459ecde3b9d9b282042a412f
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 11:29:41 2016 +0200
mini optimizations for traversal
commit a8cfa933c8f96840a4dca355a1efee2086a5cf2d
Merge: b990d0f c3de3ca
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 10:37:35 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit b990d0f6914d4c483f9e521d0132937eb0aa5bc4
Merge: deea0b0 090a591
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 10:37:31 2016 +0200
Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache
commit 090a59103feac32b848f18fafdb4f97816bf92f6
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 09:14:52 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit deea0b00b1ac35b4b23756218d2c12ab72185b09
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 20 09:14:40 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit d8537ef56e537356e32b82e10cd2b9833c542bb8
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 17:16:42 2016 +0200
potential performance improvements
commit 828ac8743ce67a964bd2d622689cf3c69b7aa22e
Merge: e696a95 76ec1fd
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 16:38:18 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit e696a95b50db1a8819247ef855b0dad710b4cc62
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 16:37:07 2016 +0200
dont pass nullptrs
commit 5b31ff978091fa1ae80d59b6ba7bad63f0c83ef7
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 16:36:45 2016 +0200
fixed shutdown order
commit 8698892b6e9395151dcfdca778ad9177b19b1614
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 15:25:21 2016 +0200
added assertions
commit 8bcc2d4610ae0c15f6406b82568e3a15a8f6df5a
Merge: 1f0676b 92b5887
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 15:16:24 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 1f0676b9e95dc47a2c573380c6d165f875fe6e87
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 15:15:06 2016 +0200
potential performance fixes
commit 3eeee4a904079d33d6fd695100afc080acde1dc7
Merge: c111396 14d8d35
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 11:39:22 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit c1113968db5fd9e4cefa8be0150dafc37cf1e25f
Merge: 4db8b2c cd3a5b4
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 19 09:08:28 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 4db8b2cbb75218391b6499de7a35bca480546031
Merge: 241e0ab e181457
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 17:48:12 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 241e0abbee7d040eeadfa2d0fd195f21a4eac0d4
Merge: ed309a9 93c5672
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 17:48:05 2016 +0200
Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache
commit ed309a9abaf3185af7e4ed75278eb78716e18935
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 16:25:32 2016 +0200
fix compile error
commit a53793c63988ac4e4ba8a074f61e8130c01aea04
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 16:13:32 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 93c567295186197236fd8d4a2f25109167e57c6c
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 16:07:10 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit ddfc6ebbd475a238cfe23ed9b9860ea8ed840355
Merge: 762d01e 0d1572c
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 15:40:57 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 762d01ed7c58c2981c8f7ff8f0736e47d34006df
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 15:40:45 2016 +0200
hold mutex for shorter period
commit 74f5e8a402ec7f94606053acf3361225d7140bee
Merge: ece92b5 6bc276e
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 15:30:36 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit ece92b50a7f87685e7b3e9b2503ec224573b7663
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 15:30:17 2016 +0200
performance optimizations
commit 979b5e29a3f707104fe70e632fc2f701fc8b731b
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 15:29:56 2016 +0200
don't use pointers
commit 3f30c6d849d586c01020bb093d094dce91f14d13
Merge: ab3af79 0baecf1
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 14:16:36 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit ab3af79ca3f608df621bc98966e8d93bd848d401
Merge: 818f576 3c96c6f
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 14:14:37 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 818f576580683704147f113208f2376de8eed9da
Merge: 19e1488 1c1a659
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 18 09:24:15 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 19e1488220cecfb0588f9b49b9f6cc26ea6fa93f
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 17 17:55:25 2016 +0200
use half of RAM for target size
commit aef5156b7d131b47d7deacf30f20ad1dde79b843
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 17 17:51:28 2016 +0200
revert boost changes
commit 294517d36f2c35757593b705ac2a5e56f3d9b9dc
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 17 17:51:20 2016 +0200
fix compile error
commit 80b7560a041fd80e5b0199b5ae1cbe0a96d118a5
Merge: b220f79 f748bab
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 17 17:42:50 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit b220f795b686a1b7a8c7f1eb50b32eee5ff573ae
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 17 17:42:16 2016 +0200
stability fixes
commit 4751c25ef42cbc2f688dbe9761453e6a1209d959
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 17 10:34:42 2016 +0200
silence boost compile warnings spam
commit f7f7cbeedc8881feb4eec45591f70b24a3d9292b
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 17 10:34:29 2016 +0200
fix compile warnings
commit d1e3f35e55963666d85c5084cb01dc8330866249
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 17 10:34:14 2016 +0200
change warning to fatal error
commit e858e5f6bbfd1ad5a32eea66fe7881d795527af4
Merge: cbe8299 0586862
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 17:58:46 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit cbe8299d8b127588533d8a292e46d77f889a8845
Merge: 4859562 df391b2
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 17:30:24 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 48595629fe43531d9fbbd5b982cb3c78b18b17f2
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 17:30:03 2016 +0200
move most-accessed property to the front of the struct
commit 660e3e3b94bc0b2ef5783097886939c67c6b1d27
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 17:29:52 2016 +0200
don't create too many lookup contexts
commit 6c8a93b9ed4157511b04262bc429ae4df3531575
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 17:21:21 2016 +0200
no copying of results in HashIndex
commit b91c040b70afc02b1e7a22a9b6e223bbac254f55
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 16:57:48 2016 +0200
privatize methods
commit 70d8d6e50545b097e9e5c7dfdd0cc210af8ce3b8
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 16:43:07 2016 +0200
don't spam on shutdown
commit c3d37194513f4576a41cc41408af4bac7a5084ca
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 16:42:58 2016 +0200
share IndexLookupContext
commit ed8362422d3bb8d8462820581ea029209fb80387
Merge: e674f2b 73f87e8
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 14:17:46 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit e674f2bd5f419243461c5b34fa507277fabdffb3
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 14:17:22 2016 +0200
transition static array chunks cache into an unordered set
commit ceb1dc126efa28a2cfca2f73037b6a3df57d99b2
Merge: 254e167 0a82f16
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 13:31:20 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 254e167f5195cd316dda8a79bd3103848bd09ba8
Merge: ce5ea17 f1c3c89
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 12:42:50 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit ce5ea175f0dec9634577d9f8bf691aea8985b9d4
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 12:42:32 2016 +0200
remove locks in case they are unnecessary
commit 0277c938871cee66e9ef1486efe8ab0d3be24885
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 12:42:11 2016 +0200
fixed bad optimization
commit 2db9e3534e4b9f7cb54c7b8ce52913334535b876
Merge: e408593 8c7034e
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 10:47:57 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit e40859312d25a42ee41640341ece78255ab5d0df
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 14 10:47:41 2016 +0200
performance optimizations
commit 6c9f19b06fc428581bee193cd7a3b9ce5a7219bb
Merge: baf397b df977e6
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 13 11:16:06 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit baf397befd61cbb072c0cebc27bf72726f22d21a
Merge: 2c43c62 d229ac3
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 13 09:41:40 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 2c43c6242ea606428789b2e33295610e1b2d15f0
Author: jsteemann <jan@arangodb.com>
Date: Thu Oct 13 09:41:24 2016 +0200
performance optimizations
commit 6304f67551dbdfc82579e37d5b02f1c73bdfe4e4
Merge: 8504836 bf8da24
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:30:34 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 8504836efa2da621cb15e028dfae2f7608d37383
Merge: c4e27d0 48d29c9
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:30:28 2016 +0200
Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache
commit c4e27d0ad85fcef3b5456bf9a2e43d717fa634e9
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:19:50 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 48d29c9abe585801c1df96fcbac73498d5f41fa7
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:19:50 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 95aad698140f38e07d19b693075b008fbb0c5681
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:18:42 2016 +0200
use relative include path
commit 7e410c86cf6e5f5e2431801728f9683daa70a8c0
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:18:26 2016 +0200
simpler iteration over all documents in a collection
commit 49eec355dfbc4a5812245adc7199de0ae74a35c3
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:11:45 2016 +0200
micro optimizations
commit f7e2d008f32d9526a525ddb15ac696b2af6eacae
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:10:16 2016 +0200
move seldomly-used code into own function
commit 7fb500e0bf97fa9b1be497cbae4c0022bb101615
Author: jsteemann <jan@arangodb.com>
Date: Wed Oct 12 17:09:56 2016 +0200
micro optimizations
commit debf61f9563f00a34028e31ea91fdd8274b5c401
Merge: 1a1024d 053e7fc
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 11 12:15:12 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 1a1024d38563f4cb08c68be0d5a891fcb2414954
Merge: 89414ef 001407d
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 11 08:47:14 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 89414efadcfc3db01e43d2baa5ef6d12f627aa17
Merge: 221ae0d 0bfe447
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 10 17:12:03 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 221ae0d34e6d6316dd7079c3c025a5b890a7a273
Merge: ee038eb e75b8f5
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 10 16:46:09 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit ee038eb2115b021de5f5301edb8c4e4337e3faad
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 10 16:45:49 2016 +0200
index refactoring
commit 20739bdffca0104bceb603073f7a50023febbdf1
Merge: 9c356e4 5d65b0b
Author: jsteemann <jan@arangodb.com>
Date: Mon Oct 10 09:11:06 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 9c356e462ebcf05dd37ba424d2d9b1d007d3164c
Merge: e50a934 8aa34ec
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 7 16:19:14 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit e50a934b151e7a92d916ce8ffb0ca167bfb02e10
Merge: 00e1fff 51dd5a9
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 7 16:19:08 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 00e1fff3b0e7bff7afd74023aa24b2abd061fe42
Author: jsteemann <jan@arangodb.com>
Date: Fri Oct 7 15:15:34 2016 +0200
changed primary index to not use pointers
commit 0318f177e13a2c9d5e3f8473d8b63de505f5d80b
Merge: 6230439 3fc8677
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 16:28:18 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 6230439538c73bd3e2bf553bea6a53f91db1db28
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 16:28:05 2016 +0200
remove _extraMemory
commit bf5b4f957751fa0fc6702da62ce46a008613a99d
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 16:27:52 2016 +0200
index API preparation
commit 5a2d19daa5f0c95131733eb94ea9182fa5b8f822
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 15:19:15 2016 +0200
fix API
commit 4835ba6ca3ed071e477bf69cec4eec1b9b46b12a
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 15:19:08 2016 +0200
removed garbage
commit a8f29ad166d50cb85bf0f95a0594d8a8baf3043b
Merge: d559c31 f790795
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 15:02:29 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit d559c316922e06c3cf5da6654afe9aeae15a8d5f
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 09:13:58 2016 +0200
cppcheck
commit 89f525278e87d0ae926367f5c2fdb08faba4932f
Merge: 6ba81c2 21beb09
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 09:05:19 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 6ba81c27e6cfa425c2a59569a371707abd2aa8f3
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 4 09:04:59 2016 +0200
enable disabling _rev checks for pre-release 3.1 data
commit 21b701c1792d8eeaa0321ce494fafe9102c1ba9a
Merge: 1bddd76 11a9d3b
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 16:24:18 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 1bddd7645fb3761eb2946b21f08f5189dadadf11
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 16:24:00 2016 +0200
free unused cache memory more eagerly
commit 0136e2f0514c9fc2b35a5d21b72a3ebb64c0aaaf
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 16:23:52 2016 +0200
renamed variable
commit 9c276a069a24f5d4544b7147efe57679c039eebf
Merge: 7c70abb 93cb87e
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 15:37:59 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 7c70abb2ce45858aaa77e08785bf635e699428f0
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 15:37:34 2016 +0200
platform-specific target size for revisions cache
commit 817561b1c220a4bf82b5a554efd1b70980eaa406
Merge: cb4b9e7 750b562
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 15:30:06 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit cb4b9e75ffac7f33041562c57e2a062ffc8f7aa0
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 13:58:53 2016 +0200
fixed crash
commit c5dbd81bd6405bb4247d57fa6afdf39f48f0922c
Merge: 8dad7b3 ca102fc
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 13:55:07 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 8dad7b3de027a29acab9c97ec00a21baf8fb36d9
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 13:54:51 2016 +0200
fix garbage collection
commit 8cac202eb8f2d05a42fc64922096e7e814de23a3
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 08:32:55 2016 +0200
API cleanup
commit 728429981af90b9a0207646acd9b4e32fa78f7d3
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 08:22:47 2016 +0200
make option hidden
commit c3fd3621d4f929c860a19ee99b523c71e5510b48
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 08:20:53 2016 +0200
remove OtherEngine
commit dd069158ed9be8aca4d9221d38e16771f424081e
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 29 08:18:40 2016 +0200
preparation for results aggregation
commit 983980afd2bdbc3602676b305dea3f816b12bd78
Merge: c46fd98 8a5bc21
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 28 15:23:16 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit c46fd98516ba5674e0a3abad544c2b5cae7e340e
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 28 15:23:02 2016 +0200
use own hash tables
commit 1e11621149dfd8d98cc78adcae9181778454abf1
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 28 11:15:37 2016 +0200
fix another crash
commit 0bd000c880afa78d45b215adff7dcf055ee9eb8e
Merge: 7e5da3d 69e453a
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 28 11:12:54 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 7e5da3d08667823af80d75e0eaf7af41d8cebd4a
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 28 11:12:40 2016 +0200
fix crash
commit d2c9ae228de019380091fdccafb50960d1ae17ac
Merge: a2571d5 2d4bcaf
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 28 10:47:49 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit a2571d581cd3e52941846c4ce8f488b9220af0ea
Merge: d02b002 1f0ecf9
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 28 10:04:53 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit d02b0026fa8cbcec0539985ba9f5fc5ca2eb1592
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 28 10:04:31 2016 +0200
garbage collection
commit 04794a8b5cfea93f9d0e620119941753052609de
Merge: c38c2b7 454e0bf
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 27 17:38:06 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit c38c2b74955b33046ecb1d459a98c76b7f908aa4
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 27 17:37:55 2016 +0200
fix shutdown
commit 3d0f7d3daedd9332222648f8e096dd84d9eba142
Merge: 2bbe5a0 54a0d45
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 27 16:38:05 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 2bbe5a02aa2d9010056ec09bb526024fce9ed108
Merge: 8442ea6 0ea2ca2
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 27 16:35:29 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 8442ea63e5bc84705b844066e11dd4c334b0d796
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 27 15:00:35 2016 +0200
read caching
commit 0cb85c8d9fb7092ad5365de69cc51b989ab84449
Merge: 5baa73d 44edc6c
Author: jsteemann <jan@arangodb.com>
Date: Mon Sep 26 12:52:39 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 5baa73d63eb9dd4a6b5168da636bd8b89958883a
Author: jsteemann <jan@arangodb.com>
Date: Mon Sep 26 12:43:39 2016 +0200
preparation for read cache
commit 55445bfb85374fd1b88ebfc29151ac60e10d1d81
Author: jsteemann <jan@arangodb.com>
Date: Mon Sep 26 08:50:42 2016 +0200
refactoring
commit f1cf513a8c1359a9e4e8f18b8a6af0c5440bc091
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 23 16:19:58 2016 +0200
refactoring
commit 2ab07bb6efda66b22cff2b02b64e7d17157ea56f
Merge: aa8327c 1bdf414
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 23 15:51:11 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit aa8327c151b7ae06046ad5ce95aed3d3e5c45a10
Merge: c55fd03 35e14fd
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 23 15:14:00 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit c55fd031c612aee1479e361d51d92212a4e74d19
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 23 15:12:36 2016 +0200
fix replication
commit 51164b4e70f6a6a16f841f369ecde1e906abb102
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 23 15:12:30 2016 +0200
refactoring
commit 548c7f60dd14d834f796f7dde6d90feb9ba1be8e
Merge: 6be89c3 9b951ff
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 23 12:21:22 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 6be89c3013e5fb1eddf83befcdaf5d5ff935e9f1
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 23 12:20:52 2016 +0200
allow storing arbitrary data elements in AssocUnique/AssocMulti
commit 73e5b06a050db6c3994abeba14675fe93e0c5b3b
Merge: ab5bb48 d9d0926
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 23 10:22:01 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit ab5bb486bcb2e4eb8fb7267a68a7939c85e64f5b
Merge: 345963c a94db7d
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 20:50:59 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 345963cb6931fc7ce1f2714735f4bfbc60ca50e1
Merge: db3a071 d6a3b81
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 16:42:20 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit db3a07134341156c1489399e33368858059094df
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 16:30:52 2016 +0200
removed last occurrences of master pointers
commit 29222e71415120a9c7163cbc420414b93acad988
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 13:14:20 2016 +0200
pass Transaction in API so we can make sure a transaction is ongoing
commit 78ba63060d1675eec6d35abe056d22c2cb6b91fb
Merge: 906dc42 560da96
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 13:00:52 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 906dc428ddf8ef079f7fa3664cb89df3fbf07c21
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 13:00:23 2016 +0200
pass initialCount to physical
commit 46971f72b09dd2dbbd8e20fad7be138298ec0180
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 00:39:05 2016 +0200
privatization
commit 7ec3508bb0be4b56de9fec42e1417000efe20ad7
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 00:37:17 2016 +0200
move master pointer management into engine
commit 667fbef8ce5ec426e3a16a5ef377ff0e42b42444
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 22 00:18:50 2016 +0200
index cleanup
commit 8fc5c764044438f2fc854f48c517a811e31f2df1
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 22:45:32 2016 +0200
constexpressified basic VPackSlices
commit ae8bc45a3fb34cf8f9a39548e22039d505619038
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 21:51:55 2016 +0200
renaming
commit ba1b68c468e20a3d5282a937efd8a2e063c1abac
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 21:38:05 2016 +0200
move last master pointers into engine
commit 179741cd1711954f91d8ec53fad7221977c4bfc3
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 20:50:41 2016 +0200
remove includes
commit ea4e5ac9d0c0479ccc34e91f7fdc08e605005681
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 18:06:54 2016 +0200
removed TRI_doc_mptr_t
commit 40c7ce768898f0e4f09b133dedc335a65d1b0a21
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 16:43:44 2016 +0200
removed more TRI_doc_mptr_t
commit 3450bcc042d4caf8499af3c5454e37b1eeaf8a28
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 16:43:23 2016 +0200
removed more TRI_doc_mptr_t
commit 64e17c8744330d2835c39523c7b15f9b79c429ef
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 13:56:08 2016 +0200
cleanup
commit 38feed51f15bdefa95e18dab0b694eccfe1d6a3b
Merge: dbbdeb4 ec15c72
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 11:03:08 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit dbbdeb44f17f804fa798e2ee4d677543fec1b05b
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 21 11:02:45 2016 +0200
make geo and fulltext index more robust given different platforms
commit c4e90fcf6a44390ecacacd6dbca3e5cf43179484
Merge: 86603e0 049471d
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 17:38:56 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 86603e04710170108d8ef4c023fa68f9366e628e
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 17:38:37 2016 +0200
removed unused struct
commit 86b1b2568aefaba5ab7f621cb27b0ae5841b4da5
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 17:22:12 2016 +0200
less TRI_doc_mptr_t
commit 30c3077002f23970e689ac422371b4e8054797db
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 16:49:09 2016 +0200
less TRI_doc_mptr_t
commit ddb8ea6e958464f12a20a5d9e29772074dab22db
Merge: 14b9b5e d4d5e15
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 15:50:59 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 14b9b5e22030c98459b5b547cb0417a0be7970a2
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 15:49:44 2016 +0200
remove mptr from method
commit cc0ed4046fcef91571f0b9b612fb290d2c19791f
Merge: 8b2b849 6fa99b6
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 15:27:30 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 8b2b849e8c256559fc579da74863b2005356481c
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 15:26:57 2016 +0200
create separate mptrs on update/replace, and dont mess up the existing ones
commit 88b885e2aa36b33feb3983a4c822c593fcfbf165
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 13:11:38 2016 +0200
cleanup
commit 851e62ef0697c60590da7f26524dd824192e6a78
Merge: 05f2fcf f510773
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 12:53:19 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 05f2fcf5ea52baf45aa8fff4624d9fe08fd9b4c7
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 12:53:11 2016 +0200
a bit more cleanup
commit 4928db648984811c58cb3e33be672f9c46c79320
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 10:42:49 2016 +0200
remove occurrences of TRI_doc_mptr_t
commit 8c1f0cbec38a4c62c1d481d291a7b913273f5271
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 20 09:13:17 2016 +0200
partly move master pointers into engine
commit f80bf0c097f9439a8f3b3db8bac27d63086f4de9
Author: jsteemann <jan@arangodb.com>
Date: Mon Sep 19 15:43:26 2016 +0200
refactoring
commit 407ddd508aa6016e99bf311df13c8aa0f8ae94c3
Author: jsteemann <jan@arangodb.com>
Date: Mon Sep 19 15:34:46 2016 +0200
refactoring
commit a40c87ead0b6ad3cdccdc826ad178b25f5ea466e
Merge: df3ceea e245e15
Author: jsteemann <jan@arangodb.com>
Date: Mon Sep 19 09:11:48 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit df3ceea699ab4f41501bb79eb206fa54bd502383
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 16 11:21:48 2016 +0200
cleanup
commit e5ff73bf80c064a4c92372ea80c3a2351973df1c
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 16 10:37:17 2016 +0200
cleanup
commit 44f42b25f09a2110b60d042635f8213242483f8f
Merge: 2bf7e33 fad7efe
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 16 10:00:38 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 2bf7e3373b0ad7e2a2fed7ccf883be05a51e4a22
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 17:21:51 2016 +0200
unify index iterators a bit
commit e83455dece1bd014a126e9a5554f9a7c1fe4de3f
Merge: c83eab8 c912d96
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 14:07:52 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit c83eab87106ca6f5123a4a4747a730deb71069eb
Merge: fb4c5c3 b9b7d8d
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 13:59:12 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit fb4c5c3108af5ae8bd5bdd70748687e24b983b37
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 13:58:58 2016 +0200
bugfixes
commit 7643365abca94aca5d138bd46341d086c1f0fb14
Merge: dabddf7 7e866a8
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 10:37:19 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit dabddf728932cc00abc6052370cab9d081eb1025
Merge: 1662199 abb16ee
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 10:34:00 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 1662199d843256c0002c59c85b5f013306098cee
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 10:17:25 2016 +0200
cleanup
commit 3ce9cf9de45f324af07112b2ac0c79ef22805cb1
Merge: e5d9703 135edf1
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 09:29:38 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit e5d970356041123b92a6ee20e4e800175e04f548
Merge: cd2def8 542f4bb
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 08:44:46 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit cd2def8762859d1cafbe066936a22a5ef27ae508
Merge: 9baaf4b a9cb076
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 08:20:43 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 9baaf4b32d6356d3defdfd8a4b1c0cf3f7ebfacf
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 15 08:20:24 2016 +0200
intermediate commit. not working yet
commit 0ec0a7ce2598f4fb7a55880611947e12112e14b3
Merge: 66c6bbe 1a2a3ba
Author: jsteemann <jan@arangodb.com>
Date: Wed Sep 14 09:43:27 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 66c6bbe68fd20cfd9c2b8c00b2220294f29124ef
Merge: f5aadb1 b5ccbd1
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 13 17:02:46 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit f5aadb1b82a85334b3a26b6fd6b9f00bebfa65f1
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 13 17:02:08 2016 +0200
some index refactoring
commit 23e5db5bdb2a192cb4e7fe9b4572fb1e272c4a11
Merge: 25355ed 84fbc98
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 13 12:52:30 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 25355edc43111717de0d80101e56f44c99d84a56
Author: jsteemann <jan@arangodb.com>
Date: Tue Sep 13 12:52:19 2016 +0200
removed dead code
commit 9dd274a1c1694c53987dc6d77526711b46ba996c
Author: jsteemann <jan@arangodb.com>
Date: Mon Sep 12 09:20:34 2016 +0200
some refactoring
commit 049c11769dd38b7afac9cb85ef03ce617f96140f
Merge: ee75b21 a620690
Author: jsteemann <jan@arangodb.com>
Date: Mon Sep 12 08:43:12 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit ee75b2169b533bafaac49752ca3b11b43940b928
Merge: 4f3a3ac 9539f2f
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 17:07:05 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 4f3a3ace83b301aa5e86e4b85b1b03f02f3dd0ea
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 17:06:46 2016 +0200
refactoring
commit 190520d23d89c5435e4b5fce4ed7dd6dbdcc9d6c
Merge: eacd578 61c6e3b
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 16:34:00 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit eacd578f1d837a622a69fdf1b7d0ca03fbe7d5bb
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 16:33:47 2016 +0200
refactoring
commit 7dbac24e00e39943130cfcc3e8a9923fda15c663
Merge: 7a62bb8 2761b7d
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 15:20:49 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 7a62bb830749a661c189d96d6931ba3993bc00ee
Merge: 8d40248 4cebbf9
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 15:09:18 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 8d40248badbf0f11abbd67a21dc356bb6c5d7ee2
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 14:45:39 2016 +0200
renaming
commit bedbe0f5105ba682552ad8192a6753ed68fe899d
Merge: c1321a3 1fcc5b1
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 13:57:59 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit c1321a37e06fbf56e66456fb8341cce46bd2ae37
Merge: 13c14b9 884b6d5
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 13:53:51 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 13c14b96ac95331171013ca2283cb5c6923d7489
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 10:29:27 2016 +0200
renamed
commit 60b8189cf9b045493fb863bc5988e55f865a6280
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 09:42:03 2016 +0200
use algorithm::transform
commit 9019c3247db8b75340721d949754a90da648d511
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 09:41:37 2016 +0200
get rid of free()
commit 2c6ab07b469d86297131d420c1a14a95771017b8
Merge: c49664d 331c4e3
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 09:30:21 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit c49664d95b308c4b59b9ff07fe1f1d68f9742778
Merge: b42aaeb 01e445a
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 09:22:56 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit b42aaeb3dfda6fce26eab0de47b617601a7cbfb6
Merge: 964fa6a 64da7d0
Author: jsteemann <jan@arangodb.com>
Date: Fri Sep 9 08:56:54 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 964fa6a2d656fed8bc89e4da445892df9d20046f
Merge: 24fd06e d7b4ad5
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 8 17:30:09 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 24fd06e5263d2b82e32f128270fc16af06839095
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 8 17:29:40 2016 +0200
added initial cache
commit 6f092c2d8828b86627fbd80e67be8a5985bda88b
Merge: 2733228 df4dabc
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 8 15:48:33 2016 +0200
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
commit 2733228be753bc5425adca5963b865f7d5168a46
Author: jsteemann <jan@arangodb.com>
Date: Thu Sep 8 14:37:32 2016 +0200
cleanup
2016-10-24 10:18:30 +02:00
Max Neunhoeffer
5e743a2a69
Allow to specify good keys in smart vertex collections.
2016-10-21 15:42:25 +02:00
Max Neunhoeffer
75ecf79277
Large scale inquisition of agency.
2016-10-21 10:34:46 +00:00
Andreas Streichardt
ad2327022e
Merge remote-tracking branch 'origin/devel' into authentication
2016-10-17 13:51:26 +02:00
Andreas Streichardt
1318fa313b
Implement cluster authentication
2016-10-17 13:35:55 +02:00