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 134E320049D for ; Wed, 9 Aug 2017 23:00:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 117FC16983F; Wed, 9 Aug 2017 21:00:02 +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 56183169816 for ; Wed, 9 Aug 2017 23:00:01 +0200 (CEST) Received: (qmail 5371 invoked by uid 500); 9 Aug 2017 21:00:00 -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 5359 invoked by uid 99); 9 Aug 2017 21:00:00 -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; Wed, 09 Aug 2017 21:00:00 +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 EAD1A18081A for ; Wed, 9 Aug 2017 20:59:59 +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-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id z9GIMmAo9k24 for ; Wed, 9 Aug 2017 20:59:59 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 4F43D5FBE2 for ; Wed, 9 Aug 2017 20:59:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id AA7102408B8; Wed, 9 Aug 2017 13:59:57 -0700 (PDT) Date: Wed, 9 Aug 2017 13:59:56 -0700 From: "abdullah alamoudi (Code Review)" To: Jenkins CC: Till Westmann Reply-To: bamousaa@gmail.com X-Gerrit-MessageType: newpatchset Subject: Change in asterixdb[master]: [ASTERIXDB-1990][ASTERIXDB-1991][ASTERIXDB-2025][STO] Fix Merge X-Gerrit-Change-Id: I843de8b26c181205e43f4eabe22a7c43f3ebfcbc X-Gerrit-ChangeURL: X-Gerrit-Commit: e38f1b39e572eb20e45cd5030cf4e5f3e72aae15 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: <20170809205957.AA7102408B8@unhygienix.ics.uci.edu> archived-at: Wed, 09 Aug 2017 21:00:02 -0000 Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1930 to look at the new patch set (#7). Change subject: [ASTERIXDB-1990][ASTERIXDB-1991][ASTERIXDB-2025][STO] Fix Merge ...................................................................... [ASTERIXDB-1990][ASTERIXDB-1991][ASTERIXDB-2025][STO] Fix Merge - user model changes: no - storage format changes: no - interface changes: no Details: - Complete merge operation after deletion of old components files. Change-Id: I843de8b26c181205e43f4eabe22a7c43f3ebfcbc --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/AqlExecutionFullParallelismIT.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/AqlExecutionTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionFullParallelismIT.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMTreeIndexAccessor.java M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexAccessor.java 13 files changed, 48 insertions(+), 7,470 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/30/1930/7 -- To view, visit https://asterix-gerrit.ics.uci.edu/1930 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I843de8b26c181205e43f4eabe22a7c43f3ebfcbc Gerrit-PatchSet: 7 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudi Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann