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

7811 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
Jan Steemann 699b2435ca fix unnecessary increase of reference counter 2016-02-04 15:07:23 +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
m0ppers 8f96fc3d94 Merge pull request #1704 from m0ppers/initializecluster 
Initializecluster
 2016-02-04 13:43:56 +01:00
Andreas Streichardt 63b2cdbe1b fix code review comments 2016-02-04 13:40:15 +01:00
Jan Steemann 3269c59a06 fixed some compile warnings 2016-02-04 12:38:51 +01:00
Andreas Streichardt 40b844c7b0 Merge branch 'devel' of github.com:arangodb/arangodb into initializecluster 2016-02-04 12:33:28 +01:00
Frank Celler b44385d9ef fixed deprecated options 2016-02-04 12:08:23 +01:00
Andreas Streichardt 9e7beb9a6e Change LOG WARNING and ERROR 2016-02-04 11:43:10 +01:00
Jan Steemann 6bac50d372 don't compact in one special case 2016-02-04 11:37:46 +01:00
Andreas Streichardt f096580706 Merge remote-tracking branch 'upstream/devel' into initializecluster 2016-02-04 11:37:02 +01:00
Andreas Streichardt adce528373 Proper initialization 
Also find a fitting spot for our role
 2016-02-04 11:29:43 +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 a01e52f4cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 09:07:57 +01:00
Jan Steemann b7fddb15ad handle compile warnings 2016-02-04 09:07:36 +01:00
Max Neunhoeffer 048f523714 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-04 09:00:43 +01:00
Max Neunhoeffer 391c03e68a Fix initial value of HTTP response code in ClusterComm. 2016-02-04 09:00:23 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Jan Steemann ac0446faf2 fixed potential truncation of master pointer list when rolling back update operations 2016-02-03 18:51:22 +01:00
Michael Hackstein 14c33024c4 Added more functions for VelocyPack variabt of AqlValue 2016-02-03 14:51:17 +01:00
Michael Hackstein cff759183a Rearranged VPack-AQL-Functions. Preperation for removal of old Functions 2016-02-03 10:53:15 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
Michael Hackstein f478411bb8 Included a backward transformation AqlValueVPack -> AqlValueJson. This allows to use the new VPack Functions without modification after switch. They return AqlValueVPack. 2016-02-03 10:48:08 +01:00
Michael Hackstein 6eeb686287 Added dummy to collect a shared VPackBuilder from a query object. Has to be properly implemented as soon as VelocyPack is the default AqlValue format 2016-02-03 10:40:51 +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
Max Neunhoeffer 300d2b68e9 Another snapshot. 2016-02-03 08:54:27 +01:00
jsteemann 13335d4cf9 bugfixes 2016-02-03 01:06:27 +01:00
jsteemann 095b60ed7f added missing files 2016-02-03 00:28:54 +01:00
jsteemann 60d9364e1f added derived files 2016-02-03 00:28:29 +01:00
jsteemann b962c5a9e8 array comparison operators 2016-02-03 00:28:03 +01:00
jsteemann 791e61d522 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-02 21:40:27 +01:00
jsteemann d9de65acf8 remove now useless casts when invoking logger 2016-02-02 21:38:01 +01:00
Jan Steemann fc909486c2 parser adjustments for array operators, not yet working 2016-02-02 18:05:39 +01:00
Richard Parker 0e3ce44885 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-02 14:54:54 +00:00
Richard Parker 35973ae675 Detect invalid lat/longitude on remove and searches 2016-02-02 14:52:08 +00:00
Michael Hackstein 92c69d2039 Implemented To_Array for VPack 2016-02-02 15:37:05 +01:00
Jan Steemann bfd5d6614a fixed namespace usage 2016-02-02 15:10:44 +01:00
Kaveh Vahedipour ecfec58a6c Pulled up to devel 2016-02-02 15:08:51 +01:00
Kaveh Vahedipour eb94d0a0d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-02 15:05:00 +01:00
Michael Hackstein fd7d7e0c5a Started implementing some Cxx AQL functions to use VPack AqlValues. Right now there is a compile-time switch to enable/disable VPack as it now adds overhead 2016-02-02 14:57:48 +01:00
Jan Steemann 11736660d8 removed namespace 2016-02-02 14:41:34 +01:00
Jan Steemann 5eb9687e21 turn off deadlock detection in cluster 2016-02-02 14:02:28 +01:00
Jan Steemann 48f1ce865b don't swallow detailed return codes 2016-02-02 14:01:26 +01:00
Jan Steemann bc6fce75d4 removed some unnecessary explicits 2016-02-02 12:13:21 +01:00
Kaveh Vahedipour 79079b318c Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-02 11:51:00 +01:00
Jan Steemann 45d9745756 fixed display of Traversals in AQL explain 2016-02-02 11:24:51 +01:00
Andreas Streichardt e5ec93223f Oops ... fix signature 2016-02-01 19:05:05 +01:00
Andreas Streichardt b8204d0f3c initialize cluster structure 2016-02-01 18:59:01 +01:00
Kaveh Vahedipour 7129e15d8f cmake builds on ubuntu 2016-02-01 16:48:39 +00:00
Kaveh Vahedipour a10c5d13e0 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 16:23:15 +00:00
Michael Hackstein 93d0508259 Created a temporary type for VPack-based AqlValues. Also started implementing new AQL Functions with this new AqlValue. 2016-02-01 17:09:54 +01:00
Kaveh Vahedipour 3a6ce7bc03 Merge branch 'cmakification' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 14:24:22 +01:00
Kaveh Vahedipour 749e765535 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 14:22:43 +01:00
Kaveh Vahedipour 6194a83437 making progress building unix versions 2016-02-01 13:06:06 +00:00
Jan Steemann 22df27632a added helper method 2016-02-01 13:30:47 +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 b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Kaveh Vahedipour 22cc984f84 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 11:02:31 +00:00
Max Neunhoeffer 0be190d85d Merge branch 'devel' into ClustUp2 2016-02-01 11:43:00 +01:00
Max Neunhoeffer bee1fd9eae Fix followerInfo. 2016-02-01 11:42:26 +01:00
Michael Hackstein e0455850fc Replaced doc_mptr_copy with doc_mptr which is the correct type in this case. 2016-02-01 11:40:18 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Michael Hackstein 8fad43282d Asserted the length of the traversal condition. 2016-02-01 11:36:08 +01:00
Michael Hackstein 4e139f1865 Added an additional nullptr check. 2016-02-01 11:17:06 +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 745493763b fixed filename order in Makefile 2016-01-31 19:36:44 +01:00
jsteemann b635983d9c removed unused functions and headers 2016-01-31 19:08:39 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann 4e94803ad7 honor results of clang-test, clang-tidy and clang-modernize 2016-01-31 15:56:18 +01:00
jsteemann 13481bbebc fix or annotate problems identified by clang-check 2016-01-31 03:32:31 +01:00
jsteemann d59595f1bf fixed leak 2016-01-31 02:22:15 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann ac634b9dab fixed compile error in non-maintainer-mode 2016-01-30 14:38:31 +01:00
jsteemann 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +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
jsteemann 00a68113b5 more files using the Logger 2016-01-29 23:45:10 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
jsteemann dad0de602b preparation for logging changes 2016-01-29 23:06:44 +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
Michael Hackstein e0f0a6f1a8 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:18:05 +01:00
Max Neunhoeffer 09f974d660 Fix a merge. 2016-01-29 14:10:35 +01:00
Michael Hackstein 436c377cb5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:01:53 +01:00
Max Neunhoeffer 238937128a Merge branch 'devel' into ClustUp2 2016-01-29 13:59:11 +01:00
Max Neunhoeffer dcf4ed8bca Sort out FollowerInfo. 2016-01-29 13:56:37 +01:00
Michael Hackstein 0b583d756a Duplicated static helper functions in AQLFunctions to be able to hadle VPack. Added a dummy for AqlValue->VPack. We have to clarify the data responsibilites before continuing here. 2016-01-29 13:42:15 +01:00
Andreas Streichardt 9850058d01 Merge branch 'devel' into waitforagency 2016-01-29 11:27:35 +01:00
Jan Steemann 2112d7c1f8 added override and final specifiers 2016-01-29 11:10:46 +01:00
Jan Steemann b82e9c692a removed unnecessary block 2016-01-29 11:10:24 +01:00
jsteemann c3fc7e1aa7 don't lock in destructor 
we have a global instance of the query cache and its destruction is
called during static deinitialization after main. if we use locks in
the dtor then we will use locks during static deinitialization (which
is fine in general, but prevents us from tracking the lock usage by
threads using thread-local storage)
 2016-01-29 01:12:59 +01:00
jsteemann 04d459a5db Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-29 00:51:14 +01:00
jsteemann 43639aee79 removed hint about "normal mode" as there is only a normal mode nowadays 2016-01-29 00:50:51 +01:00
jsteemann 1ca11411fd added (still disabled) optimizer rule `inline-subqueries` 2016-01-29 00:50:37 +01:00
jsteemann 7f662bac09 simplify code 2016-01-29 00:11:24 +01:00
jsteemann df68e95e06 some useful methods 2016-01-29 00:09:55 +01:00
Michael Hackstein 19a1943a8a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-01-28 23:11:07 +01:00
Jan Steemann 5e9a36783f fixed crash 2016-01-28 20:00:22 +01:00
Andreas Streichardt b83184cfbb typo 2016-01-28 18:35:37 +01:00
Andreas Streichardt 54569ac01a Wait for agency to come up 2016-01-28 18:13:23 +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
Michael Hackstein 0a421a1cc0 Finished implementation for multi-direction traversals. 2016-01-28 15:43:19 +01:00
Michael Hackstein 9c740d257c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-01-28 14:07:56 +01:00
Michael Hackstein 582f1f46f0 Preparation for multi-direction traversals. As requested in #1683. Internal traverser can now work with one direction per collection. Next: AQL needs to learn this too. 2016-01-28 14:07:50 +01:00
Jan Steemann 58a5920aa5 another log message 2016-01-28 13:31:43 +01:00
Jan Steemann 2b57652880 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-27 19:29:13 +01:00
Jan Steemann de52abbf83 added AQL function `IS_SAME_COLLECTION` 2016-01-27 19:29:01 +01:00
Wilfried Goesgens e1a8726606 Don't optimize the traverser if there are functions on the traversal attribute side; this fixes #1684 2016-01-27 19:21:17 +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
Michael Hackstein d1cec2a423 Cursor dump now uses VPack instead of TRI_json_t. There is only one temporary TRI_json_t from shaped json 2016-01-27 17:28:18 +01:00
Michael Hackstein 08101cbe47 Fixed logic bug in creation of unique hash index 2016-01-27 17:27:11 +01:00
Frank Celler 175e1e6b51 moved low level mutex in Mutex class 2016-01-27 15:31:02 +01:00
Max Neunhoeffer 5375ada8a7 Add replicationFactor and replicationQuorum to properties(). 2016-01-27 15:21:55 +01:00
Max Neunhoeffer 6ff1538000 Change namespace. 2016-01-27 15:21:40 +01:00
Michael Hackstein 7360cba43a The cursor now returns VPackSlices instead of TRI_json_t 2016-01-27 14:26:36 +01:00
Michael Hackstein 19cfa3429c Fixed another cluster indexes bug. 2016-01-27 14:24:00 +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
Michael Hackstein 32c159f352 Fixed a bug when creating indexes in cluster. Their information was not returned correctly. 2016-01-27 13:26:42 +01:00
Jan Steemann 53d268c843 pacify cppcheck 2016-01-27 09:37:23 +01:00
Max Neunhoeffer 887e571a26 Merge branch 'devel' into ClustUp2 2016-01-26 18:01:42 +01:00
Jan Steemann ad31aea8b9 TRI_datafile_t 2016-01-26 17:56:10 +01:00
Michael Hackstein 6f4d8ca509 Fixed invalid storage of Collection status in Cluster 2016-01-26 17:19:37 +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
Michael Hackstein b49830c106 Started migrating cursors to VelocyPack 2016-01-26 16:00:29 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Michael Hackstein 521816670f Simplyfied a function call and thereby removed TRI_json_t in v8-vocindex 2016-01-26 13:37:50 +01:00
Michael Hackstein f9ada16a89 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-26 13:27:41 +01:00
Michael Hackstein 969ac75d19 Removed all TRI_json_t references from v8-vocindex and all it's surroundings 2016-01-26 13:27:21 +01:00
Max Neunhoeffer bee3f7e21a Cleanup ClusterComm library. Allow singleRequest asyncRequests. 
Also run ClusterComm sender thread and connection manager in
single server mode.
 2016-01-26 11:05:15 +01:00
Charles Phillips 1b120d8a29 fix,solaris: conflicting declaration 'typedef struct index_t index_t' 
} index_t;
   ^
In file included from /usr/include/sys/stat.h:35:0,
                 from /usr/include/fcntl.h:37,
                 from ./lib/Basics/Common.h:60,
                 from arangod/FulltextIndex/fulltext-common.h:27,
                 from arangod/FulltextIndex/fulltext-index.h:27,
                 from arangod/FulltextIndex/fulltext-index.cpp:24:
/usr/include/sys/types.h:125:16: note: previous declaration as 'typedef short int index_t'
 typedef short  index_t;
                ^
 2016-01-25 23:29:05 -08:00
Charles Phillips a846405545 fix,solaris: call of overloaded 'log(size_t&)' is ambiguous 
return depCost + nrItems * log(nrItems);
                                         ^
arangod/Aql/SortNode.cpp:196:41: note: candidates are:
In file included from /opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/math.h:47:0,
                 from ./lib/Basics/Common.h:62,
                 from arangod/Aql/SortNode.h:27,
                 from arangod/Aql/SortNode.cpp:24:
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:221:21: note: long double std::log(long double)
  inline long double log(long double __X) { return __logl(__X); }
                     ^
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:189:15: note: float std::log(float)
  inline float log(float __X) { return __logf(__X); }
               ^
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:89:15: note: double std::log(double)
 extern double log __P((double));
               ^
 2016-01-25 23:29:05 -08:00
Jan Steemann f5d2839bf0 removed reference to unused variable 2016-01-25 18:17:50 +01:00
Jan Steemann 1e77b11090 added comment 2016-01-25 17:56:48 +01:00
Jan Steemann 5dc0a429b2 removed spinlocks and TRI_WINDOWS_VISTA_LOCKS 2016-01-25 17:55:06 +01:00
Michael Hackstein 0a63cb5d48 Removed TRI_json_t from v8-query. 2016-01-25 16:58:53 +01:00
Michael Hackstein 18b66d5c83 Removed TRI_json_t entirely from AgencyComm. Also no legacy support anymore. 2016-01-25 16:39:56 +01:00
Michael Hackstein bc1b69af70 Fixed error where a nullptr was dereferenced without any checks 2016-01-25 16:00:17 +01:00