Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/80503465 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/80503465 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/80503465 Branch: refs/heads/ignite-1270 Commit: 805034658e20a5666abade26be1989723d171986 Parents: c6b2fa5 2ae1709 Author: vozerov-gridgain <[email protected]> Authored: Mon Nov 23 16:31:45 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Nov 23 16:31:45 2015 +0300 ---------------------------------------------------------------------- examples/schema-import/bin/db-init.sql | 3 +- .../org/apache/ignite/schema/CacheConfig.java | 7 +- .../java/org/apache/ignite/schema/Demo.java | 20 +- .../org/apache/ignite/cache/QueryIndex.java | 53 +- .../store/jdbc/CacheAbstractJdbcStore.java | 638 ++++++++++++------- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 14 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 444 +++++++++---- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 277 +++++++- .../ignite/cache/store/jdbc/JdbcType.java | 255 ++++++++ .../cache/store/jdbc/JdbcTypeDefaultHasher.java | 43 ++ .../ignite/cache/store/jdbc/JdbcTypeField.java | 172 +++++ .../ignite/cache/store/jdbc/JdbcTypeHasher.java | 34 + .../processors/cache/GridCacheMapEntry.java | 3 +- .../processors/query/GridQueryProcessor.java | 6 +- .../ignite/internal/visor/cache/VisorCache.java | 4 +- .../CacheJdbcPojoStoreAbstractSelfTest.java | 395 ++++++++++++ ...dbcPojoStoreOptimizedMarshallerSelfTest.java | 31 + ...JdbcPojoStorePortableMarshallerSelfTest.java | 85 +++ .../store/jdbc/CacheJdbcPojoStoreTest.java | 200 +++--- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 2 +- ...chePartitionedAtomicSetFailoverSelfTest.java | 5 + .../ignite/testsuites/IgniteCacheTestSuite.java | 6 +- modules/schema-import/README.txt | 176 ++--- .../ignite/schema/generator/CodeGenerator.java | 198 +++--- .../ignite/schema/generator/XmlGenerator.java | 101 +-- .../apache/ignite/schema/model/IndexItem.java | 54 -- .../ignite/schema/model/PojoDescriptor.java | 72 +-- .../ignite/schema/model/SchemaDescriptor.java | 6 +- .../schema/parser/DatabaseMetadataParser.java | 12 +- .../apache/ignite/schema/parser/DbTable.java | 37 +- .../parser/dialect/DatabaseMetadataDialect.java | 32 +- .../parser/dialect/JdbcMetadataDialect.java | 22 +- .../parser/dialect/OracleMetadataDialect.java | 24 +- .../apache/ignite/schema/ui/ModalDialog.java | 6 +- .../ignite/schema/ui/SchemaImportApp.java | 13 +- .../schema/test/AbstractSchemaImportTest.java | 4 +- .../schema/test/model/ignite-type-metadata.xml | 610 +++++++++--------- .../yardstick/config/ignite-store-config.xml | 50 +- .../IgniteAtomicInvokeRetryBenchmark.java | 2 +- .../failover/IgniteConsistencyException.java | 64 ++ ...IgniteTransactionalInvokeRetryBenchmark.java | 2 +- ...IgniteTransactionalWriteInvokeBenchmark.java | 135 +++- .../IgniteTransactionalWriteReadBenchmark.java | 2 +- 43 files changed, 3022 insertions(+), 1297 deletions(-) ----------------------------------------------------------------------
