ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [39/39] ignite git commit: Merge remote-tracking branch 'upstream/ignite-1.4' into ignite-264
Date Thu, 03 Sep 2015 21:43:48 GMT
Merge remote-tracking branch 'upstream/ignite-1.4' into ignite-264


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

Branch: refs/heads/ignite-264
Commit: 637afb75b36aaf6cd449118cc15c8f897f17c00f
Parents: 8af9e64 77fc969
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Thu Sep 3 14:41:16 2015 -0700
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Thu Sep 3 14:41:16 2015 -0700

----------------------------------------------------------------------
 examples/config/example-default.xml             |  76 ++
 examples/config/example-ignite.xml              |  56 +-
 .../config/portable/example-ignite-portable.xml |  44 +
 .../ignite/examples/portable/Address.java       |  72 ++
 .../ignite/examples/portable/Employee.java      |  93 +++
 .../ignite/examples/portable/EmployeeKey.java   |  90 +++
 .../portable/ExamplePortableNodeStartup.java    |  36 +
 .../ignite/examples/portable/Organization.java  |  93 +++
 .../examples/portable/OrganizationType.java     |  32 +
 ...mputeClientPortableTaskExecutionExample.java | 154 ++++
 .../portable/computegrid/ComputeClientTask.java | 116 +++
 .../portable/computegrid/package-info.java      |  21 +
 .../CacheClientPortablePutGetExample.java       | 226 ++++++
 .../CacheClientPortableQueryExample.java        | 323 ++++++++
 .../portable/datagrid/package-info.java         |  21 +
 .../ignite/examples/portable/package-info.java  |  21 +
 .../java8/datagrid/CacheAffinityExample.java    |  15 +
 .../java8/messaging/MessagingExample.java       |  11 +-
 .../CacheClientPortableExampleTest.java         |  46 ++
 .../ComputeClientPortableExampleTest.java       |  37 +
 .../testsuites/IgniteExamplesSelfTestSuite.java |   6 +
 .../java8/examples/BasicExamplesSelfTest.java   |  10 +-
 .../java8/examples/CacheExamplesSelfTest.java   |   8 +-
 .../examples/CheckpointExamplesSelfTest.java    |   8 +-
 .../examples/ClusterGroupExampleSelfTest.java   |   4 +-
 .../examples/ContinuationExamplesSelfTest.java  |   8 +-
 .../ContinuousMapperExamplesSelfTest.java       |   8 +-
 .../examples/DeploymentExamplesSelfTest.java    |   6 +-
 .../java8/examples/EventsExamplesSelfTest.java  |   5 +-
 .../HibernateL2CacheExampleSelfTest.java        |   8 +-
 .../java8/examples/IgfsExamplesSelfTest.java    |   6 +-
 .../examples/LifecycleExamplesSelfTest.java     |   8 +-
 .../examples/MemcacheRestExamplesSelfTest.java  |   4 +-
 .../examples/MessagingExamplesSelfTest.java     |   6 +-
 .../examples/MonteCarloExamplesSelfTest.java    |   8 +-
 .../examples/SpringBeanExamplesSelfTest.java    |   8 +-
 .../java8/examples/TaskExamplesSelfTest.java    |   4 +-
 .../IgniteExamplesJ8SelfTestSuite.java          |  12 +-
 .../configuration/CacheConfiguration.java       |  70 +-
 .../ignite/configuration/TopologyValidator.java |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    |  97 ++-
 .../discovery/GridDiscoveryManager.java         |  52 +-
 .../portable/GridPortableMarshaller.java        |  44 +-
 .../portable/PortableAbstractLazyValue.java     |  57 --
 .../internal/portable/PortableBuilderEnum.java  | 114 ---
 .../internal/portable/PortableBuilderImpl.java  | 531 ------------
 .../portable/PortableBuilderReader.java         | 776 ------------------
 .../PortableBuilderSerializationAware.java      |  29 -
 .../portable/PortableBuilderSerializer.java     | 211 -----
 .../portable/PortableClassDescriptor.java       |  57 +-
 .../internal/portable/PortableContext.java      |   6 +-
 .../portable/PortableEnumArrayLazyValue.java    | 112 ---
 .../portable/PortableLazyArrayList.java         | 159 ----
 .../portable/PortableLazyLinkedList.java        | 215 -----
 .../internal/portable/PortableLazyMap.java      | 218 -----
 .../internal/portable/PortableLazyMapEntry.java |  66 --
 .../internal/portable/PortableLazySet.java      |  89 ---
 .../internal/portable/PortableLazyValue.java    |  28 -
 .../portable/PortableObjectArrayLazyValue.java  |  89 ---
 .../portable/PortablePlainLazyValue.java        |  47 --
 .../portable/PortablePlainPortableObject.java   |  50 --
 .../internal/portable/PortableReaderExImpl.java | 154 +++-
 .../ignite/internal/portable/PortableUtils.java |  11 +
 .../portable/PortableValueWithType.java         |  74 --
 .../internal/portable/PortableWriterExImpl.java | 159 +++-
 .../builder/PortableAbstractLazyValue.java      |  57 ++
 .../portable/builder/PortableBuilderEnum.java   | 116 +++
 .../portable/builder/PortableBuilderImpl.java   | 537 +++++++++++++
 .../portable/builder/PortableBuilderReader.java | 800 +++++++++++++++++++
 .../PortableBuilderSerializationAware.java      |  31 +
 .../builder/PortableBuilderSerializer.java      | 214 +++++
 .../builder/PortableEnumArrayLazyValue.java     | 114 +++
 .../portable/builder/PortableLazyArrayList.java | 166 ++++
 .../builder/PortableLazyLinkedList.java         | 217 +++++
 .../portable/builder/PortableLazyMap.java       | 220 +++++
 .../portable/builder/PortableLazyMapEntry.java  |  68 ++
 .../portable/builder/PortableLazySet.java       |  92 +++
 .../portable/builder/PortableLazyValue.java     |  28 +
 .../builder/PortableModifiableLazyValue.java    |  52 ++
 .../builder/PortableObjectArrayLazyValue.java   |  91 +++
 .../builder/PortablePlainLazyValue.java         |  49 ++
 .../builder/PortablePlainPortableObject.java    |  53 ++
 .../portable/builder/PortableValueWithType.java |  75 ++
 .../internal/portable/builder/package-info.java |  22 +
 .../cache/DynamicCacheChangeRequest.java        |  19 +-
 .../cache/DynamicCacheDescriptor.java           |  16 +-
 .../GridCacheLoaderWriterStoreFactory.java      |  20 +-
 .../GridCachePartitionExchangeManager.java      |   4 +-
 .../processors/cache/GridCacheProcessor.java    | 199 +++--
 .../distributed/dht/GridDhtTxPrepareFuture.java |  15 +-
 .../dht/GridPartitionedGetFuture.java           |  19 +-
 .../distributed/near/GridNearGetFuture.java     |  22 +-
 .../CacheObjectPortableProcessorImpl.java       |   2 +-
 .../ignite/internal/util/lang/GridFunc.java     |   1 +
 .../resources/META-INF/classnames.properties    |   2 +-
 .../store/StoreResourceInjectionSelfTest.java   | 104 +++
 .../GridPortableBuilderAdditionalSelfTest.java  | 232 +++++-
 .../portable/GridPortableBuilderSelfTest.java   |   1 +
 .../GridPortableMarshallerSelfTest.java         |  72 +-
 .../GridPortableMetaDataDisabledSelfTest.java   |  17 +
 .../portable/GridPortableMetaDataSelfTest.java  |  17 +
 .../mutabletest/GridPortableTestClasses.java    |  38 +-
 .../cache/CacheAffinityCallSelfTest.java        |  85 +-
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |   5 +
 .../cache/IgniteDynamicCacheStartSelfTest.java  |   4 +-
 ...gniteTopologyValidatorAbstractCacheTest.java |  46 +-
 .../CachePutAllFailoverAbstractTest.java        | 126 ++-
 .../CachePutAllFailoverAtomicTest.java          |  30 +
 ...ridCachePartitionNotLoadedEventSelfTest.java |   6 +-
 ...gniteCachePutRetryTransactionalSelfTest.java |  42 -
 ...ClientNodePortableMetadataMultinodeTest.java |  11 +
 .../junits/common/GridCommonAbstractTest.java   |  41 +
 .../IgniteCacheFailoverTestSuite2.java          |   2 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   4 +-
 .../ignite/logger/log4j2/Log4J2Logger.java      |  20 +-
 .../ignite/platform/cpp/package-info.java       |  22 +
 .../ignite/platform/dotnet/package-info.java    |  22 +
 .../apache/ignite/platform/package-info.java    |  22 +
 parent/pom.xml                                  |   4 +
 119 files changed, 6141 insertions(+), 3382 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/637afb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/637afb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/637afb75/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
index f0c0c20,e712cc9..5bc779c
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
@@@ -142,7 -137,9 +142,9 @@@ public class GridCachePartitionNotLoade
          startGrid(0);
          startGrid(1);
  
+         awaitPartitionMapExchange();
+ 
 -        PartitionNotFullyLoadedListener lsnr = new PartitionNotFullyLoadedListener();
 +        final PartitionNotFullyLoadedListener lsnr = new PartitionNotFullyLoadedListener();
  
          ignite(1).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST);
  


Mime
View raw message