Merge remote-tracking branch 'remotes/origin/master' into ignite-6149 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e216836 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e216836 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e216836 Branch: refs/heads/ignite-6149 Commit: 9e216836e439c1438721760e4d758fe58352033e Parents: 7815a97 40597a0 Author: sboikov <[email protected]> Authored: Mon Sep 18 11:19:47 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Sep 18 11:19:47 2017 +0300 ---------------------------------------------------------------------- README.md | 192 ++--- README.txt | 1 + .../jdbc2/JdbcDynamicIndexAbstractSelfTest.java | 39 +- .../jdbc2/JdbcInsertStatementSelfTest.java | 9 +- .../ignite/jdbc/JdbcErrorsAbstractSelfTest.java | 158 +++++ .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 2 + .../jdbc/thin/JdbcThinConnectionSelfTest.java | 2 +- .../JdbcThinDynamicIndexAbstractSelfTest.java | 4 +- .../jdbc/thin/JdbcThinErrorsSelfTest.java | 467 +++++++++++++ .../thin/JdbcThinInsertStatementSelfTest.java | 2 +- .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 2 +- .../jdbc/thin/JdbcThinResultSetSelfTest.java | 2 +- .../jdbc/thin/JdbcThinStatementSelfTest.java | 26 +- .../java/org/apache/ignite/IgniteServices.java | 44 +- .../ClientConnectorConfiguration.java | 275 ++++++++ .../configuration/IgniteConfiguration.java | 37 +- .../ignite/configuration/OdbcConfiguration.java | 4 +- .../SqlConnectorConfiguration.java | 7 +- .../ignite/internal/GridKernalContext.java | 5 +- .../ignite/internal/GridKernalContextImpl.java | 11 +- .../apache/ignite/internal/IgniteKernal.java | 4 +- .../ignite/internal/IgniteServicesImpl.java | 13 +- .../ignite/internal/MarshallerContextImpl.java | 30 +- .../internal/MarshallerMappingFileStore.java | 13 +- .../internal/jdbc/thin/JdbcThinConnection.java | 67 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java | 142 ++-- .../jdbc/thin/JdbcThinPreparedStatement.java | 54 +- .../internal/jdbc/thin/JdbcThinResultSet.java | 111 ++- .../internal/jdbc/thin/JdbcThinStatement.java | 43 +- .../internal/jdbc/thin/JdbcThinTcpIo.java | 258 ++----- .../internal/jdbc/thin/JdbcThinUtils.java | 4 +- .../discovery/GridDiscoveryManager.java | 12 +- .../ignite/internal/pagemem/PageIdUtils.java | 13 + .../pagemem/wal/record/CheckpointRecord.java | 6 + .../internal/pagemem/wal/record/DataEntry.java | 21 +- .../internal/pagemem/wal/record/DataRecord.java | 6 +- .../pagemem/wal/record/LazyDataEntry.java | 38 +- .../wal/record/MemoryRecoveryRecord.java | 7 + .../pagemem/wal/record/PageSnapshot.java | 23 +- .../internal/pagemem/wal/record/TxRecord.java | 11 +- .../pagemem/wal/record/UnwrapDataEntry.java | 118 ++++ .../delta/DataPageInsertFragmentRecord.java | 13 +- .../wal/record/delta/DataPageInsertRecord.java | 6 + .../wal/record/delta/DataPageRemoveRecord.java | 2 +- .../delta/DataPageSetFreeListPageRecord.java | 6 + .../wal/record/delta/DataPageUpdateRecord.java | 6 + .../wal/record/delta/FixCountRecord.java | 9 + .../record/delta/FixLeftmostChildRecord.java | 9 + .../pagemem/wal/record/delta/FixRemoveId.java | 6 + .../wal/record/delta/InitNewPageRecord.java | 2 - .../wal/record/delta/InnerReplaceRecord.java | 6 + .../pagemem/wal/record/delta/InsertRecord.java | 2 +- .../pagemem/wal/record/delta/MergeRecord.java | 2 +- .../wal/record/delta/MetaPageAddRootRecord.java | 9 + .../wal/record/delta/MetaPageCutRootRecord.java | 6 + .../wal/record/delta/MetaPageInitRecord.java | 6 + .../delta/MetaPageInitRootInlineRecord.java | 7 +- .../record/delta/MetaPageInitRootRecord.java | 6 + .../delta/MetaPageUpdateLastAllocatedIndex.java | 6 + ...aPageUpdateLastSuccessfulFullSnapshotId.java | 6 + .../MetaPageUpdateLastSuccessfulSnapshotId.java | 6 + .../delta/MetaPageUpdateNextSnapshotId.java | 6 + .../MetaPageUpdatePartitionDataRecord.java | 2 +- .../wal/record/delta/NewRootInitRecord.java | 6 + .../delta/PageListMetaResetCountRecord.java | 6 + .../delta/PagesListInitNewPageRecord.java | 4 +- .../record/delta/PagesListRemovePageRecord.java | 3 +- .../record/delta/PagesListSetNextRecord.java | 6 + .../delta/PagesListSetPreviousRecord.java | 6 + .../record/delta/PartitionDestroyRecord.java | 6 + .../record/delta/PartitionMetaStateRecord.java | 6 + .../pagemem/wal/record/delta/RecycleRecord.java | 15 + .../pagemem/wal/record/delta/RemoveRecord.java | 2 +- .../pagemem/wal/record/delta/ReplaceRecord.java | 6 + .../record/delta/SplitExistingPageRecord.java | 2 +- .../record/delta/SplitForwardPageRecord.java | 24 + .../record/delta/TrackingPageDeltaRecord.java | 14 +- .../cache/binary/BinaryMetadataFileStore.java | 29 +- .../binary/CacheObjectBinaryProcessorImpl.java | 18 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 3 +- .../cache/persistence/file/FileIODecorator.java | 1 - .../freelist/io/PagesListMetaIO.java | 21 + .../freelist/io/PagesListNodeIO.java | 16 + .../cache/persistence/tree/io/BPlusIO.java | 12 + .../cache/persistence/tree/io/BPlusMetaIO.java | 12 + .../cache/persistence/tree/io/DataPageIO.java | 25 +- .../cache/persistence/tree/io/PageIO.java | 27 + .../cache/persistence/tree/io/PageMetaIO.java | 14 + .../tree/io/PagePartitionCountersIO.java | 27 + .../tree/io/PagePartitionMetaIO.java | 19 + .../persistence/tree/io/TrackingPageIO.java | 31 + .../wal/AbstractWalRecordsIterator.java | 29 +- .../wal/FileWriteAheadLogManager.java | 16 +- .../cache/persistence/wal/RecordSerializer.java | 5 + .../wal/reader/IgniteWalIteratorFactory.java | 129 +++- .../wal/reader/StandaloneGridKernalContext.java | 120 +++- .../reader/StandaloneIgnitePluginProcessor.java | 6 +- .../reader/StandaloneNoopCommunicationSpi.java | 83 +++ .../wal/reader/StandaloneNoopDiscoverySpi.java | 127 ++++ .../reader/StandaloneWalRecordsIterator.java | 145 +++- .../persistence/wal/record/HeaderRecord.java | 6 + .../wal/serializer/RecordV1Serializer.java | 26 +- .../cache/query/IgniteQueryErrorCode.java | 48 +- .../odbc/ClientListenerBufferedParser.java | 81 +++ .../odbc/ClientListenerConnectionContext.java | 62 ++ .../odbc/ClientListenerMessageParser.java | 39 ++ .../odbc/ClientListenerNioListener.java | 245 +++++++ .../odbc/ClientListenerNioServerBuffer.java | 114 +++ .../odbc/ClientListenerProcessor.java | 308 ++++++++ .../odbc/ClientListenerProtocolVersion.java | 116 +++ .../processors/odbc/ClientListenerRequest.java | 31 + .../odbc/ClientListenerRequestHandler.java | 48 ++ .../odbc/ClientListenerRequestNoId.java | 28 + .../processors/odbc/ClientListenerResponse.java | 76 ++ .../odbc/SqlListenerBufferedParser.java | 81 --- .../odbc/SqlListenerConnectionContext.java | 62 -- .../odbc/SqlListenerMessageParser.java | 39 -- .../processors/odbc/SqlListenerNioListener.java | 248 ------- .../odbc/SqlListenerNioServerBuffer.java | 114 --- .../processors/odbc/SqlListenerProcessor.java | 278 -------- .../odbc/SqlListenerProtocolVersion.java | 116 --- .../processors/odbc/SqlListenerRequest.java | 31 - .../odbc/SqlListenerRequestHandler.java | 48 -- .../processors/odbc/SqlListenerRequestNoId.java | 28 - .../processors/odbc/SqlListenerResponse.java | 76 -- .../internal/processors/odbc/SqlStateCode.java | 69 ++ .../odbc/jdbc/JdbcConnectionContext.java | 28 +- .../processors/odbc/jdbc/JdbcMessageParser.java | 12 +- .../processors/odbc/jdbc/JdbcRequest.java | 4 +- .../odbc/jdbc/JdbcRequestHandler.java | 98 ++- .../processors/odbc/jdbc/JdbcResponse.java | 4 +- .../odbc/odbc/OdbcConnectionContext.java | 28 +- .../processors/odbc/odbc/OdbcMessageParser.java | 16 +- .../processors/odbc/odbc/OdbcRequest.java | 4 +- .../odbc/odbc/OdbcRequestHandler.java | 46 +- .../processors/odbc/odbc/OdbcResponse.java | 4 +- .../client/ClientConnectionContext.java | 22 +- .../platform/client/ClientMessageParser.java | 12 +- .../platform/client/ClientRequest.java | 4 +- .../platform/client/ClientRequestHandler.java | 12 +- .../platform/client/ClientResponse.java | 4 +- .../utils/PlatformConfigurationUtils.java | 4 + .../processors/query/IgniteSQLException.java | 84 ++- .../GridServiceDeploymentCompoundFuture.java | 129 +--- .../service/GridServiceProcessor.java | 64 +- .../service/PreparedConfigurations.java | 8 +- .../visor/node/VisorGridConfiguration.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 14 +- .../distributed/IgniteCache150ClientsTest.java | 4 +- .../IgniteCacheSystemTransactionsSelfTest.java | 18 + .../db/wal/reader/IgniteWalReaderTest.java | 698 +++++++++++++++++-- .../db/wal/reader/IndexedObject.java | 79 +++ .../db/wal/reader/MockWalIteratorFactory.java | 14 +- .../database/IgniteDbAbstractTest.java | 6 - .../OdbcConfigurationValidationSelfTest.java | 1 - ...ServiceDeploymentCompoundFutureSelfTest.java | 121 +--- ...GridServiceProcessorBatchDeploySelfTest.java | 137 +--- modules/dev-utils/pom.xml | 50 ++ .../development/utils/IgniteWalConverter.java | 86 +++ .../query/h2/DmlStatementsProcessor.java | 79 ++- .../query/h2/sql/GridSqlQueryParser.java | 35 +- ...onnectorConfigurationValidationSelfTest.java | 241 +++++++ .../query/h2/sql/GridQueryParsingTest.java | 2 +- ...onnectorConfigurationValidationSelfTest.java | 3 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + .../matrix/DenseOffHeapMatrixStorage.java | 2 +- .../odbc-test/config/queries-test-default.xml | 4 +- .../odbc-test/config/queries-test-noodbc-32.xml | 2 +- .../odbc-test/config/queries-test-noodbc.xml | 2 +- .../Apache.Ignite.Benchmarks/BenchmarkRunner.cs | 1 - .../Apache.Ignite.Core.Tests.csproj | 6 + .../Binary/BinaryFooterTest.cs | 2 +- .../Client/CacheTest.cs | 200 ++++++ .../Client/CacheTestNoMeta.cs | 159 +++++ .../Client/ClientConnectionTest.cs | 146 ++++ .../Client/IgniteClientConfigurationTest.cs | 42 ++ .../Apache.Ignite.Core.Tests/Client/Person.cs | 48 ++ .../Client/RawSocketTest.cs | 164 +++++ .../Compute/AbstractTaskTest.cs | 2 - .../Compute/BinarizableClosureTaskTest.cs | 1 - .../IgniteConfigurationTest.cs | 2 + .../Plugin/TestIgnitePluginConfiguration.cs | 1 - .../Apache.Ignite.Core.csproj | 9 + .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 9 +- .../Client/Cache/ICacheClient.cs | 59 ++ .../Apache.Ignite.Core/Client/IIgniteClient.cs | 44 ++ .../Client/IgniteClientConfiguration.cs | 104 +++ .../dotnet/Apache.Ignite.Core/IIgnite.cs | 4 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 17 + .../Impl/Binary/BinaryProcessorClient.cs | 113 +++ .../Impl/Binary/BinaryUtils.cs | 16 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 4 +- .../Impl/Client/Cache/CacheClient.cs | 160 +++++ .../Apache.Ignite.Core/Impl/Client/ClientOp.cs | 32 + .../Impl/Client/ClientProtocolVersion.cs | 119 ++++ .../Impl/Client/ClientSocket.cs | 263 +++++++ .../Impl/Client/IgniteClient.cs | 152 ++++ .../Impl/Cluster/ClusterGroupImpl.cs | 2 +- .../Impl/Compute/ComputeJobHolder.cs | 2 +- .../Impl/Deployment/PeerAssemblyResolver.cs | 4 +- .../Impl/Deployment/PeerLoadingObjectHolder.cs | 2 +- .../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 7 +- .../Apache.Ignite.Core/Impl/IIgniteInternal.cs | 13 +- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 10 +- .../Datagrid/MultiTieredCacheExample.cs | 2 - .../Misc/LifecycleExample.cs | 1 - .../ant/beautifier/GridJavadocAntTask.java | 8 +- .../list-of-registered-users.controller.js | 22 +- parent/pom.xml | 4 + pom.xml | 1 + 210 files changed, 7366 insertions(+), 2631 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9e216836/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9e216836/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/9e216836/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java index 9e50f41,11250ef..e38cc85 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java @@@ -35,10 -36,9 +36,11 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.tree.CacheIdAwarePendingEntryLeafIO; import org.apache.ignite.internal.processors.cache.tree.DataInnerIO; import org.apache.ignite.internal.processors.cache.tree.DataLeafIO; +import org.apache.ignite.internal.processors.cache.tree.MvccDataInnerIO; +import org.apache.ignite.internal.processors.cache.tree.MvccDataLeafIO; import org.apache.ignite.internal.processors.cache.tree.PendingEntryInnerIO; import org.apache.ignite.internal.processors.cache.tree.PendingEntryLeafIO; + import org.apache.ignite.internal.util.GridStringBuilder; /** * Base format for all the page types. http://git-wip-us.apache.org/repos/asf/ignite/blob/9e216836/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java ----------------------------------------------------------------------
