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 8B8B1200D43 for ; Tue, 7 Nov 2017 05:36:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8A01F160BFF; Tue, 7 Nov 2017 04:36:35 +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 CE667160BEC for ; Tue, 7 Nov 2017 05:36:34 +0100 (CET) Received: (qmail 27143 invoked by uid 500); 7 Nov 2017 04:36:34 -0000 Mailing-List: contact notifications-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list notifications@asterixdb.apache.org Received: (qmail 27134 invoked by uid 99); 7 Nov 2017 04:36:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2017 04:36:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 2C7C918BE69 for ; Tue, 7 Nov 2017 04:36:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.919 X-Spam-Level: X-Spam-Status: No, score=0.919 tagged_above=-999 required=6.31 tests=[SPF_FAIL=0.919] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id rmEHHfCvxiG5 for ; Tue, 7 Nov 2017 04:36:31 +0000 (UTC) Received: from vitalstatistix.ics.uci.edu (vitalstatistix.ics.uci.edu [128.195.52.38]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 5FF5B6114A for ; Tue, 7 Nov 2017 04:36:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by vitalstatistix.ics.uci.edu (Postfix) with ESMTP id F326D10072A; Mon, 6 Nov 2017 20:36:30 -0800 (PST) Date: Mon, 6 Nov 2017 20:36:30 -0800 From: "abdullah alamoudi (Code Review)" To: Ian Maxon CC: Jenkins , Taewoo Kim , Luo Chen Reply-To: bamousaa@gmail.com X-Gerrit-MessageType: merged Subject: Change in asterixdb[master]: Merge pre-rc changes to master X-Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2 X-Gerrit-ChangeURL: X-Gerrit-Commit: a0490ba6f46f28470052b3cadeec1a60be0f394e In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.12.7 Message-Id: <20171107043630.F326D10072A@vitalstatistix.ics.uci.edu> archived-at: Tue, 07 Nov 2017 04:36:35 -0000 abdullah alamoudi has submitted this change and it was merged. Change subject: Merge pre-rc changes to master ...................................................................... Merge pre-rc changes to master Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2 --- M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java 3 files changed, 0 insertions(+), 20 deletions(-) Approvals: abdullah alamoudi: Looks good to me, approved Jenkins: Verified; No violations found; ; Verified Objections: Anon. E. Moose #1000171: diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java index a220601..a7fbe06 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java @@ -57,14 +57,8 @@ // Flush will only be handled by last exiting thread. if (opType == LSMOperationType.MODIFICATION && threadRefCount.decrementAndGet() == 0 && index.hasFlushRequestForCurrentMutableComponent()) { -<<<<<<< HEAD (40cff7 [NO ISSUE][RT][IDX] Simplify index.createAccessor()) ILSMIndexAccessor accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE); - accessor.scheduleFlush(NoOpIOOperationCallbackFactory.INSTANCE.createIoOpCallback()); -======= - ILSMIndexAccessor accessor = - index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE); accessor.scheduleFlush(NoOpIOOperationCallbackFactory.INSTANCE.createIoOpCallback(index)); ->>>>>>> BRANCH (e32cb6 [NO ISSUE][STO] Add a callback on recycling of memory compon) } } } diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java index 3dc4f6b..9e9f78a 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java @@ -202,25 +202,15 @@ ILSMComponent component = operationalComponents.get(i); if (component.getType() == LSMComponentType.MEMORY) { includeMutableComponent = true; -<<<<<<< HEAD (40cff7 [NO ISSUE][RT][IDX] Simplify index.createAccessor()) IIndexAccessor invIndexAccessor = component.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE); -======= - IIndexAccessor invIndexAccessor = component.getIndex().createAccessor(NoOpOperationCallback.INSTANCE, - NoOpOperationCallback.INSTANCE); ->>>>>>> BRANCH (e32cb6 [NO ISSUE][STO] Add a callback on recycling of memory compon) indexAccessors.add(invIndexAccessor); IIndexAccessor deletedKeysAccessor = ((LSMInvertedIndexMemoryComponent) component).getBuddyIndex() .createAccessor(NoOpIndexAccessParameters.INSTANCE); deletedKeysBTreeAccessors.add(deletedKeysAccessor); } else { -<<<<<<< HEAD (40cff7 [NO ISSUE][RT][IDX] Simplify index.createAccessor()) IIndexAccessor invIndexAccessor = component.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE); -======= - IIndexAccessor invIndexAccessor = component.getIndex().createAccessor(NoOpOperationCallback.INSTANCE, - NoOpOperationCallback.INSTANCE); ->>>>>>> BRANCH (e32cb6 [NO ISSUE][STO] Add a callback on recycling of memory compon) indexAccessors.add(invIndexAccessor); IIndexAccessor deletedKeysAccessor = ((LSMInvertedIndexDiskComponent) component).getBuddyIndex() .createAccessor(NoOpIndexAccessParameters.INSTANCE); diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java index 5bb6435..1af6779 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java @@ -69,15 +69,11 @@ @Override @Test public void modificationCallbackTest() throws Exception { -<<<<<<< HEAD (40cff7 [NO ISSUE][RT][IDX] Simplify index.createAccessor()) IndexAccessParameters actx = new IndexAccessParameters(cb, NoOpOperationCallback.INSTANCE); ILSMIndexAccessor accessor = (ILSMIndexAccessor) index.createAccessor(actx); -======= - ILSMIndexAccessor accessor = (ILSMIndexAccessor) index.createAccessor(cb, NoOpOperationCallback.INSTANCE); BlockingIOOperationCallbackWrapper ioOpCallback = new BlockingIOOperationCallbackWrapper(((ILSMIndex) index).getIOOperationCallback()); ->>>>>>> BRANCH (e32cb6 [NO ISSUE][STO] Add a callback on recycling of memory compon) for (int j = 0; j < 2; j++) { isFoundNull = true; for (int i = 0; i < NUM_TUPLES; i++) { -- To view, visit https://asterix-gerrit.ics.uci.edu/2129 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I578ffd7ef17784034b14f3c0d23cd5094e39f6e2 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Luo Chen Gerrit-Reviewer: Taewoo Kim Gerrit-Reviewer: abdullah alamoudi