Merge remote-tracking branch 'remotes/origin/ignite-1.6'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88d9fe67 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88d9fe67 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88d9fe67 Branch: refs/heads/master Commit: 88d9fe6796948735bead36475f1953efcde90f4d Parents: 608bd82 f07f988 Author: Anton Vinogradov <[email protected]> Authored: Tue May 17 16:48:24 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue May 17 16:48:24 2016 +0300 ---------------------------------------------------------------------- assembly/dependencies-schema-import.xml | 1 + assembly/release-schema-import.xml | 2 +- config/hadoop/default-config.xml | 111 ++-- .../apache/ignite/IgniteSystemProperties.java | 8 + .../configuration/FileSystemConfiguration.java | 4 +- .../configuration/HadoopConfiguration.java | 2 +- .../igfs/IgfsGroupDataBlocksKeyMapper.java | 43 +- .../apache/ignite/internal/IgniteKernal.java | 7 + .../ignite/internal/IgniteNodeAttributes.java | 4 + .../ignite/internal/binary/BinaryUtils.java | 176 ++++++- .../internal/binary/BinaryWriterExImpl.java | 7 +- .../discovery/GridDiscoveryManager.java | 21 + .../processors/cache/GridCacheTtlManager.java | 5 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../continuous/GridContinuousProcessor.java | 5 +- .../processors/igfs/IgfsDataManager.java | 2 +- .../processors/igfs/IgfsDeleteWorker.java | 10 +- .../internal/processors/igfs/IgfsProcessor.java | 2 +- .../internal/processors/igfs/IgfsUtils.java | 14 + .../WebSessionAttributeProcessor.java | 134 +++++ .../internal/websession/WebSessionEntity.java | 193 +++++++ .../ignite/spi/discovery/tcp/ServerImpl.java | 44 ++ .../binary/BinaryMarshallerSelfTest.java | 158 ++++-- .../GridDiscoveryManagerAttributesSelfTest.java | 63 +++ .../cache/CrossCacheTxRandomOperationsTest.java | 13 +- .../cache/jta/websphere/package-info.java | 22 + .../stream/kafka/connect/IgniteSourceTask.java | 122 +++-- .../kafka/connect/IgniteSinkConnectorTest.java | 8 +- .../connect/IgniteSourceConnectorMock.java | 1 - .../connect/IgniteSourceConnectorTest.java | 16 +- .../kafka/connect/IgniteSourceTaskMock.java | 4 +- .../kafka/connect/TestCacheEventFilter.java | 6 +- modules/schema-import-db/README.txt | 4 + modules/schema-import-db/pom.xml | 44 ++ .../apache/ignite/schema/parser/DbColumn.java | 76 +++ .../ignite/schema/parser/DbMetadataReader.java | 147 ++++++ .../apache/ignite/schema/parser/DbTable.java | 82 +++ .../parser/dialect/DB2MetadataDialect.java | 33 ++ .../parser/dialect/DatabaseMetadataDialect.java | 75 +++ .../parser/dialect/JdbcMetadataDialect.java | 197 +++++++ .../parser/dialect/MySQLMetadataDialect.java | 62 +++ .../parser/dialect/OracleMetadataDialect.java | 364 +++++++++++++ modules/schema-import/pom.xml | 6 + .../schema/parser/DatabaseMetadataParser.java | 44 +- .../apache/ignite/schema/parser/DbColumn.java | 76 --- .../apache/ignite/schema/parser/DbTable.java | 82 --- .../parser/dialect/DB2MetadataDialect.java | 33 -- .../parser/dialect/DatabaseMetadataDialect.java | 75 --- .../parser/dialect/JdbcMetadataDialect.java | 197 ------- .../parser/dialect/MySQLMetadataDialect.java | 61 --- .../parser/dialect/OracleMetadataDialect.java | 364 ------------- .../ignite/schema/ui/SchemaImportApp.java | 526 ++++++++----------- .../ignite/cache/websession/WebSession.java | 14 +- .../cache/websession/WebSessionFilter.java | 499 +++++++++++++++--- .../cache/websession/WebSessionListener.java | 117 +---- .../ignite/cache/websession/WebSessionV2.java | 405 ++++++++++++++ .../IgniteWebSessionSelfTestSuite.java | 35 ++ .../internal/websession/WebSessionSelfTest.java | 268 ++++++++-- .../webapp2/META-INF/ignite-webapp-config.xml | 279 ++++++++++ modules/web/src/test/webapp2/WEB-INF/web.xml | 45 ++ .../cache/IgniteCacheAbstractBenchmark.java | 5 + pom.xml | 2 + 62 files changed, 3760 insertions(+), 1667 deletions(-) ----------------------------------------------------------------------
