Merge remote-tracking branch 'remotes/origin/master' into ignite-5075-cc
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f651e87c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f651e87c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f651e87c Branch: refs/heads/ignite-5075-cc Commit: f651e87ca7b1fbafc456eabc0a1b0b92734fc225 Parents: e3500de bdd43ff Author: sboikov <sboi...@gridgain.com> Authored: Fri May 26 11:32:48 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri May 26 11:32:48 2017 +0300 ---------------------------------------------------------------------- doap_Ignite.rdf | 2 + .../examples/datagrid/CacheQueryExample.java | 2 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 3 + .../jdbc/thin/JdbcConnectionSelfTest.java | 195 ++ .../src/main/java/org/apache/ignite/Ignite.java | 18 +- .../org/apache/ignite/IgniteJdbcThinDriver.java | 312 +++ .../configuration/CacheConfiguration.java | 5 +- .../MemoryPolicyConfiguration.java | 96 +- .../ignite/internal/GridKernalContext.java | 8 +- .../ignite/internal/GridKernalContextImpl.java | 12 +- .../org/apache/ignite/internal/IgniteEx.java | 27 + .../apache/ignite/internal/IgniteKernal.java | 42 +- .../internal/binary/BinaryWriterExImpl.java | 16 +- .../internal/jdbc/thin/JdbcConnection.java | 529 +++++ .../ignite/internal/jdbc/thin/JdbcTcpIo.java | 207 ++ .../ignite/internal/jdbc2/JdbcConnection.java | 3 +- .../managers/communication/GridIoManager.java | 380 +++- .../communication/IgniteIoTestMessage.java | 362 ++- .../managers/indexing/GridIndexingManager.java | 19 +- .../processors/cache/ClusterCachesInfo.java | 10 +- .../processors/cache/ExchangeActions.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProcessor.java | 47 +- .../processors/cache/IgniteCacheProxy.java | 15 +- .../IgniteCacheDatabaseSharedManager.java | 40 + .../cache/database/MemoryMetricsImpl.java | 31 +- .../cache/database/tree/BPlusTree.java | 64 +- .../cache/query/GridCacheQueryManager.java | 32 +- .../processors/odbc/OdbcNioListener.java | 242 -- .../internal/processors/odbc/OdbcProcessor.java | 199 -- .../odbc/SqlListenerAbstractMessageParser.java | 265 +++ .../odbc/SqlListenerAbstractObjectReader.java | 137 ++ .../odbc/SqlListenerAbstractObjectWriter.java | 111 + .../processors/odbc/SqlListenerNioListener.java | 263 +++ .../processors/odbc/SqlListenerProcessor.java | 191 ++ .../odbc/SqlListenerRequestHandlerImpl.java | 494 ++++ .../processors/odbc/jdbc/JdbcMessageParser.java | 50 + .../processors/odbc/jdbc/JdbcObjectReader.java | 33 + .../processors/odbc/jdbc/JdbcObjectWriter.java | 33 + .../processors/odbc/odbc/OdbcMessageParser.java | 249 +-- .../processors/odbc/odbc/OdbcObjectReader.java | 33 + .../processors/odbc/odbc/OdbcObjectWriter.java | 32 + .../odbc/odbc/OdbcRequestHandler.java | 513 ----- .../processors/query/GridQueryIndexing.java | 96 +- .../processors/query/GridQueryProcessor.java | 232 +- .../processors/query/QueryIndexKey.java | 20 +- .../query/QueryTypeDescriptorImpl.java | 16 +- .../processors/query/QueryTypeIdKey.java | 26 +- .../processors/query/QueryTypeNameKey.java | 12 +- .../internal/processors/query/QueryUtils.java | 14 +- .../schema/SchemaIndexCacheVisitorImpl.java | 12 +- .../operation/SchemaAbstractOperation.java | 2 +- .../handlers/GridRestCommandHandlerAdapter.java | 3 + .../handlers/cache/GridCacheCommandHandler.java | 10 +- .../handlers/query/QueryCommandHandler.java | 13 +- .../spi/indexing/IndexingQueryFilter.java | 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 17 +- .../spi/indexing/noop/NoopIndexingSpi.java | 6 +- ...iteMarshallerCacheClassNameConflictTest.java | 9 +- .../IgniteTxExceptionAbstractSelfTest.java | 6 +- .../cache/MemoryPolicyConfigValidationTest.java | 62 +- .../cache/query/IndexingSpiQuerySelfTest.java | 14 +- .../cache/query/IndexingSpiQueryTxSelfTest.java | 6 +- .../processors/igfs/IgfsIgniteMock.java | 24 + .../odbc/OdbcProcessorValidationSelfTest.java | 182 -- .../SqlListenerProcessorValidationSelfTest.java | 184 ++ .../ignite/testframework/GridTestUtils.java | 8 +- .../config/GridTestProperties.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 5 + .../junits/multijvm/IgniteProcessProxy.java | 18 + .../ignite/testsuites/IgniteBasicTestSuite.java | 17 +- .../testsuites/IgniteBinaryBasicTestSuite.java | 75 +- ...iteBinarySimpleNameMapperBasicTestSuite.java | 3 +- .../query/h2/DmlStatementsProcessor.java | 71 +- .../query/h2/GridH2ResultSetIterator.java | 191 -- .../query/h2/H2ConnectionWrapper.java | 67 + .../processors/query/h2/H2DatabaseType.java | 161 ++ .../processors/query/h2/H2FieldsIterator.java | 50 + .../processors/query/h2/H2KeyValueIterator.java | 48 + .../query/h2/H2ResultSetIterator.java | 191 ++ .../processors/query/h2/H2RowDescriptor.java | 479 ++++ .../internal/processors/query/h2/H2Schema.java | 135 ++ .../processors/query/h2/H2SqlFieldMetadata.java | 111 + .../processors/query/h2/H2StatementCache.java | 73 + .../processors/query/h2/H2TableDescriptor.java | 345 +++ .../processors/query/h2/H2TableEngine.java | 89 + .../query/h2/H2TwoStepCachedQuery.java | 49 + .../query/h2/H2TwoStepCachedQueryKey.java | 107 + .../internal/processors/query/h2/H2Utils.java | 299 +++ .../processors/query/h2/IgniteH2Indexing.java | 2112 +++--------------- .../query/h2/database/H2PkHashIndex.java | 4 +- .../query/h2/database/H2TreeIndex.java | 4 +- .../query/h2/ddl/DdlStatementsProcessor.java | 55 +- .../query/h2/opt/GridH2IndexBase.java | 10 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 2 +- .../query/h2/opt/GridLuceneIndex.java | 15 +- .../query/h2/sql/GridSqlCreateTable.java | 153 ++ .../query/h2/sql/GridSqlDropTable.java | 79 + .../query/h2/sql/GridSqlQueryParser.java | 260 +++ .../query/h2/sql/GridSqlQuerySplitter.java | 4 +- .../query/h2/twostep/GridMapQueryExecutor.java | 8 +- .../h2/twostep/GridReduceQueryExecutor.java | 39 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 12 +- .../DynamicIndexAbstractBasicSelfTest.java | 18 +- .../DynamicIndexAbstractConcurrentSelfTest.java | 8 +- .../cache/index/H2DynamicTableSelfTest.java | 320 +++ .../query/IgniteQueryDedicatedPoolTest.java | 6 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 140 +- .../query/h2/sql/GridQueryParsingTest.java | 286 ++- .../IgniteCacheQuerySelfTestSuite.java | 2 + .../cpp/odbc/include/ignite/odbc/message.h | 10 + .../Impl/CacheFieldsQueryExecutor.cs | 39 - .../Impl/CacheQueryableBase.cs | 14 +- .../Impl/ICacheQueryableInternal.cs | 6 - .../org/apache/ignite/IgniteSpringBean.java | 7 + .../yardstick/IgniteBenchmarkArguments.java | 11 + .../org/apache/ignite/yardstick/IgniteNode.java | 5 + .../apache/ignite/yardstick/io/FileUtils.java | 64 + 119 files changed, 8438 insertions(+), 4154 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f651e87c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ----------------------------------------------------------------------