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