Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B345817E18 for ; Wed, 10 Jun 2015 16:27:50 +0000 (UTC) Received: (qmail 24603 invoked by uid 500); 10 Jun 2015 16:27:50 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 24570 invoked by uid 500); 10 Jun 2015 16:27:50 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 24561 invoked by uid 99); 10 Jun 2015 16:27:50 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jun 2015 16:27:50 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 2DE3ACD0F3 for ; Wed, 10 Jun 2015 16:27:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 7xQOqVEDiwXf for ; Wed, 10 Jun 2015 16:27:46 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id C92EE27655 for ; Wed, 10 Jun 2015 16:27:25 +0000 (UTC) Received: (qmail 23608 invoked by uid 99); 10 Jun 2015 16:27:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jun 2015 16:27:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AA775E0332; Wed, 10 Jun 2015 16:27:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 10 Jun 2015 16:27:54 -0000 Message-Id: <396b211978994eff94c0cbdd7a19a19d@git.apache.org> In-Reply-To: <8eb7a652192c4f07b1b9bed4629f3c65@git.apache.org> References: <8eb7a652192c4f07b1b9bed4629f3c65@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/31] incubator-ignite git commit: ignite-471-2: huge merge from sprint-6 ignite-471-2: huge merge from sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a062467e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a062467e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a062467e Branch: refs/heads/ignite-471-2 Commit: a062467e517ec3403dcbc3027c4f3ba446920cb0 Parents: 3d78aa1 Author: Denis Magda Authored: Wed Jun 10 19:27:00 2015 +0300 Committer: Denis Magda Committed: Wed Jun 10 19:27:00 2015 +0300 ---------------------------------------------------------------------- modules/yardstick/config/ignite-base-config.xml | 87 +++----------------- .../yardstick/cache/model/Organization.java | 14 +++- .../ignite/yardstick/cache/model/Person.java | 20 ++++- 3 files changed, 44 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a062467e/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 cd57edc..9d28774 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -112,39 +112,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + java.lang.Integer + org.apache.ignite.yardstick.cache.model.Organization + + java.lang.Integer + org.apache.ignite.yardstick.cache.model.Person @@ -160,39 +134,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + java.lang.Integer + org.apache.ignite.yardstick.cache.model.Organization + + java.lang.Integer + org.apache.ignite.yardstick.cache.model.Person @@ -215,17 +163,6 @@ - - - - - org.apache.ignite.yardstick.cache.model.* - - - - - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a062467e/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 2c9f01c..d8bba98 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 { +public class Organization implements Externalizable { /** Organization ID. */ @QuerySqlField(index = true) private int id; @@ -80,6 +80,18 @@ public class Organization { } /** {@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/a062467e/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 461da49..df8d58b 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 { +public class Person implements Externalizable { /** Person ID. */ @QuerySqlField(index = true) private int id; @@ -152,6 +152,24 @@ public class Person { } /** {@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; }