You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/11/22 11:40:38 UTC
[49/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/community/ignite-1.7.4'
Merge remote-tracking branch 'remotes/community/ignite-1.7.4'
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12d830de
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12d830de
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12d830de
Branch: refs/heads/master
Commit: 12d830de4688464d5240f4df60b3ab638c2551d6
Parents: 47fbba8 c34d274
Author: sboikov <sb...@gridgain.com>
Authored: Tue Nov 22 14:38:59 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Nov 22 14:38:59 2016 +0300
----------------------------------------------------------------------
bin/ignite.bat | 5 +
.../org/apache/ignite/IgniteDataStreamer.java | 2 +-
.../apache/ignite/IgniteSystemProperties.java | 13 +
.../internal/ComputeTaskInternalFuture.java | 11 +
.../internal/binary/BinaryClassDescriptor.java | 37 +-
.../ignite/internal/binary/BinaryContext.java | 13 +-
.../internal/binary/BinaryObjectExImpl.java | 57 +-
.../internal/binary/BinaryObjectImpl.java | 23 +
.../binary/BinaryObjectOffheapImpl.java | 24 +-
.../ignite/internal/binary/BinaryUtils.java | 4 +
.../binary/builder/BinaryObjectBuilderImpl.java | 6 +-
.../processors/affinity/AffinityAssignment.java | 88 +++
.../affinity/GridAffinityAssignment.java | 8 +-
.../affinity/GridAffinityAssignmentCache.java | 35 +-
.../affinity/GridAffinityProcessor.java | 89 ++-
.../processors/affinity/GridAffinityUtils.java | 8 +-
.../affinity/HistoryAffinityAssignment.java | 169 ++++++
.../cache/CacheAffinitySharedManager.java | 57 +-
.../cache/DynamicCacheChangeBatch.java | 7 +
.../processors/cache/GridCacheAdapter.java | 11 +-
.../cache/GridCacheAffinityManager.java | 6 +-
.../processors/cache/GridCacheMapEntry.java | 5 +-
.../processors/cache/GridCacheMvccManager.java | 77 +++
.../GridCachePartitionExchangeManager.java | 299 +++++++--
.../processors/cache/GridCacheProcessor.java | 5 +-
.../cache/GridCacheSharedContext.java | 1 +
.../processors/cache/GridCacheUtils.java | 67 --
.../dht/GridClientPartitionTopology.java | 33 +-
.../dht/GridDhtPartitionTopology.java | 3 +-
.../dht/GridDhtPartitionTopologyImpl.java | 31 +-
.../GridDhtAtomicAbstractUpdateFuture.java | 19 +-
.../dht/atomic/GridDhtAtomicCache.java | 2 +-
.../atomic/GridDhtAtomicSingleUpdateFuture.java | 30 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 10 +-
.../GridNearAtomicAbstractUpdateRequest.java | 5 -
.../atomic/GridNearAtomicFullUpdateRequest.java | 5 -
.../GridNearAtomicSingleUpdateRequest.java | 9 -
.../dht/preloader/GridDhtPartitionFullMap.java | 18 +
.../dht/preloader/GridDhtPartitionMap2.java | 53 +-
.../GridDhtPartitionsAbstractMessage.java | 40 +-
.../GridDhtPartitionsExchangeFuture.java | 84 +--
.../preloader/GridDhtPartitionsFullMessage.java | 150 ++++-
.../GridDhtPartitionsSingleMessage.java | 132 +++-
.../GridDhtPartitionsSingleRequest.java | 4 +-
.../dht/preloader/GridDhtPreloader.java | 22 +-
.../query/GridCacheQueryMetricsAdapter.java | 2 +-
.../continuous/GridContinuousProcessor.java | 4 +-
.../datastreamer/DataStreamProcessor.java | 104 +++-
.../datastreamer/DataStreamerImpl.java | 607 ++++++++++++++-----
.../internal/processors/igfs/IgfsProcessor.java | 15 +
.../ignite/internal/util/GridLogThrottle.java | 45 +-
.../ignite/internal/util/IgniteUtils.java | 111 +++-
.../internal/util/future/GridFutureAdapter.java | 12 +-
.../util/offheap/unsafe/GridUnsafeMemory.java | 33 +-
.../visor/misc/VisorResolveHostNameTask.java | 4 +-
.../security/SecurityBasicPermissionSet.java | 107 ++++
.../security/SecurityPermissionSetBuilder.java | 222 +++++++
.../ignite/spi/discovery/tcp/ClientImpl.java | 38 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 510 +++++++++++++---
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 59 +-
.../messages/TcpDiscoveryAbstractMessage.java | 7 +
.../messages/TcpDiscoveryClientAckResponse.java | 5 +
.../TcpDiscoveryClientHeartbeatMessage.java | 7 +-
.../TcpDiscoveryConnectionCheckMessage.java | 5 +
.../messages/TcpDiscoveryHeartbeatMessage.java | 5 +
.../TcpDiscoveryNodeAddFinishedMessage.java | 11 +
.../messages/TcpDiscoveryNodeAddedMessage.java | 33 +-
.../binary/BinaryMarshallerSelfTest.java | 343 ++++++++++-
...CacheExchangeMessageDuplicatedStateTest.java | 393 ++++++++++++
.../cache/IgniteCacheDynamicStopSelfTest.java | 48 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 2 +-
...CacheLoadingConcurrentGridStartSelfTest.java | 255 +++++++-
...ncurrentGridStartSelfTestAllowOverwrite.java | 30 +
.../distributed/IgniteCacheGetRestartTest.java | 3 +
...cingDelayedPartitionMapExchangeSelfTest.java | 8 +-
.../GridCacheRebalancingSyncSelfTest.java | 18 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 3 -
.../IgniteCacheSyncRebalanceModeSelfTest.java | 2 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 2 +-
...ComputeJobExecutionErrorToLogManualTest.java | 88 +++
.../compute/PublicThreadpoolStarvationTest.java | 123 ++++
.../IgniteNoCustomEventsOnNodeStart.java | 7 +
.../DataStreamProcessorSelfTest.java | 4 +-
.../datastreamer/DataStreamerImplSelfTest.java | 170 ++++--
.../DataStreamerMultiThreadedSelfTest.java | 2 -
.../datastreamer/DataStreamerTimeoutTest.java | 92 ++-
.../igfs/IgfsProcessorValidationSelfTest.java | 30 +
...IpcEndpointRegistrationAbstractSelfTest.java | 76 ++-
...dpointRegistrationOnLinuxAndMacSelfTest.java | 11 +-
.../SecurityPermissionSetBuilderTest.java | 110 ++++
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 134 +++-
.../junits/common/GridCommonAbstractTest.java | 25 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 3 +
.../testsuites/IgniteCacheTestSuite2.java | 5 +
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
...opClientProtocolMultipleServersSelfTest.java | 102 ++--
.../query/h2/twostep/GridMergeIndex.java | 49 +-
.../cache/IgniteCacheOffheapEvictQueryTest.java | 7 +
.../IgniteCacheQueryMultiThreadedSelfTest.java | 59 ++
...lientQueryReplicatedNodeRestartSelfTest.java | 7 +
...butedQueryStopOnCancelOrTimeoutSelfTest.java | 7 +
.../query/IgniteSqlSplitterSelfTest.java | 2 +
.../query/h2/sql/GridQueryParsingTest.java | 11 +-
modules/platforms/cpp/DEVNOTES.txt | 23 +-
modules/platforms/cpp/README.txt | 10 +-
modules/platforms/cpp/binary/Makefile.am | 4 +-
.../cpp/binary/project/vs/binary.vcxproj | 2 -
.../cpp/common/project/vs/common.vcxproj | 1 -
modules/platforms/cpp/core/Makefile.am | 4 +-
.../platforms/cpp/core/project/vs/core.vcxproj | 2 -
modules/platforms/cpp/examples/README.txt | 9 +-
.../cpp/examples/odbc-example/Makefile.am | 4 +-
.../cpp/examples/putget-example/Makefile.am | 4 +-
.../cpp/examples/query-example/Makefile.am | 4 +-
modules/platforms/cpp/ignite/Makefile.am | 4 +-
.../cpp/ignite/project/vs/ignite.vcxproj | 4 +-
modules/platforms/cpp/jni/Makefile.am | 4 +-
.../platforms/cpp/jni/project/vs/jni.vcxproj | 1 -
.../platforms/cpp/odbc-test/include/test_type.h | 42 +-
.../cpp/odbc-test/src/api_robustness_test.cpp | 108 ++++
.../cpp/odbc-test/src/queries_test.cpp | 153 ++++-
.../cpp/odbc-test/src/sql_outer_join_test.cpp | 2 +-
modules/platforms/cpp/odbc/Makefile.am | 4 +-
modules/platforms/cpp/odbc/README.txt | 23 +-
.../platforms/cpp/odbc/include/ignite/odbc.h | 12 +-
.../ignite/odbc/diagnostic/diagnosable.h | 7 +
.../odbc/diagnostic/diagnosable_adapter.h | 10 +
.../ignite/odbc/diagnostic/diagnostic_record.h | 19 +
.../odbc/diagnostic/diagnostic_record_storage.h | 16 +
.../cpp/odbc/include/ignite/odbc/statement.h | 42 ++
.../cpp/odbc/install/ignite-odbc-amd64.wxs | 114 ++++
.../cpp/odbc/install/ignite-odbc-x86.wxs | 114 ++++
.../odbc/os/win/src/system/socket_client.cpp | 4 +-
.../platforms/cpp/odbc/project/vs/odbc.vcxproj | 4 +-
.../odbc/src/app/application_data_buffer.cpp | 34 +-
.../odbc/src/diagnostic/diagnostic_record.cpp | 16 +-
.../diagnostic/diagnostic_record_storage.cpp | 18 +
modules/platforms/cpp/odbc/src/entry_points.cpp | 26 +-
modules/platforms/cpp/odbc/src/odbc.cpp | 175 ++----
modules/platforms/cpp/odbc/src/statement.cpp | 151 +++++
.../Dataload/DataStreamerTestTopologyChange.cs | 27 +-
.../Apache.Ignite.Core/Impl/PlatformTarget.cs | 2 +-
.../src/test/config/incorrect-store-cache.xml | 2 +
.../src/test/config/jdbc-pojo-store-builtin.xml | 3 +
.../src/test/config/jdbc-pojo-store-obj.xml | 3 +
modules/spring/src/test/config/node.xml | 2 +
modules/spring/src/test/config/node1.xml | 2 +
.../test/config/pojo-incorrect-store-cache.xml | 2 +
modules/spring/src/test/config/store-cache.xml | 2 +
modules/spring/src/test/config/store-cache1.xml | 2 +
.../IgniteStartFromStreamConfigurationTest.java | 18 +-
pom.xml | 8 +
152 files changed, 6055 insertions(+), 1148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
index c4a107a,c8ba865..7f30dd7
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
@@@ -79,38 -93,57 +93,54 @@@ public class GridLogThrottle
* Logs warning if needed.
*
* @param log Logger.
- * @param e Error (optional).
* @param msg Message.
*/
- public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e, String msg) {
+ public static void warn(@Nullable IgniteLogger log, String msg) {
assert !F.isEmpty(msg);
- log(log, null, msg, null, LogLevel.WARN, false);
- log(log, e, msg, null, LogLevel.WARN, false, false);
++ log(log, null, msg, null, LogLevel.WARN, false, false);
}
/**
* Logs warning if needed.
*
* @param log Logger.
+ * @param e Error (optional).
+ * @param msg Message.
+ * @param quite Print warning anyway.
+ * @param byMsg Errors group by message, not by tuple(error, msg).
+ */
+ public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e, String msg, boolean quite, boolean byMsg) {
+ assert !F.isEmpty(msg);
+
+ log(log, e, msg, null, LogLevel.WARN, quite, byMsg);
+ }
+
+
+ /**
+ * Logs warning if needed.
+ *
+ * @param log Logger.
- * @param e Error (optional).
* @param msg Message.
- * @param quite Print warning anyway.
+ * @param quiet Print warning anyway.
*/
- public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e, String msg, boolean quite) {
+ public static void warn(@Nullable IgniteLogger log, String msg, boolean quiet) {
assert !F.isEmpty(msg);
- log(log, null, msg, null, LogLevel.WARN, quiet);
- log(log, e, msg, null, LogLevel.WARN, quite, false);
++ log(log, null, msg, null, LogLevel.WARN, quiet, false);
}
/**
* Logs warning if needed.
*
* @param log Logger.
- * @param e Error (optional).
* @param longMsg Long message (or just message).
- * @param shortMsg Short message for quite logging.
+ * @param shortMsg Short message for quiet logging.
*/
- public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e, String longMsg, @Nullable String shortMsg) {
+ public static void warn(@Nullable IgniteLogger log, String longMsg, @Nullable String shortMsg) {
assert !F.isEmpty(longMsg);
- log(log, null, longMsg, shortMsg, LogLevel.WARN, false);
- log(log, e, longMsg, shortMsg, LogLevel.WARN, false, false);
++ log(log, null, longMsg, shortMsg, LogLevel.WARN, false, false);
}
/**
@@@ -118,12 -151,12 +148,12 @@@
*
* @param log Logger.
* @param msg Message.
- * @param quite Print info anyway.
+ * @param quiet Print info anyway.
*/
- public static void info(@Nullable IgniteLogger log, String msg, boolean quite) {
+ public static void info(@Nullable IgniteLogger log, String msg, boolean quiet) {
assert !F.isEmpty(msg);
- log(log, null, msg, null, LogLevel.INFO, quiet);
- log(log, null, msg, null, LogLevel.INFO, quite, false);
++ log(log, null, msg, null, LogLevel.INFO, quiet, false);
}
/**
@@@ -151,12 -182,13 +181,13 @@@
* @param log Logger.
* @param e Error (optional).
* @param longMsg Long message (or just message).
- * @param shortMsg Short message for quite logging.
+ * @param shortMsg Short message for quiet logging.
* @param level Level where messages should appear.
+ * @param byMsg Errors group by message, not by tuple(error, msg).
*/
@SuppressWarnings({"RedundantTypeArguments"})
- private static void log(@Nullable IgniteLogger log, @Nullable Throwable e, String longMsg, @Nullable String shortMsg,
- LogLevel level, boolean quiet, boolean byMsg) {
+ private static void log(@Nullable IgniteLogger log, @Nullable Throwable e, String longMsg,
- @Nullable String shortMsg, LogLevel level, boolean quiet) {
++ @Nullable String shortMsg, LogLevel level, boolean quiet, boolean byMsg) {
assert !F.isEmpty(longMsg);
IgniteBiTuple<Class<? extends Throwable>, String> tup =
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 3dca5e1,6ab0885..c6281df
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@@ -144,8 -143,9 +145,10 @@@ public class IgniteBasicTestSuite exten
suite.addTestSuite(NotStringSystemPropertyTest.class);
suite.addTestSuite(MarshallerContextLockingSelfTest.class);
+ suite.addTestSuite(MarshallerContextSelfTest.class);
+ suite.addTestSuite(SecurityPermissionSetBuilderTest.class);
+
return suite;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12d830de/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java
----------------------------------------------------------------------