ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptupit...@apache.org
Subject [30/30] ignite git commit: Merge branch community/ignite-1.7.3
Date Mon, 03 Oct 2016 09:56:01 GMT
Merge branch community/ignite-1.7.3


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7b13cc5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7b13cc5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7b13cc5

Branch: refs/heads/master
Commit: e7b13cc5c4111be990e51e7633a8fb10f6795489
Parents: e7f3532 ae4ae71
Author: Pavel Tupitsyn <ptupitsyn@apache.org>
Authored: Mon Oct 3 12:55:06 2016 +0300
Committer: Pavel Tupitsyn <ptupitsyn@apache.org>
Committed: Mon Oct 3 12:55:06 2016 +0300

----------------------------------------------------------------------
 .../client/ClientReconnectionSelfTest.java      |   4 +-
 .../client/router/TcpSslRouterSelfTest.java     |   7 +-
 .../client/suite/IgniteClientTestSuite.java     |  71 +++----
 .../processors/cache/GridCacheAdapter.java      |   7 +
 .../distributed/near/GridNearCacheAdapter.java  |   7 +
 .../query/GridCacheQueryMetricsAdapter.java     |  12 +-
 .../platform/PlatformConfigurationEx.java       |   6 +
 .../cpp/PlatformCppConfigurationEx.java         |   5 +
 .../dotnet/PlatformDotNetConfigurationEx.java   |   5 +
 .../cache/VisorCacheResetQueryMetricsTask.java  |  69 +++++++
 .../cache/GridCacheAbstractFullApiSelfTest.java |  11 +-
 .../IgniteCacheConfigVariationsFullApiTest.java |   7 +-
 ...niteCacheExpireAndUpdateConsistencyTest.java |   7 +
 .../GridCacheBinaryObjectsAbstractSelfTest.java |   6 +
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |  17 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |  17 +-
 .../ignite/testframework/IgniteTestSuite.java   | 203 ++++++++++++++++---
 .../testframework/junits/GridAbstractTest.java  |  31 ++-
 .../apache/ignite/testsuites/IgniteIgnore.java  |   2 +-
 modules/ignored-tests/pom.xml                   | 128 +++++++++++-
 .../testsuites/IgniteIgnoredTestSuite.java      |   9 +
 .../CacheAbstractQueryMetricsSelfTest.java      |   6 +-
 ...titionedCacheJtaLookupClassNameSelfTest.java |   4 +-
 .../ignite/testsuites/IgniteJtaTestSuite.java   |   3 +-
 .../IgniteSessionStateStoreProviderTest.cs      |  13 ++
 .../IgniteOutputCacheProvider.cs                |   2 +-
 .../IgniteSessionStateStoreProvider.cs          |   8 +-
 .../Apache.Ignite.AspNet/Impl/ConfigUtil.cs     |  13 +-
 .../Apache.Ignite.Core.Tests.csproj             |   6 +
 .../IgniteConfigurationSection.xsd              |  12 ++
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |   1 +
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |   7 +-
 .../testsuites/IgniteResourceSelfTestSuite.java |  11 +-
 .../testsuites/IgniteSpringTestSuite.java       |  15 +-
 34 files changed, 601 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e7b13cc5/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
index a58510d,97f0866..a5f9e13
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
@@@ -17,8 -17,8 +17,9 @@@
  
  package org.apache.ignite.internal.processors.platform;
  
 +import org.apache.ignite.internal.logger.platform.PlatformLogger;
  import org.apache.ignite.internal.processors.platform.cache.PlatformCacheExtension;
+ import org.apache.ignite.internal.logger.platform.PlatformLogger;
  import org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
  import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl;
  import org.jetbrains.annotations.Nullable;

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7b13cc5/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7b13cc5/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7b13cc5/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7b13cc5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index aa74939,2c6150c..c1c4953
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@@ -270,6 -249,6 +270,12 @@@
      <Content Include="Config\Log\custom-log.xml">
        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      </Content>
++    <Content Include="Config\Log\dotnet-log4j.xml">
++      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
++    </Content>
++    <Content Include="Config\Log\custom-log.xml">
++      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
++    </Content>
      <Content Include="Config\spring-test.xml">
        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      </Content>

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7b13cc5/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
index 40e3055,916fd20..f17c896
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
@@@ -1060,42 -349,15 +1060,54 @@@
                      </xs:complexType>
                  </xs:element>
                  <xs:element name="transactionConfiguration" minOccurs="0">
 +                    <xs:annotation>
 +                        <xs:documentation>Transaction configuration.</xs:documentation>
 +                    </xs:annotation>
 +                    <xs:complexType>
 +                        <xs:attribute name="defaultTransactionConcurrency" type="transactionConcurrency">
 +                            <xs:annotation>
 +                                <xs:documentation>Cache transaction concurrency to
use when one is not explicitly specified.</xs:documentation>
 +                            </xs:annotation>
 +                        </xs:attribute>
 +                        <xs:attribute name="defaultTransactionIsolation" type="transactionIsolation">
 +                            <xs:annotation>
 +                                <xs:documentation>Cache transaction isolation to use
when one is not explicitly specified.</xs:documentation>
 +                            </xs:annotation>
 +                        </xs:attribute>
 +                        <xs:attribute name="defaultTimeout" type="xs:string">
 +                            <xs:annotation>
 +                                <xs:documentation>
 +                                    Cache transaction timeout to use when one is not explicitly
specified. TimeSpan.Zero for infinite timeout.
 +                                </xs:documentation>
 +                            </xs:annotation>
 +                        </xs:attribute>
 +                        <xs:attribute name="pessimisticTransactionLogSize" type="xs:int">
 +                            <xs:annotation>
 +                                <xs:documentation>
 +                                    Size of pessimistic transactions log stored on node
in order to recover transaction commit if originating node has left grid before it has sent
all messages to transaction nodes. 0 for unlimited.
 +                                </xs:documentation>
 +                            </xs:annotation>
 +                        </xs:attribute>
 +                        <xs:attribute name="pessimisticTransactionLogLinger" type="xs:string">
 +                            <xs:annotation>
 +                                <xs:documentation>Delay after which pessimistic recovery
entries will be cleaned up for failed node.</xs:documentation>
 +                            </xs:annotation>
 +                        </xs:attribute>
 +                    </xs:complexType>
 +                </xs:element>
 +                <xs:element name="logger" minOccurs="0">
++                    <xs:annotation>
++                        <xs:documentation>The logger. If no logger is set, logging
is delegated to Java, which uses the logger defined in Spring XML (if present) or logs to
console otherwise.</xs:documentation>
++                    </xs:annotation>
+                     <xs:complexType>
 -                        <xs:attribute name="defaultTransactionConcurrency" type="xs:string"
/>
 -                        <xs:attribute name="defaultTransactionIsolation" type="xs:string"
/>
 -                        <xs:attribute name="defaultTimeout" type="xs:string" />
 -                        <xs:attribute name="pessimisticTransactionLogSize" type="xs:int"
/>
 -                        <xs:attribute name="pessimisticTransactionLogLinger" type="xs:string"
/>
++                        <xs:attribute name="type" type="xs:string" use="required">
++                            <xs:annotation>
++                                <xs:documentation>Assembly-qualified type name.</xs:documentation>
++                            </xs:annotation>
++                        </xs:attribute>
+                     </xs:complexType>
+                 </xs:element>
+                 <xs:element name="logger" minOccurs="0">
                      <xs:annotation>
                          <xs:documentation>The logger. If no logger is set, logging
is delegated to Java, which uses the logger defined in Spring XML (if present) or logs to
console otherwise.</xs:documentation>
                      </xs:annotation>

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7b13cc5/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
index e623969,493e061..1b58d17
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
@@@ -21,8 -21,8 +21,9 @@@ namespace Apache.Ignite.Core.Impl.Unman
      using System.Collections.Generic;
      using System.Diagnostics;
      using System.Diagnostics.CodeAnalysis;
 +    using System.Globalization;
      using System.IO;
+     using System.Globalization;
      using System.Runtime.InteropServices;
      using System.Threading;
      using Apache.Ignite.Core.Cache.Affinity;


Mime
View raw message