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 9355A200D3A for ; Wed, 15 Nov 2017 19:24:15 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 91F9C160BF4; Wed, 15 Nov 2017 18:24:15 +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 B1444160BE4 for ; Wed, 15 Nov 2017 19:24:14 +0100 (CET) Received: (qmail 3439 invoked by uid 500); 15 Nov 2017 18:24:13 -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 3430 invoked by uid 99); 15 Nov 2017 18:24:13 -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; Wed, 15 Nov 2017 18:24:13 +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 27017C3DD0 for ; Wed, 15 Nov 2017 18:24:13 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 4.072 X-Spam-Level: **** X-Spam-Status: No, score=4.072 tagged_above=-999 required=6.31 tests=[MISSING_HEADERS=1.207, REPLYTO_WITHOUT_TO_CC=1.946, SPF_FAIL=0.919] 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 sOEpWCi-WVEN for ; Wed, 15 Nov 2017 18:24:12 +0000 (UTC) Received: from vitalstatistix.ics.uci.edu (vitalstatistix.ics.uci.edu [128.195.52.38]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 2B9E160D12 for ; Wed, 15 Nov 2017 18:24:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by vitalstatistix.ics.uci.edu (Postfix) with ESMTP id 7C62910072F; Wed, 15 Nov 2017 10:24:10 -0800 (PST) Date: Wed, 15 Nov 2017 10:24:10 -0800 From: "Steven Jacobs (Code Review)" Message-ID: Reply-To: sjaco002@ucr.edu X-Gerrit-MessageType: newchange Subject: Change in asterixdb[master]: ASTERIXDB-2167 test X-Gerrit-Change-Id: I9526d50b31aebc3bf971d95ba3edf29c0c1066a7 X-Gerrit-ChangeURL: X-Gerrit-Commit: f7492c95b9b9bb6833a4166c89346d97d9cdc6ca MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.12.7 archived-at: Wed, 15 Nov 2017 18:24:15 -0000 Steven Jacobs has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/2154 Change subject: ASTERIXDB-2167 test ...................................................................... ASTERIXDB-2167 test Change-Id: I9526d50b31aebc3bf971d95ba3edf29c0c1066a7 --- M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java 2 files changed, 4 insertions(+), 7 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/54/2154/1 diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java index 48a6e6a..ea5c134 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java @@ -30,8 +30,8 @@ import org.apache.asterix.active.IActiveEntityEventsListener; import org.apache.asterix.active.IActiveNotificationHandler; import org.apache.asterix.common.config.DatasetConfig.DatasetType; -import org.apache.asterix.common.context.DatasetLSMComponentIdGeneratorFactory; import org.apache.asterix.common.context.CorrelatedPrefixMergePolicyFactory; +import org.apache.asterix.common.context.DatasetLSMComponentIdGeneratorFactory; import org.apache.asterix.common.context.IStorageComponentProvider; import org.apache.asterix.common.dataflow.NoOpFrameOperationCallbackFactory; import org.apache.asterix.common.exceptions.CompilationException; @@ -677,7 +677,7 @@ public IPushRuntimeFactory getCommitRuntimeFactory(MetadataProvider metadataProvider, TxnId txnId, int[] primaryKeyFieldPermutation, boolean isSink) throws AlgebricksException { int[] datasetPartitions = getDatasetPartitions(metadataProvider); - return new CommitRuntimeFactory(txnId, datasetId, primaryKeyFieldPermutation, + return new CommitRuntimeFactory(datasetId, primaryKeyFieldPermutation, metadataProvider.isTemporaryDatasetWriteJob(), metadataProvider.isWriteTransaction(), datasetPartitions, isSink); } diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java index 58f7e69..36f5db8 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java @@ -20,7 +20,6 @@ package org.apache.asterix.transaction.management.runtime; import org.apache.asterix.common.api.IJobEventListenerFactory; -import org.apache.asterix.common.transactions.TxnId; import org.apache.hyracks.algebricks.runtime.base.IPushRuntime; import org.apache.hyracks.algebricks.runtime.base.IPushRuntimeFactory; import org.apache.hyracks.api.context.IHyracksTaskContext; @@ -31,7 +30,6 @@ private static final long serialVersionUID = 1L; - protected final TxnId txnId; protected final int datasetId; protected final int[] primaryKeyFields; protected final boolean isTemporaryDatasetWriteJob; @@ -39,9 +37,8 @@ protected int[] datasetPartitions; protected final boolean isSink; - public CommitRuntimeFactory(TxnId txnId, int datasetId, int[] primaryKeyFields, boolean isTemporaryDatasetWriteJob, + public CommitRuntimeFactory(int datasetId, int[] primaryKeyFields, boolean isTemporaryDatasetWriteJob, boolean isWriteTransaction, int[] datasetPartitions, boolean isSink) { - this.txnId = txnId; this.datasetId = datasetId; this.primaryKeyFields = primaryKeyFields; this.isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob; @@ -58,7 +55,7 @@ @Override public IPushRuntime createPushRuntime(IHyracksTaskContext ctx) throws HyracksDataException { IJobletEventListenerFactory fact = ctx.getJobletContext().getJobletEventListenerFactory(); - return new CommitRuntime(ctx, ((IJobEventListenerFactory) fact).getTxnId(txnId), datasetId, + return new CommitRuntime(ctx, ((IJobEventListenerFactory) fact).getTxnId(null), datasetId, primaryKeyFields, isTemporaryDatasetWriteJob, isWriteTransaction, datasetPartitions[ctx.getTaskAttemptId().getTaskId().getPartition()], isSink); } -- To view, visit https://asterix-gerrit.ics.uci.edu/2154 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9526d50b31aebc3bf971d95ba3edf29c0c1066a7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs