ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: prepare yardstick sql config
Date Wed, 03 Jun 2015 19:22:26 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-portable-bench 9f79e5363 -> ac1bea961


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/ac1bea96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac1bea96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac1bea96

Branch: refs/heads/ignite-portable-bench
Commit: ac1bea961ea96e8b35039f2f084977d2bdab54b2
Parents: 9f79e53
Author: dmagda <magda7817@gmail.com>
Authored: Wed Jun 3 22:22:14 2015 +0300
Committer: dmagda <magda7817@gmail.com>
Committed: Wed Jun 3 22:22:14 2015 +0300

----------------------------------------------------------------------
 modules/yardstick/config/ignite-base-config.xml |  2 ++
 .../yardstick/cache/model/Organization.java     | 14 +-------------
 .../ignite/yardstick/cache/model/Person.java    | 20 +-------------------
 3 files changed, 4 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac1bea96/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 d79b05a..14b62a1 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -40,6 +40,8 @@
                                     <value>org.apache.ignite.yardstick.cache.model.*</value>
                                 </list>
                             </property>
+
+                            <property name="metaDataEnabled" value="false" />
                         </bean>
                     </property>
                 </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac1bea96/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/ac1bea96/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..461da49 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;
@@ -152,24 +152,6 @@ public class Person implements Externalizable {
     }
 
     /** {@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;
     }


Mime
View raw message