Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Anon. E. Moose (1000171) has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Contrib+1 Analytics Compatibility Tests Successful https://cbjenkins.page.link/Zok7tsa5BjEqgAAR6 : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 03:25:02 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/8674/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 03:04:42 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/4512/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 02:08:23 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Anon. E. Moose (1000171) has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Analytics Compatibility Compilation Successful https://cbjenkins.page.link/LKTsbkgpZNgvtqsb6 : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:55:18 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/4512/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:54:22 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/8674/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:52:39 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/835/ (16/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:42 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/6117/ (6/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:26 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/5917/ (3/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:25 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/6267/ (13/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:38 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/1073/ (10/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:32 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/1262/ (11/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:34 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/6477/ (8/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:29 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/5894/ (15/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:41 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Murtadha Hubail has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/3432
Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
..
[NO ISSUE][OTH] Simplify ResultJobRecord APIs
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Simplify ResultJobRecord APIs by allowing only a single ResultSetId
per ResultJobRecord (i.e. per job).
- Fail result partition registration when a job attempts to use
multiple ResultSetIds or inconsistent number of partitions and
log the inconsistency.
- Remove unused methods.
Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f
---
M
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/result/ResultJobRecord.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
2 files changed, 37 insertions(+), 39 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/32/3432/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/result/ResultJobRecord.java
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/result/ResultJobRecord.java
index b3b0706..eebfd9d 100644
---
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/result/ResultJobRecord.java
+++
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/result/ResultJobRecord.java
@@ -21,12 +21,12 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ResultJobRecord implements IResultStateRecord {
@@ -77,15 +77,13 @@
}
private static final long serialVersionUID = 1L;
-
+private static final Logger LOGGER = LogManager.getLogger();
private final long timestamp;
private long jobStartTime;
private long jobEndTime;
private Status status;
-
+private ResultSetId rsId;
private ResultSetMetaData resultSetMetaData;
-
-private Map resultSetMetadataMap = new
HashMap<>();
public ResultJobRecord() {
this.timestamp = System.nanoTime();
@@ -116,10 +114,6 @@
updateState(State.SUCCESS);
}
-public void fail(ResultSetId rsId, int partition) {
-getOrCreateDirectoryRecord(rsId, partition).fail();
-}
-
public void fail(List exceptions) {
updateState(State.FAILED);
status.setExceptions(exceptions);
@@ -139,47 +133,40 @@
StringBuilder sb = new StringBuilder();
sb.append("{ \"status\": ").append(status.toString()).append(", ");
sb.append("\"timestamp\": ").append(timestamp).append(", ");
-sb.append("\"resultsets\":
").append(Arrays.toString(resultSetMetadataMap.entrySet().toArray())).append("
}");
+sb.append("\"resultset\": ").append(resultSetMetaData).append(" }");
return sb.toString();
}
public synchronized void setResultSetMetaData(ResultSetId rsId,
IResultMetadata metadata, int nPartitions)
throws HyracksDataException {
-ResultSetMetaData rsMd = resultSetMetadataMap.get(rsId);
-if (rsMd == null) {
-final ResultSetMetaData resultSetMetaData = new
ResultSetMetaData(nPartitions, metadata);
-resultSetMetadataMap.put(rsId, resultSetMetaData);
-this.resultSetMetaData = resultSetMetaData;
-} else if (rsMd.getRecords().length != nPartitions) {
-throw
HyracksDataException.create(ErrorCode.INCONSISTENT_RESULT_METADATA,
rsId.toString());
+if (this.rsId == null) {
+this.rsId = rsId;
+this.resultSetMetaData = new ResultSetMetaData(nPartitions,
metadata);
+} else if (!this.rsId.equals(rsId) ||
resultSetMetaData.getRecords().length != nPartitions) {
+logInconsistentMetadata(rsId, nPartitions);
+throw
HyracksDataException.create(ErrorCode.INCONSISTENT_RESULT_METADATA,
this.rsId.toString());
}
-//TODO(tillw) throwing a HyracksDataException here hangs the execution
tests
}
-public ResultSetMetaData getResultSetMetaData(ResultSetId rsId) {
-return resultSetMetadataMap.get(rsId);
-}
-
-public synchronized ResultDirectoryRecord
getOrCreateDirectoryRecord(ResultSetId rsId, int partition) {
-ResultDirectoryRecord[] records =
getResultSetMetaData(rsId).getRecords();
+public synchronized ResultDirectoryRecord getOrCreateDirectoryRecord(int
partition) {
+ResultDirectoryRecord[] records = resultSetMetaData.getRecords();
if (records[partition] == null) {
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/3903/ (7/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:27 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/5813/ (1/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:24 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/11386/ (5/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:26 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/9853/ (12/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:36 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ssl-compression/674/ (2/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:24 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/1168/ (9/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:31 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/6058/ (14/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:39 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Simplify ResultJobRecord APIs
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3432 ) Change subject: [NO ISSUE][OTH] Simplify ResultJobRecord APIs .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/5876/ (4/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37816efc92ee9f5e66f29ce74dec4c6c5bd07c6f Gerrit-Change-Number: 3432 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 09 Jun 2019 01:51:25 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] Fix type inference for ANY in UDFs
Xikui Wang has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3405 ) Change subject: [NO ISSUE] Fix type inference for ANY in UDFs .. Patch Set 3: Code-Review+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/3405 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a03749fe041ec6f43de230d3e784122f7664545 Gerrit-Change-Number: 3405 Gerrit-PatchSet: 3 Gerrit-Owner: Xikui Wang Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Xikui Wang Gerrit-Comment-Date: Sun, 09 Jun 2019 00:11:30 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Add API To Get Dataset Size
Murtadha Hubail has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3425 )
Change subject: [NO ISSUE][OTH] Add API To Get Dataset Size
..
[NO ISSUE][OTH] Add API To Get Dataset Size
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Add an API that returns the on disk total size of a dataset
and its indexes on a node.
Change-Id: Iaff87bbe1f2417689f7827deaf03fcddd64ca7e4
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3425
Contrib: Jenkins
Sonar-Qube: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Murtadha Hubail
Reviewed-by: Michael Blow
---
A
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/DatasetCopyIdentifier.java
M
asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
2 files changed, 99 insertions(+), 0 deletions(-)
Approvals:
Jenkins: Verified; No violations found; ; Verified
Murtadha Hubail: Looks good to me, but someone else must approve
Michael Blow: Looks good to me, approved
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/DatasetCopyIdentifier.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/DatasetCopyIdentifier.java
new file mode 100644
index 000..6500c8a
--- /dev/null
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/storage/DatasetCopyIdentifier.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.common.storage;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class DatasetCopyIdentifier implements Serializable {
+
+private static final long serialVersionUID = 1L;
+private final String dataset;
+private final String dataverse;
+private final String rebalance;
+
+private DatasetCopyIdentifier(String dataverse, String datasetName, String
rebalance) {
+this.dataverse = dataverse;
+this.dataset = datasetName;
+this.rebalance = rebalance;
+}
+
+public static DatasetCopyIdentifier of(String dataverse, String
datasetName, String rebalance) {
+return new DatasetCopyIdentifier(dataverse, datasetName, rebalance);
+}
+
+public String getDataset() {
+return dataset;
+}
+
+public String getRebalance() {
+return rebalance;
+}
+
+@Override
+public boolean equals(Object o) {
+if (this == o) {
+return true;
+}
+if (o == null || getClass() != o.getClass()) {
+return false;
+}
+DatasetCopyIdentifier that = (DatasetCopyIdentifier) o;
+return Objects.equals(dataverse, that.dataverse) &&
Objects.equals(dataset, that.dataset)
+&& Objects.equals(rebalance, that.rebalance);
+}
+
+@Override
+public int hashCode() {
+return Objects.hash(dataverse, dataset, rebalance);
+}
+
+public String getDataverse() {
+return dataverse;
+}
+
+public boolean isMatch(ResourceReference resourceReference) {
+return resourceReference.getDataverse().equals(dataverse) &&
resourceReference.getDataset().equals(dataset)
+&& resourceReference.getRebalance().equals(rebalance);
+}
+
+@Override
+public String toString() {
+return "DatasetCopyIdentifier{" + "dataset='" + dataset + '\'' + ",
dataverse='" + dataverse + '\''
++ ", rebalance='" + rebalance + '\'' + '}';
+}
+}
\ No newline at end of file
diff --git
a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
index aef7bbd..e170779 100644
---
a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
+++
Change in asterixdb[master]: [NO ISSUE][OTH] Add API To Get Dataset Size
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3425 ) Change subject: [NO ISSUE][OTH] Add API To Get Dataset Size .. Patch Set 3: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3425 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaff87bbe1f2417689f7827deaf03fcddd64ca7e4 Gerrit-Change-Number: 3425 Gerrit-PatchSet: 3 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Comment-Date: Sat, 08 Jun 2019 21:19:11 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Better error messages for dump_index
Till Westmann has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3431 )
Change subject: [NO ISSUE][COMP] Better error messages for dump_index
..
[NO ISSUE][COMP] Better error messages for dump_index
- user model changes: no
- storage format changes: no
- interface changes: no
Change-Id: I87d75f7264c1eecf178300a1b0a67b351cce0216
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3431
Contrib: Jenkins
Sonar-Qube: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Till Westmann
Reviewed-by: Murtadha Hubail
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DatasetResourcesRewriter.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/FunctionRewriter.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/StorageComponentsRewriter.java
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dump_index/dump_index.4.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dump_index/dump_index.5.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dump_index/dump_index.6.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dump_index/dump_index.7.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dump_index/dump_index.8.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dump_index/dump_index.9.query.sqlpp
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
13 files changed, 160 insertions(+), 21 deletions(-)
Approvals:
Jenkins: Verified; No violations found; ; Verified
Till Westmann: Looks good to me, but someone else must approve
Murtadha Hubail: Looks good to me, approved
Anon. E. Moose (1000171):
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DatasetResourcesRewriter.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DatasetResourcesRewriter.java
index 47c1045..f1687b5 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DatasetResourcesRewriter.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DatasetResourcesRewriter.java
@@ -27,6 +27,7 @@
import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
import
org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.api.exceptions.SourceLocation;
public class DatasetResourcesRewriter extends FunctionRewriter {
@@ -42,13 +43,13 @@
@Override
public DatasetResourcesDatasource toDatasource(IOptimizationContext
context, AbstractFunctionCallExpression f)
throws AlgebricksException {
-String dataverseName = getString(f.getArguments(), 0);
-String datasetName = getString(f.getArguments(), 1);
+final SourceLocation loc = f.getSourceLocation();
+String dataverseName = getString(loc, f.getArguments(), 0);
+String datasetName = getString(loc, f.getArguments(), 1);
MetadataProvider metadataProvider = (MetadataProvider)
context.getMetadataProvider();
Dataset dataset = metadataProvider.findDataset(dataverseName,
datasetName);
if (dataset == null) {
-throw new
CompilationException(ErrorCode.UNKNOWN_DATASET_IN_DATAVERSE,
f.getSourceLocation(), datasetName,
-dataverseName);
+throw new
CompilationException(ErrorCode.UNKNOWN_DATASET_IN_DATAVERSE, loc, datasetName,
dataverseName);
}
return new
DatasetResourcesDatasource(context.getComputationNodeDomain(),
dataset.getDatasetId());
}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
index c91e9b0..08e5d51 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
@@ -29,6 +29,7 @@
import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
import
org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.api.exceptions.SourceLocation;
import
Change in asterixdb[master]: [NO ISSUE][OTH] Add API To Get Dataset Size
Murtadha Hubail has removed a vote on this change. Change subject: [NO ISSUE][OTH] Add API To Get Dataset Size .. Removed Contrib-2 by Anon. E. Moose (1000171) -- To view, visit https://asterix-gerrit.ics.uci.edu/3425 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Iaff87bbe1f2417689f7827deaf03fcddd64ca7e4 Gerrit-Change-Number: 3425 Gerrit-PatchSet: 3 Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann
