Change in asterixdb-bad[master]: Updated BAD to work with recent Asterix changes

[Steven Jacobs (Code Review)]

Steven Jacobs has submitted this change and it was merged.

Change subject: Updated BAD to work with recent Asterix changes
..


Updated BAD to work with recent Asterix changes

Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
---
M asterix-bad/pom.xml
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/metadata/PrecompiledJobEventListener.java
M asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
6 files changed, 8 insertions(+), 14 deletions(-)

Approvals:
  Ildar Absalyamov: Looks good to me, approved
  Jenkins: Verified



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 @@
 
   
org.apache.hadoop:hadoop-minicluster
 
+
+  
org.apache.asterix:asterix-common
+
   
 
   
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 @@
 }
 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);
 }
 
 }
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 @@
 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
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 @@
 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 @@
 } 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);
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.app.result.ResultReader;
 import org.ap

Change in asterixdb-bad[master]: Updated BAD to work with recent Asterix changes

[Ildar Absalyamov (Code Review)]

Ildar Absalyamov has posted comments on this change.

Change subject: Updated BAD to work with recent Asterix changes
..


Patch Set 2: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1539
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Updated BAD to work with recent Asterix changes

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Updated BAD to work with recent Asterix changes
..


Patch Set 2:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-gerrit/81/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1539
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Updated BAD to work with recent Asterix changes

[Steven Jacobs (Code Review)]

Steven Jacobs has posted comments on this change.

Change subject: Updated BAD to work with recent Asterix changes
..


Patch Set 1:

(1 comment)

Uploading a new patch set that should build

https://asterix-gerrit.ics.uci.edu/#/c/1539/1/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
File 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java:

Line 121: ResultUtil.printResults(resultReader, 
((QueryTranslator) statementExecutor).getSessionConfig(),
> Is this not-open intentionally? Do we need to open it explicitly?
Till's refactoring of resultReader makes this call no longer necessary


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1539
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: Yes

Change in asterixdb-bad[master]: Updated BAD to work with recent Asterix changes

[Steven Jacobs (Code Review)]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1539

to look at the new patch set (#2).

Change subject: Updated BAD to work with recent Asterix changes
..

Updated BAD to work with recent Asterix changes

Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
---
M asterix-bad/pom.xml
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/metadata/PrecompiledJobEventListener.java
M asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
6 files changed, 8 insertions(+), 14 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad 
refs/changes/39/1539/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1539
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Xikui Wang 

Change in asterixdb-bad[master]: Updated BAD to work with recent Asterix changes

[Xikui Wang (Code Review)]

Xikui Wang has posted comments on this change.

Change subject: Updated BAD to work with recent Asterix changes
..


Patch Set 1:

(1 comment)

added one comment.

https://asterix-gerrit.ics.uci.edu/#/c/1539/1/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
File 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java:

Line 121: ResultUtil.printResults(resultReader, 
((QueryTranslator) statementExecutor).getSessionConfig(),
Is this not-open intentionally? Do we need to open it explicitly?


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1539
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: Yes

Change in asterixdb-bad[master]: Updated BAD to work with recent Asterix changes

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Updated BAD to work with recent Asterix changes
..


Patch Set 1:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-gerrit/80/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1539
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Updated BAD to work with recent Asterix changes

[Steven Jacobs (Code Review)]

Steven Jacobs has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1539

Change subject: Updated BAD to work with recent Asterix changes
..

Updated BAD to work with recent Asterix changes

Change-Id: I20f2e86ff47f92477ffc1d20514127af41340346
---
M asterix-bad/pom.xml
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/metadata/PrecompiledJobEventListener.java
M asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java
6 files changed, 5 insertions(+), 21 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad 
refs/changes/39/1539/1

diff --git a/asterix-bad/pom.xml b/asterix-bad/pom.xml
index 0d32652..19671e3 100644
--- a/asterix-bad/pom.xml
+++ b/asterix-bad/pom.xml
@@ -210,13 +210,6 @@
   test
 
 
-  org.apache.asterix
-  asterix-common
-  ${asterix.version}
-  test-jar
-  test
-
-
   org.apache.hyracks
   algebricks-common
   ${hyracks.version}
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 @@
 }
 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);
 }
 
 }
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 @@
 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
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 @@
 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 @@
 } 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);
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,