Merge remote-tracking branch 'origin/ignite-32' into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e339859 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e339859 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e339859 Branch: refs/heads/ignite-54-55 Commit: 7e3398594c2d8594ed4662b10d601bc2e6039fb5 Parents: 8edd706 9b132b7 Author: anovikov <anovi...@gridgain.com> Authored: Wed Feb 4 11:48:53 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Wed Feb 4 11:48:53 2015 +0700 ---------------------------------------------------------------------- .../ignite/cache/CacheTypeFieldMetadata.java | 8 +- .../apache/ignite/cache/CacheTypeMetadata.java | 174 ++++++++++++++++ .../ignite/cache/store/jdbc/JdbcCacheStore.java | 180 ++++++++++------ .../cache/store/jdbc/JdbcPojoCacheStore.java | 4 +- .../core/src/test/config/store/jdbc/Ignite.xml | 32 +-- .../store/jdbc/PojoJdbcCacheStoreTest.java | 1 - .../ignite/schema/generator/XmlGenerator.java | 67 +++++- .../ignite/schema/model/PojoDescriptor.java | 71 ++++++- .../schema/parser/DatabaseMetadataParser.java | 4 +- .../apache/ignite/schema/parser/DbTable.java | 39 +++- .../parser/dialect/DatabaseMetadataDialect.java | 33 +++ .../parser/dialect/JdbcMetadataDialect.java | 57 +++++- .../parser/dialect/OracleMetadataDialect.java | 102 +++++++--- .../yardstick/config/benchmark-store.properties | 69 +++++++ .../yardstick/config/ignite-store-config.xml | 203 +++++++++++++++++++ .../ignite/yardstick/cache/model/SampleKey.java | 88 ++++++++ .../yardstick/cache/model/SampleValue.java | 9 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 44 ++++ .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 53 +++++ .../store/jdbc/IgniteJdbcStorePutBenchmark.java | 42 ++++ .../jdbc/IgniteJdbcStorePutGetBenchmark.java | 47 +++++ 21 files changed, 1195 insertions(+), 132 deletions(-) ----------------------------------------------------------------------
