ignite-4535 : Merge with ignite-3477-master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2fb75c41 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2fb75c41 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2fb75c41 Branch: refs/heads/ignite-3477-master Commit: 2fb75c41eda348ac9c7de770638d4810d394ae5e Parents: 55b13c6 b6c1761 Author: Ilya Lantukh <[email protected]> Authored: Mon Apr 3 15:10:59 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Mon Apr 3 15:10:59 2017 +0300 ---------------------------------------------------------------------- .../spi/checkpoint/s3/S3CheckpointSpi.java | 72 +- .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 27 +- .../cloud/TcpDiscoveryCloudIpFinder.java | 51 +- .../ignite/binary/BinaryBasicIdMapper.java | 5 +- .../ignite/binary/BinaryBasicNameMapper.java | 5 +- .../ignite/binary/BinaryTypeConfiguration.java | 30 +- .../ignite/cache/CacheKeyConfiguration.java | 10 +- .../org/apache/ignite/cache/QueryEntity.java | 35 +- .../affinity/fair/FairAffinityFunction.java | 21 +- .../rendezvous/RendezvousAffinityFunction.java | 27 +- .../cache/eviction/AbstractEvictionPolicy.java | 15 +- .../cache/eviction/fifo/FifoEvictionPolicy.java | 74 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 2 + .../igfs/IgfsPerBlockLruEvictionPolicy.java | 131 +++- .../cache/eviction/lru/LruEvictionPolicy.java | 74 +- .../eviction/sorted/SortedEvictionPolicy.java | 74 +- .../configuration/AtomicConfiguration.java | 15 +- .../configuration/BinaryConfiguration.java | 30 +- .../configuration/CacheConfiguration.java | 71 +- .../configuration/CollectionConfiguration.java | 31 +- .../configuration/ConnectorConfiguration.java | 100 ++- .../configuration/FileSystemConfiguration.java | 151 +++- .../configuration/HadoopConfiguration.java | 31 +- .../configuration/NearCacheConfiguration.java | 50 ++ .../configuration/TransactionConfiguration.java | 45 +- .../igfs/IgfsGroupDataBlocksKeyMapper.java | 5 +- .../igfs/IgfsIpcEndpointConfiguration.java | 30 +- .../ignite/internal/MarshallerPlatformIds.java | 3 + .../ignite/internal/binary/BinaryUtils.java | 4 + .../client/GridClientConfiguration.java | 100 ++- .../client/GridClientDataConfiguration.java | 15 +- .../client/GridClientPartitionAffinity.java | 15 +- .../balancer/GridClientBalancerAdapter.java | 5 +- .../router/GridTcpRouterConfiguration.java | 50 +- .../internal/jdbc2/JdbcSqlFieldsQuery.java | 57 ++ .../processors/cache/GridCacheProcessor.java | 39 +- .../cache/transactions/IgniteTxAdapter.java | 2 + .../platform/PlatformContextImpl.java | 10 +- .../binary/PlatformBinaryProcessor.java | 40 +- .../dotnet/PlatformDotNetConfigurationEx.java | 21 +- .../utils/PlatformConfigurationUtils.java | 3 +- .../service/GridServiceProcessor.java | 12 +- .../optimized/OptimizedMarshaller.java | 15 +- .../apache/ignite/mxbean/IgniteMBeanAware.java | 28 + .../dotnet/PlatformDotNetAffinityFunction.java | 10 +- .../PlatformDotNetBinaryConfiguration.java | 31 +- .../PlatformDotNetBinaryTypeConfiguration.java | 35 +- .../dotnet/PlatformDotNetConfiguration.java | 10 +- .../ignite/services/ServiceConfiguration.java | 35 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 50 +- .../ignite/spi/IgniteSpiMBeanAdapter.java | 78 ++ .../checkpoint/cache/CacheCheckpointSpi.java | 40 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 219 +++++- .../spi/checkpoint/noop/NoopCheckpointSpi.java | 7 + .../sharedfs/SharedFsCheckpointSpi.java | 54 +- .../fifoqueue/FifoQueueCollisionSpi.java | 134 +++- .../fifoqueue/FifoQueueCollisionSpiMBean.java | 2 +- .../jobstealing/JobStealingCollisionSpi.java | 281 ++++++- .../JobStealingCollisionSpiMBean.java | 6 +- .../spi/collision/noop/NoopCollisionSpi.java | 7 + .../PriorityQueueCollisionSpi.java | 278 +++++-- .../PriorityQueueCollisionSpiMBean.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 637 +++++++++++++--- .../deployment/local/LocalDeploymentSpi.java | 24 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 438 +++++++++-- .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 5 +- .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 17 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +- .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 12 +- .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 14 +- .../memory/MemoryEventStorageSpi.java | 98 ++- .../spi/failover/always/AlwaysFailoverSpi.java | 53 +- .../jobstealing/JobStealingFailoverSpi.java | 68 +- .../spi/failover/never/NeverFailoverSpi.java | 30 +- .../spi/indexing/noop/NoopIndexingSpi.java | 7 + .../adaptive/AdaptiveLoadBalancingSpi.java | 43 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 44 +- .../WeightedRandomLoadBalancingSpi.java | 61 +- .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 33 +- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 10 +- .../IgniteHadoopWeightedMapReducePlanner.java | 26 +- .../ignite/impl/binary/binary_type_impl.h | 2 +- .../common/include/ignite/common/concurrent.h | 30 + .../cpp/common/include/ignite/reference.h | 14 +- .../cpp/core-test/config/cache-test.xml | 2 +- .../project/vs/core-test.vcxproj.filters | 3 + .../cpp/core-test/src/cache_invoke_test.cpp | 6 +- .../platforms/cpp/core-test/src/cache_test.cpp | 23 +- .../cpp/core-test/src/continuous_query_test.cpp | 204 ++++- .../cpp/core-test/src/reference_test.cpp | 12 +- modules/platforms/cpp/core/Makefile.am | 1 + modules/platforms/cpp/core/include/Makefile.am | 70 +- .../cpp/core/include/ignite/cache/cache.h | 22 +- .../ignite/cache/cache_entry_processor.h | 42 +- .../cache/event/cache_entry_event_filter.h | 109 +++ .../cache/query/continuous/continuous_query.h | 35 +- .../cpp/core/include/ignite/ignite_binding.h | 39 +- .../include/ignite/ignite_binding_context.h | 2 +- .../cpp/core/include/ignite/impl/bindings.h | 95 +++ .../impl/cache/cache_entry_processor_holder.h | 15 - .../core/include/ignite/impl/cache/cache_impl.h | 81 +- .../cache/event/cache_entry_event_filter_base.h | 66 ++ .../event/cache_entry_event_filter_holder.h | 185 +++++ .../continuous/continuous_query_handle_impl.h | 10 - .../query/continuous/continuous_query_impl.h | 60 +- .../include/ignite/impl/ignite_binding_impl.h | 101 +-- .../include/ignite/impl/ignite_environment.h | 37 +- .../cpp/core/include/ignite/impl/ignite_impl.h | 10 +- .../cpp/core/include/ignite/impl/operations.h | 2 +- .../platforms/cpp/core/project/vs/core.vcxproj | 5 + .../cpp/core/project/vs/core.vcxproj.filters | 18 + .../cpp/core/src/impl/cache/cache_impl.cpp | 90 ++- .../continuous/continuous_query_handle_impl.cpp | 5 - .../cpp/core/src/impl/ignite_binding_impl.cpp | 88 +++ .../cpp/core/src/impl/ignite_environment.cpp | 124 ++- .../platforms/cpp/core/src/impl/ignite_impl.cpp | 2 +- .../Apache.Ignite.Core.Tests.csproj | 11 +- .../Binary/BinaryBuilderSelfTest.cs | 112 +-- .../BinaryBuilderSelfTestDynamicRegistration.cs | 40 + .../Binary/BinaryCompactFooterInteropTest.cs | 2 +- .../Binary/BinaryDynamicRegistrationTest.cs | 441 +++++++++++ .../Binary/BinarySelfTest.cs | 197 +++-- .../Binary/BinarySelfTestFullFooter.cs | 5 +- .../Binary/JavaBinaryInteropTest.cs | 182 +++++ .../Serializable/AdvancedSerializationTest.cs | 228 ++++++ .../BasicSerializableObjectsTest.cs | 124 +++ .../Binary/Serializable/CallbacksTest.cs | 369 +++++++++ .../Binary/Serializable/DelegatesTest.cs | 161 ++++ .../Binary/Serializable/ObjectReferenceTests.cs | 131 ++++ .../Binary/Serializable/PrimitivesTest.cs | 754 +++++++++++++++++++ .../Binary/Serializable/SqlDmlTest.cs | 277 +++++++ .../Cache/Affinity/AffinityFunctionTest.cs | 21 - .../Cache/CacheAbstractTest.cs | 56 +- .../Cache/Query/CacheLinqTest.cs | 2 +- .../Cache/Query/CacheQueriesTest.cs | 15 +- .../Continuous/ContinuousQueryAbstractTest.cs | 29 +- .../Cache/Store/CacheStoreTest.cs | 5 +- .../Compute/ComputeApiTest.cs | 28 +- .../Compute/IgniteExceptionTaskSelfTest.cs | 40 +- .../Compute/ResourceTaskTest.cs | 13 +- .../Apache.Ignite.Core.Tests/DeploymentTest.cs | 15 +- .../Examples/ExamplesTest.cs | 2 +- .../Apache.Ignite.Core.Tests/ExecutableTest.cs | 28 +- .../SerializationTest.cs | 240 ------ .../Services/ServiceProxyTest.cs | 40 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 11 + .../Apache.Ignite.Core.csproj | 7 +- .../Cache/Configuration/CacheConfiguration.cs | 8 +- .../Cache/Query/Continuous/ContinuousQuery.cs | 59 +- .../Apache.Ignite.Core/Cache/Query/QueryBase.cs | 4 +- .../Cache/Query/SqlFieldsQuery.cs | 6 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 25 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 4 +- .../Impl/Binary/BinarizableSerializer.cs | 5 +- .../Impl/Binary/BinaryFullTypeDescriptor.cs | 49 +- .../Impl/Binary/BinaryObjectBuilder.cs | 27 +- .../Impl/Binary/BinaryObjectHeader.cs | 13 +- .../Impl/Binary/BinaryObjectSchemaSerializer.cs | 2 + .../Impl/Binary/BinaryProcessor.cs | 38 +- .../Impl/Binary/BinaryReader.cs | 39 +- .../Impl/Binary/BinaryReflectiveActions.cs | 2 +- .../BinaryReflectiveSerializerInternal.cs | 84 ++- .../Binary/BinarySurrogateTypeDescriptor.cs | 13 +- .../Impl/Binary/BinarySystemHandlers.cs | 96 +-- .../Impl/Binary/BinarySystemTypeSerializer.cs | 2 +- .../Impl/Binary/BinaryUtils.cs | 54 +- .../Impl/Binary/BinaryWriter.cs | 242 +++--- .../Impl/Binary/DateTimeHolder.cs | 101 --- .../Impl/Binary/DateTimeSerializer.cs | 48 -- .../Binary/DeserializationCallbackProcessor.cs | 102 +++ .../Impl/Binary/IBinarySerializerInternal.cs | 4 +- .../Impl/Binary/IBinaryTypeDescriptor.cs | 8 + .../Impl/Binary/Io/BinaryStreamAdapter.cs | 119 --- .../Impl/Binary/Marshaller.cs | 248 ++++-- .../Impl/Binary/ReflectionUtils.cs | 50 ++ .../Impl/Binary/SerializableObjectHolder.cs | 96 --- .../Impl/Binary/SerializableSerializer.cs | 656 +++++++++++++++- .../Impl/Binary/TypeResolver.cs | 7 + .../Impl/Binary/UserSerializerProxy.cs | 5 +- .../Affinity/AffinityFunctionSerializer.cs | 3 - .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 3 +- .../Common/CopyOnWriteConcurrentDictionary.cs | 35 + .../Impl/Common/DelegateConverter.cs | 90 ++- .../Impl/Common/DelegateTypeDescriptor.cs | 3 +- .../Impl/Common/SerializableTypeDescriptor.cs | 222 ++++++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 13 +- .../Impl/Services/ServiceProxySerializer.cs | 4 +- .../Impl/Unmanaged/UnmanagedCallbacks.cs | 8 +- .../NuGet/LINQPad/ComputeExample.linq | 1 - .../NuGet/LINQPad/PutGetExample.linq | 5 +- .../NuGet/LINQPad/QueryExample.linq | 5 +- .../NuGet/LINQPad/QueryExample.linq | 5 +- .../dotnet/Apache.Ignite.Linq/QueryOptions.cs | 2 +- .../examples/Apache.Ignite.Examples/App.config | 16 +- .../Apache.Ignite.ExamplesDll/Binary/Address.cs | 2 - .../Compute/CharacterCountClosure.cs | 1 - .../Datagrid/ContinuousQueryFilter.cs | 2 - .../Datagrid/EmployeeStorePredicate.cs | 2 - .../Messaging/RemoteOrderedListener.cs | 1 - .../Messaging/RemoteUnorderedListener.cs | 1 - .../Services/MapService.cs | 1 - .../spi/deployment/uri/UriDeploymentSpi.java | 80 +- .../commands/cache/VisorCacheCommand.scala | 2 +- .../helpers/jade/form/form-field-checkbox.pug | 14 +- .../helpers/jade/form/form-field-datalist.pug | 2 +- .../helpers/jade/form/form-field-dropdown.pug | 3 +- .../app/helpers/jade/form/form-field-number.pug | 3 +- .../helpers/jade/form/form-field-password.pug | 2 +- .../app/helpers/jade/form/form-field-text.pug | 3 +- .../frontend/app/helpers/jade/mixins.pug | 1 + .../frontend/app/primitives/tooltip/index.pug | 25 + .../views/configuration/domains-import.tpl.pug | 6 + .../zk/TcpDiscoveryZookeeperIpFinder.java | 37 +- 214 files changed, 10250 insertions(+), 2348 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2fb75c41/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2fb75c41/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2fb75c41/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2fb75c41/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ----------------------------------------------------------------------
