ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [46/50] [abbrv] ignite git commit: Merge branch 'ignite-1.7.4' into master
Date Thu, 17 Nov 2016 10:52:09 GMT
Merge branch 'ignite-1.7.4' into master


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

Branch: refs/heads/ignite-2693
Commit: ad2831e784cb15d1a106cbded794d2e075389b93
Parents: e007f6e d69e26d
Author: Pavel Tupitsyn <ptupitsyn@apache.org>
Authored: Mon Nov 14 12:14:19 2016 +0300
Committer: Pavel Tupitsyn <ptupitsyn@apache.org>
Committed: Mon Nov 14 12:14:19 2016 +0300

----------------------------------------------------------------------
 .../platform/PlatformAbstractTarget.java        |  65 +---
 .../platform/PlatformNoopProcessor.java         |   5 +
 .../processors/platform/PlatformProcessor.java  |   7 +
 .../platform/PlatformProcessorImpl.java         |  21 +-
 .../processors/platform/PlatformTarget.java     |  20 --
 .../binary/PlatformBinaryProcessor.java         |  96 ++++++
 .../platform/cache/PlatformCache.java           |  48 ++-
 .../cache/affinity/PlatformAffinity.java        |   4 +-
 .../query/PlatformAbstractQueryCursor.java      |   4 +-
 .../query/PlatformContinuousQueryProxy.java     |   3 +-
 .../platform/cluster/PlatformClusterGroup.java  |  35 +-
 .../platform/compute/PlatformCompute.java       |   9 +-
 .../datastreamer/PlatformDataStreamer.java      |   9 +-
 .../datastructures/PlatformAtomicLong.java      |  27 +-
 .../datastructures/PlatformAtomicReference.java |   8 +-
 .../datastructures/PlatformAtomicSequence.java  |  31 +-
 .../platform/services/PlatformServices.java     |  13 +-
 .../transactions/PlatformTransactions.java      |  17 +-
 .../utils/PlatformConfigurationUtils.java       |  63 +++-
 modules/hadoop/pom.xml                          |  49 +++
 .../query/h2/sql/GridSqlQuerySplitter.java      | 143 +++++---
 .../query/IgniteSqlSplitterSelfTest.java        | 326 +++++++++++++++++++
 .../ignite/impl/binary/binary_type_manager.h    |  14 +-
 .../impl/binary/binary_type_updater_impl.h      |  12 +-
 .../include/ignite/impl/ignite_environment.h    |  49 ++-
 modules/platforms/cpp/core/src/ignition.cpp     |   8 +-
 .../impl/binary/binary_type_updater_impl.cpp    |  13 +-
 .../core/src/impl/cache/query/query_impl.cpp    |   6 +-
 .../cpp/core/src/impl/ignite_environment.cpp    |  45 ++-
 .../core/src/impl/interop/interop_target.cpp    |   6 +-
 .../cpp/jni/include/ignite/jni/exports.h        |   3 +-
 .../platforms/cpp/jni/include/ignite/jni/java.h |   6 +-
 .../cpp/jni/include/ignite/jni/utils.h          |  91 +++++-
 modules/platforms/cpp/jni/project/vs/module.def |   6 +-
 modules/platforms/cpp/jni/src/exports.cpp       |  12 +-
 modules/platforms/cpp/jni/src/java.cpp          |  36 +-
 .../Apache.Ignite.AspNet.csproj                 |   3 +-
 .../Apache.Ignite.Core.Tests.csproj             |   1 +
 .../Cache/CacheAbstractTest.cs                  |  46 ++-
 .../Cache/CacheSwapSpaceTest.cs                 | 120 +++++++
 .../Apache.Ignite.Core.Tests/ExceptionsTest.cs  |   3 +
 .../IgniteConfigurationSerializerTest.cs        |  21 +-
 .../IgniteConfigurationTest.cs                  |  24 +-
 .../ProjectFilesTest.cs                         |  62 ++++
 .../Apache.Ignite.Core.Tests/ReconnectTest.cs   |  81 ++++-
 .../Apache.Ignite.Core.csproj                   |   7 +-
 .../Binary/BinaryConfiguration.cs               |   5 +-
 .../Cache/Configuration/CacheConfiguration.cs   |   2 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  36 +-
 .../IgniteConfigurationSection.xsd              |  46 ++-
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs    |   2 +-
 .../Impl/Binary/BinaryObjectSchemaSerializer.cs |   2 +-
 .../Impl/Binary/BinaryProcessor.cs              | 156 +++++++++
 .../Impl/Binary/BinaryReader.cs                 |   2 +-
 .../Impl/Binary/BinaryUtils.cs                  |  12 +
 .../Impl/Binary/BinaryWriter.cs                 |   6 +-
 .../Impl/Binary/Marshaller.cs                   |  11 +-
 .../Impl/Cache/CacheAffinityImpl.cs             |   2 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  12 +-
 .../Impl/Cache/Query/AbstractQueryCursor.cs     |   4 +-
 .../Continuous/ContinuousQueryHandleImpl.cs     |   2 +-
 .../Impl/Cluster/ClusterGroupImpl.cs            |  72 +---
 .../Impl/Cluster/IClusterGroupEx.cs             |  35 --
 .../Impl/Compute/ComputeImpl.cs                 |   4 +-
 .../Impl/DataStructures/AtomicLong.cs           |  14 +-
 .../Impl/DataStructures/AtomicReference.cs      |   4 +-
 .../Impl/DataStructures/AtomicSequence.cs       |  14 +-
 .../Impl/Datastream/DataStreamerImpl.cs         |  20 +-
 .../Apache.Ignite.Core/Impl/Events/Events.cs    |   4 +-
 .../Apache.Ignite.Core/Impl/ExceptionUtils.cs   |   1 +
 .../Impl/Handle/HandleRegistry.cs               |   8 +-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |  29 +-
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs      |   9 +-
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   | 105 +-----
 .../Impl/Services/Services.cs                   |   4 +-
 .../Impl/SwapSpace/SwapSpaceSerializer.cs       |  99 ++++++
 .../Impl/Transactions/TransactionsImpl.cs       |  12 +-
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs    |  12 +-
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |  10 -
 .../Impl/Unmanaged/UnmanagedUtils.cs            |  19 +-
 .../SwapSpace/File/FileSwapSpaceSpi.cs          | 105 ++++++
 .../SwapSpace/ISwapSpaceSpi.cs                  |  35 ++
 .../TransactionDeadlockException.cs             |  71 ++++
 .../Apache.Ignite.Linq.csproj                   |   2 +-
 .../Apache.Ignite.Log4Net.csproj                |   4 +-
 .../Apache.Ignite.NLog.csproj                   |   4 +-
 modules/platforms/dotnet/README.txt             |  13 +-
 .../Apache.Ignite.Examples.csproj               |   1 +
 .../examples/Apache.Ignite.Examples/App.config  |   1 +
 .../Datagrid/OptimisticTransactionExample.cs    | 110 +++++++
 .../Datagrid/QueryExample.cs                    |  24 +-
 .../Apache.Ignite.ExamplesDll.csproj            |   1 +
 .../Binary/Employee.cs                          |   5 +-
 .../Compute/AverageSalaryJob.cs                 |   5 +-
 .../Datagrid/ScanQueryFilter.cs                 |  50 +++
 95 files changed, 2173 insertions(+), 711 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
index 1d2e001,ac3e553..898f12a
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
@@@ -114,9 -114,11 +115,10 @@@ namespace Apache.Ignite.Core.Test
                              <atomicConfiguration backups='2' cacheMode='Local' atomicSequenceReserveSize='250'
/>
                              <transactionConfiguration defaultTransactionConcurrency='Optimistic'
defaultTransactionIsolation='RepeatableRead' defaultTimeout='0:1:2' pessimisticTransactionLogSize='15'
pessimisticTransactionLogLinger='0:0:33' />
                              <logger type='Apache.Ignite.Core.Tests.IgniteConfigurationSerializerTest+TestLogger,
Apache.Ignite.Core.Tests' />
+                             <swapSpaceSpi type='FileSwapSpaceSpi' baseDirectory='abcd'
maximumSparsity='0.7' maximumWriteQueueSize='25' readStripesNumber='36' writeBufferSize='47'
/>
                          </igniteConfig>";
 -            var reader = XmlReader.Create(new StringReader(xml));
  
 -            var cfg = IgniteConfigurationXmlSerializer.Deserialize(reader);
 +            var cfg = IgniteConfiguration.FromXml(xml);
  
              Assert.AreEqual("c:", cfg.WorkDirectory);
              Assert.AreEqual("127.1.1.1", cfg.Localhost);

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Marshaller.cs
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Handle/HandleRegistry.cs
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Impl/Handle/HandleRegistry.cs
index 36b5072,4e1135a..588d608
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Handle/HandleRegistry.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Handle/HandleRegistry.cs
@@@ -102,17 -102,6 +102,17 @@@ namespace Apache.Ignite.Core.Impl.Handl
          }
  
          /// <summary>
-         /// Allocate a handle for critical resource in safe mode.		
-         /// </summary>		
-         /// <param name="target">Target.</param>		
-         /// <returns>Pointer.</returns>		
++        /// Allocate a handle for critical resource in safe mode.
++        /// </summary>
++        /// <param name="target">Target.</param>
++        /// <returns>Pointer.</returns>
 +        [ExcludeFromCodeCoverage]
 +        public long AllocateCriticalSafe(object target)
 +        {
 +            return Allocate0(target, true, true);
 +        }
 +
 +        /// <summary>
          /// Internal allocation routine.
          /// </summary>
          /// <param name="target">Target.</param>

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.csproj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/Apache.Ignite.NLog/Apache.Ignite.NLog.csproj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad2831e7/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Binary/Employee.cs
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Binary/Employee.cs
index 4cff2a8,b746bdf..d4637e3
--- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Binary/Employee.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Binary/Employee.cs
@@@ -35,7 -33,8 +33,8 @@@ namespace Apache.Ignite.ExamplesDll.Bin
          /// <param name="salary">Salary.</param>
          /// <param name="address">Address.</param>
          /// <param name="departments">Departments.</param>
-         public Employee(string name, long salary, Address address, ICollection<string>
departments, 
+         /// <param name="organizationId">The organization identifier.</param>
 -        public Employee(string name, long salary, Address address, ICollection<string>
departments, 
++        public Employee(string name, long salary, Address address, ICollection<string>
departments,
              int organizationId = 0)
          {
              Name = name;


Mime
View raw message