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

1511 Commits

Author SHA1 Message Date
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
Jan Steemann dca8efa82f updated vpack library 2015-11-13 12:58:17 +01:00
Michael Hackstein 8d0d921ab6 Included two Abstract classes for Traversals. Traverser and TraversalPath. Implemented both of them for Single-Server Traversals. 2015-11-12 16:25:36 +01:00
Jan Steemann 71e605a5c7 updated vpack library 2015-11-11 13:57:17 +01:00
Jan Steemann ccf75ab804 updated vpack library 2015-11-10 15:49:38 +01:00
Michael Hackstein d12daaaef7 Replaced TRI_Json_t in RestExportHandler by VelocyPack 2015-11-10 14:12:40 +01:00
Michael Hackstein eb9376f7d8 Added a method to create TRI_json_t from VPack 2015-11-10 09:54:27 +01:00
Michael Hackstein 66e1534b65 Started to Implement a static VelocyPackHelper. Having the same functionality as JsonHelper but for VelocyPack. Should make move way easier. 2015-11-09 16:01:54 +01:00
Wilfried Goesgens 7a54982eb4 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-06 13:53:21 +01:00
Michael Hackstein 074c071573 Implemented a VelocyPack Dumper adapter for TRI_string_buffer 2015-11-06 11:38:04 +01:00
Jan Steemann dc53e9fe95 move away from mutex to atomic variables 2015-11-05 10:58:35 +01:00
Wilfried Goesgens 179660e87c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-04 17:07:09 +01:00
Frank Celler 94a730edd2 Merge pull request #1528 from christiano/devel 
Added PT bye message
 2015-11-04 13:23:51 +01:00
Jan Steemann 874fe25fcb fixed test failure 2015-11-03 10:21:32 +01:00
Jan Steemann eef31ab797 comments 2015-11-03 10:21:32 +01:00
Michael Hackstein f23259b2bb Added CXX implementation of BINARY_OPERATOR_DIV 2015-11-03 10:19:30 +01:00
Michael Hackstein 11606c1f55 Added a CXX implementation of BINARY_PLUS. 2015-11-03 10:19:26 +01:00
Frank Celler 3500e569a8 reverted 011117edee, 72c8847324, 5da5715fa9, a371aac4af, 7decf1560a, 0331ff7993, 6ec2014052, ae8d686ae6, 7efd0a1ec7, 3449b87e2c, d35a4034ef, 7b3c1ed4dd, e0c88e4a1a, 952d643101, fc9de8ed08, 2f4319b31a, 105662d5ba, 0a08833b0f, 4ac19a99fc, 4c5494c67d, 528bb85b30, 528bb85b30 becuase of missing CLA 2015-11-03 10:19:25 +01:00
Frank Celler 2d63bd5e7c reverted e9a4f7bb55, 21b498127c, fe02d691d8, 75e904c085, 42440ff75a becuase of missing CLA 2015-11-03 10:19:24 +01:00
Wilfried Goesgens bb9039c855 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-29 16:01:01 +01:00
Jan Steemann ac4069d9de added TRI_DeleteArrayJson() function 2015-10-29 14:49:29 +01:00
Jan Steemann 01499dde43 added deadlock detection for lazy locking of collections 2015-10-29 11:57:22 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
 2015-10-28 11:08:18 +01:00
jsteemann 5fff134c80 added CXX implementations of `WITHIN` and `NEAR` AQL functions 2015-10-27 23:24:00 +01:00
jsteemann fad9782a4a removed unused functions 2015-10-23 01:22:41 +02:00
Frank Celler b7de227138 removed readline 2015-10-22 15:41:33 +02:00
Wilfried Goesgens cd6cc35def Adjust the stage to the now non-void pointered index implementation. 2015-10-22 11:12:21 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Michael Hackstein 3a3ab872f0 Fixed internal error for plan instantiation if the condition is empty 2015-10-19 15:09:59 +02:00
Jan Steemann 84978c0a8a noexcept emulation 2015-10-19 12:03:15 +02:00
Jan Steemann 37e76084bb Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-19 09:52:53 +02:00
Frank Celler 1641553f26 fixed signed / unsigned mixup 2015-10-18 23:40:34 +02:00
jsteemann aaf9c72e3c removed unused typedef 2015-10-17 09:28:39 +02:00
Christiano Anderson 1ba370f214 Changed PT message 2015-10-16 12:44:45 -03:00
Christiano Anderson ddcb14b94a Added PT bye message 2015-10-16 10:58:04 -03:00
jsteemann 04a9ee03c3 fixed an assertion failure 2015-10-15 23:27:14 +02:00
Jan Steemann 7f778b148a blind commit 2015-10-15 16:19:33 +02:00
jsteemann f5f61ea173 cppcheck 2015-10-15 01:32:25 +02:00
Jan Steemann b792632726 preparations for condition validation 2015-10-14 18:29:00 +02:00
Jan Steemann 98882efa61 optimizer fixes 2015-10-14 16:56:03 +02:00
Michael Hackstein 4c6b0f283a AttributeNames from the attribute parser are now non-nested attributes. They offer a function to join nested elements 2015-10-13 16:26:11 +02:00
jsteemann adebf6e7c9 removed some iostream includes 2015-10-12 21:40:46 +02:00
Jan Steemann ffa777979c make IN values unique and sort em 2015-10-12 15:34:41 +02:00
Jan Steemann f0edd198bc added specializeOne() and specializeAll() 2015-10-12 13:02:52 +02:00
Jan Steemann bf71cdecdb noexcept 2015-10-08 16:35:28 +02:00
Michael Hackstein 345725bdf9 Fixed skiplistindex with equality and range conditions 2015-10-08 14:58:52 +02:00
Michael Hackstein 5a026db641 Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions 2015-10-07 16:13:04 +02:00
Jan Steemann a1de2bfcc1 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	CHANGELOG
 2015-10-07 10:18:21 +02:00
jsteemann c5cb00f56d removed unused methods 2015-10-06 21:38:49 +02:00
Michael Hackstein 9f9e49566b Fixed namespace issue for ostream of TRI_json_t 2015-10-06 17:50:03 +02:00
Jan Steemann 118f924598 support [*] operator 2015-10-05 19:15:22 +02:00
Jan Steemann e46ba60715 changed signatures of attribute-access-detecting functions 2015-10-05 16:01:19 +02:00
Jan Steemann 1f009a046c Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-05 10:32:53 +02:00
jsteemann c302b9153a added stringification for TRI_json_t 2015-10-02 21:10:34 +02:00
Jan Steemann 7292384b37 deduplicate IN arrays 2015-10-02 14:05:27 +02:00
Jan Steemann 0ea2247eb0 scan-build 2015-09-30 17:28:52 +02:00
Michael Hackstein 1a7f414c16 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-09-18 12:21:39 +02:00
Frank Celler c4d1fff729 new traversal 2015-09-18 10:40:28 +02:00
Jan Steemann 775292224a don't leak lockfile descriptor at shutdown 
the descriptor will be freed by the OS anyway at shutdown, but fixing this will make the leak disappear from the Valgrind output
 2015-09-17 18:02:59 +02:00
jsteemann 6f17678fd9 use table lookups for JSON escaping 2015-09-16 01:18:57 +02:00
Jan Steemann 75ccd7e2cc fixed incremental sync method 2015-09-14 17:44:12 +02:00
Jan Steemann 5865ca7955 lol self 2015-09-08 15:16:10 +02:00
Jan Steemann 18963d635c fix leak 2015-09-08 15:06:43 +02:00
Michael Hackstein 1afd19e550 Fixed the resizing of AssocUnique. It was different from AssocMulti which cased the nonUnique index to be faster than the unique one 2015-09-08 11:48:57 +02:00
Jan Steemann 8b599b5274 changed some include headers around 2015-09-07 17:09:10 +02:00
Jan Steemann b6a1684605 primary index speedup 2015-09-07 16:22:39 +02:00
Jan Steemann 39939fc1c9 primary index initial insertion speedup 2015-09-07 13:05:02 +02:00
Jan Steemann f45d9f5bc7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-07 09:39:50 +02:00
Jan Steemann b74d608180 fixed my own bug 2015-09-07 09:39:21 +02:00
CoDEmanX 8aa78dcb7f Fix some more typos 2015-09-05 17:18:04 +02:00
Jan Steemann 21d023b502 fixed inconsistent ifdefs 2015-09-04 18:14:55 +02:00
Jan Steemann 47360f4511 added tests 2015-09-04 14:21:31 +02:00
Willi Goesgens 771c291042 Merge pull request #1472 from CoDEmanX/devel 
More Americanization
 2015-09-04 09:15:30 +02:00
Jan Steemann 06760a2c45 fixed broken index scan 2015-09-03 22:49:53 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
Michael Hackstein 630c8fd42f Improved Primary Sequential read 2015-09-03 16:25:24 +02:00
Jan Steemann ec61d921f6 fixed typo 2015-09-03 13:55:07 +02:00
Jan Steemann ad67d59fc9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-03 13:54:01 +02:00
Jan Steemann ad6ca31201 use unique_ptr 2015-09-03 13:53:50 +02:00
Jan Steemann 5c44c968ef no additional memory allocations in maintainer mode, no zone comparisons on free 2015-09-03 13:15:49 +02:00
Jan Steemann 73d087f788 delete random implementation on shutdown 2015-09-03 13:08:13 +02:00
Michael Hackstein 0edccb5ca3 The AssocUnique does not require the key element for insertion any more. It needs two functions instead: Compare identical and compare element keys. 2015-09-03 10:16:15 +02:00
Michael Hackstein 481cb1b7dd Removed const in AssocMulti batch insert. It was non-const casted internally... 2015-09-03 10:16:15 +02:00
Michael Hackstein 9001e88a89 Added a general batch inserter for AssocUnique. Not used in any index yet 2015-09-03 10:16:14 +02:00
Jan Steemann c89cf82c6b constified 2015-09-02 17:37:28 +02:00
Jan Steemann 4494b69f8e fix compiler warnings on 32bit 2015-09-02 14:13:27 +02:00
Jan Steemann 2e617ac0cc Merge branch 'american-english' of https://github.com/CoDEmanX/ArangoDB into devel 
Conflicts:
	arangod/Wal/Slots.cpp
	lib/Basics/debugging.cpp
	lib/Basics/files.cpp
 2015-09-02 13:14:49 +02:00
Jan Steemann 0e802d6438 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-02 10:20:18 +02:00
Jan Steemann a7dc45e966 use ReadWriteLocker 2015-09-02 10:20:05 +02:00
Jan Steemann a80d6635ab create fat datafiles 
This prevents SIGBUS when a sparse datafile is accessed and the disk is full. In
this case the mmapped region is not necessarily backed by physical memory, and
accessing the memory may crash the program
 2015-09-02 10:18:24 +02:00
CoDEmanX 956b396e43 Change spelling of 'initialize' to American English (actual code and files) 2015-09-01 17:29:22 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Michael Hackstein faf0677757 Removed debug output 2015-09-01 15:05:49 +02:00
Michael Hackstein a9e7adc1ed Fixes in basics SkipList 2015-09-01 15:05:48 +02:00
Michael Hackstein 4409a59265 Further templatification of skiplist and fixed the tests 2015-09-01 15:05:47 +02:00
Michael Hackstein e01f8f6b0f Fixes for C++ification of skiplist 2015-09-01 15:05:47 +02:00
Michael Hackstein cbd1cd7111 Removed non obsolete file for basic skiplist 2015-09-01 15:05:46 +02:00
Michael Hackstein d50df2617c Templatified the Basic skiplist. This avoids using void* and includes type safeness 2015-09-01 15:05:46 +02:00
Michael Hackstein b8b129d84c The primary index now uses the Hash-cache again 2015-08-31 11:33:12 +02:00
Jan Steemann 573c143398 constified 2015-08-29 02:18:02 +02:00
Michael Hackstein 81fa8018b0 Improved primary index lookups to use parameter by reference instead of byPointer. less error prone. Fixed some issues with it. 2015-08-28 09:28:24 +02:00
Michael Hackstein 771a6d5143 Should have dereferenced the pointer before adding sth 2015-08-28 09:28:24 +02:00
Michael Hackstein 082e49f2c1 Further adoptions of internal functionality to new Primary index 2015-08-28 09:28:23 +02:00
Michael Hackstein 6d4d41387b Implemented sequential read and any read in Transaction.h 2015-08-28 09:28:22 +02:00
Michael Hackstein 48240bccc1 Added findSequential and findRandom in AssocUnique. Required for PrimaryIndex 2015-08-28 09:28:22 +02:00
Michael Hackstein b791ea09da Fixed a bug in AssocUnique. 2015-08-27 10:38:43 +02:00
Jan Steemann 1a2449193e skiplist code cleanup 2015-08-26 22:52:41 +02:00
Jan Steemann 21793ff9f7 cppcheck 2015-08-26 21:36:44 +02:00
Jan Steemann e8505a35f2 cppcheck 2015-08-26 21:35:57 +02:00
Michael Hackstein 2212be29c0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-26 17:10:14 +02:00
Michael Hackstein 7257bf0b9d Skiplist and HashIndex will now print their figures if requested 2015-08-26 17:10:02 +02:00
Jan Steemann 8f2df77c30 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-26 16:59:40 +02:00
Jan Steemann 249627e21b fixed VS build 2015-08-26 16:59:27 +02:00
Max Neunhoeffer c0f1b72bab Add "sensible" madvise calls. 
Essentially the strategy is: A newly created and a newly opened file
is advised to be "SEQUENTIAL ACCESS", because we will either write to
it or scan it sequentially. As soon as it is sealed, we switch the
advice to "RANDOM ACCESS", because this should be the normal pattern and
aggressive read-aheads tend to be bad. The collector and the compactor
switch a sealed file back to "SEQUENTIAL ACCESS" just before they scan
it and back to "RANDOM ACCESS", when they are done.

Furthermore, all data files in a collection are advised with "WILLNEED"
just before the collection is scanned during loading.

Finally, the actual hash table of AssocMulti is advised to be random
access, although this is an anonymous map given to us by malloc and not
a memory mapped file.
 2015-08-26 16:45:26 +02:00
Jan Steemann a3550e331e fixed makefiles 2015-08-26 16:17:45 +02:00
Michael Hackstein 4a3b8007bd Fixed memory calculation of HashIndexMulti. And added index information for it 2015-08-26 14:38:23 +02:00
Michael Hackstein 4effa2291e Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-26 10:41:27 +02:00
Jan Steemann 9374a25822 removed unused error code 2015-08-25 19:55:48 +02:00
Michael Hackstein 40c1361244 Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-25 16:40:31 +02:00
Jan Steemann 18f231f666 do not read memory for comparisons 2015-08-25 16:09:12 +02:00
Max Neunhoeffer 7957df9215 Merge branch 'array_indexing' of ssh://github.com/ArangoDB/ArangoDB into array_indexing 2015-08-25 13:04:48 +02:00
Max Neunhoeffer 203e9a5195 Make hashcache in AssocMulti switchable-off. Does not work yet. 2015-08-25 12:46:47 +02:00
Michael Hackstein 57c6103458 Revert "The AssocUnique index now requires only an element to insert it. They key is derived" 
This reverts commit ea70a948e254716905a7619e72b41fbef4f66695.
 2015-08-25 09:40:29 +02:00
Michael Hackstein 2d6af6e872 The AssocUnique index now requires only an element to insert it. They key is derived 2015-08-24 17:14:39 +02:00
Michael Hackstein 5b6f8b7b8e Added a remove by key function to AssocUnique 2015-08-24 17:06:21 +02:00
Michael Hackstein ba8264eada AssocUnique is now a templated index. Foundation to move primary index to use it 2015-08-24 16:41:16 +02:00
Michael Hackstein f9647962d7 Moved HashIndex/hash-array.h to Basics/AssocUnique.h 2015-08-24 14:17:49 +02:00
Michael Hackstein 2dd0f7cf7f Continued @neunhoef 's on simplification of hash-index. The index itself will never free anything, calling class is responsible for freeing now. 2015-08-24 13:14:35 +02:00
Michael Hackstein d43c515b56 Fixed a bug in hash index buckets. When resizing the table was not nulled correctly. 2015-08-24 11:22:53 +02:00
Michael Hackstein b708a7ae68 Merge remote-tracking branch 'origin/devel' into array_indexing 2015-08-21 15:34:49 +02:00
Michael Hackstein 85b58a6d8d Fixed sparse indexes 2015-08-21 14:07:32 +02:00
Michael Hackstein 9bb7c0dec6 The skiplist index is now able to index arrays as well 2015-08-21 11:04:04 +02:00
Michael Hackstein 4bb8508d82 Implemented a new improved version of the Array index insertion function. 2015-08-20 14:03:17 +02:00
Willi Goesgens 61eb1e6002 Fix vs 2015 compile issue. 2015-08-20 11:34:01 +02:00
Jan Steemann deb7830615 fix dump/restore filenames 2015-08-20 02:47:00 +02:00
Jan Steemann 97d67e4399 use binary-safe string representations 2015-08-20 01:46:20 +02:00
Jan Steemann 0e3fddf917 fixes for VS2015 2015-08-19 17:18:13 +02:00
Michael Hackstein 241905c42c Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-19 12:51:53 +02:00
Jan Steemann 65424143c6 fix VS build 2015-08-19 12:37:34 +02:00
Jan Steemann 28ad41defc fix compile warnings 2015-08-19 12:22:34 +02:00
Jan Steemann e9a598c020 do not include deprecated header 2015-08-19 12:01:12 +02:00
Michael Hackstein 1a4d59d954 Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-19 11:57:12 +02:00
Jan Steemann 6680f3bb5a fix Mac build 2015-08-19 11:56:41 +02:00
Michael Hackstein 59e8ea3fad Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-19 11:56:34 +02:00
Jan Steemann 9f0384284f moved files 2015-08-19 11:19:37 +02:00
Jan Steemann 338dd7e100 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-17 18:41:13 +02:00
Jan Steemann 4e771b2728 replication improvements 2015-08-17 18:41:05 +02:00
Willi Goesgens 35de50d153 set the mac to add hashes too. 2015-08-17 17:31:15 +02:00
Michael Hackstein e867181a72 Merge remote-tracking branch 'origin/eimerung_hashindex' into array_indexing 2015-08-17 15:58:53 +02:00
Michael Hackstein 2c0bdb5861 Added a function in the attribute parser to transform an expanded attribute to the correct path for pid. 2015-08-17 12:43:13 +02:00
Max Neunhoeffer 1ba7587fc0 Rename ThreadProtector to DataProtector. 2015-08-17 12:43:12 +02:00
Jan Steemann a8428877e7 some cleanup 2015-08-17 12:43:12 +02:00
Jan Steemann 4db822443b allow non-const access to string-buffer 2015-08-17 12:43:11 +02:00
Michael Hackstein 8e3e2d547d Do not push <Class const> into vector. It does not work everywhere 2015-08-17 12:43:11 +02:00
Jan Steemann 98106510d2 remove CONST_CAST helper 2015-08-17 12:43:11 +02:00
Jan Steemann 205d1e73ed fix Visual Studio compile errors 2015-08-17 12:43:09 +02:00
Michael Hackstein d7d00a5d0d Fixed index comparision with multiple components. Introduced by AttributeName format. 2015-08-17 12:43:09 +02:00
Max Neunhoeffer a18faae89f Untemplatify ThreadProtector for those with gcc < 4.9.2. 
We will revert this later once everybody has gcc >= 4.9.2.
 2015-08-17 12:43:09 +02:00
Jan Steemann 907e6368c6 some unused function cleanup 2015-08-17 12:43:09 +02:00
Michael Hackstein c2338d80d0 A user can now create an indux on attribute[*] which will put an index on attribute and ignores the expand flag. Does not harm any feature in AQL now. 2015-08-17 12:43:08 +02:00
Michael Hackstein 17a8f73a06 Now the input for indexes is parsed using the new attribute parser. This means the flags for expanded Attributes are set. Also introduced a transformation function to transform an attributeName list back into a string. 2015-08-17 12:43:07 +02:00
Max Neunhoeffer a5cb29e026 Improve the explanation of ThreadProtectors. 2015-08-17 12:43:06 +02:00
Max Neunhoeffer 49f74b1baf Replace DataGuardian by ThreadProtector. 2015-08-17 12:43:06 +02:00
Michael Hackstein 8fbb2739b0 The indexes can now use the new AttributeName struct which contains a flag if the attribute should be Array-Indexed. Right now this flag is hard-coded to false in all cases and not persisted. 2015-08-17 12:43:05 +02:00
Michael Hackstein c85d5e347a Implemented a new AttributeNameParser this is able to identify [*] expansion and shall be used for array indexes. Also includes tests. 2015-08-17 12:43:05 +02:00
Jan Steemann 46565e4daf fix parallel insertion 2015-08-17 12:43:05 +02:00
Max Neunhoeffer 6d5d14a3ed Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-08-17 12:40:16 +02:00
Jan Steemann 57e9b55739 use TRI_CHAR_NODE_PAIR() 2015-08-14 00:54:59 +02:00
Max Neunhoeffer 1cfaf524d1 Fix DataProtector after blog post comments. 2015-08-13 23:16:07 +02:00
Jan Steemann 22e14c9444 fix buffer overrun when there are more users than DATA_PROTECTOR_MULTIPLICITY 2015-08-13 20:57:34 +02:00
Jan Steemann ca5b7661a3 initialize _list to nullptr 
otherwise _list is uninitialized and if the assignment in the constructor fails with std::bad_alloc,
the destructor will delete from an uninitialized pointer
 2015-08-13 20:19:41 +02:00
Jan Steemann 6dc10ba1de remove unused function 2015-08-13 16:34:55 +02:00
Jan Steemann a1d0c4e431 fixed g++5.1 compile error, added tests 2015-08-13 11:14:50 +02:00
Jan Steemann 99ac624ab0 declare differently 2015-08-13 00:17:37 +02:00
Jan Steemann 59744e9945 more version information (readline version, tcmalloc usage) 2015-08-12 21:38:50 +02:00
Jan Steemann 7b5ac63591 cppcheck 2015-08-12 21:37:28 +02:00
Jan Steemann 589e67357f issue #1434: return more meaningful error message from org/arangodb/general-graph::_fromVertex() 2015-08-12 21:36:27 +02:00
Jan Steemann f6f10dbd45 removed uncalled functions 2015-08-12 19:46:25 +02:00
Jan Steemann f1c5480e97 small cleanup 2015-08-12 15:01:33 +02:00
Jan Steemann e642ce972f throw error if collection not yet loaded 2015-08-10 17:08:41 +02:00
Max Neunhoeffer a851b5a69d Rename ThreadProtector to DataProtector. 2015-08-10 09:54:29 +02:00
Jan Steemann 5d82f0b385 some cleanup 2015-08-07 15:16:33 +02:00
Jan Steemann 68d58248da allow non-const access to string-buffer 2015-08-07 13:29:38 +02:00
Jan Steemann da38382202 remove CONST_CAST helper 2015-08-07 13:18:21 +02:00
Jan Steemann 9778bc16fd fix Visual Studio compile errors 2015-08-07 11:07:56 +02:00
Max Neunhoeffer 5472655ca7 Untemplatify ThreadProtector for those with gcc < 4.9.2. 
We will revert this later once everybody has gcc >= 4.9.2.
 2015-08-07 10:20:31 +02:00
Jan Steemann 330fac6225 some unused function cleanup 2015-08-06 21:25:32 +02:00
Max Neunhoeffer 0931e1aef8 Improve the explanation of ThreadProtectors. 2015-08-06 13:18:25 +02:00
Max Neunhoeffer e197e02b5b Replace DataGuardian by ThreadProtector. 2015-08-06 13:03:37 +02:00
Jan Steemann 2a88c76e0e fix parallel insertion 2015-08-05 15:16:07 +02:00
Jan Steemann c0e26e7a78 handle UBool result type correctly 2015-08-04 12:21:34 +02:00
Jan Steemann 35529ffd61 make more environment data available in --version 2015-08-04 11:21:50 +02:00
Jan Steemann 7a3d49be88 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-04 10:30:28 +02:00
Jan Steemann 0400737ae4 some flock diagnostics 2015-08-04 09:57:28 +02:00
Jan Steemann 0f1ce26e41 added function to create an ICU RegexMatcher 2015-08-03 23:57:26 +02:00
Jan Steemann 38227a81f8 speed up initial edge index creation 2015-08-03 18:27:50 +02:00
Jan Steemann 23f8f2f86b nullptr 2015-07-30 22:43:02 +02:00
Jan Steemann 6d4395059b use lock guards 2015-07-29 15:15:49 +02:00
Jan Steemann 326f0dba6e removed some unused code 2015-07-29 13:50:18 +02:00
Jan Steemann 454a6c998c Merge branch 'devel' of https://github.com/arangodb/arangodb into shaper-cxx 2015-07-28 17:38:48 +02:00
Jan Steemann 6d7ccd7699 move shaper to cxx 2015-07-28 17:38:31 +02:00
Michael Hackstein 412394ff3c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-07-28 13:22:01 +02:00
Michael Hackstein 25f7b25206 Fixed failing failure-tests 2015-07-28 13:21:54 +02:00
Jan Steemann 3d3024a54e cppcheck 2015-07-28 09:51:24 +02:00
Jan Steemann 7e4b615248 simplify call to mmap 2015-07-27 16:24:25 +02:00
Frank Celler 33d702c190 ignore died process on delete 2015-07-24 09:30:26 +00:00
Frank Celler 4dccc6a8dc Merge branch 'devel' of github.com:arangodb/arangodb into dispatcher 2015-07-23 15:41:05 +02:00
Frank Celler 35a3c6421c moved dispatcher to atomic 2015-07-23 15:40:34 +02:00
Max Neunhoeffer 68a5f3a131 Add one more comment. 2015-07-23 14:46:25 +02:00
Max Neunhoeffer 395e920825 Add a few more comments. 2015-07-23 14:44:58 +02:00
Max Neunhoeffer 350da2c910 Add a data guardian implementation (lock-free using hazard pointers). 2015-07-23 14:23:04 +02:00
Max Neunhoeffer c3c1c3242f Add TRI_DEFER. 2015-07-22 10:29:13 +02:00
Jan Steemann abf69329e2 casts for Windows 2015-07-21 18:57:56 +02:00
Jan Steemann 38cdc662ec removed configure options `--enable-timing` and `--enable-figures` 2015-07-21 18:47:43 +02:00
Jan Steemann 20c96b5e46 removed locks 2015-07-21 17:34:57 +02:00
Jan Steemann 09736f965f more lock instrumentation 2015-07-21 13:09:02 +02:00
Jan Steemann 4d0872f2b9 more cxx 2015-07-20 18:42:02 +02:00
Jan Steemann a5db59cc47 remove some locks in HttpServer and friends 2015-07-17 17:48:45 +02:00
Jan Steemann c54b5a6ba8 renamed file 2015-07-16 21:06:29 +02:00
Jan Steemann 1428af9e49 remove useless header inclusions 2015-07-15 21:47:50 +02:00
Jan Steemann 6d4dbcbb47 add SpinLock and SpinLocker, unified other Lockers 2015-07-15 21:22:00 +02:00
Willi Goesgens 0f85dec259 Fix memleak with unique_ptr 2015-07-15 09:57:35 +02:00
Willi Goesgens a2b29d8864 work around error message about empty object when compiling in devel mode. 2015-07-14 17:04:11 +02:00
Jan Steemann af9c155c90 use references 2015-07-14 14:05:18 +02:00
Jan Steemann cc27e9b88f try to pacify some compilers 2015-07-14 08:50:29 +02:00
Jan Steemann 53400a44a7 simplifications 2015-07-13 22:56:41 +02:00
Michael Hackstein 32100ca6fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-07-13 14:50:03 +02:00
Michael Hackstein b54dae0d5b Fixed a memleak in newest shortest path shortcut implementation 2015-07-13 14:49:54 +02:00
Jan Steemann 14ccfbabc3 Merge branch 'aql-query-cache' of https://github.com/arangodb/arangodb into devel 2015-07-13 12:46:41 +02:00
Jan Steemann 5a453bbcfc issue #1409: Document values with null character truncated with 2.6.2 on Windows 2015-07-13 12:45:13 +02:00
Michael Hackstein df33ffe410 Added an implementation for shortest path which allows to take shortcuts iff we do not have to access the data, f.e. filtering or distances. Gives an enormous speedup. 2015-07-13 11:31:42 +02:00
Jan Steemann c71dc4d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-query-cache 2015-07-13 10:49:14 +02:00
Willi Goesgens bd7aa7c305 Remove the global include to iostream; this reduces the compile time by 10% 
( http://herbsutter.com/2013/08/19/gotw-7a-solution-minimizing-compile-time-dependencies-part-1/  for inspiration)
 2015-07-07 12:11:21 +02:00
Max Neunhoeffer c87575ce33 Fix bug in AssocMulti lookupByKeyContinue if batchSize==1. 2015-06-29 16:32:00 +02:00
Jan Steemann 8372c33993 fixed invalidation with index creation etc., adjusted tests 2015-06-25 23:40:31 +02:00
Willi Goesgens 641b6798a0 Fix grammer in docu 2015-06-24 17:42:39 +02:00
Jan Steemann 5e7dd0da7f Merge branch 'aql-argv-optimization' of https://github.com/arangodb/arangodb into devel 2015-06-18 17:12:14 +02:00
Jan Steemann 788f99980a Merge branch 'aql-parser-simplification' of https://github.com/arangodb/arangodb into devel 2015-06-17 15:15:40 +02:00
Jan Steemann 2a8192105a Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-argv-optimization 2015-06-17 12:41:38 +02:00
Jan Steemann 30ef155b16 issue #1313: escape whitespace in process name when scanning /proc/pid/stats 
This fixes statistics values read from that file
 2015-06-17 11:54:59 +02:00
Jan Steemann dec79dd051 pass function arguments by reference 2015-06-16 18:01:45 +02:00
Jan Steemann 7cd27d5c56 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-parser-simplification 2015-06-16 15:14:18 +02:00
Michael Hackstein 933e4c353a Added further OOM tests for ShortestPath computation 2015-06-16 11:27:21 +02:00
Jan Steemann 5cac2938b1 exception handling 2015-06-16 09:37:02 +02:00
Jan Steemann e7ff3f2a19 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-parser-simplification 2015-06-12 12:04:41 +02:00
Jan Steemann 1a18fb0282 factor out huge array/object literals when calling V8-based AQL functions 2015-06-12 11:50:22 +02:00
Jan Steemann ff7a00d6e4 fixed edge index selectivity estimates and added tests 2015-06-11 21:22:01 +02:00
Max Neunhoeffer 8ae33e04e7 Fix selectivity estimate by casting to double before division. 2015-06-11 11:50:51 +02:00
Jan Steemann 79ce6eb93b fixed threading issues 2015-06-11 09:50:56 +02:00
Jan Steemann d99d164c0a simplified parser 2015-06-10 20:25:25 +02:00
Jan Steemann f5f719360c added out-of-bounds checking for _heap and _history 2015-06-10 18:04:17 +02:00
Jan Steemann b5896be10b simplifications 2015-06-10 11:53:31 +02:00
Jan Steemann a6b2998b5d added try...catch blocks for V8-to-CPP bindings 2015-06-08 16:04:42 +02:00
Jan Steemann 4c7994597a cppcheck 2015-06-02 22:49:22 +02:00
Jan Steemann b44ae7b471 make Json smaller 2015-06-02 14:11:20 +02:00
Jan Steemann 39cf9c527c micro optimizations 2015-06-01 14:56:01 +02:00
Jan Steemann 2d2bf87a2d printers for standard objects 2015-05-29 17:49:19 +02:00
Jan Steemann 6d5b86867d added print methods 2015-05-29 11:45:01 +02:00
Jan Steemann db617fd514 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-29 09:49:31 +02:00
Jan Steemann 88198767dd logging 2015-05-29 09:49:22 +02:00
Willi Goesgens e1255b4e65 Fix signature of windows function dummy. 2015-05-29 09:28:27 +02:00
Michael Hackstein 6a7dae216d Merge branch 'devel' of github.com:/arangodb/arangodb into devel 2015-05-28 15:18:32 -07:00
Frank Celler c2db22e379 linux processor affinity 2015-05-28 14:51:32 +02:00
Frank Celler f5f8afea22 added empty affinity implementation 2015-05-28 13:51:34 +02:00
Michael Hackstein 6eadcb31ff Fixed a bug where the shortest path computation computed the correct distancebut returned a wrong path. It was only triggered under very special conditions 2015-05-27 13:42:21 -07:00
Jan Steemann a9f2769ffa now compiles and links 2015-05-23 04:31:13 +02:00
Jan Steemann 5a4eb1719f added missing declarations 2015-05-21 09:56:48 +02:00
Jan Steemann d4285fc6fd fix Visual Studio compile warnings 2015-05-20 16:12:30 +02:00
Jan Steemann 688b21fe51 fixed namespaces 2015-05-20 15:49:39 +02:00
Michael Hackstein 86c7f87dd3 Merge branch 'cppTrav2' into devel 2015-05-19 16:17:27 -07:00
Jan Steemann 77650c602b fixed wrong define 2015-05-19 15:58:38 +02:00
Max Neunhoeffer 0c6f5263d2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-05-18 13:57:56 -07:00
Max Neunhoeffer e426ca9205 Fix bug in edge index. 2015-05-18 13:57:32 -07:00
Jan Steemann 82199b1d71 fixed format string for reading /proc/pid/stat 2015-05-18 12:17:32 +02:00
Jan Steemann 8670f2a36d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-18 10:33:53 +02:00
Jan Steemann 30a9f44e64 please the VisualStudio compiler 2015-05-18 10:33:37 +02:00
Jan Steemann 96648678aa prevent memleak, disable debug output 2015-05-18 10:32:11 +02:00
Max Neunhoeffer 13204298d9 Make number of buckets in edge index configurable. 2015-05-17 19:04:47 -07:00
Max Neunhoeffer ead85dfd7c Use multiple buckets in AssocMulti hash. 2015-05-17 11:32:58 -07:00
Max Neunhoeffer fe7eb0d1ad Use high water mark 66% and low water mark 33% in edge index. 2015-05-16 13:58:44 -07:00
Max Neunhoeffer a2f9eee8fc Add performance logging to edge index resizing. 2015-05-16 10:02:41 -07:00
Max Neunhoeffer eef79e68eb Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-05-15 17:19:46 -07:00
Max Neunhoeffer 78bf0d2de3 Improve performance of edge index resize. 2015-05-15 17:16:14 -07:00