ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [38/38] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-961
Date Sat, 20 Feb 2016 11:46:57 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-961

Conflicts:
	pom.xml


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

Branch: refs/heads/ignite-961
Commit: 6c1e937c2bd4fb681d3dca9880da37e8698ea560
Parents: 2560c88 582fe56
Author: sboikov <sboikov@gridgain.com>
Authored: Sat Feb 20 14:46:00 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Sat Feb 20 14:46:00 2016 +0300

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 .../cache/query/CacheQueryEntryEvent.java       |  48 +
 .../ignite/internal/GridJobCancelRequest.java   |   5 +
 .../ignite/internal/GridJobExecuteRequest.java  |   5 +
 .../ignite/internal/GridJobExecuteResponse.java |   5 +
 .../ignite/internal/GridJobSiblingsRequest.java |   5 +
 .../internal/GridJobSiblingsResponse.java       |   5 +
 .../ignite/internal/GridTaskCancelRequest.java  |   5 +
 .../ignite/internal/GridTaskSessionRequest.java |   5 +
 .../ignite/internal/MarshallerContextImpl.java  |   3 +-
 .../ignite/internal/binary/BinaryContext.java   |   1 +
 .../internal/binary/BinaryEnumObjectImpl.java   |  14 +
 .../internal/binary/BinaryObjectImpl.java       |   5 +
 .../binary/BinaryObjectOffheapImpl.java         |   5 +
 .../ignite/internal/binary/BinaryUtils.java     |   5 +-
 .../checkpoint/GridCheckpointRequest.java       |   5 +
 .../managers/communication/GridIoMessage.java   |   5 +
 .../communication/GridIoUserMessage.java        |   5 +
 .../deployment/GridDeploymentInfoBean.java      |   5 +
 .../deployment/GridDeploymentRequest.java       |   5 +
 .../deployment/GridDeploymentResponse.java      |   5 +
 .../eventstorage/GridEventStorageMessage.java   |   5 +
 .../affinity/AffinityTopologyVersion.java       |   5 +
 .../cache/CacheEntryInfoCollection.java         |   5 +
 .../cache/CacheEntryPredicateAdapter.java       |   5 +
 .../cache/CacheEntryPredicateContainsValue.java |   8 +-
 .../cache/CacheEntrySerializablePredicate.java  |   5 +
 .../cache/CacheEvictableEntryImpl.java          |   2 +-
 .../processors/cache/CacheEvictionEntry.java    |   5 +
 .../cache/CacheInvokeDirectResult.java          |   5 +
 .../cache/CacheObjectByteArrayImpl.java         |   5 +
 .../processors/cache/CacheObjectImpl.java       |   5 +
 .../cache/GridCacheDeploymentManager.java       |   8 +-
 .../processors/cache/GridCacheEntryEx.java      |   2 +-
 .../processors/cache/GridCacheEntryInfo.java    |   5 +
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../processors/cache/GridCacheMapEntry.java     | 120 +--
 .../processors/cache/GridCacheMessage.java      |   5 +
 .../processors/cache/GridCacheMvccManager.java  |   2 +-
 .../processors/cache/GridCacheProcessor.java    |   4 +-
 .../processors/cache/GridCacheReturn.java       |   5 +
 .../processors/cache/GridCacheTtlManager.java   |  75 +-
 .../processors/cache/KeyCacheObjectImpl.java    |   5 +
 .../binary/CacheObjectBinaryProcessorImpl.java  |  15 +-
 .../CacheDataStructuresManager.java             |   4 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  29 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   5 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  14 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  16 +
 .../dht/preloader/GridDhtPartitionDemander.java |   3 +-
 .../preloader/GridDhtPartitionExchangeId.java   |   5 +
 .../distributed/near/CacheVersionedValue.java   |   5 +
 .../distributed/near/GridNearCacheEntry.java    |   4 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  18 +-
 .../processors/cache/dr/GridCacheDrManager.java |   4 +-
 .../cache/dr/GridOsCacheDrManager.java          |   3 +-
 .../cache/query/GridCacheQueryManager.java      | 424 ++++++---
 .../cache/query/GridCacheSqlQuery.java          |   5 +
 .../continuous/CacheContinuousQueryEntry.java   |   5 +
 .../continuous/CacheContinuousQueryEvent.java   |  17 +-
 .../continuous/CacheContinuousQueryHandler.java | 120 +--
 .../CacheContinuousQueryListener.java           |   3 +-
 .../continuous/CacheContinuousQueryManager.java |  65 +-
 .../cache/transactions/IgniteTxEntry.java       |   5 +
 .../cache/transactions/IgniteTxKey.java         |   5 +
 .../transactions/IgniteTxLocalAdapter.java      |   4 +-
 .../cache/transactions/TxEntryValueHolder.java  |   5 +
 .../cache/version/GridCacheVersion.java         |   5 +
 .../clock/GridClockDeltaSnapshotMessage.java    |   5 +
 .../processors/clock/GridClockDeltaVersion.java |   5 +
 .../continuous/GridContinuousMessage.java       |   5 +
 .../datastreamer/DataStreamerEntry.java         |   5 +
 .../datastreamer/DataStreamerImpl.java          |   6 +-
 .../datastreamer/DataStreamerRequest.java       |   5 +
 .../datastreamer/DataStreamerResponse.java      |   5 +
 .../datastructures/DataStructuresProcessor.java |   1 +
 .../processors/igfs/IgfsAckMessage.java         |   5 +
 .../internal/processors/igfs/IgfsBlockKey.java  |   5 +
 .../processors/igfs/IgfsBlocksMessage.java      |   5 +
 .../processors/igfs/IgfsDeleteMessage.java      |   5 +
 .../processors/igfs/IgfsFileAffinityRange.java  |   5 +
 .../igfs/IgfsFragmentizerRequest.java           |   5 +
 .../igfs/IgfsFragmentizerResponse.java          |   5 +
 .../processors/igfs/IgfsSyncMessage.java        |   5 +
 .../platform/PlatformProcessorImpl.java         |  17 +-
 .../callback/PlatformCallbackGateway.java       |  30 +
 .../callback/PlatformCallbackUtils.java         |  15 +
 .../datastructures/PlatformAtomicReference.java |   7 +-
 .../messages/GridQueryCancelRequest.java        |   5 +
 .../twostep/messages/GridQueryFailResponse.java |   5 +
 .../messages/GridQueryNextPageRequest.java      |   5 +
 .../messages/GridQueryNextPageResponse.java     |   5 +
 .../h2/twostep/messages/GridQueryRequest.java   |   5 +
 .../handlers/task/GridTaskResultRequest.java    |   5 +
 .../handlers/task/GridTaskResultResponse.java   |   5 +
 .../service/GridServiceProcessor.java           | 101 ++-
 .../processors/service/GridServiceProxy.java    |  22 +-
 .../ignite/internal/util/GridByteArrayList.java |   5 +
 .../ignite/internal/util/GridLongList.java      |   5 +
 .../internal/util/GridMessageCollection.java    |   5 +
 .../internal/util/UUIDCollectionMessage.java    |   5 +
 .../util/nio/GridNioFinishedFuture.java         |   5 +
 .../ignite/internal/util/nio/GridNioFuture.java |   7 +-
 .../internal/util/nio/GridNioFutureImpl.java    |   5 +
 .../util/nio/GridNioRecoveryDescriptor.java     |   2 +
 .../ignite/internal/util/nio/GridNioServer.java |   7 +
 .../extensions/communication/Message.java       |   5 +
 .../jobstealing/JobStealingRequest.java         |   5 +
 .../communication/tcp/TcpCommunicationSpi.java  |  15 +
 .../internal/GridAffinityNoCacheSelfTest.java   |   5 +
 .../GridMultithreadedJobStealingSelfTest.java   |   3 +-
 .../GridCommunicationSendMessageSelfTest.java   |   5 +
 .../communication/GridIoManagerSelfTest.java    |   5 +
 .../cache/CacheEnumOperationsAbstractTest.java  | 307 +++++++
 .../CacheEnumOperationsSingleNodeTest.java      |  28 +
 .../cache/CacheEnumOperationsTest.java          |  28 +
 .../cache/GridCacheDeploymentSelfTest.java      |  78 +-
 .../GridDataStreamerImplSelfTest.java           |  49 +-
 .../IgniteCacheNearRestartRollbackSelfTest.java | 278 ++++++
 .../GridCacheEvictableEntryEqualsSelfTest.java  |  85 ++
 ...CacheAtomicLocalOffheapExpiryPolicyTest.java |  30 +
 ...gniteCacheAtomicOffheapExpiryPolicyTest.java |  30 +
 ...rimaryWriteOrderOffheapExpiryPolicyTest.java |  31 +
 ...teOrderWithStoreOffheapExpiryPolicyTest.java |  31 +
 ...AtomicReplicatedOffheapExpiryPolicyTest.java |  30 +
 ...eAtomicWithStoreOffheapExpiryPolicyTest.java |  30 +
 .../IgniteCacheExpiryPolicyAbstractTest.java    | 169 +++-
 .../IgniteCacheExpiryPolicyTestSuite.java       |  13 +
 ...niteCacheTxLocalOffheapExpiryPolicyTest.java |  30 +
 .../IgniteCacheTxOffheapExpiryPolicyTest.java   |  30 +
 ...acheTxReplicatedOffheapExpiryPolicyTest.java |  30 +
 ...CacheTxWithStoreOffheapExpiryPolicyTest.java |  30 +
 .../continuous/CacheContinuousBatchAckTest.java | 355 ++++++++
 ...heContinuousBatchForceServerModeAckTest.java |  80 ++
 ...CacheContinuousQueryCounterAbstractTest.java | 612 +++++++++++++
 ...inuousQueryCounterPartitionedAtomicTest.java |  41 +
 ...ContinuousQueryCounterPartitionedTxTest.java |  41 +
 ...tinuousQueryCounterReplicatedAtomicTest.java |  41 +
 ...eContinuousQueryCounterReplicatedTxTest.java |  41 +
 .../CacheContinuousQueryLostPartitionTest.java  |   4 +-
 ...acheContinuousQueryRandomOperationsTest.java | 896 ++++++++++++++++---
 .../GridServiceSerializationSelfTest.java       | 149 +++
 .../communication/GridTestMessage.java          |   5 +
 .../spi/communication/GridTestMessage.java      |   5 +
 .../testsuites/IgniteBinaryCacheTestSuite.java  |   2 +
 .../IgniteCacheEvictionSelfTestSuite.java       |   4 +-
 .../testsuites/IgniteCacheRestartTestSuite.java |   2 +
 .../testsuites/IgniteCacheTestSuite2.java       |   4 +
 .../testsuites/IgniteKernalSelfTestSuite.java   |   2 +
 .../hadoop/jobtracker/HadoopJobTracker.java     |   5 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  95 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |   9 +
 .../query/h2/sql/GridSqlAggregateFunction.java  |  12 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  30 +-
 .../h2/twostep/msg/GridH2ValueMessage.java      |   5 +
 .../IgniteBinaryObjectQueryArgumentsTest.java   | 161 ++++
 .../cache/IgniteCacheAbstractQuerySelfTest.java | 187 +++-
 .../cache/IgniteClientReconnectQueriesTest.java |   9 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |  43 +-
 .../IgniteCacheQuerySelfTestSuite.java          |  12 +
 .../cpp/common/include/ignite/common/exports.h  |   6 +-
 .../cpp/common/include/ignite/common/java.h     |  21 +-
 modules/platforms/cpp/common/src/exports.cpp    |   6 +-
 modules/platforms/cpp/common/src/java.cpp       |  28 +-
 .../cpp/core-test/src/cache_query_test.cpp      |  45 +
 .../ignite/cache/query/query_fields_row.h       |   2 +-
 .../Apache.Ignite.Core.Tests.NuGet.csproj       | 103 +++
 .../Apache.Ignite.Core.Tests.NuGet.sln          |  26 +
 ...ache.Ignite.Core.Tests.NuGet.sln.DotSettings |   4 +
 .../Apache.Ignite.Core.Tests.NuGet/CacheTest.cs | 107 +++
 .../ComputeTest.cs                              |  84 ++
 .../Config/ignite-config.xml                    |  50 ++
 .../Apache.Ignite.Core.Tests.NuGet/NuGet.config |  34 +
 .../Properties/AssemblyInfo.cs                  |  35 +
 .../StartupTest.cs                              |  66 ++
 .../TestRunner.cs                               |  70 ++
 .../Apache.Ignite.Core.Tests.NuGet/TestUtil.cs  |  43 +
 .../install-package.cmd                         |   3 +
 .../Apache.Ignite.Core.Tests.csproj             |   2 +
 .../IgniteStartStopTest.cs                      |  58 +-
 .../Process/IgniteProcess.cs                    |  16 +
 .../ProcessExtensions.cs                        |  78 ++
 .../Apache.Ignite.Core.Tests/ReconnectTest.cs   |  96 ++
 .../Apache.Ignite.Core.csproj                   |   5 +
 .../Apache.Ignite.Core.nuspec                   |  80 ++
 .../Apache.Ignite.Core/Cluster/ICluster.cs      |  14 +
 .../Common/ClientDisconnectedException.cs       |  97 ++
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |  56 +-
 .../Impl/Binary/BinaryUtils.cs                  |   2 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |   2 +-
 .../Impl/Common/IgniteHome.cs                   |  11 +-
 .../Impl/Compute/ComputeTaskHolder.cs           |   2 +-
 .../Impl/DataStructures/AtomicReference.cs      |   2 +-
 .../Apache.Ignite.Core/Impl/ExceptionUtils.cs   | 110 ++-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |  32 +-
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs      |   7 +
 .../Impl/Unmanaged/UnmanagedCallbackHandlers.cs |   3 +
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |  32 +-
 .../dotnet/Apache.Ignite.Core/NuGet/Install.ps1 |  27 +
 .../NuGet/LINQPad/ComputeExample.linq           | 106 +++
 .../NuGet/LINQPad/PutGetExample.linq            |  69 ++
 .../NuGet/LINQPad/QueryExample.linq             |  96 ++
 .../Apache.Ignite.Core/NuGet/PostBuild.ps1      |  20 +
 .../Apache.Ignite.Core/NuGet/Uninstall.ps1      |  21 +
 .../apache/ignite/yarn/ApplicationMaster.java   |  30 +-
 .../apache/ignite/yarn/IgniteYarnClient.java    |  25 +
 .../ignite/yarn/utils/IgniteYarnUtils.java      |  19 +
 parent/pom.xml                                  |   2 +
 pom.xml                                         |   2 +-
 210 files changed, 6885 insertions(+), 781 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6c1e937c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c1e937c/parent/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c1e937c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 1f17e70,ccfd471..2f87aa4
--- a/pom.xml
+++ b/pom.xml
@@@ -85,8 -84,6 +85,7 @@@
          <module>modules/osgi-paxlogging</module>
          <module>modules/osgi-karaf</module>
          <module>modules/osgi</module>
 +        <module>modules/json</module>
- 		<module>modules/benchmarks</module>
      </modules>
  
      <profiles>


Mime
View raw message