asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjaco...@apache.org
Subject asterixdb-bad git commit: Updated BAD to work with recent Asterix changes
Date Thu, 02 Mar 2017 05:19:33 GMT
Repository: asterixdb-bad
Updated Branches:
  refs/heads/master 79226b576 -> 936674a37


Updated BAD to work with recent Asterix changes

Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346


Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/936674a3
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/936674a3
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/936674a3

Branch: refs/heads/master
Commit: 936674a37d801a707bbd65a5490f065ab2567196
Parents: 79226b5
Author: Steven Glenn Jacobs <sjaco002@ucr.edu>
Authored: Wed Mar 1 15:56:01 2017 -0800
Committer: Steven Glenn Jacobs <sjaco002@ucr.edu>
Committed: Wed Mar 1 15:56:01 2017 -0800

----------------------------------------------------------------------
 asterix-bad/pom.xml                                       |  3 +++
 .../bad/lang/statement/CreateChannelStatement.java        |  2 +-
 .../bad/lang/statement/CreateProcedureStatement.java      |  2 +-
 .../bad/lang/statement/ExecuteProcedureStatement.java     |  3 +--
 .../asterix/bad/metadata/PrecompiledJobEventListener.java | 10 +---------
 .../org/apache/asterix/bad/test/BADExecutionTest.java     |  2 +-
 6 files changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/936674a3/asterix-bad/pom.xml
----------------------------------------------------------------------
diff --git a/asterix-bad/pom.xml b/asterix-bad/pom.xml
index 0d32652..6b58441 100644
--- a/asterix-bad/pom.xml
+++ b/asterix-bad/pom.xml
@@ -144,6 +144,9 @@
             <usedDependencies>
               <usedDependency>org.apache.hadoop:hadoop-minicluster</usedDependency>
             </usedDependencies>
+            <ignoredUnusedDeclaredDependencies>
+              <ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-common</ignoredUnusedDeclaredDependency>
+            </ignoredUnusedDeclaredDependencies>
           </configuration>
         </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/936674a3/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
----------------------------------------------------------------------
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
index 362c8bf..7c6aa19 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
@@ -245,7 +245,7 @@ public class CreateChannelStatement implements IExtensionStatement {
             }
             ScheduledExecutorService ses = ChannelJobService.startJob(channeljobSpec, EnumSet.noneOf(JobFlag.class),
                     jobId, hcc, ChannelJobService.findPeriod(duration));
-            listener.storeDistributedInfo(jobId, ses, null, null);
+            listener.storeDistributedInfo(jobId, ses, null);
         }
 
     }

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/936674a3/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
----------------------------------------------------------------------
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
index 71e11dc..a98d780 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
@@ -172,7 +172,7 @@ public class CreateProcedureStatement implements IExtensionStatement {
             PrecompiledJobEventListener listener, MetadataProvider metadataProvider, IHyracksDataset
hdc, Stats stats)
                     throws Exception {
         JobId jobId = hcc.distributeJob(jobSpec);
-        listener.storeDistributedInfo(jobId, null, new ResultReader(hdc), metadataProvider.getResultSetId());
+        listener.storeDistributedInfo(jobId, null, new ResultReader(hdc, jobId, metadataProvider.getResultSetId()));
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/936674a3/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
----------------------------------------------------------------------
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
index f333cba..47016e3 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
@@ -118,7 +118,6 @@ public class ExecuteProcedureStatement implements IExtensionStatement
{
                 if (listener.getType() == PrecompiledType.QUERY) {
                     hcc.waitForCompletion(hyracksJobId);
                     ResultReader resultReader = listener.getResultReader();
-                    resultReader.open(hyracksJobId, listener.getResultSetId());
                     ResultUtil.printResults(resultReader, ((QueryTranslator) statementExecutor).getSessionConfig(),
                             new Stats(), null);
                 }
@@ -126,7 +125,7 @@ public class ExecuteProcedureStatement implements IExtensionStatement
{
             } else {
                 ScheduledExecutorService ses = ChannelJobService.startJob(null, EnumSet.noneOf(JobFlag.class),
                         hyracksJobId, hcc, ChannelJobService.findPeriod(procedure.getDuration()));
-                listener.storeDistributedInfo(hyracksJobId, ses, listener.getResultReader(),
listener.getResultSetId());
+                listener.storeDistributedInfo(hyracksJobId, ses, listener.getResultReader());
             }
 
             MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/936674a3/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/PrecompiledJobEventListener.java
----------------------------------------------------------------------
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/PrecompiledJobEventListener.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/PrecompiledJobEventListener.java
index 7c22dc5..55547ea 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/PrecompiledJobEventListener.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/PrecompiledJobEventListener.java
@@ -28,7 +28,6 @@ import org.apache.asterix.active.IActiveEventSubscriber;
 import org.apache.asterix.app.result.ResultReader;
 import org.apache.asterix.common.metadata.IDataset;
 import org.apache.asterix.external.feed.management.ActiveEntityEventsListener;
-import org.apache.hyracks.api.dataset.ResultSetId;
 import org.apache.hyracks.api.exceptions.HyracksDataException;
 import org.apache.hyracks.api.job.JobId;
 import org.apache.log4j.Logger;
@@ -38,7 +37,6 @@ public class PrecompiledJobEventListener extends ActiveEntityEventsListener
{
 
     private ScheduledExecutorService executorService = null;
     private ResultReader resultReader;
-    private ResultSetId resultSetId;
 
     public enum PrecompiledType {
         CHANNEL,
@@ -60,20 +58,14 @@ public class PrecompiledJobEventListener extends ActiveEntityEventsListener
{
         return resultReader;
     }
 
-    public ResultSetId getResultSetId() {
-        return resultSetId;
-    }
-
     public PrecompiledType getType() {
         return type;
     }
 
-    public void storeDistributedInfo(JobId jobId, ScheduledExecutorService ses, ResultReader
resultReader,
-            ResultSetId resultSetId) {
+    public void storeDistributedInfo(JobId jobId, ScheduledExecutorService ses, ResultReader
resultReader) {
         this.jobId = jobId;
         this.executorService = ses;
         this.resultReader = resultReader;
-        this.resultSetId = resultSetId;
     }
 
     public ScheduledExecutorService getExecutorService() {

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/936674a3/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
----------------------------------------------------------------------
diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
index 5d05bb4..d3ec0ba 100644
--- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
+++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
@@ -24,7 +24,7 @@ import java.util.Collection;
 import java.util.logging.Logger;
 
 import org.apache.asterix.common.config.TransactionProperties;
-import org.apache.asterix.test.aql.TestExecutor;
+import org.apache.asterix.test.common.TestExecutor;
 import org.apache.asterix.test.runtime.ExecutionTestUtil;
 import org.apache.asterix.testframework.context.TestCaseContext;
 import org.apache.asterix.testframework.xml.TestGroup;


Mime
View raw message