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

1147 Commits

Author SHA1 Message Date
Jan Steemann d32b2b62e5 set file descriptor properly 2016-02-15 09:56:40 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Jan Steemann b734e4c228 don't log to the same output multiple times 2016-02-12 19:12:56 +01:00
Jan Steemann 20aebf6cc0 fix some Visual Studio 2015 errors 2016-02-12 19:10:52 +01:00
Jan Steemann 13cceddbcc removed linenoise option 2016-02-12 18:07:42 +01:00
Wilfried Goesgens 1c8acea215 On solaris we need to hide ERR... 2016-02-12 17:03:31 +01:00
Wilfried Goesgens d85e19c902 Depending on which solaris version we compile at, these facilities can be unknown. 2016-02-12 17:03:24 +01:00
Wilfried Goesgens ee94d45bea Use fcntl instead of flock, this is more modern and better portable. 2016-02-12 17:03:16 +01:00
Kaveh Vahedipour 389ddf3e8c Much requested farsi goodbye added. 2016-02-12 14:10:27 +00:00
Kaveh Vahedipour 05ef0d2711 linenoise library should be automatically included 2016-02-12 12:44:05 +00:00
Jan Steemann b8849daa50 fix invalid fix 2016-02-12 10:41:09 +01:00
Kaveh Vahedipour fe9370afb4 Pre merge into devel 2016-02-11 13:00:50 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
jsteemann bca7bee317 don't copy 2016-02-10 23:07:56 +01:00
Michael Hackstein 335abd5640 Added a helper function to transform any VPack value to a double. This is conistent with V8 Json to double 2016-02-09 16:50:39 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Kaveh Vahedipour 8e07620109 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-08 17:10:37 +00:00
Jan Steemann 2f5b9e8ace nicer exceptions 2016-02-08 17:27:45 +01:00
Kaveh Vahedipour b99970ef72 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-08 16:17:36 +01:00
jsteemann 78bc8e6997 remove unused thread cleanup method 2016-02-07 00:22:22 +01:00
Jan Steemann 17ea3f422d dont use dynamic memory for condition variable initialization 2016-02-05 19:37:45 +01:00
Jan Steemann 99b79acb61 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-05 18:20:32 +01:00
Frank Celler d6808f8d6f fixed deadlock on fatal 2016-02-05 16:40:33 +01:00
Wilfried Goesgens 4b864f0643 In solaris try to call pstack in case of failing asserts 2016-02-05 14:55:52 +01:00
Wilfried Goesgens 21707e1710 Output a log message before exiting false in maintainer mode. 2016-02-05 14:55:18 +01:00
Jan Steemann f172dd90d4 prevent crash in case TRI_LookupArrayJson is called on invalid data 2016-02-05 14:24:01 +01:00
Kaveh Vahedipour 2b6a0ceaa5 Added simple piping of VP slices into Logger streams. 2016-02-05 10:49:19 +00:00
Jan Steemann d63fa1ad81 use dedicated REPLICATION log channel 2016-02-05 11:01:39 +01:00
Kaveh Vahedipour 43e2cff79c Added simple piping of VP slices into Logger streams. 2016-02-05 09:23:09 +00:00
Jan Steemann 51d4df998d cleanup 2016-02-04 19:12:27 +01:00
Wilfried Goesgens 4d1f8a5164 Move solaris specific stuff into its own header. 2016-02-04 17:54:46 +00:00
Jan Steemann 9ff2684f92 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 18:41:36 +01:00
Jan Steemann a6353c053f fixed Windows build 2016-02-04 18:41:13 +01:00
Wilfried Goesgens a13432a988 Fix solaris compile 2016-02-04 17:38:42 +00:00
Jan Steemann 35e2284146 don't malloc log string twice 2016-02-04 17:47:26 +01:00
Michael Hackstein edf7f6b9d9 Further implementation of AQL functions for VPack. UNIQUE UNIQUE_SORTED UNION UNION_DISTINCT 2016-02-04 15:23:26 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris 
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
 2016-02-04 15:11:34 +01:00
Michael Hackstein 84b1f9055d Further implementation of VPackAqlValue functions. This included VALUES and ATTRIBUTES. These functions by accident had an ordering in TRI_json_t which they do not have any more in VelocyPack. Clarified Documentation. 2016-02-04 13:49:59 +01:00
Jan Steemann 3269c59a06 fixed some compile warnings 2016-02-04 12:38:51 +01:00
Jan Steemann 0ff20a6590 try to work around compiler warning 2016-02-04 12:32:56 +01:00
Jan Steemann 5964ecb005 removed unused function 2016-02-04 11:10:42 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Jan Steemann 657ac8d50f fixes for Windows 2016-02-04 09:36:29 +01:00
Jan Steemann b7fddb15ad handle compile warnings 2016-02-04 09:07:36 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
Kaveh Vahedipour a4623a395d Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-03 09:33:25 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
jsteemann d9de65acf8 remove now useless casts when invoking logger 2016-02-02 21:38:01 +01:00
jsteemann 74bf32d723 more detailed logging for mmap operations, added mmap log section 2016-02-02 21:36:25 +01:00
Kaveh Vahedipour eb94d0a0d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-02 15:05:00 +01:00
Jan Steemann 5eb9687e21 turn off deadlock detection in cluster 2016-02-02 14:02:28 +01:00
Jan Steemann bc6fce75d4 removed some unnecessary explicits 2016-02-02 12:13:21 +01:00
Kaveh Vahedipour 2c776cac26 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 17:48:56 +01:00
Jan Steemann 998f106361 argl 2016-02-01 17:17:21 +01:00
Michael Hackstein c782fe5917 Use VPackCollection::merge to merge to VPackSlices. 2016-02-01 17:10:25 +01:00
Jan Steemann 9a0204a656 fixed compile error 2016-02-01 16:57:41 +01:00
Kaveh Vahedipour 7db958580a Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 15:01:22 +01:00
Kaveh Vahedipour 56be55c7a3 OSX does not allow static_cast from pthread_t to unsigned long 2016-02-01 13:59:46 +00:00
Kaveh Vahedipour c045f0ae48 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 14:50:16 +01:00
jsteemann 1a3e042496 attempt to fix warning with clang on Mac 2016-02-01 14:49:12 +01:00
Kaveh Vahedipour 749e765535 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 14:22:43 +01:00
jsteemann 6d735086ac honor clang-check results 2016-02-01 13:20:49 +01:00
jsteemann 3aed47d8e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-01 13:15:05 +01:00
Michael Hackstein 197292a230 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 13:02:49 +01:00
Kaveh Vahedipour 99b0ca712e Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 13:02:15 +01:00
Max Neunhoeffer daf2afe71a Merge branch 'devel' into ClustUp2 2016-02-01 12:30:45 +01:00
Jan Steemann 33061cab76 fixed Windows build 2016-02-01 12:23:43 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Max Neunhoeffer 0be190d85d Merge branch 'devel' into ClustUp2 2016-02-01 11:43:00 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Michael Hackstein b85d5d4a26 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 09:49:29 +01:00
Michael Hackstein 9ea8e3ea0c Started to write merge of two slices. This is not yet working for null means delete, works for all other merges. 2016-02-01 09:49:19 +01:00
jsteemann 54c796b6e8 fixed issues identified by `-fsanitize=undefined` 2016-01-31 23:30:41 +01:00
jsteemann 349a6d9754 more logging 2016-01-31 21:48:59 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +01:00
jsteemann 5bfd12a0ce Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-30 01:08:59 +01:00
jsteemann dbd5c500cb remove TRI_ENABLE_LOGGING 2016-01-30 00:46:40 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
Frank Celler 44a519b89e added setLevel 2016-01-29 23:25:05 +01:00
Jan Steemann c47eef63b5 added missing header 2016-01-29 20:05:16 +01:00
Frank Celler eef111f4ae added Logger 2016-01-29 19:23:24 +01:00
Jan Steemann 828f46c76b shut up compiler 2016-01-29 19:19:06 +01:00
Jan Steemann cd4cbae6ce ported fixes to devel 2016-01-29 19:05:27 +01:00
Wilfried Goesgens 6c0d6cd182 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-01-29 09:57:41 +01:00
Wilfried Goesgens 61c8941ac9 Remove unneccesary copy of va_args 2016-01-29 09:57:20 +01:00
Michael Hackstein 651e705ebd Introduced a new EMPTY_GRAPH error which is thrown during AQL execitions whenever the graph has no edge collections. 2016-01-28 18:07:26 +01:00
Jan Steemann 37a083edca Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-27 18:53:29 +01:00
Jan Steemann 585208afcf changed directory name pattern for collections 2016-01-27 18:53:16 +01:00
Frank Celler 7a11220acc fixed missing namespace 2016-01-27 16:17:17 +01:00
Frank Celler 175e1e6b51 moved low level mutex in Mutex class 2016-01-27 15:31:02 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 3d8a52cdf4 some refactoring 2016-01-27 13:28:19 +01:00
Jan Steemann 1634421d3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-26 17:09:15 +01:00
Wilfried Goesgens ac277648f3 Change the way windows eventlogging is handled: initialize it once on start. 
Fix unhandled exception handler to do less resource allocation.
 2016-01-26 16:50:19 +01:00
Jan Steemann ee6d77c425 some locks removed 2016-01-26 16:43:21 +01:00
Jan Steemann 7069810778 removed some low-level locks 2016-01-26 16:16:18 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00