You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/20 04:44:08 UTC
ignite git commit: IGNITE-1946 Fixed Demo and tests.
Repository: ignite
Updated Branches:
refs/heads/ignite-1753-1282 8f5770524 -> 801574525
IGNITE-1946 Fixed Demo and tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/80157452
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/80157452
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/80157452
Branch: refs/heads/ignite-1753-1282
Commit: 8015745254a5d4272bbaf80dd7e3251fcfa864ff
Parents: 8f57705
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Nov 20 10:44:34 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Nov 20 10:44:34 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/schema/CacheConfig.java | 5 +-
.../java/org/apache/ignite/schema/Demo.java | 20 +-
modules/schema-import/README.txt | 28 +-
.../ignite/schema/generator/CodeGenerator.java | 6 +-
.../ignite/schema/generator/XmlGenerator.java | 17 +-
.../schema/test/model/ignite-type-metadata.xml | 610 ++++++++++---------
6 files changed, 359 insertions(+), 327 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/80157452/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
index c7ff04f..c5801cc 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
@@ -17,8 +17,7 @@
package org.apache.ignite.schema;
-import javax.cache.configuration.Factory;
-import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory;
import org.apache.ignite.configuration.CacheConfiguration;
/**
@@ -31,7 +30,7 @@ public class CacheConfig {
* @param name Cache name.
* @param storeFactory Cache store factory.
*/
- public static <K, V> CacheConfiguration<K, V> cache(String name, Factory<CacheStore<K, V>> storeFactory) {
+ public static <K, V> CacheConfiguration<K, V> cache(String name, CacheJdbcPojoStoreFactory<K, V> storeFactory) {
throw new IllegalStateException("Please run Ignite Schema Import Utility as described in README.txt");
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/80157452/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
index cade7f1..a981f5a 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
@@ -18,13 +18,13 @@
package org.apache.ignite.schema;
import javax.cache.Cache;
-import javax.cache.configuration.Factory;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory;
+import org.apache.ignite.cache.store.jdbc.dialect.H2Dialect;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.transactions.Transaction;
import org.h2.jdbcx.JdbcConnectionPool;
@@ -38,16 +38,14 @@ import org.h2.jdbcx.JdbcConnectionPool;
*/
public class Demo {
/**
- * Constructs and returns a fully configured instance of a {@link CacheJdbcPojoStore}.
+ * Constructs and returns a fully configured instance of a {@link CacheJdbcPojoStoreFactory}.
*/
- private static class H2DemoStoreFactory<K, V> implements Factory<CacheStore<K, V>> {
- /** {@inheritDoc} */
- @Override public CacheStore<K, V> create() {
- CacheJdbcPojoStore<K, V> store = new CacheJdbcPojoStore<>();
+ private static class H2DemoStoreFactory<K, V> extends CacheJdbcPojoStoreFactory<K, V> {
+ /** Default constructor. */
+ H2DemoStoreFactory() {
+ setDialect(new H2Dialect());
- store.setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/~/schema-import/demo", "sa", ""));
-
- return store;
+ setDataSource(JdbcConnectionPool.create("jdbc:h2:tcp://localhost/~/schema-import/demo", "sa", ""));
}
}
@@ -144,4 +142,4 @@ public class Demo {
System.out.println(">>> Updated person: " + cache.get(key));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/80157452/modules/schema-import/README.txt
----------------------------------------------------------------------
diff --git a/modules/schema-import/README.txt b/modules/schema-import/README.txt
index 9b0a44d..62c54d1 100644
--- a/modules/schema-import/README.txt
+++ b/modules/schema-import/README.txt
@@ -17,19 +17,19 @@ Use Schema Import Utility for generation of type mapping and domain model in Jav
For example you may use the following script for create sample type 'Person' in your RDBMS system:
-create table PERSON(id integer not null, firstName varchar(50), lastName varchar(50), PRIMARY KEY(id));
+create table PERSON(id integer not null PRIMARY KEY, firstName varchar(50), lastName varchar(50), salary double);
-insert into PERSON(id, first_name, last_name) values(1, 'Johannes', 'Kepler');
-insert into PERSON(id, first_name, last_name) values(2, 'Galileo', 'Galilei');
-insert into PERSON(id, first_name, last_name) values(3, 'Henry', 'More');
-insert into PERSON(id, first_name, last_name) values(4, 'Polish', 'Brethren');
-insert into PERSON(id, first_name, last_name) values(5, 'Robert', 'Boyle');
-insert into PERSON(id, first_name, last_name) values(6, 'Isaac', 'Newton');
+insert into PERSON(id, firstName, lastName, salary) values(1, 'Johannes', 'Kepler', 1000);
+insert into PERSON(id, firstName, lastName, salary) values(2, 'Galileo', 'Galilei', 1200);
+insert into PERSON(id, firstName, lastName, salary) values(3, 'Henry', 'More', 1150);
+insert into PERSON(id, firstName, lastName, salary) values(4, 'Polish', 'Brethren', 2000);
+insert into PERSON(id, firstName, lastName, salary) values(5, 'Robert', 'Boyle', 2500);
+insert into PERSON(id, firstName, lastName, salary) values(6, 'Isaac', 'Newton', 1300);
The Ignite Schema Import utility generates the following artifacts:
- # Java POJO key and value classes
- # XML CacheTypeMetadata configuration
- # Java configuration snippet (alternative to XML)
+ # Java POJO key and value classes (enter "org.apache.ignite.schema" package name before generation).
+ # XML CacheTypeMetadata configuration.
+ # Java configuration snippet (alternative to XML).
After you exit from the wizard, you should:
# Copy generated POJO java classes to you project source folder.
@@ -94,7 +94,7 @@ Example of spring configuration:
<property name="javaType" value="long"/>
</bean>
<bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="FIRST_NAME"/>
+ <property name="databaseName" value="FIRSTNAME"/>
<property name="databaseType">
<util:constant static-field="java.sql.Types.VARCHAR"/>
</property>
@@ -102,7 +102,7 @@ Example of spring configuration:
<property name="javaType" value="java.lang.String"/>
</bean>
<bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="LAST_NAME"/>
+ <property name="databaseName" value="LASTNAME"/>
<property name="databaseType">
<util:constant static-field="java.sql.Types.VARCHAR"/>
</property>
@@ -157,8 +157,8 @@ tm.setKeyFields(F.asList(new CacheTypeFieldMetadata("ID", Types.BIGINT, "id", Lo
// Value fields for PERSONS.
tm.setValueFields(F.asList(
new CacheTypeFieldMetadata("ID", Types.BIGINT, "id", long.class),
- new CacheTypeFieldMetadata("FIRST_NAME", Types.VARCHAR, "firstName", String.class),
- new CacheTypeFieldMetadata("LAST_NAME", Types.VARCHAR, "lastName", String.class)
+ new CacheTypeFieldMetadata("FIRSTNAME", Types.VARCHAR, "firstName", String.class),
+ new CacheTypeFieldMetadata("LASTNAME", Types.VARCHAR, "lastName", String.class)
));
...
ccfg.setTypeMetadata(tm);
http://git-wip-us.apache.org/repos/asf/ignite/blob/80157452/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
index 93a2cec..4ad4051 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
@@ -647,6 +647,8 @@ public class CodeGenerator {
add2(src, (first ? "JdbcType " : "") + "jdbcType = new JdbcType();");
add0(src, "");
+ add2(src, "jdbcType.setCacheName(cacheName);");
+
// Database info.
add2(src, "jdbcType.setDatabaseSchema(\"" + pojo.schema() + "\");");
add2(src, "jdbcType.setDatabaseTable(\"" + tbl + "\");");
@@ -714,8 +716,8 @@ public class CodeGenerator {
if (idx.getFields().size() == 1) {
Map.Entry<String, Boolean> fld = F.first(idx.getFields().entrySet());
- add2(src, "idxs.add(new QueryIndex(\"" + fld.getKey() + fld.getValue() +
- "\"" + idx.getName() + "\"));");
+ add2(src, "idxs.add(new QueryIndex(\"" + fld.getKey() + "\", " + fld.getValue() + ", \"" +
+ idx.getName() + "\"));");
add0(src, "");
}
else {
http://git-wip-us.apache.org/repos/asf/ignite/blob/80157452/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
index 6e6a878..547e7b0 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
@@ -190,14 +190,13 @@ public class XmlGenerator {
*
* @param doc XML document.
* @param parent Parent XML node.
- * @param name Property name.
* @param fields Map with fields.
*/
- private static void addQueryFields(Document doc, Node parent, String name, Collection<PojoField> fields) {
+ private static void addQueryFields(Document doc, Node parent, Collection<PojoField> fields) {
if (!fields.isEmpty()) {
- Element prop = addProperty(doc, parent, name, null);
+ Element prop = addProperty(doc, parent, "fields", null);
- Element map = addElement(doc, prop, "map");
+ Element map = addElement(doc, prop, "util:map", "map-class", "java.util.LinkedHashMap");
for (PojoField field : fields)
addElement(doc, map, "entry", "key", field.javaName(), "value", field.javaTypeName());
@@ -225,13 +224,13 @@ public class XmlGenerator {
Element idxType = addProperty(doc, idxBean, "indexType", null);
addElement(doc, idxType, "util:constant", "static-field", "org.apache.ignite.cache.QueryIndexType." + idx.getIndexType());
- addProperty(doc, idxBean, "fields", null);
+ Element flds = addProperty(doc, idxBean, "fields", null);
- Element fldsMap = addElement(doc, idxBean, "map");
+ Element fldsMap = addElement(doc, flds, "map");
- Map<String, Boolean> flds = idx.getFields();
+ Map<String, Boolean> idxFlds = idx.getFields();
- for (Map.Entry<String, Boolean> fld : flds.entrySet())
+ for (Map.Entry<String, Boolean> fld : idxFlds.entrySet())
addElement(doc, fldsMap, "entry", "key", fld.getKey(), "value", fld.getValue().toString());
}
}
@@ -277,7 +276,7 @@ public class XmlGenerator {
addProperty(doc, bean, "valueType", pkg + "." + pojo.valueClassName());
- addQueryFields(doc, bean, "queryFields", pojo.fields());
+ addQueryFields(doc, bean, pojo.fields());
addQueryIndexes(doc, bean, pojo.indexes());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/80157452/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml
index 2de9c62..f03f24f 100644
--- a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml
+++ b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/model/ignite-type-metadata.xml
@@ -18,7 +18,7 @@
-->
<!--
- XML generated by Apache Ignite Schema Import utility: 02/05/2015
+ XML generated by Apache Ignite Schema Import utility: 11/20/2015
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:util="http://www.springframework.org/schema/util"
@@ -27,149 +27,301 @@
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd">
- <bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="databaseSchema" value="PUBLIC"/>
- <property name="databaseTable" value="OBJECTS"/>
- <property name="keyType" value="org.apache.ignite.schema.test.model.ObjectsKey"/>
- <property name="valueType" value="org.apache.ignite.schema.test.model.Objects"/>
- <property name="keyFields">
+ <bean class="org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory">
+ <property name="types">
<list>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="PK"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.INTEGER"/>
- </property>
- <property name="javaName" value="pk"/>
- <property name="javaType" value="int"/>
- </bean>
- </list>
- </property>
- <property name="valueFields">
- <list>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="PK"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.INTEGER"/>
- </property>
- <property name="javaName" value="pk"/>
- <property name="javaType" value="int"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="BOOLCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.BOOLEAN"/>
- </property>
- <property name="javaName" value="boolcol"/>
- <property name="javaType" value="java.lang.Boolean"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="BYTECOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.TINYINT"/>
- </property>
- <property name="javaName" value="bytecol"/>
- <property name="javaType" value="java.lang.Byte"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="SHORTCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.SMALLINT"/>
- </property>
- <property name="javaName" value="shortcol"/>
- <property name="javaType" value="java.lang.Short"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="INTCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.INTEGER"/>
- </property>
- <property name="javaName" value="intcol"/>
- <property name="javaType" value="java.lang.Integer"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="LONGCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.BIGINT"/>
- </property>
- <property name="javaName" value="longcol"/>
- <property name="javaType" value="java.lang.Long"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="FLOATCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.REAL"/>
- </property>
- <property name="javaName" value="floatcol"/>
- <property name="javaType" value="java.lang.Float"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="DOUBLECOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.DOUBLE"/>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="databaseSchema" value="PUBLIC"/>
+ <property name="databaseTable" value="OBJECTS"/>
+ <property name="keyType" value="org.apache.ignite.schema.test.model.ObjectsKey"/>
+ <property name="valueType" value="org.apache.ignite.schema.test.model.Objects"/>
+ <property name="keyFields">
+ <list>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="PK"/>
+ <property name="javaFieldType" value="int"/>
+ <property name="javaFieldName" value="pk"/>
+ </bean>
+ </list>
+ </property>
+ <property name="valueFields">
+ <list>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="PK"/>
+ <property name="javaFieldType" value="int"/>
+ <property name="javaFieldName" value="pk"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.BOOLEAN"/>
+ </property>
+ <property name="databaseFieldName" value="BOOLCOL"/>
+ <property name="javaFieldType" value="java.lang.Boolean"/>
+ <property name="javaFieldName" value="boolcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TINYINT"/>
+ </property>
+ <property name="databaseFieldName" value="BYTECOL"/>
+ <property name="javaFieldType" value="java.lang.Byte"/>
+ <property name="javaFieldName" value="bytecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.SMALLINT"/>
+ </property>
+ <property name="databaseFieldName" value="SHORTCOL"/>
+ <property name="javaFieldType" value="java.lang.Short"/>
+ <property name="javaFieldName" value="shortcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="INTCOL"/>
+ <property name="javaFieldType" value="java.lang.Integer"/>
+ <property name="javaFieldName" value="intcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.BIGINT"/>
+ </property>
+ <property name="databaseFieldName" value="LONGCOL"/>
+ <property name="javaFieldType" value="java.lang.Long"/>
+ <property name="javaFieldName" value="longcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.REAL"/>
+ </property>
+ <property name="databaseFieldName" value="FLOATCOL"/>
+ <property name="javaFieldType" value="java.lang.Float"/>
+ <property name="javaFieldName" value="floatcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DOUBLE"/>
+ </property>
+ <property name="databaseFieldName" value="DOUBLECOL"/>
+ <property name="javaFieldType" value="java.lang.Double"/>
+ <property name="javaFieldName" value="doublecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DOUBLE"/>
+ </property>
+ <property name="databaseFieldName" value="DOUBLECOL2"/>
+ <property name="javaFieldType" value="java.lang.Double"/>
+ <property name="javaFieldName" value="doublecol2"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DECIMAL"/>
+ </property>
+ <property name="databaseFieldName" value="BIGDECIMALCOL"/>
+ <property name="javaFieldType" value="java.math.BigDecimal"/>
+ <property name="javaFieldName" value="bigdecimalcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.VARCHAR"/>
+ </property>
+ <property name="databaseFieldName" value="STRCOL"/>
+ <property name="javaFieldType" value="java.lang.String"/>
+ <property name="javaFieldName" value="strcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DATE"/>
+ </property>
+ <property name="databaseFieldName" value="DATECOL"/>
+ <property name="javaFieldType" value="java.sql.Date"/>
+ <property name="javaFieldName" value="datecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TIME"/>
+ </property>
+ <property name="databaseFieldName" value="TIMECOL"/>
+ <property name="javaFieldType" value="java.sql.Time"/>
+ <property name="javaFieldName" value="timecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TIMESTAMP"/>
+ </property>
+ <property name="databaseFieldName" value="TSCOL"/>
+ <property name="javaFieldType" value="java.sql.Timestamp"/>
+ <property name="javaFieldName" value="tscol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.VARBINARY"/>
+ </property>
+ <property name="databaseFieldName" value="ARRCOL"/>
+ <property name="javaFieldType" value="java.lang.Object"/>
+ <property name="javaFieldName" value="arrcol"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="databaseSchema" value="PUBLIC"/>
+ <property name="databaseTable" value="PRIMITIVES"/>
+ <property name="keyType" value="org.apache.ignite.schema.test.model.PrimitivesKey"/>
+ <property name="valueType" value="org.apache.ignite.schema.test.model.Primitives"/>
+ <property name="keyFields">
+ <list>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="PK"/>
+ <property name="javaFieldType" value="int"/>
+ <property name="javaFieldName" value="pk"/>
+ </bean>
+ </list>
+ </property>
+ <property name="valueFields">
+ <list>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="PK"/>
+ <property name="javaFieldType" value="int"/>
+ <property name="javaFieldName" value="pk"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.BOOLEAN"/>
+ </property>
+ <property name="databaseFieldName" value="BOOLCOL"/>
+ <property name="javaFieldType" value="boolean"/>
+ <property name="javaFieldName" value="boolcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TINYINT"/>
+ </property>
+ <property name="databaseFieldName" value="BYTECOL"/>
+ <property name="javaFieldType" value="byte"/>
+ <property name="javaFieldName" value="bytecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.SMALLINT"/>
+ </property>
+ <property name="databaseFieldName" value="SHORTCOL"/>
+ <property name="javaFieldType" value="short"/>
+ <property name="javaFieldName" value="shortcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.INTEGER"/>
+ </property>
+ <property name="databaseFieldName" value="INTCOL"/>
+ <property name="javaFieldType" value="int"/>
+ <property name="javaFieldName" value="intcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.BIGINT"/>
+ </property>
+ <property name="databaseFieldName" value="LONGCOL"/>
+ <property name="javaFieldType" value="long"/>
+ <property name="javaFieldName" value="longcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.REAL"/>
+ </property>
+ <property name="databaseFieldName" value="FLOATCOL"/>
+ <property name="javaFieldType" value="float"/>
+ <property name="javaFieldName" value="floatcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DOUBLE"/>
+ </property>
+ <property name="databaseFieldName" value="DOUBLECOL"/>
+ <property name="javaFieldType" value="double"/>
+ <property name="javaFieldName" value="doublecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DOUBLE"/>
+ </property>
+ <property name="databaseFieldName" value="DOUBLECOL2"/>
+ <property name="javaFieldType" value="double"/>
+ <property name="javaFieldName" value="doublecol2"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DECIMAL"/>
+ </property>
+ <property name="databaseFieldName" value="BIGDECIMALCOL"/>
+ <property name="javaFieldType" value="java.math.BigDecimal"/>
+ <property name="javaFieldName" value="bigdecimalcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.VARCHAR"/>
+ </property>
+ <property name="databaseFieldName" value="STRCOL"/>
+ <property name="javaFieldType" value="java.lang.String"/>
+ <property name="javaFieldName" value="strcol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.DATE"/>
+ </property>
+ <property name="databaseFieldName" value="DATECOL"/>
+ <property name="javaFieldType" value="java.sql.Date"/>
+ <property name="javaFieldName" value="datecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TIME"/>
+ </property>
+ <property name="databaseFieldName" value="TIMECOL"/>
+ <property name="javaFieldType" value="java.sql.Time"/>
+ <property name="javaFieldName" value="timecol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.TIMESTAMP"/>
+ </property>
+ <property name="databaseFieldName" value="TSCOL"/>
+ <property name="javaFieldType" value="java.sql.Timestamp"/>
+ <property name="javaFieldName" value="tscol"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField">
+ <property name="databaseFieldType">
+ <util:constant static-field="java.sql.Types.VARBINARY"/>
+ </property>
+ <property name="databaseFieldName" value="ARRCOL"/>
+ <property name="javaFieldType" value="java.lang.Object"/>
+ <property name="javaFieldName" value="arrcol"/>
+ </bean>
+ </list>
</property>
- <property name="javaName" value="doublecol"/>
- <property name="javaType" value="java.lang.Double"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="DOUBLECOL2"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.DOUBLE"/>
- </property>
- <property name="javaName" value="doublecol2"/>
- <property name="javaType" value="java.lang.Double"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="BIGDECIMALCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.DECIMAL"/>
- </property>
- <property name="javaName" value="bigdecimalcol"/>
- <property name="javaType" value="java.math.BigDecimal"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="STRCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.VARCHAR"/>
- </property>
- <property name="javaName" value="strcol"/>
- <property name="javaType" value="java.lang.String"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="DATECOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.DATE"/>
- </property>
- <property name="javaName" value="datecol"/>
- <property name="javaType" value="java.sql.Date"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="TIMECOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.TIME"/>
- </property>
- <property name="javaName" value="timecol"/>
- <property name="javaType" value="java.sql.Time"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="TSCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.TIMESTAMP"/>
- </property>
- <property name="javaName" value="tscol"/>
- <property name="javaType" value="java.sql.Timestamp"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="ARRCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.VARBINARY"/>
- </property>
- <property name="javaName" value="arrcol"/>
- <property name="javaType" value="java.lang.Object"/>
</bean>
</list>
</property>
- <property name="queryFields">
- <map>
+ </bean>
+ <bean class="org.apache.ignite.cache.QueryEntity">
+ <property name="keyType" value="org.apache.ignite.schema.test.model.ObjectsKey"/>
+ <property name="valueType" value="org.apache.ignite.schema.test.model.Objects"/>
+ <property name="fields">
+ <util:map map-class="java.util.LinkedHashMap">
<entry key="pk" value="int"/>
<entry key="boolcol" value="java.lang.Boolean"/>
<entry key="bytecol" value="java.lang.Byte"/>
@@ -185,157 +337,29 @@
<entry key="timecol" value="java.sql.Time"/>
<entry key="tscol" value="java.sql.Timestamp"/>
<entry key="arrcol" value="java.lang.Object"/>
- </map>
- </property>
- <property name="ascendingFields">
- <map>
- <entry key="pk" value="int"/>
- </map>
- </property>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="databaseSchema" value="PUBLIC"/>
- <property name="databaseTable" value="PRIMITIVES"/>
- <property name="keyType" value="org.apache.ignite.schema.test.model.PrimitivesKey"/>
- <property name="valueType" value="org.apache.ignite.schema.test.model.Primitives"/>
- <property name="keyFields">
- <list>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="PK"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.INTEGER"/>
- </property>
- <property name="javaName" value="pk"/>
- <property name="javaType" value="int"/>
- </bean>
- </list>
+ </util:map>
</property>
- <property name="valueFields">
+ <property name="indexes">
<list>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="PK"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.INTEGER"/>
- </property>
- <property name="javaName" value="pk"/>
- <property name="javaType" value="int"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="BOOLCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.BOOLEAN"/>
- </property>
- <property name="javaName" value="boolcol"/>
- <property name="javaType" value="boolean"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="BYTECOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.TINYINT"/>
- </property>
- <property name="javaName" value="bytecol"/>
- <property name="javaType" value="byte"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="SHORTCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.SMALLINT"/>
- </property>
- <property name="javaName" value="shortcol"/>
- <property name="javaType" value="short"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="INTCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.INTEGER"/>
- </property>
- <property name="javaName" value="intcol"/>
- <property name="javaType" value="int"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="LONGCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.BIGINT"/>
- </property>
- <property name="javaName" value="longcol"/>
- <property name="javaType" value="long"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="FLOATCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.REAL"/>
- </property>
- <property name="javaName" value="floatcol"/>
- <property name="javaType" value="float"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="DOUBLECOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.DOUBLE"/>
- </property>
- <property name="javaName" value="doublecol"/>
- <property name="javaType" value="double"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="DOUBLECOL2"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.DOUBLE"/>
- </property>
- <property name="javaName" value="doublecol2"/>
- <property name="javaType" value="double"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="BIGDECIMALCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.DECIMAL"/>
+ <bean class="org.apache.ignite.cache.QueryIndex">
+ <property name="name" value="PRIMARY_KEY_C"/>
+ <property name="indexType">
+ <util:constant static-field="org.apache.ignite.cache.QueryIndexType.SORTED"/>
</property>
- <property name="javaName" value="bigdecimalcol"/>
- <property name="javaType" value="java.math.BigDecimal"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="STRCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.VARCHAR"/>
- </property>
- <property name="javaName" value="strcol"/>
- <property name="javaType" value="java.lang.String"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="DATECOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.DATE"/>
+ <property name="fields">
+ <map>
+ <entry key="PK" value="true"/>
+ </map>
</property>
- <property name="javaName" value="datecol"/>
- <property name="javaType" value="java.sql.Date"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="TIMECOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.TIME"/>
- </property>
- <property name="javaName" value="timecol"/>
- <property name="javaType" value="java.sql.Time"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="TSCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.TIMESTAMP"/>
- </property>
- <property name="javaName" value="tscol"/>
- <property name="javaType" value="java.sql.Timestamp"/>
- </bean>
- <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
- <property name="databaseName" value="ARRCOL"/>
- <property name="databaseType">
- <util:constant static-field="java.sql.Types.VARBINARY"/>
- </property>
- <property name="javaName" value="arrcol"/>
- <property name="javaType" value="java.lang.Object"/>
</bean>
</list>
</property>
- <property name="queryFields">
- <map>
+ </bean>
+ <bean class="org.apache.ignite.cache.QueryEntity">
+ <property name="keyType" value="org.apache.ignite.schema.test.model.PrimitivesKey"/>
+ <property name="valueType" value="org.apache.ignite.schema.test.model.Primitives"/>
+ <property name="fields">
+ <util:map map-class="java.util.LinkedHashMap">
<entry key="pk" value="int"/>
<entry key="boolcol" value="boolean"/>
<entry key="bytecol" value="byte"/>
@@ -351,12 +375,22 @@
<entry key="timecol" value="java.sql.Time"/>
<entry key="tscol" value="java.sql.Timestamp"/>
<entry key="arrcol" value="java.lang.Object"/>
- </map>
+ </util:map>
</property>
- <property name="ascendingFields">
- <map>
- <entry key="pk" value="int"/>
- </map>
+ <property name="indexes">
+ <list>
+ <bean class="org.apache.ignite.cache.QueryIndex">
+ <property name="name" value="PRIMARY_KEY_D"/>
+ <property name="indexType">
+ <util:constant static-field="org.apache.ignite.cache.QueryIndexType.SORTED"/>
+ </property>
+ <property name="fields">
+ <map>
+ <entry key="PK" value="true"/>
+ </map>
+ </property>
+ </bean>
+ </list>
</property>
</bean>
</beans>