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/07/03 13:15:51 UTC
incubator-ignite git commit: changed externalizable to serializable
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-7-portable-bench 543fcceff -> d4ccc196a
changed externalizable to serializable
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d4ccc196
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d4ccc196
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d4ccc196
Branch: refs/heads/ignite-sprint-7-portable-bench
Commit: d4ccc196acded68c65d8b2ecd812a2a1c6b119f9
Parents: 543fcce
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Jul 3 14:15:41 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Jul 3 14:15:41 2015 +0300
----------------------------------------------------------------------
.../yardstick/cache/model/Organization.java | 14 +------------
.../ignite/yardstick/cache/model/Person.java | 22 ++------------------
2 files changed, 3 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4ccc196/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..902415f 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 implements Serializable {
/** 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/d4ccc196/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..8f35ba7 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 implements Serializable {
/** Person ID. */
@QuerySqlField(index = true)
private int id;
@@ -150,25 +150,7 @@ public class Person implements Externalizable {
public void setSalary(double salary) {
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) {
return this == o || (o instanceof Person) && id == ((Person)o).id;