You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/01/17 10:44:59 UTC
[49/50] [abbrv] ignite git commit: Merge branch ignite-2.0 into
ignite-db-x
Merge branch ignite-2.0 into ignite-db-x
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f258b9d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f258b9d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f258b9d
Branch: refs/heads/ignite-3477
Commit: 6f258b9dd0c2d3aad6d30e09282da8b953d27a58
Parents: 0ee73fb f136542
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Jan 17 13:14:17 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Jan 17 13:14:17 2017 +0300
----------------------------------------------------------------------
modules/cloud/pom.xml | 6 +-
.../java/org/apache/ignite/IgniteLogger.java | 4 +-
.../apache/ignite/IgniteSystemProperties.java | 13 +
.../ignite/cache/affinity/AffinityKey.java | 4 +-
.../ignite/cache/query/SqlFieldsQuery.java | 6 +
.../configuration/HadoopConfiguration.java | 2 +-
.../configuration/IgniteConfiguration.java | 31 +
.../org/apache/ignite/events/CacheEvent.java | 6 +-
.../ignite/events/CacheQueryReadEvent.java | 8 +-
.../apache/ignite/hadoop/HadoopInputSplit.java | 54 ++
.../org/apache/ignite/hadoop/HadoopJob.java | 74 +++
.../ignite/hadoop/HadoopMapReducePlan.java | 80 +++
.../ignite/hadoop/HadoopMapReducePlanner.java | 40 ++
.../igfs/IgfsGroupDataBlocksKeyMapper.java | 17 +-
.../igfs/secondary/IgfsSecondaryFileSystem.java | 28 +
.../local/LocalIgfsSecondaryFileSystem.java | 130 +++-
.../ignite/internal/GridKernalContext.java | 7 +
.../ignite/internal/GridKernalContextImpl.java | 12 +
.../apache/ignite/internal/IgniteKernal.java | 3 +
.../org/apache/ignite/internal/IgnitionEx.java | 19 +
.../internal/binary/BinaryEnumObjectImpl.java | 10 +-
.../ignite/internal/binary/BinaryMetadata.java | 5 +-
.../internal/binary/BinaryObjectExImpl.java | 8 +-
.../igfs/common/IgfsHandshakeRequest.java | 17 -
.../internal/igfs/common/IgfsMarshaller.java | 2 -
.../managers/communication/GridIoManager.java | 2 +
.../managers/communication/GridIoPolicy.java | 3 +
.../cache/CacheInvokeDirectResult.java | 2 +-
.../processors/cache/CacheInvokeResult.java | 2 +-
.../processors/cache/CacheLazyEntry.java | 4 +-
.../processors/cache/CacheObjectAdapter.java | 7 +-
.../processors/cache/GridCacheAdapter.java | 5 +-
.../cache/GridCacheMvccCandidate.java | 9 +-
.../processors/cache/GridCacheReturn.java | 2 +-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../GridNearAtomicAbstractUpdateFuture.java | 34 +-
.../GridNearAtomicSingleUpdateFuture.java | 38 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 57 +-
.../distributed/near/GridNearLockFuture.java | 2 +-
.../cache/query/GridCacheQueryAdapter.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 13 +-
.../cache/query/GridCacheQueryRequest.java | 2 +
.../cache/query/GridCacheSqlQuery.java | 6 +-
.../continuous/CacheContinuousQueryEvent.java | 10 +-
.../continuous/CacheContinuousQueryManager.java | 4 +-
.../store/GridCacheStoreManagerAdapter.java | 30 +-
.../cache/store/GridCacheWriteBehindStore.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 11 +-
.../GridCacheVersionConflictContext.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 5 +-
.../closure/GridClosureProcessor.java | 6 +-
.../continuous/GridContinuousMessage.java | 2 +-
.../datastreamer/DataStreamProcessor.java | 60 +-
.../datastreamer/DataStreamerImpl.java | 37 +-
.../datastructures/CollocatedSetItemKey.java | 2 +-
.../GridCacheAtomicLongValue.java | 2 +
.../GridCacheAtomicSequenceImpl.java | 2 +
.../GridCacheAtomicSequenceValue.java | 2 +
.../GridCacheCountDownLatchValue.java | 3 +
.../datastructures/GridCacheSetItemKey.java | 2 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 4 +-
.../processors/hadoop/HadoopFileBlock.java | 1 +
.../processors/hadoop/HadoopInputSplit.java | 54 --
.../internal/processors/hadoop/HadoopJob.java | 107 ---
.../internal/processors/hadoop/HadoopJobEx.java | 140 ++++
.../processors/hadoop/HadoopJobInfo.java | 54 +-
.../processors/hadoop/HadoopJobProperty.java | 9 +-
.../processors/hadoop/HadoopMapReducePlan.java | 80 ---
.../hadoop/HadoopMapReducePlanner.java | 40 --
.../processors/hadoop/HadoopTaskContext.java | 6 +-
.../processors/hadoop/HadoopTaskInfo.java | 1 +
.../hadoop/counter/HadoopCounterWriter.java | 4 +-
.../shuffle/HadoopDirectShuffleMessage.java | 34 +-
.../processors/igfs/IgfsBaseBlockKey.java | 42 ++
.../internal/processors/igfs/IgfsBlockKey.java | 26 +-
.../processors/igfs/IgfsBlockLocationImpl.java | 55 ++
.../processors/igfs/IgfsDataManager.java | 12 +-
.../internal/processors/igfs/IgfsImpl.java | 26 +-
.../processors/igfs/IgfsIpcHandler.java | 4 -
.../processors/igfs/IgfsKernalContextAware.java | 32 -
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../igfs/IgfsSecondaryFileSystemImpl.java | 10 +-
.../igfs/IgfsSecondaryFileSystemV2.java | 40 --
.../local/LocalFileSystemBlockKey.java | 103 +++
.../local/LocalFileSystemIgfsFile.java | 10 +-
.../LocalFileSystemPositionedReadable.java | 65 ++
...fsSecondaryFileSystemPositionedReadable.java | 65 --
.../internal/processors/job/GridJobWorker.java | 7 +-
.../odbc/OdbcQueryExecuteRequest.java | 6 +-
.../platform/PlatformNativeException.java | 3 +-
.../internal/processors/pool/PoolProcessor.java | 5 +
.../processors/query/GridQueryProcessor.java | 37 +-
.../processors/resource/GridResourceIoc.java | 6 +-
.../resource/GridResourceProcessor.java | 31 +-
.../processors/rest/GridRestResponse.java | 2 +-
.../internal/util/future/GridFutureAdapter.java | 2 +-
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../ignite/internal/util/nio/GridNioServer.java | 159 ++++-
.../util/tostring/GridToStringBuilder.java | 656 +++++++++++++++++--
.../util/tostring/GridToStringInclude.java | 12 +-
.../util/tostring/GridToStringThreadLocal.java | 12 +-
.../query/VisorQueryScanSubstringFilter.java | 5 +-
.../internal/visor/query/VisorQueryUtils.java | 60 ++
.../ignite/resources/FileSystemResource.java | 62 ++
.../communication/tcp/TcpCommunicationSpi.java | 20 +-
.../tcp/TcpCommunicationSpiMBean.java | 5 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 3 +
.../roundrobin/RoundRobinLoadBalancingSpi.java | 16 +-
.../resources/META-INF/classnames.properties | 5 +-
.../ignite/cache/store/jdbc/model/Person.java | 2 +-
...mmunicationBalancePairedConnectionsTest.java | 28 +
.../IgniteCommunicationBalanceTest.java | 25 +-
.../cache/CacheEntryProcessorCopySelfTest.java | 6 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 7 +-
...cMessageRecoveryNoPairedConnectionsTest.java | 47 --
...micMessageRecoveryPairedConnectionsTest.java | 47 ++
.../GridCacheDhtEvictionsDisabledSelfTest.java | 5 +-
.../AtomicPutAllChangingTopologyTest.java | 212 ++++++
.../cache/query/IndexingSpiQuerySelfTest.java | 199 +++++-
.../DataStreamProcessorSelfTest.java | 104 +++
.../processors/igfs/IgfsAbstractSelfTest.java | 18 +-
.../igfs/IgfsDualAbstractSelfTest.java | 26 +-
...SecondaryFileSystemDualAbstractSelfTest.java | 5 -
...fsLocalSecondaryFileSystemProxySelfTest.java | 81 +++
...IgfsLocalSecondaryFileSystemTestAdapter.java | 7 +-
...gfsSecondaryFileSystemInjectionSelfTest.java | 270 ++++++++
.../tostring/GridToStringBuilderSelfTest.java | 33 +-
.../junits/GridTestKernalContext.java | 12 +-
.../IgniteCacheFailoverTestSuite.java | 3 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 6 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 3 +
.../apache/ignite/stream/flume/IgniteSink.java | 7 +-
modules/gce/pom.xml | 4 +-
.../fs/IgniteHadoopFileSystemCounterWriter.java | 6 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 23 +-
.../mapreduce/IgniteHadoopMapReducePlanner.java | 416 ------------
.../IgniteHadoopWeightedMapReducePlanner.java | 15 +-
.../planner/HadoopAbstractMapReducePlanner.java | 118 ++++
.../planner/HadoopTestRoundRobinMrPlanner.java | 75 +++
.../processors/hadoop/HadoopCommonUtils.java | 1 +
.../processors/hadoop/HadoopContext.java | 2 +
.../processors/hadoop/HadoopExternalSplit.java | 1 +
.../processors/hadoop/HadoopProcessor.java | 4 +-
.../processors/hadoop/HadoopSplitWrapper.java | 1 +
.../HadoopFileSystemCounterWriterDelegate.java | 4 +-
.../HadoopIgfsSecondaryFileSystemDelegate.java | 4 +-
.../hadoop/igfs/HadoopIgfsEndpoint.java | 38 +-
...doopFileSystemCounterWriterDelegateImpl.java | 4 +-
...doopIgfsSecondaryFileSystemDelegateImpl.java | 61 +-
.../hadoop/impl/igfs/HadoopIgfsJclLogger.java | 9 +-
.../hadoop/impl/igfs/HadoopIgfsOutProc.java | 24 +-
.../hadoop/impl/igfs/HadoopIgfsWrapper.java | 33 +-
.../hadoop/impl/v1/HadoopV1MapTask.java | 6 +-
.../hadoop/impl/v1/HadoopV1ReduceTask.java | 4 +-
.../hadoop/impl/v1/HadoopV1Splitter.java | 2 +-
.../hadoop/impl/v2/HadoopV2Context.java | 2 +-
.../processors/hadoop/impl/v2/HadoopV2Job.java | 15 +-
.../hadoop/impl/v2/HadoopV2Splitter.java | 2 +-
.../hadoop/impl/v2/HadoopV2TaskContext.java | 70 +-
.../hadoop/jobtracker/HadoopJobMetadata.java | 4 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 32 +-
.../planner/HadoopAbstractMapReducePlanner.java | 116 ----
.../planner/HadoopDefaultMapReducePlan.java | 4 +-
.../hadoop/shuffle/HadoopShuffle.java | 4 +-
.../hadoop/shuffle/HadoopShuffleJob.java | 66 +-
.../shuffle/direct/HadoopDirectDataInput.java | 75 ++-
.../shuffle/direct/HadoopDirectDataOutput.java | 14 +
.../direct/HadoopDirectDataOutputContext.java | 48 +-
.../direct/HadoopDirectDataOutputState.java | 14 +-
.../shuffle/streams/HadoopDataInStream.java | 34 +-
.../shuffle/streams/HadoopOffheapBuffer.java | 18 +
.../HadoopEmbeddedTaskExecutor.java | 8 +-
.../hadoop/taskexecutor/HadoopRunnableTask.java | 6 +-
.../taskexecutor/HadoopTaskExecutorAdapter.java | 8 +-
.../external/HadoopExternalTaskExecutor.java | 16 +-
.../child/HadoopChildProcessRunner.java | 4 +-
.../resources/META-INF/classnames.properties | 8 +
.../impl/HadoopAbstractMapReduceTest.java | 2 +-
.../hadoop/impl/HadoopAbstractSelfTest.java | 3 +-
.../hadoop/impl/HadoopCommandLineTest.java | 4 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 619 -----------------
.../hadoop/impl/HadoopJobTrackerSelfTest.java | 1 +
.../hadoop/impl/HadoopPlannerMockJob.java | 10 +-
.../impl/HadoopTaskExecutionSelfTest.java | 19 +-
.../hadoop/impl/HadoopTasksAllVersionsTest.java | 16 +-
.../hadoop/impl/HadoopTasksV1Test.java | 4 +-
.../hadoop/impl/HadoopTasksV2Test.java | 4 +-
.../hadoop/impl/HadoopTeraSortTest.java | 32 +-
.../impl/HadoopTestRoundRobinMrPlanner.java | 75 ---
.../hadoop/impl/HadoopTestTaskContext.java | 6 +-
.../hadoop/impl/HadoopV2JobSelfTest.java | 6 +-
.../HadoopWeightedMapReducePlannerTest.java | 6 +-
.../client/HadoopClientProtocolSelfTest.java | 2 +-
.../impl/igfs/Hadoop1DualAbstractTest.java | 7 +-
.../impl/igfs/Hadoop1OverIgfsProxyTest.java | 67 ++
.../igfs/HadoopFIleSystemFactorySelfTest.java | 6 +-
...Igfs20FileSystemLoopbackPrimarySelfTest.java | 2 +-
...oopIgfs20FileSystemShmemPrimarySelfTest.java | 2 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 6 +-
...oopSecondaryFileSystemConfigurationTest.java | 4 +-
.../hadoop/impl/igfs/IgfsEventsTestSuite.java | 4 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 4 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 2 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 32 +-
...niteHadoopFileSystemLoggerStateSelfTest.java | 6 +-
...condaryFileSystemInitializationSelfTest.java | 4 +-
.../collections/HadoopAbstractMapTest.java | 4 +-
.../streams/HadoopDataStreamSelfTest.java | 177 ++++-
.../testsuites/IgniteHadoopTestSuite.java | 4 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 14 +-
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 6 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 18 +-
.../cache/IgniteCacheMergeSqlQuerySelfTest.java | 14 +-
.../IgniteCacheUpdateSqlQuerySelfTest.java | 4 +-
.../org/apache/ignite/logger/jcl/JclLogger.java | 9 +-
modules/platforms/cpp/binary/Makefile.am | 2 +-
.../ignite/impl/binary/binary_type_manager.h | 2 +-
.../src/impl/binary/binary_type_manager.cpp | 6 +-
.../binary/src/impl/interop/interop_memory.cpp | 2 +-
modules/platforms/cpp/common/Makefile.am | 2 +-
.../include/ignite/common/dynamic_size_array.h | 2 +-
.../cpp/common/project/vs/common.vcxproj | 1 +
modules/platforms/cpp/configure.ac | 2 +-
modules/platforms/cpp/configure.acrel | 2 +-
modules/platforms/cpp/core-test/Makefile.am | 2 +-
.../cpp/core-test/src/cache_query_test.cpp | 8 +-
.../cpp/core-test/src/reference_test.cpp | 14 +-
modules/platforms/cpp/core/Makefile.am | 2 +-
.../cache/query/continuous/continuous_query.h | 8 +-
.../include/ignite/cache/query/query_cursor.h | 4 +-
.../query/continuous/continuous_query_impl.h | 8 +-
.../core/include/ignite/impl/handle_registry.h | 2 +-
.../cpp/core/include/ignite/impl/operations.h | 4 +-
.../cpp/core/src/impl/cache/cache_impl.cpp | 5 +-
.../cpp/core/src/impl/handle_registry.cpp | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
.../cpp/examples/odbc-example/Makefile.am | 2 +-
.../cpp/examples/putget-example/Makefile.am | 2 +-
.../cpp/examples/query-example/Makefile.am | 2 +-
modules/platforms/cpp/ignite/Makefile.am | 2 +-
modules/platforms/cpp/jni/Makefile.am | 2 +-
.../platforms/cpp/jni/project/vs/jni.vcxproj | 1 +
modules/platforms/cpp/jni/src/java.cpp | 2 +-
modules/platforms/cpp/odbc-test/Makefile.am | 2 +-
.../cpp/odbc-test/config/queries-default.xml | 1 +
.../odbc-test/include/sql_test_suite_fixture.h | 3 +
.../platforms/cpp/odbc-test/include/test_type.h | 20 +-
.../cpp/odbc-test/src/api_robustness_test.cpp | 113 +++-
.../platforms/cpp/odbc-test/src/column_test.cpp | 189 ++++++
.../odbc-test/src/sql_test_suite_fixture.cpp | 17 +
.../cpp/odbc-test/src/sql_types_test.cpp | 131 ++++
modules/platforms/cpp/odbc/Makefile.am | 5 +-
modules/platforms/cpp/odbc/include/Makefile.am | 3 +-
.../cpp/odbc/include/ignite/odbc/common_types.h | 29 +-
.../ignite/odbc/config/connection_info.h | 2 -
.../cpp/odbc/include/ignite/odbc/log.h | 123 ++++
.../odbc/include/ignite/odbc/meta/column_meta.h | 2 -
.../cpp/odbc/include/ignite/odbc/statement.h | 143 +++-
.../cpp/odbc/include/ignite/odbc/utility.h | 26 +-
.../cpp/odbc/install/ignite-odbc-amd64.wxs | 2 +-
.../cpp/odbc/install/ignite-odbc-x86.wxs | 2 +-
.../odbc/os/linux/src/system/socket_client.cpp | 9 +-
.../odbc/os/win/src/system/socket_client.cpp | 9 +-
.../src/system/ui/dsn_configuration_window.cpp | 18 +-
.../cpp/odbc/os/win/src/system_dsn.cpp | 17 +-
.../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 +
.../cpp/odbc/project/vs/odbc.vcxproj.filters | 6 +
modules/platforms/cpp/odbc/src/column.cpp | 28 +-
.../cpp/odbc/src/config/connection_info.cpp | 9 +-
modules/platforms/cpp/odbc/src/connection.cpp | 21 +-
.../odbc/src/diagnostic/diagnosable_adapter.cpp | 3 +-
.../odbc/src/diagnostic/diagnostic_record.cpp | 38 ++
modules/platforms/cpp/odbc/src/entry_points.cpp | 52 +-
modules/platforms/cpp/odbc/src/log.cpp | 83 +++
.../platforms/cpp/odbc/src/meta/column_meta.cpp | 4 -
modules/platforms/cpp/odbc/src/odbc.cpp | 286 ++++----
.../odbc/src/query/column_metadata_query.cpp | 13 +-
.../platforms/cpp/odbc/src/query/data_query.cpp | 23 +-
.../cpp/odbc/src/query/table_metadata_query.cpp | 12 +-
modules/platforms/cpp/odbc/src/statement.cpp | 187 +++++-
modules/platforms/cpp/odbc/src/utility.cpp | 29 +-
.../Apache.Ignite.AspNet.Tests.csproj | 7 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.AspNet.csproj | 5 +
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Benchmarks.csproj | 5 +
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Core.Tests.TestDll.csproj | 5 +
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Core.Tests.csproj | 7 +
.../Cache/CacheAbstractTest.cs | 627 +-----------------
.../Cache/CacheAbstractTransactionalTest.cs | 565 ++++++++++++++++
.../Cache/CacheLocalAtomicTest.cs | 5 -
.../Cache/CacheLocalTest.cs | 6 +-
.../CachePartitionedAtomicNearEnabledTest.cs | 5 -
.../Cache/CachePartitionedAtomicTest.cs | 5 -
.../Cache/CachePartitionedNearEnabledTest.cs | 7 +-
.../Cache/CachePartitionedTest.cs | 7 +-
.../Cache/CacheReplicatedAtomicTest.cs | 5 -
.../Cache/CacheReplicatedTest.cs | 7 +-
.../Query/CacheQueriesCodeConfigurationTest.cs | 4 +-
.../Log/ConcurrentMemoryTarget.cs | 73 +++
.../Log/NLogLoggerTest.cs | 5 +-
.../Apache.Ignite.Core.Tests/MessagingTest.cs | 6 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 5 +
.../Apache.Ignite.Core.Tests/TestUtils.cs | 1 -
.../Apache.Ignite.Core.csproj | 16 +-
.../Impl/Binary/BinaryReader.cs | 16 +-
.../Impl/Transactions/TransactionsImpl.cs | 18 +
.../Impl/Unmanaged/UnmanagedUtils.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Transactions/ITransactions.cs | 19 +-
.../Apache.Ignite.EntityFramework.Tests.csproj | 5 +
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.EntityFramework.csproj | 9 +-
.../Impl/ArrayDbDataReader.cs | 5 +
.../Impl/DataReaderResult.cs | 2 +
.../Impl/DbCommandInfo.cs | 11 +
.../Impl/DbCommandProxy.cs | 1 +
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Linq.csproj | 5 +
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Log4Net.csproj | 5 +
.../IgniteLog4NetLogger.cs | 16 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.NLog.csproj | 5 +
.../Properties/AssemblyInfo.cs | 4 +-
modules/platforms/dotnet/Apache.Ignite.sln | 3 +
.../dotnet/Apache.Ignite/Apache.Ignite.csproj | 5 +
.../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-
modules/platforms/dotnet/README.md | 6 +-
modules/platforms/dotnet/build.ps1 | 2 +-
.../Apache.Ignite.Examples.csproj | 3 +
.../examples/Apache.Ignite.Examples/App.config | 2 +
.../DataStructures/AtomicSequenceExample.cs | 26 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.ExamplesDll.csproj | 4 +
.../Properties/AssemblyInfo.cs | 4 +-
.../Services/MapService.cs | 2 -
.../apache/ignite/logger/slf4j/Slf4jLogger.java | 11 +-
modules/web-console/backend/app/mongo.js | 19 +
.../generator/AbstractTransformer.js | 5 +
.../modules/configuration/generator/Beans.js | 4 +
.../generator/ConfigurationGenerator.js | 36 +
.../states/configuration/caches/affinity.jade | 82 +++
.../states/configuration/caches/memory.jade | 4 +-
.../frontend/views/configuration/caches.jade | 1 +
.../yardstick/cache/IgniteIoTestBenchmark.java | 73 ---
parent/pom.xml | 2 +-
352 files changed, 6795 insertions(+), 3698 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
index 7f3f5e4,9fd6bc1..a17f755
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
@@@ -29,9 -29,9 +29,10 @@@ import org.apache.ignite.binary.BinaryO
import org.apache.ignite.binary.BinaryType;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectAdapter;
import org.apache.ignite.internal.processors.cache.CacheObjectContext;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
+ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
index a34e98d,09a5524..1f13c6f
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
@@@ -22,9 -22,9 +22,10 @@@ import java.io.IOException
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@@ -142,70 -120,8 +143,72 @@@ public abstract class CacheObjectAdapte
/** {@inheritDoc} */
public String toString() {
- return getClass().getSimpleName() + " [val=" + val + ", hasValBytes=" + (valBytes != null) + ']';
+ return S.toString(S.INCLUDE_SENSITIVE ? getClass().getSimpleName() : "CacheObject",
+ "val", val, true,
+ "hasValBytes", valBytes != null, false);
}
+
+ /**
+ * @param dataLen Serialized value length.
+ * @return Full size required to store cache object.
+ * @see #putValue(byte, ByteBuffer, int, int, byte[], int)
+ */
+ public static int objectPutSize(int dataLen) {
+ return dataLen + 5;
+ }
+
+ /**
+ * @param cacheObjType Cache object type.
+ * @param buf Buffer to write value to.
+ * @param off Offset in source binary data.
+ * @param len Length of the data to write.
+ * @param valBytes Binary data.
+ * @param start Start offset in binary data.
+ * @return {@code True} if data were successfully written.
+ * @throws IgniteCheckedException If failed.
+ */
+ public static boolean putValue(byte cacheObjType, final ByteBuffer buf, int off, int len,
+ byte[] valBytes, final int start) throws IgniteCheckedException {
+ int dataLen = valBytes.length;
+
+ if (buf.remaining() < len)
+ return false;
+
+ final int headSize = 5; // 4 bytes len + 1 byte type
+
+ if (off == 0 && len >= headSize) {
+ buf.putInt(dataLen);
+ buf.put(cacheObjType);
+
+ len -= headSize;
+ }
+ else if (off >= headSize)
+ off -= headSize;
+ else {
+ // Partial header write.
+ final ByteBuffer head = ByteBuffer.allocate(headSize);
+
+ head.order(buf.order());
+
+ head.putInt(dataLen);
+ head.put(cacheObjType);
+
+ head.position(off);
+
+ if (len < head.capacity())
+ head.limit(off + Math.min(len, head.capacity() - off));
+
+ buf.put(head);
+
+ if (head.limit() < headSize)
+ return true;
+
+ len -= headSize - off;
+ off = 0;
+ }
+
+ buf.put(valBytes, start + off, len);
+
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
index 3922e3e,eddf302..e664554
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
@@@ -99,10 -99,9 +99,10 @@@ class CacheContinuousQueryEvent<K, V> e
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(CacheContinuousQueryEvent.class, this,
- "evtType", getEventType(),
- "key", getKey(),
- "newVal", getValue(),
- "oldVal", getOldValue(),
- "partCntr", getPartitionUpdateCounter());
+ "evtType", getEventType(), false,
+ "key", getKey(), true,
+ "newVal", getValue(), true,
- "oldVal", getOldValue(), true);
++ "oldVal", getOldValue(), true,
++ "partCntr", getPartitionUpdateCounter(), false);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
index 253197d,a830186..b3645ea
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
@@@ -562,11 -562,14 +563,14 @@@ public abstract class GridCacheStoreMan
if (key instanceof GridCacheInternal)
return true;
- key = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
- val = cctx.unwrapBinaryIfNeeded(val, !convertBinary());
+ Object key0 = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
+ Object val0 = cctx.unwrapBinaryIfNeeded(val, !convertBinary());
- if (log.isDebugEnabled())
- log.debug("Storing value in cache store [key=" + key0 + ", val=" + val0 + ']');
+ if (log.isDebugEnabled()) {
+ log.debug(S.toString("Storing value in cache store",
- "key", key, true,
- "val", val, true));
++ "key", key0, true,
++ "val", val0, true));
+ }
sessionInit0(tx);
@@@ -590,8 -593,11 +594,11 @@@
sessionEnd0(tx, threwEx);
}
- if (log.isDebugEnabled())
- log.debug("Stored value in cache store [key=" + key0 + ", val=" + val0 + ']');
+ if (log.isDebugEnabled()) {
+ log.debug(S.toString("Stored value in cache store",
- "key", key, true,
- "val", val, true));
++ "key", key0, true,
++ "val", val0, true));
+ }
return true;
}
@@@ -668,10 -671,10 +675,10 @@@
if (key instanceof GridCacheInternal)
return false;
- key = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
+ Object key0 = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
if (log.isDebugEnabled())
- log.debug("Removing value from cache store [key=" + key0 + ']');
- log.debug(S.toString("Removing value from cache store", "key", key, true));
++ log.debug(S.toString("Removing value from cache store", "key", key0, true));
sessionInit0(tx);
@@@ -696,7 -699,7 +703,7 @@@
}
if (log.isDebugEnabled())
- log.debug("Removed value from cache store [key=" + key0 + ']');
- log.debug(S.toString("Removed value from cache store", "key", key, true));
++ log.debug(S.toString("Removed value from cache store", "key", key0, true));
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index c2692d0,614c612..ca6ef90
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@@ -299,9 -242,10 +299,8 @@@ public class IgniteCacheObjectProcessor
@Override public CacheObjectContext contextForCache(CacheConfiguration ccfg) throws IgniteCheckedException {
assert ccfg != null;
- boolean storeVal = ctx.config().isPeerClassLoadingEnabled() ||
- GridQueryProcessor.isEnabled(ccfg) ||
- !ccfg.isCopyOnRead();
- CacheMemoryMode memMode = ccfg.getMemoryMode();
-
+ boolean storeVal = !ccfg.isCopyOnRead() || (!isBinaryEnabled(ccfg) &&
+ (GridQueryProcessor.isEnabled(ccfg) || ctx.config().isPeerClassLoadingEnabled()));
CacheObjectContext res = new CacheObjectContext(ctx,
ccfg.getName(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 5200907,3286bac..cf85a52
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@@ -1128,16 -1055,15 +1143,18 @@@ public class GridQueryProcessor extend
if (log.isDebugEnabled())
log.debug("Remove [space=" + space + ", key=" + key + ", val=" + val + "]");
+ CacheObjectContext coctx = null;
+
if (ctx.indexing().enabled()) {
- CacheObjectContext coctx = cacheObjectContext(space);
+ coctx = cacheObjectContext(space);
- ctx.indexing().remove(space, key.value(coctx, false));
+ Object key0 = unwrap(key, coctx);
+
+ ctx.indexing().remove(space, key0);
}
- if (idx == null)
+ // If val == null we only need to call SPI.
+ if (idx == null || val == null)
return;
if (!busyLock.enterBusy())
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f258b9d/modules/hadoop/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --cc modules/hadoop/src/main/resources/META-INF/classnames.properties
index 051094d,f528107..d8848ac
--- a/modules/hadoop/src/main/resources/META-INF/classnames.properties
+++ b/modules/hadoop/src/main/resources/META-INF/classnames.properties
@@@ -26,9 -26,20 +26,17 @@@ org.apache.ignite.hadoop.util.KerberosU
org.apache.ignite.hadoop.util.KerberosUserNameMapper$State
org.apache.ignite.hadoop.util.UserNameMapper
org.apache.ignite.internal.processors.hadoop.HadoopAttributes
-org.apache.ignite.internal.processors.hadoop.HadoopDefaultJobInfo
org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit
+ org.apache.ignite.internal.processors.hadoop.HadoopFileBlock
+ org.apache.ignite.hadoop.HadoopInputSplit
+ org.apache.ignite.internal.processors.hadoop.HadoopJobId
+ org.apache.ignite.internal.processors.hadoop.HadoopJobInfo
+ org.apache.ignite.internal.processors.hadoop.HadoopJobPhase
+ org.apache.ignite.internal.processors.hadoop.HadoopJobProperty
+ org.apache.ignite.internal.processors.hadoop.HadoopJobStatus
+ org.apache.ignite.hadoop.HadoopMapReducePlan
org.apache.ignite.internal.processors.hadoop.HadoopSplitWrapper
org.apache.ignite.internal.processors.hadoop.HadoopTaskCancelledException
-org.apache.ignite.internal.processors.hadoop.HadoopTaskInfo
-org.apache.ignite.internal.processors.hadoop.HadoopTaskType
org.apache.ignite.internal.processors.hadoop.counter.HadoopCounterAdapter
org.apache.ignite.internal.processors.hadoop.counter.HadoopCountersImpl
org.apache.ignite.internal.processors.hadoop.counter.HadoopCountersImpl$CounterKey