Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AB466200C17 for ; Fri, 27 Jan 2017 00:28:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A9CD5160B50; Thu, 26 Jan 2017 23:28:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A9D00160B4C for ; Fri, 27 Jan 2017 00:28:55 +0100 (CET) Received: (qmail 10792 invoked by uid 500); 26 Jan 2017 23:28:54 -0000 Mailing-List: contact commits-help@mnemonic.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mnemonic.incubator.apache.org Delivered-To: mailing list commits@mnemonic.incubator.apache.org Received: (qmail 10783 invoked by uid 99); 26 Jan 2017 23:28:54 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2017 23:28:54 +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 71246C1939 for ; Thu, 26 Jan 2017 23:28:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id lCDp1f7xkswP for ; Thu, 26 Jan 2017 23:28:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 0273F5F472 for ; Thu, 26 Jan 2017 23:28:50 +0000 (UTC) Received: (qmail 10753 invoked by uid 99); 26 Jan 2017 23:28:50 -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; Thu, 26 Jan 2017 23:28:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 21126DFC2A; Thu, 26 Jan 2017 23:28:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garyw@apache.org To: commits@mnemonic.incubator.apache.org Message-Id: <19e8892a5ee8408b9165640b0cba70e3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-mnemonic git commit: MNEMONIC-186: Add convenient funtions to shift durable parameters Date: Thu, 26 Jan 2017 23:28:50 +0000 (UTC) archived-at: Thu, 26 Jan 2017 23:28:56 -0000 Repository: incubator-mnemonic Updated Branches: refs/heads/0.5.0-dev b2d186022 -> 59051d41a MNEMONIC-186: Add convenient funtions to shift durable parameters Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/59051d41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/59051d41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/59051d41 Branch: refs/heads/0.5.0-dev Commit: 59051d41a7e9ae4468a3bfc63fee151934363d7c Parents: b2d1860 Author: Wang, Gang(Gary) Authored: Thu Jan 26 14:56:20 2017 -0800 Committer: Wang, Gang(Gary) Committed: Thu Jan 26 15:25:06 2017 -0800 ---------------------------------------------------------------------- .../DurableSinglyLinkedListNGTest.java | 24 ++++------------- .../DurableSinglyLinkedListNGPrintTest.java | 24 ++++------------- .../DurableSinglyLinkedListNGSortTest.java | 24 ++++------------- .../main/java/org/apache/mnemonic/Utils.java | 28 ++++++++++++++++++++ 4 files changed, 43 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/59051d41/mnemonic-collections/src/test/java/org/apache/mnemonic/collections/DurableSinglyLinkedListNGTest.java ---------------------------------------------------------------------- diff --git a/mnemonic-collections/src/test/java/org/apache/mnemonic/collections/DurableSinglyLinkedListNGTest.java b/mnemonic-collections/src/test/java/org/apache/mnemonic/collections/DurableSinglyLinkedListNGTest.java index 09e00d7..2be362b 100644 --- a/mnemonic-collections/src/test/java/org/apache/mnemonic/collections/DurableSinglyLinkedListNGTest.java +++ b/mnemonic-collections/src/test/java/org/apache/mnemonic/collections/DurableSinglyLinkedListNGTest.java @@ -19,13 +19,13 @@ package org.apache.mnemonic.collections; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Random; import org.apache.mnemonic.NonVolatileMemAllocator; import org.apache.mnemonic.RestorableAllocator; +import org.apache.commons.lang3.tuple.Pair; import org.apache.mnemonic.Durable; import org.apache.mnemonic.EntityFactoryProxy; import org.apache.mnemonic.Reclaim; @@ -220,29 +220,15 @@ public class DurableSinglyLinkedListNGTest { @Override public > Durable restore(A allocator, EntityFactoryProxy[] factoryproxys, DurableType[] gfields, long phandler, boolean autoreclaim) { - EntityFactoryProxy[] val_efproxies = null; - DurableType[] val_gftypes = null; - if (null != factoryproxys && factoryproxys.length >= 2) { - val_efproxies = Arrays.copyOfRange(factoryproxys, 1, factoryproxys.length); - } - if (null != gfields && gfields.length >= 2) { - val_gftypes = Arrays.copyOfRange(gfields, 1, gfields.length); - } - return DurableSinglyLinkedListFactory.restore(allocator, val_efproxies, val_gftypes, phandler, autoreclaim); + Pair dpt = Utils.shiftDurableParams(gfields, factoryproxys, 1); + return DurableSinglyLinkedListFactory.restore(allocator, dpt.getRight(), dpt.getLeft(), phandler, autoreclaim); } @Override public > Durable create( A allocator, EntityFactoryProxy[] factoryproxys, DurableType[] gfields, boolean autoreclaim) { - EntityFactoryProxy[] val_efproxies = null; - DurableType[] val_gftypes = null; - if (null != factoryproxys && factoryproxys.length >= 2) { - val_efproxies = Arrays.copyOfRange(factoryproxys, 1, factoryproxys.length); - } - if (null != gfields && gfields.length >= 2) { - val_gftypes = Arrays.copyOfRange(gfields, 1, gfields.length); - } - return DurableSinglyLinkedListFactory.create(allocator, val_efproxies, val_gftypes, autoreclaim); + Pair dpt = Utils.shiftDurableParams(gfields, factoryproxys, 1); + return DurableSinglyLinkedListFactory.create(allocator, dpt.getRight(), dpt.getLeft(), autoreclaim); } } }; http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/59051d41/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGPrintTest.java ---------------------------------------------------------------------- diff --git a/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGPrintTest.java b/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGPrintTest.java index b64bfe2..67176f1 100644 --- a/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGPrintTest.java +++ b/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGPrintTest.java @@ -19,12 +19,12 @@ package org.apache.mnemonic.service.computingservice; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Random; import java.nio.file.Files; import java.nio.file.Paths; +import org.apache.commons.lang3.tuple.Pair; import org.apache.mnemonic.NonVolatileMemAllocator; import org.apache.mnemonic.RestorableAllocator; import org.apache.mnemonic.Durable; @@ -162,28 +162,14 @@ public class DurableSinglyLinkedListNGPrintTest { @Override public > Durable restore(A allocator, EntityFactoryProxy[] factoryproxys, DurableType[] gfields, long phandler, boolean autoreclaim) { - EntityFactoryProxy[] val_efproxies = null; - DurableType[] val_gftypes = null; - if (null != factoryproxys && factoryproxys.length >= 2) { - val_efproxies = Arrays.copyOfRange(factoryproxys, 1, factoryproxys.length); - } - if (null != gfields && gfields.length >= 2) { - val_gftypes = Arrays.copyOfRange(gfields, 1, gfields.length); - } - return DurableSinglyLinkedListFactory.restore(allocator, val_efproxies, val_gftypes, phandler, autoreclaim); + Pair dpt = Utils.shiftDurableParams(gfields, factoryproxys, 1); + return DurableSinglyLinkedListFactory.restore(allocator, dpt.getRight(), dpt.getLeft(), phandler, autoreclaim); } @Override public > Durable create(A allocator, EntityFactoryProxy[] factoryproxys, DurableType[] gfields, boolean autoreclaim) { - EntityFactoryProxy[] val_efproxies = null; - DurableType[] val_gftypes = null; - if (null != factoryproxys && factoryproxys.length >= 2) { - val_efproxies = Arrays.copyOfRange(factoryproxys, 1, factoryproxys.length); - } - if (null != gfields && gfields.length >= 2) { - val_gftypes = Arrays.copyOfRange(gfields, 1, gfields.length); - } - return DurableSinglyLinkedListFactory.create(allocator, val_efproxies, val_gftypes, autoreclaim); + Pair dpt = Utils.shiftDurableParams(gfields, factoryproxys, 1); + return DurableSinglyLinkedListFactory.create(allocator, dpt.getRight(), dpt.getLeft(), autoreclaim); } } }; http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/59051d41/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGSortTest.java ---------------------------------------------------------------------- diff --git a/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGSortTest.java b/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGSortTest.java index 9389d74..ff10bae 100644 --- a/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGSortTest.java +++ b/mnemonic-computing-services/mnemonic-utilities-service/src/test/java/org/apache/mnemonic/service/computingservice/DurableSinglyLinkedListNGSortTest.java @@ -19,12 +19,12 @@ package org.apache.mnemonic.service.computingservice; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Random; import java.nio.file.Files; import java.nio.file.Paths; +import org.apache.commons.lang3.tuple.Pair; import org.apache.mnemonic.NonVolatileMemAllocator; import org.apache.mnemonic.RestorableAllocator; import org.apache.mnemonic.Durable; @@ -187,28 +187,14 @@ public class DurableSinglyLinkedListNGSortTest { @Override public > Durable restore(A allocator, EntityFactoryProxy[] factoryproxys, DurableType[] gfields, long phandler, boolean autoreclaim) { - EntityFactoryProxy[] val_efproxies = null; - DurableType[] val_gftypes = null; - if (null != factoryproxys && factoryproxys.length >= 2) { - val_efproxies = Arrays.copyOfRange(factoryproxys, 1, factoryproxys.length); - } - if (null != gfields && gfields.length >= 2) { - val_gftypes = Arrays.copyOfRange(gfields, 1, gfields.length); - } - return DurableSinglyLinkedListFactory.restore(allocator, val_efproxies, val_gftypes, phandler, autoreclaim); + Pair dpt = Utils.shiftDurableParams(gfields, factoryproxys, 1); + return DurableSinglyLinkedListFactory.restore(allocator, dpt.getRight(), dpt.getLeft(), phandler, autoreclaim); } @Override public > Durable create(A allocator, EntityFactoryProxy[] factoryproxys, DurableType[] gfields, boolean autoreclaim) { - EntityFactoryProxy[] val_efproxies = null; - DurableType[] val_gftypes = null; - if (null != factoryproxys && factoryproxys.length >= 2) { - val_efproxies = Arrays.copyOfRange(factoryproxys, 1, factoryproxys.length); - } - if (null != gfields && gfields.length >= 2) { - val_gftypes = Arrays.copyOfRange(gfields, 1, gfields.length); - } - return DurableSinglyLinkedListFactory.create(allocator, val_efproxies, val_gftypes, autoreclaim); + Pair dpt = Utils.shiftDurableParams(gfields, factoryproxys, 1); + return DurableSinglyLinkedListFactory.create(allocator, dpt.getRight(), dpt.getLeft(), autoreclaim); } } }; http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/59051d41/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java ---------------------------------------------------------------------- diff --git a/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java b/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java index c448138..faadec4 100644 --- a/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java +++ b/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java @@ -31,6 +31,7 @@ import java.util.Iterator; import java.util.List; import java.util.ServiceLoader; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.mnemonic.service.memoryservice.VolatileMemoryAllocatorService; import org.apache.mnemonic.service.computingservice.GeneralComputingService; import org.apache.mnemonic.service.memoryservice.NonVolatileMemoryAllocatorService; @@ -496,4 +497,31 @@ public class Utils { } return ret.toArray(new EntityFactoryProxy[0]); } + + /** + * shift durable parameters. + * + * @param gtypes + * an array of entity generic types + * + * @param factoryproxies + * an array of entity factory proxies + * + * @param len + * the length to shift from start + * + * @return the pair of shifted parameters. + */ + public static Pair shiftDurableParams( + DurableType[] gtypes, EntityFactoryProxy[] factoryproxies, int len) { + DurableType[] ret_gtypes = {}; + EntityFactoryProxy[] ret_proxies = {}; + if (null != gtypes && gtypes.length > len) { + ret_gtypes = Arrays.copyOfRange(gtypes, len, gtypes.length); + } + if (null != factoryproxies && factoryproxies.length > len) { + ret_proxies = Arrays.copyOfRange(factoryproxies, len, factoryproxies.length); + } + return Pair.of(ret_gtypes, ret_proxies); + } }