Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/14ed5068 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/14ed5068 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/14ed5068 Branch: refs/heads/ignite-6 Commit: 14ed5068a4d8589647fd805f8744cf70c42890ce Parents: 8f9b046 a577f74 Author: sboikov <sboi...@gridgain.com> Authored: Thu Feb 5 10:44:42 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Feb 5 10:44:42 2015 +0300 ---------------------------------------------------------------------- .../src/test/resources/spring-server-node.xml | 6 +- .../test/resources/spring-server-ssl-node.xml | 6 +- .../java/org/apache/ignite/IgnitePortables.java | 4 +- .../apache/ignite/cache/CacheConfiguration.java | 23 + .../ignite/cache/CacheTypeFieldMetadata.java | 145 ++ .../apache/ignite/cache/CacheTypeMetadata.java | 330 ++++ .../cache/query/CacheQueryConfiguration.java | 23 - .../cache/query/CacheQueryTypeMetadata.java | 196 --- .../apache/ignite/cache/store/CacheStore.java | 2 +- .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 ++++++++++++++++++ .../cache/store/jdbc/JdbcPojoCacheStore.java | 205 +++ .../store/jdbc/dialect/BasicJdbcDialect.java | 274 +++ .../cache/store/jdbc/dialect/DB2Dialect.java | 68 + .../cache/store/jdbc/dialect/H2Dialect.java | 41 + .../cache/store/jdbc/dialect/JdbcDialect.java | 117 ++ .../cache/store/jdbc/dialect/MySQLDialect.java | 48 + .../cache/store/jdbc/dialect/OracleDialect.java | 72 + .../store/jdbc/dialect/SQLServerDialect.java | 67 + .../cache/store/jdbc/dialect/package.html | 24 + .../cache/query/GridCacheQueriesProxy.java | 2 +- .../processors/query/GridQueryProcessor.java | 36 +- .../core/src/test/config/store/jdbc/Ignite.xml | 101 ++ ...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 +++ .../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 + .../store/jdbc/PojoJdbcCacheStoreTest.java | 702 ++++++++ .../cache/store/jdbc/model/Organization.java | 155 ++ .../cache/store/jdbc/model/OrganizationKey.java | 97 ++ .../ignite/cache/store/jdbc/model/Person.java | 155 ++ .../cache/store/jdbc/model/PersonKey.java | 97 ++ .../ignite/cache/store/jdbc/model/package.html | 24 + modules/schema-load/pom.xml | 107 ++ .../main/java/media/data_connection_48x48.png | Bin 0 -> 4443 bytes .../src/main/java/media/error_48x48.png | Bin 0 -> 4349 bytes .../src/main/java/media/ignite_128x128.png | Bin 0 -> 4917 bytes .../src/main/java/media/ignite_16x16.png | Bin 0 -> 608 bytes .../src/main/java/media/ignite_24x24.png | Bin 0 -> 930 bytes .../src/main/java/media/ignite_32x32.png | Bin 0 -> 1203 bytes .../src/main/java/media/ignite_48x48.png | Bin 0 -> 1868 bytes .../src/main/java/media/ignite_64x64.png | Bin 0 -> 2453 bytes .../src/main/java/media/information_48x48.png | Bin 0 -> 4102 bytes .../src/main/java/media/question_48x48.png | Bin 0 -> 3857 bytes .../src/main/java/media/sign_warning_48x48.png | Bin 0 -> 2988 bytes .../schema-load/src/main/java/media/style.css | 95 ++ .../src/main/java/media/text_tree_48x48.png | Bin 0 -> 2567 bytes .../ignite/schema/generator/PojoGenerator.java | 415 +++++ .../ignite/schema/generator/XmlGenerator.java | 341 ++++ .../ignite/schema/model/PojoDescriptor.java | 508 ++++++ .../apache/ignite/schema/model/PojoField.java | 421 +++++ .../schema/parser/DatabaseMetadataParser.java | 105 ++ .../apache/ignite/schema/parser/DbColumn.java | 76 + .../apache/ignite/schema/parser/DbTable.java | 105 ++ .../parser/dialect/DB2MetadataDialect.java | 30 + .../parser/dialect/DatabaseMetadataDialect.java | 78 + .../parser/dialect/JdbcMetadataDialect.java | 144 ++ .../parser/dialect/OracleMetadataDialect.java | 257 +++ .../ignite/schema/ui/ConfirmCallable.java | 81 + .../org/apache/ignite/schema/ui/Controls.java | 661 ++++++++ .../org/apache/ignite/schema/ui/GridPaneEx.java | 177 ++ .../org/apache/ignite/schema/ui/MessageBox.java | 233 +++ .../apache/ignite/schema/ui/ModalDialog.java | 50 + .../apache/ignite/schema/ui/SchemaLoadApp.java | 1395 ++++++++++++++++ .../ignite/schema/ui/TextColumnValidator.java | 32 + .../schema/load/AbstractSchemaLoaderTest.java | 134 ++ .../load/generator/PojoGeneratorTest.java | 70 + .../schema/load/generator/XmlGeneratorTest.java | 50 + .../apache/ignite/schema/load/model/Ignite.xml | 321 ++++ .../apache/ignite/schema/load/model/Objects.txt | 502 ++++++ .../ignite/schema/load/model/ObjectsKey.txt | 96 ++ .../ignite/schema/load/model/Primitives.txt | 506 ++++++ .../ignite/schema/load/model/PrimitivesKey.txt | 96 ++ .../load/parser/DbMetadataParserTest.java | 118 ++ .../testsuites/IgniteSchemaLoadTestSuite.java | 41 + .../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 + pom.xml | 1 + 81 files changed, 12363 insertions(+), 248 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/14ed5068/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java ----------------------------------------------------------------------
