ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [27/27] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-51
Date Thu, 26 Feb 2015 04:09:43 GMT
# Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-51


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

Branch: refs/heads/ignite-51
Commit: a265949e8da58c23263aed470749ffc67422c848
Parents: a6b4183 e09b037
Author: sboikov <semen.boikov@inria.fr>
Authored: Thu Feb 26 07:08:24 2015 +0300
Committer: sboikov <semen.boikov@inria.fr>
Committed: Thu Feb 26 07:08:24 2015 +0300

----------------------------------------------------------------------
 .../hibernate/example-hibernate-L2-cache.xml    |    2 +-
 .../ComputeFibonacciContinuationExample.java    |    8 +-
 .../IgniteCountDownLatchExample.java            |    3 +-
 .../MessagingPingPongListenActorExample.java    |    3 +-
 .../examples/ScalarContinuationExample.scala    |   11 +-
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |   10 +-
 .../internal/client/ClientStartNodeTask.java    |    5 +-
 .../processors/rest/RestProcessorTest.java      |    8 +-
 .../processors/rest/TestBinaryClient.java       |    6 +-
 .../processors/rest/TestMemcacheClient.java     |   44 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |   14 +-
 .../java/org/apache/ignite/IgniteCache.java     |   69 +
 .../java/org/apache/ignite/IgniteCluster.java   |    3 +-
 .../ignite/cache/IgniteEntryProcessor.java      |   28 +
 .../CacheRendezvousAffinityFunction.java        |    2 +-
 .../ignite/cluster/ClusterNodeLocalMap.java     |   60 -
 .../ignite/events/DiscoveryCustomEvent.java     |   56 +
 .../org/apache/ignite/events/EventType.java     |   12 +
 .../IgfsByteDelimiterRecordResolver.java        |    4 +-
 .../ignite/internal/ClusterMetricsSnapshot.java |  204 +-
 .../internal/GridEventConsumeHandler.java       |    8 +-
 .../internal/GridMessageListenHandler.java      |    8 +-
 .../router/impl/GridTcpRouterNioParser.java     |   10 +-
 .../cluster/ClusterNodeLocalMapImpl.java        |   27 +-
 .../cluster/IgniteClusterAsyncImpl.java         |    3 +-
 .../internal/cluster/IgniteClusterImpl.java     |    4 +-
 .../internal/direct/DirectByteBufferStream.java |    4 +-
 .../igfs/common/IgfsControlResponse.java        |    6 +-
 .../internal/igfs/common/IgfsMarshaller.java    |   16 +-
 .../discovery/GridDiscoveryManager.java         |   78 +-
 .../affinity/GridAffinityMessage.java           |    4 +-
 .../processors/cache/GridCacheSwapManager.java  |    4 +-
 .../processors/cache/GridCacheUtils.java        |   12 +-
 .../processors/cache/IgniteCacheProxy.java      |   63 +
 .../query/GridCacheDistributedQueryManager.java |    4 +-
 .../cache/query/GridCacheQueryManager.java      |    2 +-
 .../continuous/CacheContinuousQueryEntry.java   |   12 +-
 .../continuous/CacheContinuousQueryHandler.java |    4 +-
 .../cache/transactions/IgniteTxEntry.java       |   20 +-
 .../version/GridCacheRawVersionedEntry.java     |    8 +-
 .../processors/clock/GridClockMessage.java      |   24 +-
 .../continuous/GridContinuousProcessor.java     |    4 +-
 .../dataload/GridDataLoaderProcessor.java       |    2 +-
 .../datastructures/DataStructuresProcessor.java |    2 +-
 .../processors/igfs/IgfsDataManager.java        |    8 +-
 .../internal/processors/igfs/IgfsImpl.java      |    6 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |    4 +-
 .../internal/processors/igfs/IgfsServer.java    |    4 +-
 .../internal/processors/job/GridJobWorker.java  |    2 +-
 .../processors/rest/GridRestResponse.java       |    4 +-
 .../message/GridClientAbstractMessage.java      |    4 +-
 .../message/GridClientHandshakeRequest.java     |    4 +-
 .../cache/GridCacheQueryCommandHandler.java     |    7 +-
 .../protocols/tcp/GridMemcachedMessage.java     |    4 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   44 +-
 .../processors/task/GridTaskWorker.java         |    4 +-
 .../ignite/internal/util/GridByteArrayList.java |   14 +-
 .../ignite/internal/util/IgniteByteUtils.java   |  705 -------
 .../ignite/internal/util/IgniteUtils.java       | 1532 ++++++++------
 .../nio/GridConnectionBytesVerifyFilter.java    |    2 +-
 .../util/nio/GridTcpCommunicationClient.java    |    2 +-
 .../apache/ignite/internal/util/typedef/X.java  |    3 +-
 .../VisorComputeToggleMonitoringTask.java       |    4 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |    4 +-
 .../node/VisorNodeEventsCollectorTask.java      |    3 +-
 .../visor/query/VisorQueryCleanupTask.java      |    4 +-
 .../visor/query/VisorQueryNextPageTask.java     |    6 +-
 .../internal/visor/query/VisorQueryTask.java    |    4 +-
 .../internal/visor/util/VisorTaskUtils.java     |   46 +-
 .../ignite/lang/IgniteProductVersion.java       |    6 +-
 .../optimized/optimized-classnames.properties   |    2 +-
 .../ignite/spi/IgniteSpiThreadFactory.java      |    2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   12 +-
 .../ignite/spi/discovery/DiscoverySpi.java      |    7 +
 .../spi/discovery/DiscoverySpiListener.java     |   11 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |    7 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   56 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |    3 +
 .../tcp/internal/TcpDiscoveryNode.java          |    4 +-
 .../TcpDiscoveryMulticastIpFinder.java          |    6 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |    4 +-
 .../TcpDiscoveryCustomEventMessage.java         |   66 +
 .../messages/TcpDiscoveryHeartbeatMessage.java  |   14 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |    2 +-
 .../internal/GridDiscoveryEventSelfTest.java    |   43 +
 .../internal/GridEventStorageSelfTest.java      |    3 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |   24 +-
 .../internal/GridMultipleJobsSelfTest.java      |    2 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |    4 +-
 .../GridTaskContinuousMapperSelfTest.java       |    3 +-
 .../GridTaskExecutionContextSelfTest.java       |    2 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |   20 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  101 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   13 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |    5 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |   33 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |   12 +-
 .../GridCacheMultiNodeDataStructureTest.java    |    3 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |    2 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |   16 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |    2 +-
 .../GridCacheAbstractJobExecutionTest.java      |    2 +-
 .../distributed/GridCacheEventAbstractTest.java |    4 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |    6 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |    2 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    3 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |    2 +-
 .../GridCacheRandomEvictionPolicySelfTest.java  |    2 +-
 .../IgniteCacheLoaderWriterAbstractTest.java    |   47 +
 .../closure/GridClosureProcessorSelfTest.java   |   14 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |    5 +-
 .../igfs/IgfsDataManagerSelfTest.java           |    3 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |    3 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |    2 +-
 .../streamer/GridStreamerSelfTest.java          |    2 +-
 .../internal/util/IgniteUtilsSelfTest.java      |   20 +-
 .../internal/util/nio/GridNioSelfTest.java      |    6 +-
 .../internal/util/nio/GridRoundTripTest.java    |    4 +-
 .../offheap/GridOffHeapMapAbstractSelfTest.java |    3 +-
 .../ignite/lang/GridByteArrayListSelfTest.java  |    6 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |   36 +-
 .../loadtests/cache/GridCacheLoadTest.java      |    6 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |    5 +-
 .../loadtests/colocation/GridTestMain.java      |    3 +-
 .../communication/GridIoManagerBenchmark.java   |    3 +-
 .../communication/GridTestMessage.java          |    5 +-
 .../GridMultiSplitsRedeployLoadTest.java        |    5 +-
 .../loadtests/discovery/GridGcTimeoutTest.java  |    3 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |   16 +-
 .../job/GridJobExecutionSingleNodeLoadTest.java |    2 +-
 .../mapper/GridContinuousMapperLoadTest1.java   |    3 +-
 .../loadtests/mapper/GridNodeStartup.java       |    3 +-
 .../mergesort/GridMergeSortLoadTest.java        |    3 +-
 .../streamer/GridStreamerIndexLoadTest.java     |    4 +-
 .../swap/GridSwapEvictAllBenchmark.java         |    3 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    6 +-
 ...idSessionFutureWaitJobAttributeSelfTest.java |    3 +-
 .../GridSessionSetTaskAttributeSelfTest.java    |    3 +-
 ...GridSessionTaskWaitJobAttributeSelfTest.java |    3 +-
 .../discovery/AbstractDiscoverySelfTest.java    |    7 +-
 .../roundrobin/GridRoundRobinTestUtils.java     |    6 +-
 .../file/GridFileSwapSpaceSpiSelfTest.java      |    5 +-
 .../index/GridStreamerIndexSelfTest.java        |   17 +-
 .../window/GridStreamerWindowSelfTest.java      |    3 +-
 .../cache/GridAbstractCacheStoreSelfTest.java   |    3 +-
 .../tests/p2p/GridP2PAwareTestUserResource.java |    5 +-
 .../tests/p2p/GridTestMessageListener.java      |    4 +-
 .../internal/igfs/hadoop/IgfsHadoopIpcIo.java   |   10 +-
 .../internal/igfs/hadoop/IgfsHadoopWrapper.java |    2 +-
 .../processors/hadoop/GridHadoopSetup.java      |    3 +-
 .../GridHadoopDefaultMapReducePlanner.java      |    3 +-
 .../shuffle/GridHadoopShuffleMessage.java       |    4 +-
 .../taskexecutor/GridHadoopExecutorService.java |    2 +-
 .../hadoop/v2/GridHadoopSplitWrapper.java       |    9 +-
 .../hadoop/GridHadoopGroupingTest.java          |   10 +-
 .../hadoop/GridHadoopJobTrackerSelfTest.java    |    2 +-
 .../hadoop/GridHadoopSortingTest.java           |    9 +-
 .../processors/hadoop/GridHadoopStartup.java    |    2 +-
 .../ignite/loadtests/igfs/IgfsNodeStartup.java  |    3 +-
 ...idHibernateAbstractRegionAccessStrategy.java |   97 -
 .../GridHibernateAccessStrategyAdapter.java     |  369 ----
 .../GridHibernateCollectionRegion.java          |   99 -
 .../hibernate/GridHibernateEntityRegion.java    |  110 -
 .../GridHibernateGeneralDataRegion.java         |   69 -
 .../hibernate/GridHibernateNaturalIdRegion.java |   98 -
 .../GridHibernateNonStrictAccessStrategy.java   |  220 --
 .../GridHibernateQueryResultsRegion.java        |   71 -
 .../GridHibernateReadOnlyAccessStrategy.java    |  106 -
 .../GridHibernateReadWriteAccessStrategy.java   |  282 ---
 .../cache/hibernate/GridHibernateRegion.java    |  101 -
 .../hibernate/GridHibernateRegionFactory.java   |  231 ---
 .../GridHibernateTimestampsRegion.java          |   40 -
 ...ridHibernateTransactionalAccessStrategy.java |  139 --
 .../GridHibernateTransactionalDataRegion.java   |   96 -
 .../HibernateAbstractRegionAccessStrategy.java  |   97 +
 .../HibernateAccessStrategyAdapter.java         |  369 ++++
 .../hibernate/HibernateCollectionRegion.java    |   99 +
 .../cache/hibernate/HibernateEntityRegion.java  |  110 +
 .../hibernate/HibernateGeneralDataRegion.java   |   69 +
 .../hibernate/HibernateNaturalIdRegion.java     |   98 +
 .../HibernateNonStrictAccessStrategy.java       |  220 ++
 .../hibernate/HibernateQueryResultsRegion.java  |   71 +
 .../HibernateReadOnlyAccessStrategy.java        |  106 +
 .../HibernateReadWriteAccessStrategy.java       |  282 +++
 .../ignite/cache/hibernate/HibernateRegion.java |  101 +
 .../cache/hibernate/HibernateRegionFactory.java |  231 +++
 .../hibernate/HibernateTimestampsRegion.java    |   40 +
 .../HibernateTransactionalAccessStrategy.java   |  139 ++
 .../HibernateTransactionalDataRegion.java       |   96 +
 .../apache/ignite/cache/hibernate/package.html  |    2 +-
 ...idHibernateL2CacheConfigurationSelfTest.java |  393 ----
 .../hibernate/GridHibernateL2CacheSelfTest.java | 1923 -----------------
 ...idHibernateL2CacheTransactionalSelfTest.java |  135 --
 .../HibernateL2CacheConfigurationSelfTest.java  |  393 ++++
 .../hibernate/HibernateL2CacheSelfTest.java     | 1925 ++++++++++++++++++
 .../HibernateL2CacheTransactionalSelfTest.java  |  135 ++
 .../testsuites/IgniteHibernateTestSuite.java    |    6 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    2 +-
 .../GridCacheCrossCacheQuerySelfTestNewApi.java |    2 +-
 .../http/jetty/GridJettyRestHandler.java        |    2 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |    4 +-
 ...gniteProjectionStartStopRestartSelfTest.java |    3 +-
 202 files changed, 6704 insertions(+), 6632 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index f73a77d,c1c8b0d..e231254
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@@ -1613,10 -1559,8 +1613,8 @@@ public class GridCacheSwapManager exten
          Set<Integer> parts = primary ? cctx.affinity().primaryPartitions(cctx.localNodeId(),
topVer) :
              cctx.affinity().backupPartitions(cctx.localNodeId(), topVer);
  
 -        return new PartitionsIterator(parts) {
 +        return new PartitionsIterator<K, V>(parts) {
-             @Override protected GridCloseableIterator<? extends Map.Entry<byte[],
byte[]>> partitionIterator(int part)
-                 throws IgniteCheckedException
-             {
+             @Override protected GridCloseableIterator<? extends Map.Entry<byte[],
byte[]>> partitionIterator(int part) {
                  return offheap.iterator(spaceName, part);
              }
          };

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index 62f48a2,c9ef668..f6b4819
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@@ -193,10 -193,8 +193,8 @@@ public class GridCacheDistributedQueryM
       * @param sndId Sender node id.
       * @param req Query request.
       * @return Query info.
-      * @throws ClassNotFoundException If class not found.
       */
-     @Nullable private GridCacheQueryInfo distributedQueryInfo(UUID sndId, GridCacheQueryRequest
req)
-         throws ClassNotFoundException {
 -    @Nullable private GridCacheQueryInfo distributedQueryInfo(UUID sndId, GridCacheQueryRequest<K,
V> req) {
++    @Nullable private GridCacheQueryInfo distributedQueryInfo(UUID sndId, GridCacheQueryRequest
req) {
          IgnitePredicate<Cache.Entry<Object, Object>> prjPred = req.projectionFilter()
== null ?
              F.<Cache.Entry<Object, Object>>alwaysTrue() : req.projectionFilter();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index c9781af,eb184c9..ea44edf
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@@ -786,71 -835,69 +786,71 @@@ public class IgniteTxEntry implements G
  
      /** {@inheritDoc} */
      @Override public void writeExternal(ObjectOutput out) throws IOException {
 -        out.writeBoolean(depEnabled);
 -
 -        if (depEnabled) {
 -            U.writeByteArray(out, keyBytes);
 -            U.writeByteArray(out, transformClosBytes);
 -            U.writeByteArray(out, filterBytes);
 -        }
 -        else {
 -            out.writeObject(key);
 -            U.writeCollection(out, entryProcessorsCol);
 -            U.writeArray(out, filters);
 -        }
 -
 -        out.writeInt(cacheId);
 -
 -        val.writeTo(out);
 -
 -        out.writeLong(ttl);
 -
 -        CU.writeVersion(out, explicitVer);
 -        out.writeBoolean(grpLock);
 -
 -        if (conflictExpireTime != CU.EXPIRE_TIME_CALCULATE) {
 -            out.writeBoolean(true);
 -            out.writeLong(conflictExpireTime);
 -        }
 -        else
 -            out.writeBoolean(false);
 -
 -        CU.writeVersion(out, conflictVer);
 -
 -        out.writeObject(transferExpiryPlc ? new IgniteExternalizableExpiryPolicy(expiryPlc)
: null);
 +// TODO IGNITE-51.
 +//        out.writeBoolean(depEnabled);
 +//
 +//        if (depEnabled) {
- //            IgniteByteUtils.writeByteArray(out, keyBytes);
- //            IgniteByteUtils.writeByteArray(out, transformClosBytes);
- //            IgniteByteUtils.writeByteArray(out, filterBytes);
++//            U.writeByteArray(out, keyBytes);
++//            U.writeByteArray(out, transformClosBytes);
++//            U.writeByteArray(out, filterBytes);
 +//        }
 +//        else {
 +//            out.writeObject(key);
 +//            U.writeCollection(out, entryProcessorsCol);
 +//            U.writeArray(out, filters);
 +//        }
 +//
 +//        out.writeInt(cacheId);
 +//
 +//        val.writeTo(out);
 +//
 +//        out.writeLong(ttl);
 +//
 +//        CU.writeVersion(out, explicitVer);
 +//        out.writeBoolean(grpLock);
 +//
 +//        if (conflictExpireTime != CU.EXPIRE_TIME_CALCULATE) {
 +//            out.writeBoolean(true);
 +//            out.writeLong(conflictExpireTime);
 +//        }
 +//        else
 +//            out.writeBoolean(false);
 +//
 +//        CU.writeVersion(out, conflictVer);
 +//
 +//        out.writeObject(transferExpiryPlc ? new IgniteExternalizableExpiryPolicy(expiryPlc)
: null);
      }
  
      /** {@inheritDoc} */
      @SuppressWarnings({"unchecked"})
      @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
 -        depEnabled = in.readBoolean();
 -
 -        if (depEnabled) {
 -            keyBytes = U.readByteArray(in);
 -            transformClosBytes = U.readByteArray(in);
 -            filterBytes = U.readByteArray(in);
 -        }
 -        else {
 -            key = (K)in.readObject();
 -            entryProcessorsCol = U.readCollection(in);
 -            filters = GridCacheUtils.readEntryFilterArray(in);
 -        }
 -
 -        cacheId = in.readInt();
 -
 -        val.readFrom(in);
 -
 -        ttl = in.readLong();
 -
 -        explicitVer = CU.readVersion(in);
 -        grpLock = in.readBoolean();
 -
 -        conflictExpireTime = in.readBoolean() ? in.readLong() : CU.EXPIRE_TIME_CALCULATE;
 -        conflictVer = CU.readVersion(in);
 -
 -        expiryPlc = (ExpiryPolicy)in.readObject();
 +// TODO IGNITE-51.
 +//        depEnabled = in.readBoolean();
 +//
 +//        if (depEnabled) {
- //            keyBytes = IgniteByteUtils.readByteArray(in);
- //            transformClosBytes = IgniteByteUtils.readByteArray(in);
- //            filterBytes = IgniteByteUtils.readByteArray(in);
++//            keyBytes = U.readByteArray(in);
++//            transformClosBytes = U.readByteArray(in);
++//            filterBytes = U.readByteArray(in);
 +//        }
 +//        else {
 +//            key = (K)in.readObject();
 +//            entryProcessorsCol = U.readCollection(in);
 +//            filters = GridCacheUtils.readEntryFilterArray(in);
 +//        }
 +//
 +//        cacheId = in.readInt();
 +//
 +//        val.readFrom(in);
 +//
 +//        ttl = in.readLong();
 +//
 +//        explicitVer = CU.readVersion(in);
 +//        grpLock = in.readBoolean();
 +//
 +//        conflictExpireTime = in.readBoolean() ? in.readLong() : CU.EXPIRE_TIME_CALCULATE;
 +//        conflictVer = CU.readVersion(in);
 +//
 +//        expiryPlc = (ExpiryPolicy)in.readObject();
      }
  
      /** {@inheritDoc} */
@@@ -1008,28 -1087,27 +1008,28 @@@
           * @throws IOException If failed.
           */
          public void writeTo(ObjectOutput out) throws IOException {
 -            out.writeBoolean(hasWriteVal);
 -            out.writeBoolean(valBytesSent);
 -
 -            if (hasWriteVal) {
 -                if (valBytesSent)
 -                    U.writeByteArray(out, valBytes);
 -                else {
 -                    if (val != null && val instanceof byte[]) {
 -                        out.writeBoolean(true);
 -
 -                        U.writeByteArray(out, (byte[]) val);
 -                    }
 -                    else {
 -                        out.writeBoolean(false);
 -
 -                        out.writeObject(val);
 -                    }
 -                }
 -            }
 -
 -            out.writeInt(op.ordinal());
 +// TODO IGNITE-51.
 +//            out.writeBoolean(hasWriteVal);
 +//            out.writeBoolean(valBytesSent);
 +//
 +//            if (hasWriteVal) {
 +//                if (valBytesSent)
- //                    IgniteByteUtils.writeByteArray(out, valBytes);
++//                    U.writeByteArray(out, valBytes);
 +//                else {
 +//                    if (val != null && val instanceof byte[]) {
 +//                        out.writeBoolean(true);
 +//
- //                        IgniteByteUtils.writeByteArray(out, (byte[]) val);
++//                        U.writeByteArray(out, (byte[]) val);
 +//                    }
 +//                    else {
 +//                        out.writeBoolean(false);
 +//
 +//                        out.writeObject(val);
 +//                    }
 +//                }
 +//            }
 +//
 +//            out.writeInt(op.ordinal());
          }
  
          /**
@@@ -1039,18 -1117,17 +1039,18 @@@
           */
          @SuppressWarnings("unchecked")
          public void readFrom(ObjectInput in) throws IOException, ClassNotFoundException
{
 -            hasWriteVal = in.readBoolean();
 -            valBytesSent = in.readBoolean();
 -
 -            if (hasWriteVal) {
 -                if (valBytesSent)
 -                    valBytes = U.readByteArray(in);
 -                else
 -                    val = in.readBoolean() ? (V) U.readByteArray(in) : (V)in.readObject();
 -            }
 -
 -            op = fromOrdinal(in.readInt());
 +// TODO IGNITE-51.
 +//            hasWriteVal = in.readBoolean();
 +//            valBytesSent = in.readBoolean();
 +//
 +//            if (hasWriteVal) {
 +//                if (valBytesSent)
- //                    valBytes = IgniteByteUtils.readByteArray(in);
++//                    valBytes = U.readByteArray(in);
 +//                else
- //                    val = in.readBoolean() ? (V) IgniteByteUtils.readByteArray(in) : (V)in.readObject();
++//                    val = in.readBoolean() ? (V) U.readByteArray(in) : (V)in.readObject();
 +//            }
 +//
 +//            op = fromOrdinal(in.readInt());
          }
  
          /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a265949e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------


Mime
View raw message