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/02/02 07:37:07 UTC
incubator-ignite git commit: # IGNITE-32: changed xml and POJOs.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-32 28ad3dfeb -> c8b046012
# IGNITE-32: changed xml and POJOs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c8b04601
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c8b04601
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c8b04601
Branch: refs/heads/ignite-32
Commit: c8b0460127469f88d18aba5addac3dd01e1805d4
Parents: 28ad3df
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Feb 2 13:37:07 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Feb 2 13:37:07 2015 +0700
----------------------------------------------------------------------
.../core/src/test/config/store/jdbc/Ignite.xml | 166 ++++++++++---------
.../cache/store/jdbc/model/Organization.java | 4 +-
.../cache/store/jdbc/model/OrganizationKey.java | 3 +-
.../ignite/cache/store/jdbc/model/Person.java | 4 +-
.../cache/store/jdbc/model/PersonKey.java | 3 +-
5 files changed, 97 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8b04601/modules/core/src/test/config/store/jdbc/Ignite.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml b/modules/core/src/test/config/store/jdbc/Ignite.xml
index 6cd8287..25dc5c8 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/core/src/test/config/store/jdbc/Ignite.xml
@@ -4,10 +4,10 @@
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License" + you may not use this file except in compliance with
+ (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,48 +16,52 @@
limitations under the License.
-->
<!--
- XML generated by Apache Ignite Schema Load utility: 01/26/2015
+ XML generated by Apache Ignite Schema Load utility: 02/33/2015
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata">
- <property name="type" value="org.apache.ignite.cache.store.jdbc.model.Organization"/>
- <property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.OrganizationKey"/>
- <property name="schema" value="PUBLIC"/>
- <property name="tableName" value="ORGANIZATION"/>
- <property name="keyDescriptors">
- <list>
- <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
- <property name="javaName" value="id"/>
- <property name="javaType" value="java.lang.Integer"/>
- <property name="dbName" value="ID"/>
- <property name="dbType" value="4"/>
- </bean>
- </list>
- </property>
- <property name="valueDescriptors">
- <list>
- <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
- <property name="javaName" value="id"/>
- <property name="javaType" value="java.lang.Integer"/>
- <property name="dbName" value="ID"/>
- <property name="dbType" value="4"/>
- </bean>
- <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
- <property name="javaName" value="name"/>
- <property name="javaType" value="java.lang.String"/>
- <property name="dbName" value="NAME"/>
- <property name="dbType" value="12"/>
- </bean>
- <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
- <property name="javaName" value="city"/>
- <property name="javaType" value="java.lang.String"/>
- <property name="dbName" value="CITY"/>
- <property name="dbType" value="12"/>
- </bean>
- </list>
+ <property name="type" value="org.apache.ignite.Organization"/>
+ <property name="keyType" value="org.apache.ignite.OrganizationKey"/>
+ <property name="tableMetadata">
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableMetadata">
+ <property name="schema" value="PUBLIC"/>
+ <property name="table" value="ORGANIZATION"/>
+ <property name="keyColumns">
+ <list>
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
+ <property name="dbName" value="ID"/>
+ <property name="dbType" value="4"/>
+ <property name="javaName" value="id"/>
+ <property name="javaType" value="java.lang.Integer"/>
+ </bean>
+ </list>
+ </property>
+ <property name="valueColumns">
+ <list>
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
+ <property name="dbName" value="ID"/>
+ <property name="dbType" value="4"/>
+ <property name="javaName" value="id"/>
+ <property name="javaType" value="java.lang.Integer"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
+ <property name="dbName" value="NAME"/>
+ <property name="dbType" value="12"/>
+ <property name="javaName" value="name"/>
+ <property name="javaType" value="java.lang.String"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
+ <property name="dbName" value="CITY"/>
+ <property name="dbType" value="12"/>
+ <property name="javaName" value="city"/>
+ <property name="javaType" value="java.lang.String"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
</property>
<property name="queryFields">
<map>
@@ -75,7 +79,7 @@
</property>
<property name="groups">
<map>
- <entry key="primaryKeyD">
+ <entry key="PRIMARY_KEY_D">
<map>
<entry key="id">
<bean class="org.apache.ignite.lang.IgniteBiTuple">
@@ -85,7 +89,7 @@
</entry>
</map>
</entry>
- <entry key="orgNameCityIdx">
+ <entry key="ORG_NAME_CITY_IDX">
<map>
<entry key="name">
<bean class="org.apache.ignite.lang.IgniteBiTuple">
@@ -101,7 +105,7 @@
</entry>
</map>
</entry>
- <entry key="orgNameIdx">
+ <entry key="ORG_NAME_IDX">
<map>
<entry key="name">
<bean class="org.apache.ignite.lang.IgniteBiTuple">
@@ -115,41 +119,45 @@
</property>
</bean>
<bean class="org.apache.ignite.cache.query.CacheQueryTypeMetadata">
- <property name="type" value="org.apache.ignite.cache.store.jdbc.model.Person"/>
- <property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.PersonKey"/>
- <property name="schema" value="PUBLIC"/>
- <property name="tableName" value="PERSON"/>
- <property name="keyDescriptors">
- <list>
- <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
- <property name="javaName" value="id"/>
- <property name="javaType" value="java.lang.Integer"/>
- <property name="dbName" value="ID"/>
- <property name="dbType" value="4"/>
- </bean>
- </list>
- </property>
- <property name="valueDescriptors">
- <list>
- <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
- <property name="javaName" value="id"/>
- <property name="javaType" value="java.lang.Integer"/>
- <property name="dbName" value="ID"/>
- <property name="dbType" value="4"/>
- </bean>
- <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
- <property name="javaName" value="orgId"/>
- <property name="javaType" value="java.lang.Integer"/>
- <property name="dbName" value="ORG_ID"/>
- <property name="dbType" value="4"/>
- </bean>
- <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
- <property name="javaName" value="name"/>
- <property name="javaType" value="java.lang.String"/>
- <property name="dbName" value="NAME"/>
- <property name="dbType" value="12"/>
- </bean>
- </list>
+ <property name="type" value="org.apache.ignite.Person"/>
+ <property name="keyType" value="org.apache.ignite.PersonKey"/>
+ <property name="tableMetadata">
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableMetadata">
+ <property name="schema" value="PUBLIC"/>
+ <property name="table" value="PERSON"/>
+ <property name="keyColumns">
+ <list>
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
+ <property name="dbName" value="ID"/>
+ <property name="dbType" value="4"/>
+ <property name="javaName" value="id"/>
+ <property name="javaType" value="java.lang.Integer"/>
+ </bean>
+ </list>
+ </property>
+ <property name="valueColumns">
+ <list>
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
+ <property name="dbName" value="ID"/>
+ <property name="dbType" value="4"/>
+ <property name="javaName" value="id"/>
+ <property name="javaType" value="java.lang.Integer"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
+ <property name="dbName" value="ORG_ID"/>
+ <property name="dbType" value="4"/>
+ <property name="javaName" value="orgId"/>
+ <property name="javaType" value="java.lang.Integer"/>
+ </bean>
+ <bean class="org.apache.ignite.cache.query.CacheQueryTableColumnMetadata">
+ <property name="dbName" value="NAME"/>
+ <property name="dbType" value="12"/>
+ <property name="javaName" value="name"/>
+ <property name="javaType" value="java.lang.String"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
</property>
<property name="queryFields">
<map>
@@ -171,7 +179,7 @@
</property>
<property name="groups">
<map>
- <entry key="primaryKey8">
+ <entry key="PRIMARY_KEY_8">
<map>
<entry key="id">
<bean class="org.apache.ignite.lang.IgniteBiTuple">
@@ -181,7 +189,7 @@
</entry>
</map>
</entry>
- <entry key="personNameIdx1">
+ <entry key="PERSON_NAME_IDX1">
<map>
<entry key="name">
<bean class="org.apache.ignite.lang.IgniteBiTuple">
@@ -191,7 +199,7 @@
</entry>
</map>
</entry>
- <entry key="personNameIdx2">
+ <entry key="PERSON_NAME_IDX2">
<map>
<entry key="name">
<bean class="org.apache.ignite.lang.IgniteBiTuple">
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8b04601/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
index 1b9bdc8..9b82247 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* Organization definition.
*
- * Code generated by Apache Ignite Schema Load utility: 01/26/2015.
+ * Code generated by Apache Ignite Schema Load utility: 02/33/2015.
*/
public class Organization implements Serializable {
/** */
@@ -138,6 +138,7 @@ public class Organization implements Serializable {
int res = id != null ? id.hashCode() : 0;
res = 31 * res + (name != null ? name.hashCode() : 0);
+
res = 31 * res + (city != null ? city.hashCode() : 0);
return res;
@@ -151,3 +152,4 @@ public class Organization implements Serializable {
"]";
}
}
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8b04601/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
index c14b3b0..658929f 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* OrganizationKey definition.
*
- * Code generated by Apache Ignite Schema Load utility: 01/26/2015.
+ * Code generated by Apache Ignite Schema Load utility: 02/33/2015.
*/
public class OrganizationKey implements Serializable {
/** */
@@ -94,3 +94,4 @@ public class OrganizationKey implements Serializable {
"]";
}
}
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8b04601/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
index 2b1980d..3807606 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* Person definition.
*
- * Code generated by Apache Ignite Schema Load utility: 01/26/2015.
+ * Code generated by Apache Ignite Schema Load utility: 02/33/2015.
*/
public class Person implements Serializable {
/** */
@@ -138,6 +138,7 @@ public class Person implements Serializable {
int res = id != null ? id.hashCode() : 0;
res = 31 * res + (orgId != null ? orgId.hashCode() : 0);
+
res = 31 * res + (name != null ? name.hashCode() : 0);
return res;
@@ -151,3 +152,4 @@ public class Person implements Serializable {
"]";
}
}
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8b04601/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
index 0344484..9416fb5 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
@@ -22,7 +22,7 @@ import java.io.*;
/**
* PersonKey definition.
*
- * Code generated by Apache Ignite Schema Load utility: 01/26/2015.
+ * Code generated by Apache Ignite Schema Load utility: 02/33/2015.
*/
public class PersonKey implements Serializable {
/** */
@@ -94,3 +94,4 @@ public class PersonKey implements Serializable {
"]";
}
}
+