http://git-wip-us.apache.org/repos/asf/ignite/blob/d71f6129/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>
http://git-wip-us.apache.org/repos/asf/ignite/blob/d71f6129/modules/yardstick/config/ignite-store-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-store-config.xml b/modules/yardstick/config/ignite-store-config.xml index 35b8e19..031de91 100644 --- a/modules/yardstick/config/ignite-store-config.xml +++ b/modules/yardstick/config/ignite-store-config.xml @@ -35,31 +35,31 @@ <property name="user" value="sa"/> </bean> - <bean id="sampleTypeMetadata" class="org.apache.ignite.cache.CacheTypeMetadata"> + <bean id="sampleTypeMetadata" class="org.apache.ignite.cache.store.jdbc.JdbcType"> <property name="databaseTable" value="SAMPLE"/> <property name="keyType" value="org.apache.ignite.yardstick.cache.model.SampleKey"/> - <property name="valueType" value="org.apache.ignite.yardstick.cache.model.SampleValue"/> <property name="keyFields"> <list> - <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata"> - <property name="databaseName" value="ID"/> - <property name="databaseType"> + <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField"> + <property name="databaseFieldType"> <util:constant static-field="java.sql.Types.INTEGER"/> </property> - <property name="javaName" value="id"/> - <property name="javaType" value="int"/> + <property name="databaseFieldName" value="ID"/> + <property name="javaFieldType" value="int"/> + <property name="javaFieldName" value="id"/> </bean> </list> </property> + <property name="valueType" value="org.apache.ignite.yardstick.cache.model.SampleValue"/> <property name="valueFields"> <list> - <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata"> - <property name="databaseName" value="VALUE"/> - <property name="databaseType"> + <bean class="org.apache.ignite.cache.store.jdbc.JdbcTypeField"> + <property name="databaseFieldType"> <util:constant static-field="java.sql.Types.INTEGER"/> </property> - <property name="javaName" value="id"/> - <property name="javaType" value="int"/> + <property name="databaseFieldName" value="VALUE"/> + <property name="javaFieldType" value="int"/> + <property name="javaFieldName" value="id"/> </bean> </list> </property> @@ -79,18 +79,19 @@ <property name="swapEnabled" value="false"/> - <property name="typeMetadata"> - <list> - <ref bean="sampleTypeMetadata"/> - </list> - </property> - <property name="cacheStoreFactory"> <bean class="org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory"> <property name="dataSourceBean" value="storeDataSource"/> <property name="dialect"> <bean class="org.apache.ignite.cache.store.jdbc.dialect.H2Dialect"/> </property> + <property name="types"> + <list> + <bean parent="sampleTypeMetadata"> + <property name="cacheName" value="atomic"/> + </bean> + </list> + </property> </bean> </property> </bean> @@ -104,18 +105,19 @@ <property name="swapEnabled" value="false"/> - <property name="typeMetadata"> - <list> - <ref bean="sampleTypeMetadata"/> - </list> - </property> - <property name="cacheStoreFactory"> <bean class="org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory"> <property name="dataSourceBean" value="storeDataSource"/> <property name="dialect"> <bean class="org.apache.ignite.cache.store.jdbc.dialect.H2Dialect"/> </property> + <property name="types"> + <list> + <bean parent="sampleTypeMetadata"> + <property name="cacheName" value="tx"/> + </bean> + </list> + </property> </bean> </property> </bean>
