1
0
Fork 0
Commit Graph

1293 Commits

Author SHA1 Message Date
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
Charles Phillips a85a055835 fix,solaris: "version" conflicts with math namespace
lib/Basics/RandomGenerator.cpp: In function 'arangodb::basics::Random::random_e arangodb::basics::Random::selectVersion(arangodb::basics::Random::random_e)':
lib/Basics/RandomGenerator.cpp:544:25: error: reference to 'version' is ambiguous
   random_e oldVersion = version;
                         ^
In file included from ./lib/Basics/Common.h:62:0,
                 from lib/Basics/RandomGenerator.h:27,
                 from lib/Basics/RandomGenerator.cpp:24:
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/math.h:119:6: note: candidates are: enum version
 enum version {libm_ieee = -1, c_issue_4, ansi_1, strict_ansi};
2016-01-25 23:29:04 -08:00
Charles Phillips b68a4302fe CODE, TRI_facilitynames not declared in codebase (?)
Possibly related issue from FreeBSD build: https://github.com/arangodb/arangodb/pull/1124
2016-01-25 23:29:03 -08:00
Charles Phillips 6f56b1f586 simplify custom isSymlink and isDirectory fns into S_ISLNK, S_ISDIR macros 2016-01-25 23:29:03 -08:00
Charles Phillips 8bd23eb261 flags for solaris operating system 2016-01-25 23:29:03 -08:00
Jan Steemann 5dc0a429b2 removed spinlocks and TRI_WINDOWS_VISTA_LOCKS 2016-01-25 17:55:06 +01:00
Jan Steemann 31bdc67d12 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-25 13:47:57 +01:00
Jan Steemann 097de21d33 fixed mismatched free/delete 2016-01-25 13:47:41 +01:00
Jan Steemann 47b77150f3 more trace logging 2016-01-25 13:47:21 +01:00
Kaveh Vahedipour 720c55fd4c Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-01-25 13:47:10 +01:00
Kaveh Vahedipour 3f39a10bf8 Integrated obiwahn contributions 2016-01-25 13:46:44 +01:00
Michael Hackstein a3f0d2e279 Merge branch 'vpack' of github.com:arangodb/arangodb into devel 2016-01-25 13:09:05 +01:00
Michael Hackstein e845e48621 Fixed broken include statement 2016-01-25 11:44:42 +01:00
Michael Hackstein 5b2062b4e4 Removed legacy toJson function from Index.h. All callers now use VelocyPack directly 2016-01-25 11:42:31 +01:00
Jan Steemann 6e24f5e016 include debug malloc 2016-01-25 11:29:08 +01:00
Jan Christoph Uhde d6fa59d930 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  fix for invalid input
  renamed methods (thanks M$ for redefining free in debugging)
  moved into sub-directories
  fixed missing ;
  moved tests into sub-directories
  added missing backslash
  added fs.append
  removed unnecessary 'exit 1'
  create out directory
  added -- to signal the end of arangosh commands
  fixed merge errors
  switch to testing.js, moved testing.js to client
  added WorkMonitor
  less re-allocations
  increase threshold for "big" allocations
  cppcheck
  Documentation: AQL title updates
  move QueryErrors - Aql/Fundamentals links explained
  move AQL query errors in its own chapter
2016-01-25 11:24:29 +01:00
Michael Hackstein e39a43ef43 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-24 10:38:48 +01:00
jsteemann 904a85a27e less re-allocations 2016-01-23 17:26:11 +01:00
jsteemann 0fbb3882e4 increase threshold for "big" allocations 2016-01-23 17:25:48 +01:00
jsteemann 9ba3b68109 cppcheck 2016-01-23 16:22:39 +01:00
Jan Christoph Uhde f86139481b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  Fix arangosh text to report proper results.
  fix undefined behavior
  Use json output of rspec, and parse it to get a proper result.
  mutex is not necessary, because it is initialized in the boot phase
  align structure for ruby tests properly so that we have a result.
  Lintify
  fix out-of-memory situations
  call open/close event localy for now.
  Fix indention, broken merge
  fixed temp path to honor TMPDIR
  - rename variables to match V ertex, E dge, P ath  - add tests that wrap the graph operations into more obscure quries.
  jslint
  Issue #1675 . allow enabling strict mode in tests
  Fix layers for results of config-, upgrade-test and arangob.
  Mention warnings saw that this should also be here when inspecting pr #1674
  Documentation: added a few titles
  more diagnosis
2016-01-22 16:30:46 +01:00
Frank Celler 2a590d16d4 mutex is not necessary, because it is initialized in the boot phase 2016-01-22 14:19:00 +01:00
Michael Hackstein b31cc0ba15 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-22 13:36:47 +01:00
Jan Steemann 9beeb09f37 fix out-of-memory situations 2016-01-22 13:24:33 +01:00
Wilfried Goesgens 9902b8eaf9 call open/close event localy for now. 2016-01-22 13:23:54 +01:00
Wilfried Goesgens c99910e6ea Fix indention, broken merge 2016-01-22 13:22:06 +01:00
Michael Hackstein 7ef829ae63 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-22 13:16:39 +01:00
Frank Celler d3330bdf9b fixed temp path to honor TMPDIR 2016-01-22 13:16:25 +01:00
Jan Christoph Uhde 032dc64693 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb: (105 commits)
  fixes ported from 2.8
  fix version strings
  lock debugging
  Add missing return code if uniq constraints are violated.
  added --enable-boost-tests in case the boost libraries are not available
  Migrate jasmine->mocha
  reorganise Aql/Basics.md for improved information retrieval
  fix some locks
  catch exception
  make example copyable
  another fix for Visual Studio
  fixes for Visual Studio
  added VPack version number
  unification of sub-thread naming
  removed outdated upgrading function
  fixed test in failure mode
  namespace cleanup
  more checks & asserts, C API cleanup
  class has virtual methods, so add virtual dtor, too
  shorten critical logging section
  ...
2016-01-21 21:13:08 +01:00
Michael Hackstein 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
Jan Steemann 25f4f54935 lock debugging 2016-01-21 15:54:48 +01:00
jsteemann 6f0be080fa unification of sub-thread naming 2016-01-21 00:51:51 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
jsteemann ef67a496e6 more checks & asserts, C API cleanup 2016-01-20 22:08:11 +01:00
Jan Steemann 17dde3e93f shorten critical logging section 2016-01-20 14:04:55 +01:00
Frank Celler a2c911c608 fixed wrong TRI_HAVE_GETTID for Windows 2016-01-20 11:38:13 +01:00
Michael Hackstein 51a683facb Added a toVelocyPack function to all indexes. Removed specialized toJson from all indexes. Generalized toJson invokes specialized toVelocyPack for compatibility reasons. 2016-01-19 15:40:37 +01:00
Frank Celler ff11db7b78 added threadNumber to identify a thread 2016-01-19 13:57:30 +01:00
jsteemann 8a5018b4af added some Bloom filter implementation 2016-01-19 12:07:54 +01:00
Michael Hackstein b8bff937b1 Improved VelocyPack Helper functions. They now directly return the default value if the key is not existing 2016-01-19 09:46:33 +01:00
Michael Hackstein aace581915 Fixed the most stupid thing ever found on windows yet. std::max forbidden trololololol 2016-01-18 12:26:32 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Michael Hackstein 0371083fd0 Added a function to compare two VelocyPacks which is compatible to the old compare two shaped json values. 2016-01-15 13:42:03 +01:00
Michael Hackstein 212b3752b1 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-15 10:58:20 +01:00
Frank Celler cffd81011b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-01-15 09:52:37 +01:00
Frank Celler 828a2eb1ce added time 2016-01-15 09:52:31 +01:00
jsteemann 1b959c827d more const unification 2016-01-15 00:09:52 +01:00
jsteemann f66eb007cd some const unification 2016-01-15 00:03:03 +01:00
jsteemann 0421c619a6 merge defines 2016-01-14 23:46:20 +01:00
Jan Christoph Uhde b53cb6188a fix: build on debian sid -- bumped cmake version 2016-01-14 23:40:52 +01:00
jsteemann 3ace0533d5 removed useless comments 2016-01-14 23:22:37 +01:00
jsteemann 2ae325fd4e removed some of those "using namespace" directives 2016-01-14 23:21:39 +01:00
Michael Hackstein 0575fbb4ef Added a convenience function for uint64_t parsing. Works with strings as well as numbers 2016-01-14 12:44:07 +01:00
Michael Hackstein ad8fa5c63a Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-14 09:23:10 +01:00
Frank Celler 89ca0ffae1 added work monitor call 2016-01-13 18:10:51 +01:00
Michael Hackstein 2029d185be Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-13 17:20:32 +01:00
Michael Hackstein c7dee19a1f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-01-13 16:47:17 +01:00
Michael Hackstein 6bb32275cc Avoid Tail recursion in Traverser. Some compilers cannot do it ;( 2016-01-13 16:47:07 +01:00
Jan Steemann 8404d0eac1 better OOM handling in ThreadPool constructor 2016-01-13 16:19:53 +01:00
Michael Hackstein 09ffbabf06 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-13 10:51:41 +01:00
Michael Hackstein 69f4f974d3 Vocbase server now stores VPack instead of TRI_json_t 2016-01-13 10:25:52 +01:00
Jan Steemann bb3703cf9e fix recovery 2016-01-12 20:47:02 +01:00
Jan Steemann 6937dbc489 aggregate fixes 2016-01-12 17:21:18 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
Jan Steemann 91fb07dcd1 catch conversion exceptions 2016-01-08 18:11:54 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann 9a1d7959e9 merged string-buffer.h and StringBuffer.h 2016-01-06 13:24:09 +01:00
Jan Steemann bdc51bca80 fix potential crash 2016-01-06 12:14:15 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Wilfried Goesgens 775b853ec1 Add missing include 2016-01-05 14:36:04 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Jan Steemann a04993b4e4 turn off debug output 2016-01-04 19:12:34 +01:00
Jan Steemann f207238e8a do not use workmonitor freelists for client tools 2016-01-04 18:43:51 +01:00
Jan Steemann 28d80cf8d4 fixed shutdown leak 2016-01-04 18:37:01 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Max Neunhoeffer 2dbdb52a36 Merge branch 'devel' into vpack 2015-12-23 15:14:05 +01:00
Jan Steemann eb1834da80 fixed Visual Studio warning 2015-12-23 15:13:53 +01:00
Max Neunhoeffer b4887dce17 Remove unused stuff: GLOBAL_TIMEZONE and matchInteger. 2015-12-23 15:13:06 +01:00
Max Neunhoeffer 394057fbda Merge branch 'devel' into vpack 2015-12-23 15:09:20 +01:00
Max Neunhoeffer c7f00bfeda Continue work on TODOs. 2015-12-23 14:40:04 +01:00
Jan Steemann b5838ed560 removed unused functions 2015-12-23 14:19:11 +01:00
Jan Steemann 887e93babc index handling fixes 2015-12-23 14:01:14 +01:00
Max Neunhoeffer a80f2e71f4 Merge branch 'vpack' of ssh://github.com/ArangoDB/ArangoDB into vpack 2015-12-22 16:50:54 +01:00
Max Neunhoeffer 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Jan Steemann f6592aabff removed unused file 2015-12-22 16:49:39 +01:00
Jan Steemann e2e483e06a potential fix 2015-12-22 12:34:48 +01:00
Max Neunhoeffer 4131d38b10 Merge branch 'devel' into vpack 2015-12-21 10:25:26 +01:00
Max Neunhoeffer b8674e5a21 Fix Hebrew fix. 2015-12-21 10:23:54 +01:00
Max Neunhoeffer 3d6223c64c Merge branch 'devel' into vpack 2015-12-21 10:21:41 +01:00
Max Neunhoeffer a26675e28b Turn around the Hebrew "Goodbye" to make it right with most terminals. 2015-12-21 10:18:36 +01:00
Jan Steemann ad45a4b254 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 12:31:14 +01:00
Jan Steemann b76c61adb1 \0 fix 2015-12-17 12:28:16 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
jsteemann ead2ee47e7 issue #1409: fix NUL-byte handling 2015-12-17 10:54:24 +01:00
Jan Steemann 8e18d6463f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-16 11:44:56 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Michael Hackstein 2867ff1eb4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-16 10:52:08 +01:00
Michael Hackstein e6e66d4469 Fixed a bug in Traversal Path Uniqueness. 2015-12-16 10:51:54 +01:00
Jan Steemann a7cf52c6e0 fixed Visual Studio build 2015-12-16 10:06:42 +01:00
jsteemann bcbfa1505b removed wrong assertion 2015-12-15 21:25:03 +01:00
jsteemann 1e98af01ba set cloexec for file descriptors 2015-12-15 20:30:28 +01:00
Jan Steemann ad8381ad6a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 16:37:33 +01:00
jsteemann c043f9301c changed error message 2015-12-15 13:13:31 +01:00
jsteemann 72f2c4a80e added implementation for make_unique 2015-12-15 13:09:27 +01:00
Jan Steemann 84fae4ebcb Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-14 18:16:30 +01:00
Jan Steemann 8e7ac689a2 issue #1606: fail gracefully on invalid index definitions 2015-12-14 16:58:05 +01:00
Jan Steemann da6f76ca7a switched to template implementations 2015-12-14 15:48:40 +01:00
jsteemann fd29ccdbc5 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-13 23:37:22 +01:00
jsteemann 600c48375d added optimizer rule `sort-in-values` 2015-12-13 23:33:44 +01:00
jsteemann 1942ecc9ad added missing space between languages 2015-12-13 00:46:42 +01:00
jsteemann c40bfe6557 cppcheck 2015-12-10 22:40:40 +01:00
Jan Steemann a406ced17c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-10 21:33:43 +01:00
Jan Steemann a1a95f227f fix VS warning 2015-12-10 21:16:03 +01:00
Jan Steemann f2b9e1139b replaced levenshtein distance implementation 2015-12-10 18:43:44 +01:00
Max Neunhoeffer b6b78c4acc Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-10 15:28:30 +01:00
Max Neunhoeffer 105ac4d562 Remove xxhash. 2015-12-10 15:28:18 +01:00
Wilfried Goesgens 399c44278e Add left-to-right and right-to-left guards around the hebrew bye message 2015-12-10 11:09:21 +01:00
Michael Hackstein b492b154d8 Added a velocyPackFromFile to the VelocyPackHelper 2015-12-10 11:02:19 +01:00
Jan Steemann a36e4827c7 build fix 2015-12-10 10:43:59 +01:00
Michael Hackstein f6e24e41e7 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-09 12:41:57 +01:00
Max Neunhoeffer 7aba9b0cbb Add some velocy helpers, to be deleted later. 2015-12-09 12:39:56 +01:00
Michael Hackstein 02784df7f8 Updated file list function to use std::vector<std::string> instead of TRI_string_vector_t. 2015-12-08 15:10:03 +01:00
Michael Hackstein 1e7108d9ca Optimized toVelocyPack functions in Index. Added special implementations for edge and primary indexes. All others TODO 2015-12-07 15:44:28 +01:00
Michael Hackstein fe61871111 Added a new convenience function to VelocyPackHelper to get either the string value of an attribute or a default string if it fails 2015-12-06 12:57:02 +01:00
Michael Hackstein 6474f65166 Added an additional assertion to VPackHelper 2015-12-05 13:01:10 +01:00
Michael Hackstein a8ff6f3a5f Fixed convenience function for NumberType in VPack 2015-12-04 16:44:22 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Jan Steemann 75a888d9ac Windows fixes 2015-12-03 15:06:20 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
jsteemann 9fa0f6d3a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-02 16:38:50 +01:00
Jan Steemann eb8899d9ae applied changes suggested by cppcheck 2015-12-02 10:17:14 +01:00
jsteemann 49af794f5d Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-01 01:56:46 +01:00
Michael Hackstein e56776bfd5 The PathEnumerator now automatically prunes if the getVertex callback returns false 2015-11-27 16:23:13 +01:00
Michael Hackstein 7bf37620bb Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-26 16:32:26 +01:00
Jan Steemann e29bc893b7 finalized index API changes 2015-11-25 16:44:01 +01:00
Jan Steemann db85c926be added transaction to AssocUnique APIs 2015-11-25 15:57:48 +01:00
Jan Steemann db078f1554 changed some APIs of AssocMulti 2015-11-25 15:40:01 +01:00
Jan Steemann 9ef5b4746a removed several includes from Common.h 2015-11-25 12:21:55 +01:00
Jan Steemann b6752faf0b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-11-25 11:44:32 +01:00
Jan Steemann a7c8a37938 use range-based for loop 2015-11-25 11:05:31 +01:00
Jan Steemann 5518244942 less iostream-ing 2015-11-24 13:55:06 +01:00
Michael Hackstein b18ce56a68 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-20 10:49:00 +01:00
Jan Steemann a4bff00093 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-11-19 16:46:30 +01:00
Jan Steemann bcb31ab4c2 insertv continued 2015-11-19 16:46:06 +01:00
Max Neunhoeffer f604f1d434 Fix Prefetch NOP. 2015-11-19 16:45:19 +01:00
Max Neunhoeffer de47cb4ad7 Add a memory prefetch hint. 2015-11-19 16:44:32 +01:00
Jan Steemann 89e0f887b9 velocypack update 2015-11-19 13:28:40 +01:00
jsteemann cb62c657e0 initial commit 2015-11-18 17:46:19 +01:00
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00
Jan Steemann a6b898c34a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-11-17 14:09:15 +01:00
Jan Steemann 82eddeb120 allow using array indexes without specifying the `[*]` extension 2015-11-17 14:03:58 +01:00