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/dfe3be97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfe3be97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfe3be97 Branch: refs/heads/ignite-58 Commit: dfe3be97f0217c4ea5a649fb3654fef7906ea3e0 Parents: b8cc3f2 ed2af98 Author: anovikov <anovi...@gridgain.com> Authored: Tue Feb 3 13:20:41 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Tue Feb 3 13:20:41 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheConfiguration.java | 23 ++ .../ignite/cache/CacheTypeFieldMetadata.java | 145 +++++++++ .../apache/ignite/cache/CacheTypeMetadata.java | 156 ++++++++++ .../query/CacheQueryTableColumnMetadata.java | 143 --------- .../cache/query/CacheQueryTableMetadata.java | 134 --------- .../cache/query/CacheQueryTypeMetadata.java | 59 +--- .../ignite/cache/store/jdbc/JdbcCacheStore.java | 145 +++++---- .../cache/store/jdbc/JdbcPojoCacheStore.java | 22 +- .../core/src/test/config/store/jdbc/Ignite.xml | 252 +++++----------- ...ractJdbcCacheStoreMultithreadedSelfTest.java | 9 +- .../store/jdbc/PojoJdbcCacheStoreTest.java | 7 +- .../cache/store/jdbc/model/Organization.java | 2 +- .../cache/store/jdbc/model/OrganizationKey.java | 2 +- .../ignite/cache/store/jdbc/model/Person.java | 2 +- .../cache/store/jdbc/model/PersonKey.java | 2 +- .../ignite/schema/generator/PojoGenerator.java | 2 +- .../ignite/schema/generator/XmlGenerator.java | 100 +------ .../ignite/schema/model/PojoDescriptor.java | 65 ----- .../schema/parser/DatabaseMetadataParser.java | 45 +-- .../apache/ignite/schema/parser/DbTable.java | 39 +-- .../parser/dialect/JdbcMetadataDialect.java | 40 +-- .../parser/dialect/OracleMetadataDialect.java | 66 ++--- .../apache/ignite/schema/load/model/Ignite.xml | 292 +++++++------------ 23 files changed, 651 insertions(+), 1101 deletions(-) ----------------------------------------------------------------------
