Change in asterixdb[master]: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; f...
Jenkins has posted comments on this change. Change subject: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; fix NC effective map precedence .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/8043/ (7/12) -- To view, visit https://asterix-gerrit.ics.uci.edu/2363 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ied091c2ab17f631df84eab40143180b3a9be09ed Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; f...
Jenkins has posted comments on this change. Change subject: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; fix NC effective map precedence .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/2490/ (4/12) -- To view, visit https://asterix-gerrit.ics.uci.edu/2363 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ied091c2ab17f631df84eab40143180b3a9be09ed Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; f...
Jenkins has posted comments on this change. Change subject: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; fix NC effective map precedence .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/595/ (8/12) -- To view, visit https://asterix-gerrit.ics.uci.edu/2363 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ied091c2ab17f631df84eab40143180b3a9be09ed Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; f...
Jenkins has posted comments on this change. Change subject: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; fix NC effective map precedence .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/3336/ (10/12) -- To view, visit https://asterix-gerrit.ics.uci.edu/2363 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ied091c2ab17f631df84eab40143180b3a9be09ed Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; f...
Jenkins has posted comments on this change. Change subject: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; fix NC effective map precedence .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/6538/ (3/12) -- To view, visit https://asterix-gerrit.ics.uci.edu/2363 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ied091c2ab17f631df84eab40143180b3a9be09ed Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; f...
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2363
Change subject: [NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; fix
NC effective map precedence
..
[NO ISSUE] Trace AsterixHyracksIntegrationUtil to console; fix NC effective map
precedence
Change-Id: Ied091c2ab17f631df84eab40143180b3a9be09ed
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestUtils.java
3 files changed, 41 insertions(+), 11 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/63/2363/1
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index ae82ea7..ee96d00 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -55,6 +55,7 @@
import org.apache.hyracks.control.common.controllers.ControllerConfig;
import org.apache.hyracks.control.common.controllers.NCConfig;
import org.apache.hyracks.control.nc.NodeControllerService;
+import org.apache.hyracks.test.support.TestUtils;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -97,12 +98,13 @@
* @param args unused
*/
public static void main(String[] args) throws Exception {
+TestUtils.redirectLoggingToConsole();
AsterixHyracksIntegrationUtil integrationUtil = new
AsterixHyracksIntegrationUtil();
try {
integrationUtil.run(Boolean.getBoolean("cleanup.start"),
Boolean.getBoolean("cleanup.shutdown"),
System.getProperty("external.lib", ""),
System.getProperty("conf.path", DEFAULT_CONF_FILE));
} catch (Exception e) {
-LOGGER.log(Level.WARN, "Unexpected exception", e);
+LOGGER.fatal("Unexpected exception", e);
System.exit(1);
}
}
@@ -125,7 +127,7 @@
}
final List nodeControllers = new ArrayList<>();
for (String nodeId : nodeNames) {
-// mark this NC as virtual in the CC's config manager, so he
doesn't try to contact NCService...
+// mark this NC as virtual, so that the CC doesn't try to start
via NCService...
configManager.set(nodeId, NCConfig.Option.NCSERVICE_PORT,
NCConfig.NCSERVICE_PORT_DISABLED);
final INCApplication ncApplication = createNCApplication();
ConfigManager ncConfigManager;
@@ -363,7 +365,8 @@
private static Path getProjectPath() {
final String targetDir = "asterix-app";
final BiPredicate matcher =
-(path, attributes) ->
path.getFileName().toString().equals(targetDir) && path.toFile().isDirectory();
+(path, attributes) ->
path.getFileName().toString().equals(targetDir) && path.toFile().isDirectory()
+&& path.toFile().list((d, n) ->
n.equals("pom.xml")).length == 1;
final Path currentPath = Paths.get(System.getProperty("user.dir"));
try (Stream pathStream = Files.find(currentPath, 10, matcher)) {
return pathStream.findFirst().orElse(currentPath);
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
index fd8c116..baff800 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
@@ -454,12 +454,10 @@
private Map getNodeEffectiveMap(String nodeId) {
ensureNode(nodeId);
-CompositeMap nodeEffectiveMap = new CompositeMap<>();
-nodeEffectiveMap.setMutator(new NoOpMapMutator());
-nodeEffectiveMap.addComposited(nodeSpecificDefinedMap.get(nodeId));
-nodeEffectiveMap.addComposited(nodeSpecificDefaultMap.get(nodeId));
-nodeEffectiveMap.addComposited(definedMap);
-return nodeEffectiveMap;
+return new CompositeMap<>(
+Stream.of(nodeSpecificDefinedMap.get(nodeId),
nodeSpecificDefaultMap.get(nodeId), definedMap)
+.t
Change in asterixdb-bad[master]: Coordinated change for https://asterix-gerrit.ics.uci.edu/#/...
Michael Blow has submitted this change and it was merged.
Change subject: Coordinated change for
https://asterix-gerrit.ics.uci.edu/#/c/2344/
..
Coordinated change for https://asterix-gerrit.ics.uci.edu/#/c/2344/
Change-Id: I973c67448d4b34c4521d0abd23c999397e88cf67
---
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/ExecuteProcedureStatement.java
3 files changed, 14 insertions(+), 24 deletions(-)
Approvals:
Jenkins: Verified
Murtadha Hubail: Looks good to me, approved
diff --git a/asterix-bad/pom.xml b/asterix-bad/pom.xml
index 291697d..20e97b2 100644
--- a/asterix-bad/pom.xml
+++ b/asterix-bad/pom.xml
@@ -282,22 +282,12 @@
org.apache.asterix
- asterix-lang-common
- ${asterix.version}
-
-
- org.apache.asterix
asterix-metadata
${asterix.version}
org.apache.asterix
asterix-external-data
- ${asterix.version}
-
-
- org.apache.asterix
- asterix-transactions
${asterix.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 feaa3ca..53baf6d 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
@@ -40,6 +40,7 @@
import org.apache.asterix.bad.metadata.Channel;
import org.apache.asterix.bad.metadata.DeployedJobSpecEventListener;
import
org.apache.asterix.bad.metadata.DeployedJobSpecEventListener.PrecompiledType;
+import org.apache.asterix.common.transactions.ITxnIdFactory;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.config.DatasetConfig.IndexType;
import org.apache.asterix.common.dataflow.ICcApplicationContext;
@@ -256,11 +257,11 @@
}
private void setupExecutorJob(EntityId entityId, JobSpecification
channeljobSpec, IHyracksClientConnection hcc,
-DeployedJobSpecEventListener listener) throws Exception {
+DeployedJobSpecEventListener listener, ITxnIdFactory txnIdFactory)
throws Exception {
if (channeljobSpec != null) {
DeployedJobSpecId destributedId =
hcc.deployJobSpec(channeljobSpec);
ScheduledExecutorService ses =
DeployedJobService.startRepetitiveDeployedJobSpec(destributedId, hcc,
-ChannelJobService.findPeriod(duration), new HashMap<>(),
entityId);
+ChannelJobService.findPeriod(duration), new HashMap<>(),
entityId, txnIdFactory);
listener.storeDistributedInfo(destributedId, ses, null, null);
}
@@ -331,7 +332,7 @@
activeEventHandler.registerListener(listener);
}
-setupExecutorJob(entityId, channeljobSpec, hcc, listener);
+setupExecutorJob(entityId, channeljobSpec, hcc, listener,
metadataProvider.getTxnIdFactory());
channel = new Channel(dataverse, channelName.getValue(),
subscriptionsTableName, resultsTableName, function,
duration, null);
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 7ab7f95..7db935a 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
@@ -18,6 +18,12 @@
*/
package org.apache.asterix.bad.lang.statement;
+import java.io.DataOutput;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+
import org.apache.asterix.active.DeployedJobService;
import org.apache.asterix.active.EntityId;
import org.apache.asterix.algebra.extension.IExtensionStatement;
@@ -45,7 +51,6 @@
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.om.base.AString;
import org.apache.asterix.om.base.IAObject;
-import
org.apache.asterix.transaction.management.service.transaction.TxnIdFactory;
import org.apache.asterix.translator.ConstantHelper;
import org.apache.asterix.translator.IRequestParameters;
import org.apache.asterix.translator.IStatementExecutor;
@@ -56,12 +61,6 @@
import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
-
-import java.io.DataOutput;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concur
Change in asterixdb-bad[master]: Coordinated change for https://asterix-gerrit.ics.uci.edu/#/...
Murtadha Hubail has posted comments on this change. Change subject: Coordinated change for https://asterix-gerrit.ics.uci.edu/#/c/2344/ .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2361 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I973c67448d4b34c4521d0abd23c999397e88cf67 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb-bad Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE] More multi-CC support, ConfigManager updates
Murtadha Hubail has posted comments on this change. Change subject: [NO ISSUE] More multi-CC support, ConfigManager updates .. Patch Set 11: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2344 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff60887bf71ce3f3ed7201afd9499612bfc83485 Gerrit-PatchSet: 11 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets
Luo Chen has posted comments on this change. Change subject: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/2362/1//COMMIT_MSG Commit Message: PS1, Line 19: - Introduce max active writable datasets and use : it to automatically calculate the number of pages : of a user dataset memory component. Even with the previous configuration, we can figure out this max active writable datasets automatically based on memory component size and memory component global memory. Any strong motivation to turn things around? -- To view, visit https://asterix-gerrit.ics.uci.edu/2362 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9909c26b1e12b431f913e201d2c3d83769be7269 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Luo Chen Gerrit-HasComments: Yes
Change in asterixdb[master]: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets .. Patch Set 1: BAD Compatibility Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/2627/ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/2362 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9909c26b1e12b431f913e201d2c3d83769be7269 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/2627/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2362 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9909c26b1e12b431f913e201d2c3d83769be7269 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets .. Patch Set 1: Integration-Tests-1 Integration Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/5510/ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/2362 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9909c26b1e12b431f913e201d2c3d83769be7269 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/3335/ (12/12) -- To view, visit https://asterix-gerrit.ics.uci.edu/2362 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9909c26b1e12b431f913e201d2c3d83769be7269 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2276][CONF] Introduce Max Active Writable Datasets .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/5510/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2362 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9909c26b1e12b431f913e201d2c3d83769be7269 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
