IGNITE-1803: WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/36b1f002 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/36b1f002 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/36b1f002 Branch: refs/heads/ignite-1803 Commit: 36b1f0028e46bbbad1d7cbc5651d47aecd104036 Parents: aff0642 Author: vozerov-gridgain <[email protected]> Authored: Fri Oct 30 09:14:54 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Oct 30 09:14:54 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/portable/PortableObjectImpl.java | 5 +++++ .../src/main/java/org/apache/ignite/MyBenchmark.java | 10 +++------- .../main/java/org/apache/ignite/QueryBenchmark.java | 14 +++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/36b1f002/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java index dbfdd01..322ebf0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java @@ -251,6 +251,11 @@ public final class PortableObjectImpl extends PortableObjectEx implements Extern /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Nullable @Override protected <F> F fieldByOffset(int fieldOffset) { +// int schemaOffset = PRIM.readInt(arr, start + GridPortableMarshaller.SCHEMA_OR_RAW_OFF_POS); +// int fieldPos = PRIM.readInt(arr, start + schemaOffset + fieldOffset); +// +// return (F)(Object)PRIM.readInt(arr, start + fieldPos + 1); + PortableReaderExImpl reader = new PortableReaderExImpl(ctx, arr, start, null); return (F)reader.unmarshalFieldByOffset(fieldOffset); http://git-wip-us.apache.org/repos/asf/ignite/blob/36b1f002/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java b/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java index 581071e..a4893d3 100644 --- a/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java +++ b/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java @@ -117,14 +117,10 @@ public class MyBenchmark { // } @Benchmark - public boolean testFieldRead() throws Exception { -// String city = marshPortable.field("city"); -// String street = marshPortable.field("street"); + public Object testFieldRead() throws Exception { + //return marshPortable.field("city"); - String city = fieldCity.value(marshPortable); - String street = fieldStreet.value(marshPortable); - - return city != null && street != null; + return fieldCity.value(marshPortable); } private static final Address addr = new Address(); http://git-wip-us.apache.org/repos/asf/ignite/blob/36b1f002/modules/microbench/src/main/java/org/apache/ignite/QueryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/microbench/src/main/java/org/apache/ignite/QueryBenchmark.java b/modules/microbench/src/main/java/org/apache/ignite/QueryBenchmark.java index b5d6813..daae981 100644 --- a/modules/microbench/src/main/java/org/apache/ignite/QueryBenchmark.java +++ b/modules/microbench/src/main/java/org/apache/ignite/QueryBenchmark.java @@ -101,7 +101,7 @@ public class QueryBenchmark { discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); - cfg.setMarshaller(new PortableMarshaller()); + //cfg.setMarshaller(new PortableMarshaller()); CacheConfiguration cacheCfg = new CacheConfiguration(); @@ -143,15 +143,15 @@ public class QueryBenchmark { } public static void main(String[] args) throws Exception { - setup(); +// setup(); +// +// while (true) +// cache.query(qry).getAll(); - while (true) - cache.query(qry).getAll(); - -// Options opts = new OptionsBuilder().include(QueryBenchmark.class.getSimpleName()).build(); -// new Runner(opts).run(); + Options opts = new OptionsBuilder().include(QueryBenchmark.class.getSimpleName()).build(); + new Runner(opts).run(); } /**
