Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f15b83e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f15b83e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f15b83e Branch: refs/heads/ignite-843 Commit: 0f15b83ea3ff35b8271a28fe898034e8cc0bc437 Parents: 316b942 58a665a Author: Alexey Kuznetsov <[email protected]> Authored: Fri Sep 4 17:24:43 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Sep 4 17:24:43 2015 +0700 ---------------------------------------------------------------------- examples/config/example-default.xml | 76 + examples/config/example-ignite.xml | 56 +- .../config/portable/example-ignite-portable.xml | 44 + examples/pom.xml | 2 +- .../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 | 230 +++ .../CacheClientPortableQueryExample.java | 328 +++ .../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 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 5 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../configuration/CacheConfiguration.java | 70 +- .../ignite/configuration/TopologyValidator.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 97 +- .../discovery/GridDiscoveryManager.java | 50 +- .../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 +- .../core/src/main/resources/ignite.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 +- .../testsuites/IgniteCacheTestSuite3.java | 3 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../query/h2/opt/GridH2IndexBase.java | 42 + .../query/IgniteSqlSplitterSelfTest.java | 35 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 5 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- .../ignite/logger/log4j2/Log4J2Logger.java | 20 +- modules/mesos/pom.xml | 2 +- modules/platform/licenses/apache-2.0.txt | 202 ++ modules/platform/pom.xml | 2 +- .../platform/src/main/cpp/common/configure.ac | 2 +- .../src/main/cpp/common/ignite-common.pc.in | 2 +- .../cpp/common/include/ignite/common/exports.h | 8 +- .../cpp/common/include/ignite/common/java.h | 16 +- .../src/main/cpp/common/src/exports.cpp | 16 +- .../platform/src/main/cpp/common/src/java.cpp | 45 +- .../platform/src/main/cpp/core-test/Makefile.am | 49 + .../main/cpp/core-test/config/cache-query.xml | 91 + .../main/cpp/core-test/config/cache-test.xml | 129 ++ .../src/main/cpp/core-test/configure.ac | 62 + .../src/main/cpp/core-test/include/Makefile.am | 22 + .../include/ignite/portable_test_defs.h | 320 +++ .../include/ignite/portable_test_utils.h | 516 +++++ .../cpp/core-test/include/teamcity_messages.h | 55 + .../src/main/cpp/core-test/project/README.TXT | 1 + .../main/cpp/core-test/project/vs/README.TXT | 1 + .../cpp/core-test/project/vs/core-test.vcxproj | 174 ++ .../project/vs/core-test.vcxproj.filters | 68 + .../main/cpp/core-test/src/cache_query_test.cpp | 651 ++++++ .../src/main/cpp/core-test/src/cache_test.cpp | 481 +++++ .../main/cpp/core-test/src/concurrent_test.cpp | 186 ++ .../cpp/core-test/src/handle_registry_test.cpp | 176 ++ .../main/cpp/core-test/src/ignition_test.cpp | 97 + .../src/portable_reader_writer_raw_test.cpp | 1532 ++++++++++++++ .../src/portable_reader_writer_test.cpp | 1951 ++++++++++++++++++ .../cpp/core-test/src/portable_session_test.cpp | 257 +++ .../cpp/core-test/src/portable_test_defs.cpp | 65 + .../main/cpp/core-test/src/teamcity_boost.cpp | 159 ++ .../cpp/core-test/src/teamcity_messages.cpp | 150 ++ modules/platform/src/main/cpp/core/Makefile.am | 66 + modules/platform/src/main/cpp/core/configure.ac | 62 + modules/platform/src/main/cpp/core/ignite.pc.in | 9 + .../src/main/cpp/core/include/Makefile.am | 61 + .../main/cpp/core/include/ignite/cache/cache.h | 1153 +++++++++++ .../cpp/core/include/ignite/cache/cache_entry.h | 118 ++ .../core/include/ignite/cache/cache_peek_mode.h | 71 + .../cpp/core/include/ignite/cache/query/query.h | 27 + .../include/ignite/cache/query/query_argument.h | 125 ++ .../include/ignite/cache/query/query_cursor.h | 191 ++ .../include/ignite/cache/query/query_scan.h | 151 ++ .../core/include/ignite/cache/query/query_sql.h | 253 +++ .../include/ignite/cache/query/query_text.h | 159 ++ .../src/main/cpp/core/include/ignite/guid.h | 112 + .../src/main/cpp/core/include/ignite/ignite.h | 154 ++ .../core/include/ignite/ignite_configuration.h | 92 + .../main/cpp/core/include/ignite/ignite_error.h | 260 +++ .../src/main/cpp/core/include/ignite/ignition.h | 195 ++ .../core/include/ignite/impl/cache/cache_impl.h | 418 ++++ .../ignite/impl/cache/query/query_impl.h | 115 ++ .../core/include/ignite/impl/handle_registry.h | 202 ++ .../include/ignite/impl/ignite_environment.h | 130 ++ .../cpp/core/include/ignite/impl/ignite_impl.h | 146 ++ .../core/include/ignite/impl/interop/interop.h | 25 + .../ignite/impl/interop/interop_input_stream.h | 234 +++ .../ignite/impl/interop/interop_memory.h | 280 +++ .../ignite/impl/interop/interop_output_stream.h | 234 +++ .../cpp/core/include/ignite/impl/operations.h | 452 ++++ .../ignite/impl/portable/portable_common.h | 146 ++ .../ignite/impl/portable/portable_id_resolver.h | 106 + .../impl/portable/portable_metadata_handler.h | 102 + .../impl/portable/portable_metadata_manager.h | 120 ++ .../impl/portable/portable_metadata_snapshot.h | 122 ++ .../impl/portable/portable_metadata_updater.h | 53 + .../portable/portable_metadata_updater_impl.h | 65 + .../ignite/impl/portable/portable_reader_impl.h | 1130 ++++++++++ .../ignite/impl/portable/portable_utils.h | 344 +++ .../ignite/impl/portable/portable_writer_impl.h | 859 ++++++++ .../cpp/core/include/ignite/portable/portable.h | 29 + .../include/ignite/portable/portable_consts.h | 106 + .../ignite/portable/portable_containers.h | 525 +++++ .../ignite/portable/portable_raw_reader.h | 324 +++ .../ignite/portable/portable_raw_writer.h | 300 +++ .../include/ignite/portable/portable_reader.h | 355 ++++ .../include/ignite/portable/portable_type.h | 293 +++ .../include/ignite/portable/portable_writer.h | 335 +++ .../main/cpp/core/os/linux/include/Makefile.am | 20 + .../core/os/linux/include/ignite/impl/utils.h | 155 ++ .../main/cpp/core/os/linux/src/impl/utils.cpp | 439 ++++ .../cpp/core/os/win/include/ignite/impl/utils.h | 155 ++ .../src/main/cpp/core/os/win/src/impl/utils.cpp | 453 ++++ .../src/main/cpp/core/project/README.TXT | 1 + .../src/main/cpp/core/project/vs/README.TXT | 1 + .../src/main/cpp/core/project/vs/core.vcxproj | 272 +++ .../cpp/core/project/vs/core.vcxproj.filters | 246 +++ .../main/cpp/core/project/vs/core.vcxprojrel | 272 +++ modules/platform/src/main/cpp/core/src/guid.cpp | 65 + .../platform/src/main/cpp/core/src/ignite.cpp | 43 + .../src/main/cpp/core/src/ignite_error.cpp | 222 ++ .../platform/src/main/cpp/core/src/ignition.cpp | 468 +++++ .../main/cpp/core/src/impl/cache/cache_impl.cpp | 388 ++++ .../core/src/impl/cache/query/query_impl.cpp | 193 ++ .../main/cpp/core/src/impl/handle_registry.cpp | 234 +++ .../cpp/core/src/impl/ignite_environment.cpp | 166 ++ .../src/main/cpp/core/src/impl/ignite_impl.cpp | 42 + .../src/impl/interop/interop_input_stream.cpp | 215 ++ .../core/src/impl/interop/interop_memory.cpp | 182 ++ .../src/impl/interop/interop_output_stream.cpp | 215 ++ .../impl/portable/portable_metadata_handler.cpp | 78 + .../impl/portable/portable_metadata_manager.cpp | 201 ++ .../portable/portable_metadata_snapshot.cpp | 70 + .../impl/portable/portable_metadata_updater.cpp | 32 + .../portable/portable_metadata_updater_impl.cpp | 94 + .../src/impl/portable/portable_reader_impl.cpp | 683 ++++++ .../core/src/impl/portable/portable_utils.cpp | 214 ++ .../src/impl/portable/portable_writer_impl.cpp | 600 ++++++ .../core/src/portable/portable_containers.cpp | 76 + .../core/src/portable/portable_raw_reader.cpp | 135 ++ .../core/src/portable/portable_raw_writer.cpp | 147 ++ .../cpp/core/src/portable/portable_reader.cpp | 142 ++ .../cpp/core/src/portable/portable_type.cpp | 51 + .../cpp/core/src/portable/portable_writer.cpp | 154 ++ .../ignite/platform/cpp/package-info.java | 22 + .../ignite/platform/dotnet/package-info.java | 22 + .../apache/ignite/platform/package-info.java | 22 + modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- parent/pom.xml | 14 +- pom.xml | 2 +- 279 files changed, 31654 insertions(+), 3479 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f15b83e/examples/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f15b83e/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f15b83e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f15b83e/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f15b83e/modules/rest-http/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f15b83e/modules/schema-import/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f15b83e/parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f15b83e/pom.xml ----------------------------------------------------------------------
