Change in asterixdb[master]: ASTERIXDB-2167 test

[Steven Jacobs (Code Review)]

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 <sjaco...@ucr.edu>