ignite-471: adding typeid to portable ids map to prevent exception on startup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8bdfdba2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8bdfdba2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8bdfdba2 Branch: refs/heads/ignite-471 Commit: 8bdfdba20ece025b90423420a8368d1d0d118147 Parents: cf8a9c1 2b02dd0 Author: Denis Magda <dma...@gridgain.com> Authored: Thu Apr 30 16:28:58 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Apr 30 16:28:58 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 13 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- modules/cloud/README.txt | 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 +++++++ modules/cloud/pom.xml | 108 ++++ .../cloud/TcpDiscoveryCloudIpFinder.java | 433 +++++++++++++++ .../tcp/ipfinder/cloud/package-info.java | 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 +++++ .../tcp/ipfinder/cloud/package-info.java | 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 ++++ .../java/org/apache/ignite/IgniteLogger.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 46 +- .../eviction/sorted/SortedEvictionPolicy.java | 2 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../ignite/internal/GridJobContextImpl.java | 7 +- .../org/apache/ignite/internal/IgnitionEx.java | 167 +++++- .../internal/MarshallerContextAdapter.java | 1 + .../internal/cluster/ClusterGroupAdapter.java | 16 + .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../processors/cache/CacheInvokeResult.java | 24 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../processors/cache/GridCacheReturn.java | 5 +- .../cache/GridCacheSharedContext.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 10 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtLockRequest.java | 38 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 + .../distributed/dht/GridDhtTxPrepareFuture.java | 10 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearLockRequest.java | 54 +- .../cache/distributed/near/GridNearTxLocal.java | 6 + .../local/atomic/GridLocalAtomicCache.java | 6 +- .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +++- .../top/GridTopologyCommandHandler.java | 3 +- .../ignite/internal/util/GridJavaProcess.java | 4 + .../util/spring/IgniteSpringHelper.java | 54 +- .../util/tostring/GridToStringBuilder.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 92 ++-- .../visor/cache/VisorCacheConfiguration.java | 7 - .../visor/cache/VisorCacheNodesTask.java | 74 +++ .../cache/VisorCacheStoreConfiguration.java | 35 -- .../cache/VisorCacheTypeFieldMetadata.java | 36 +- .../visor/cache/VisorCacheTypeMetadata.java | 99 +--- .../internal/visor/igfs/VisorIgfsMetrics.java | 128 +---- .../visor/node/VisorBasicConfiguration.java | 11 + .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../node/VisorNodeEventsCollectorTask.java | 58 +- .../internal/visor/query/VisorQueryArg.java | 19 +- .../internal/visor/query/VisorQueryCursor.java | 1 - .../internal/visor/query/VisorQueryJob.java | 9 +- .../internal/visor/query/VisorQueryTask.java | 41 -- .../internal/visor/util/VisorEventMapper.java | 13 + .../internal/visor/util/VisorTaskUtils.java | 2 +- .../apache/ignite/logger/java/JavaLogger.java | 12 +- .../apache/ignite/marshaller/Marshaller.java | 14 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 10 +- .../optimized/OptimizedMarshaller.java | 8 +- .../apache/ignite/resources/LoggerResource.java | 2 +- .../apache/ignite/resources/SpringResource.java | 2 +- .../org/apache/ignite/services/Service.java | 2 +- .../ignite/services/ServiceConfiguration.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 4 +- .../fifoqueue/FifoQueueCollisionSpi.java | 10 +- .../jobstealing/JobStealingCollisionSpi.java | 14 +- .../PriorityQueueCollisionSpi.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../memory/MemoryEventStorageSpi.java | 10 +- .../spi/failover/always/AlwaysFailoverSpi.java | 10 +- .../jobstealing/JobStealingFailoverSpi.java | 6 +- .../spi/failover/never/NeverFailoverSpi.java | 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 12 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 10 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +- .../src/test/config/load/merge-sort-base.xml | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 30 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +++++ .../cache/IgniteCachePutAllRestartTest.java | 203 +++++++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +- .../distributed/GridCacheLockAbstractTest.java | 75 +++ ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 +++++ .../DataStreamerMultiThreadedSelfTest.java | 21 +- .../logger/java/IgniteJavaLoggerTest.java | 65 --- .../ignite/logger/java/JavaLoggerTest.java | 65 +++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +- .../GridSwapSpaceSpiAbstractSelfTest.java | 2 +- .../junits/logger/GridTestLog4jLogger.java | 10 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- .../testsuites/IgniteLoggingSelfTestSuite.java | 2 +- modules/gce/README.txt | 32 ++ modules/gce/licenses/apache-2.0.txt | 202 +++++++ modules/gce/pom.xml | 94 ++++ .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 +++++++++++++ .../tcp/ipfinder/gce/package-info.java | 22 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 +++ .../tcp/ipfinder/gce/package-info.java | 22 + .../ignite/testsuites/IgniteGCETestSuite.java | 71 +++ .../processors/hadoop/HadoopProcessor.java | 2 +- .../query/h2/opt/GridLuceneIndex.java | 8 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 32 +- .../ignite/logger/jcl/IgniteJclLogger.java | 167 ------ .../org/apache/ignite/logger/jcl/JclLogger.java | 167 ++++++ .../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -- .../apache/ignite/logger/jcl/JclLoggerTest.java | 48 ++ .../ignite/testsuites/IgniteJclTestSuite.java | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 8 +- .../ignite/logger/slf4j/GridSlf4jLogger.java | 138 ----- .../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +++++ .../util/spring/IgniteSpringHelperImpl.java | 217 ++++++-- .../IgniteStartFromStreamConfigurationTest.java | 50 ++ .../testsuites/IgniteSpringTestSuite.java | 2 + .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 314 ++++++----- .../visor/commands/VisorConsoleCommand.scala | 77 --- .../ignite/visor/commands/VisorTextTable.scala | 539 ------------------ .../visor/commands/ack/VisorAckCommand.scala | 42 +- .../commands/alert/VisorAlertCommand.scala | 35 +- .../commands/cache/VisorCacheClearCommand.scala | 51 +- .../commands/cache/VisorCacheCommand.scala | 34 +- .../commands/cache/VisorCacheScanCommand.scala | 60 +- .../commands/cache/VisorCacheStopCommand.scala | 30 +- .../commands/cache/VisorCacheSwapCommand.scala | 66 +-- .../commands/common/VisorConsoleCommand.scala | 90 +++ .../visor/commands/common/VisorTextTable.scala | 543 +++++++++++++++++++ .../config/VisorConfigurationCommand.scala | 438 +++++++-------- .../commands/deploy/VisorDeployCommand.scala | 47 +- .../commands/disco/VisorDiscoveryCommand.scala | 58 +- .../commands/events/VisorEventsCommand.scala | 338 +++++------- .../visor/commands/gc/VisorGcCommand.scala | 130 ++--- .../visor/commands/kill/VisorKillCommand.scala | 53 +- .../visor/commands/node/VisorNodeCommand.scala | 47 +- .../visor/commands/ping/VisorPingCommand.scala | 41 +- .../commands/start/VisorStartCommand.scala | 34 +- .../commands/tasks/VisorTasksCommand.scala | 76 +-- .../commands/top/VisorTopologyCommand.scala | 36 +- .../visor/commands/vvm/VisorVvmCommand.scala | 32 +- .../scala/org/apache/ignite/visor/visor.scala | 286 +++++++--- .../ignite/visor/VisorTextTableSpec.scala | 3 +- pom.xml | 7 +- 166 files changed, 6038 insertions(+), 3020 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java index 5dca2f2,5dca2f2..eac9d9b --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java @@@ -80,6 -80,6 +80,7 @@@ public abstract class MarshallerContext } } ++ /** {@inheritDoc} */ @Override public boolean registerClass(int id, Class cls) throws IgniteCheckedException { boolean registered = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 53c520b,9b69571..b8e57a4 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@@ -355,8 -355,8 +355,8 @@@ public class GridDhtLockRequest extend writer.incrementState(); - case 26: + case 27: - if (!writer.writeByteArray("ownedBytes", ownedBytes)) + if (!writer.writeByteBuffer("ownedBytes", ownedBytes)) return false; writer.incrementState(); @@@ -433,8 -433,8 +433,8 @@@ reader.incrementState(); - case 26: + case 27: - ownedBytes = reader.readByteArray("ownedBytes"); + ownedBytes = reader.readByteBuffer("ownedBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java index d984bf8,c25e74e..418337f --- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java @@@ -21,10 -21,9 +21,10 @@@ import org.apache.ignite.* import org.jetbrains.annotations.*; import java.io.*; +import java.nio.*; /** - * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides + * {@code Marshaller} allows to marshal or unmarshal objects in grid. It provides * serialization/deserialization mechanism for all instances that are sent across networks * or are otherwise serialized. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bdfdba2/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java index 6f2dcff,c6d597f..ca2186e --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java @@@ -168,7 -166,7 +167,7 @@@ public class GridLuceneIndex implement } } - String keyStr = Base64.encodeBase64String(U.toArray(marshaller.marshal(key))); - String keyStr = org.apache.commons.codec.binary.Base64.encodeBase64String(marshaller.marshal(key)); ++ String keyStr = org.apache.commons.codec.binary.Base64.encodeBase64String(U.toArray(marshaller.marshal(key))); try { // Delete first to avoid duplicates. @@@ -216,8 -203,7 +215,8 @@@ */ public void remove(Object key) throws IgniteCheckedException { try { - writer.deleteDocuments(new Term(KEY_FIELD_NAME, org.apache.commons.codec.binary.Base64.encodeBase64String(marshaller.marshal(key)))); + writer.deleteDocuments(new Term(KEY_FIELD_NAME, - Base64.encodeBase64String(U.toArray(marshaller.marshal(key))))); ++ org.apache.commons.codec.binary.Base64.encodeBase64String(U.toArray(marshaller.marshal(key))))); } catch (IOException e) { throw new IgniteCheckedException(e); @@@ -366,7 -352,7 +365,8 @@@ if (ctx != null && ctx.deploy().enabled()) ldr = ctx.cache().internalCache(spaceName).context().deploy().globalLoader(); - K k = marshaller.unmarshal(ByteBuffer.wrap(Base64.decodeBase64(keyStr)), ldr); - K k = marshaller.unmarshal(org.apache.commons.codec.binary.Base64.decodeBase64(keyStr), ldr); ++ K k = marshaller.unmarshal(ByteBuffer.wrap( ++ org.apache.commons.codec.binary.Base64.decodeBase64(keyStr)), ldr); byte[] valBytes = doc.getBinaryValue(VAL_FIELD_NAME);
