You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/03 21:10:09 UTC
incubator-ignite git commit: ignite-471-2: prepare yardstick sql
config
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 e89507c86 -> 5ae5574ce
ignite-471-2: prepare yardstick sql config
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ae5574c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ae5574c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ae5574c
Branch: refs/heads/ignite-471-2
Commit: 5ae5574cee2f8d6894fdc6b7b0e9dd2f2a218391
Parents: e89507c
Author: dmagda <ma...@gmail.com>
Authored: Wed Jun 3 22:09:50 2015 +0300
Committer: dmagda <ma...@gmail.com>
Committed: Wed Jun 3 22:09:50 2015 +0300
----------------------------------------------------------------------
modules/yardstick/config/ignite-base-config.xml | 6 ++++++
.../yardstick/cache/model/Organization.java | 14 +-------------
.../ignite/yardstick/cache/model/Person.java | 19 +------------------
3 files changed, 8 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ae5574c/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index 8a7cede..cd57edc 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -217,6 +217,12 @@
<property name="marshaller">
<bean class="org.gridgain.grid.marshaller.portable.PortableMarshaller">
+ <property name="classNames">
+ <list>
+ <value>org.apache.ignite.yardstick.cache.model.*</value>
+ </list>
+ </property>
+ <property name="metaDataEnabled" value="false" />
</bean>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ae5574c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
index d8bba98..2c9f01c 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
@@ -24,7 +24,7 @@ import java.io.*;
/**
* Organization record used for query test.
*/
-public class Organization implements Externalizable {
+public class Organization {
/** Organization ID. */
@QuerySqlField(index = true)
private int id;
@@ -80,18 +80,6 @@ public class Organization implements Externalizable {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeInt(id);
- out.writeUTF(name);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- id = in.readInt();
- name = in.readUTF();
- }
-
- /** {@inheritDoc} */
@Override public boolean equals(Object o) {
return this == o || (o instanceof Organization) && id == ((Organization)o).id;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ae5574c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
index df8d58b..9f985b1 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
@@ -24,7 +24,7 @@ import java.io.*;
/**
* Person record used for query test.
*/
-public class Person implements Externalizable {
+public class Person {
/** Person ID. */
@QuerySqlField(index = true)
private int id;
@@ -151,23 +151,6 @@ public class Person implements Externalizable {
this.salary = salary;
}
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeInt(id);
- out.writeInt(orgId);
- out.writeUTF(firstName);
- out.writeUTF(lastName);
- out.writeDouble(salary);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- id = in.readInt();
- orgId = in.readInt();
- firstName = in.readUTF();
- lastName = in.readUTF();
- salary = in.readDouble();
- }
/** {@inheritDoc} */
@Override public boolean equals(Object o) {