You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2019/02/16 00:23:10 UTC
[asterixdb] 07/08: Merge commit 'd9850dc' from
'stabilization-f69489' into 'master'
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 97e589dbd30e23b8463ceb2733943427ba3c71ec
Merge: 6b0e2f7 d9850dc
Author: Michael Blow <mb...@apache.org>
AuthorDate: Fri Feb 15 18:57:27 2019 -0500
Merge commit 'd9850dc' from 'stabilization-f69489' into 'master'
Change-Id: Ia35c75e8c35720dfd22436f4d08f6986e3aa1b3c
asterixdb/NOTICE | 2 +-
.../optimizer/rules/am/BTreeAccessMethod.java | 36 ++++++++----
asterixdb/asterix-app/pom.xml | 4 +-
.../asterix/test/runtime/ExecutionTestUtil.java | 11 ++++
.../range-search-open.5.query.sqlpp | 33 +++--------
.../range-search/range-search.5.query.sqlpp | 33 +++--------
.../range-search-open/range-search-open.2.adm | 1 +
.../range-search/range-search.2.adm | 1 +
.../range-search-open/range-search-open.5.ast | 67 ++++++++++++++++++++++
.../range-search/range-search.5.ast | 67 ++++++++++++++++++++++
.../src/main/licenses/templates/asterix-notice.ftl | 2 +-
hyracks-fullstack/NOTICE | 2 +-
.../src/main/licenses/templates/hyracks-notice.ftl | 2 +-
.../common/controllers/ControllerConfig.java | 5 +-
.../control/nc/NCLogConfigurationFactory.java | 26 ++++-----
hyracks-fullstack/hyracks/hyracks-server/pom.xml | 4 ++
.../apache/hyracks/test/server/NCServiceIT.java | 19 +++++-
.../test/server/process/HyracksCCProcess.java | 8 ++-
.../server/process/HyracksNCServiceProcess.java | 9 ++-
.../test/server/process/HyracksServerProcess.java | 5 ++
.../test/server/process/HyracksVirtualCluster.java | 61 ++++++++++++++++----
.../src/test/resources/NCServiceIT/cc.conf | 1 +
.../src/test/resources/NCServiceIT/nc-blue.conf | 2 -
.../src/test/resources/NCServiceIT/nc-red.conf | 2 -
hyracks-fullstack/pom.xml | 2 +
25 files changed, 306 insertions(+), 99 deletions(-)
diff --cc asterixdb/asterix-app/pom.xml
index 77e31c0,8ef9c45..f74fbf3
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@@ -287,8 -286,7 +287,8 @@@
<profile>
<id>asterix-gerrit-asterix-app</id>
<properties>
- <test.excludes>**/SqlppExecutionWithCancellationTest.java,**/DmlTest.java,**/RepeatedTest.java,**/SqlppExecutionTest.java,**/*Compression*Test.java,**/*Ssl*Test.java</test.excludes>
- <test.excludes>**/SqlppExecutionWithCancellationTest.java,**/DmlTest.java,**/RepeatedTest.java,**/SqlppExecutionTest.java,**/AqlExecutionTest.java</test.excludes>
++ <test.excludes>**/SqlppExecutionWithCancellationTest.java,**/DmlTest.java,**/RepeatedTest.java,**/SqlppExecutionTest.java,**/AqlExecutionTest.java,**/*Compression*Test.java,**/*Ssl*Test.java</test.excludes>
+ <itest.excludes>**/*.java</itest.excludes>
</properties>
<build>
<plugins>
@@@ -326,17 -327,9 +326,17 @@@
</properties>
</profile>
<profile>
+ <id>asterix-gerrit-ssl-compression</id>
+ <properties>
+ <test.includes>**/*Compression*Test.java,**/*Ssl*Test.java</test.includes>
+ <itest.excludes>**/*.java</itest.excludes>
+ <failIfNoTests>false</failIfNoTests>
+ </properties>
+ </profile>
+ <profile>
<id>asterix-gerrit-verify-asterix-app</id>
<properties>
- <test.excludes>**/*.java</test.excludes>
+ <test.includes>**/AqlExecutionTest.java</test.includes>
<itest.excludes>**/SqlppExecution*IT.java,**/RebalanceWithCancellationIT.java</itest.excludes>
<failIfNoTests>false</failIfNoTests>
</properties>
diff --cc hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
index dc229e0,79ad71f..f7291cb
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
@@@ -18,8 -18,7 +18,9 @@@
*/
package org.apache.hyracks.control.common.controllers;
+import static org.apache.hyracks.control.common.config.OptionTypes.BOOLEAN;
+
+ import java.io.File;
import java.io.Serializable;
import java.net.URL;
import java.util.function.Function;
@@@ -123,10 -121,8 +124,12 @@@ public class ControllerConfig implement
}
public String getLogDir() {
- return configManager.getAppConfig().getString(ControllerConfig.Option.LOG_DIR);
+ String relPath = configManager.getAppConfig().getString(ControllerConfig.Option.LOG_DIR);
+ String fullPath = new File(relPath).getAbsolutePath();
+ return fullPath;
}
+
+ public boolean isSslEnabled() {
+ return getAppConfig().getBoolean(Option.SSL_ENABLED);
+ }
}
diff --cc hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
index 24c3dee,587696c..a657d6b
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
@@@ -18,10 -18,7 +18,10 @@@
*/
package org.apache.hyracks.control.nc;
++import java.io.File;
+import java.net.URI;
+
import org.apache.hyracks.control.common.controllers.NCConfig;
- import org.apache.hyracks.util.file.FileUtil;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
@@@ -51,24 -51,22 +51,22 @@@ public class NCLogConfigurationFactory
ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
.addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule", "0 0 0 * * ?"))
.addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size", "50M"));
- AppenderComponentBuilder defaultRoll =
- builder.newAppender("default", "RollingFile")
- .addAttribute("fileName", FileUtil.joinPath(logDir, "nc-" + nodeId + ".log"))
- .addAttribute("filePattern",
- FileUtil.joinPath(logDir, "nc-" + nodeId + "-%d{MM-dd-yy-ss}.log.gz"))
- .add(defaultLayout).addComponent(triggeringPolicy);
+ AppenderComponentBuilder defaultRoll = builder.newAppender("default", "RollingFile")
+ .addAttribute("fileName", new File(logDir, "nc-" + nodeId + ".log").getAbsolutePath())
+ .addAttribute("filePattern",
- new File(logDir, "nc-" + nodeId + "-%d{MM-dd-yy}.log.gz").getAbsolutePath())
++ new File(logDir, "nc-" + nodeId + "-%d{MM-dd-yy-ss}.log.gz").getAbsolutePath())
+ .add(defaultLayout).addComponent(triggeringPolicy);
builder.add(defaultRoll);
// create the new logger
builder.add(builder.newRootLogger(Level.INFO).add(builder.newAppenderRef("default")));
LayoutComponentBuilder accessLayout = builder.newLayout("PatternLayout").addAttribute("pattern", "%m%n");
- AppenderComponentBuilder accessRoll =
- builder.newAppender("access", "RollingFile")
- .addAttribute("fileName", FileUtil.joinPath(logDir, "access-" + nodeId + ".log"))
- .addAttribute("filePattern",
- FileUtil.joinPath(logDir, "access-" + nodeId + "-%d{MM-dd-yy-ss}.log.gz"))
- .add(accessLayout).addComponent(triggeringPolicy);
+ AppenderComponentBuilder accessRoll = builder.newAppender("access", "RollingFile")
+ .addAttribute("fileName", new File(logDir, "access-" + nodeId + ".log").getAbsolutePath())
+ .addAttribute("filePattern",
- new File(logDir, "access-" + nodeId + "-%d{MM-dd-yy}.log.gz").getAbsolutePath())
++ new File(logDir, "access-" + nodeId + "-%d{MM-dd-yy-ss}.log.gz").getAbsolutePath())
+ .add(accessLayout).addComponent(triggeringPolicy);
builder.add(accessRoll);
builder.add(builder.newLogger("org.apache.hyracks.http.server.CLFLogger", Level.forName("ACCESS", 550))
.add(builder.newAppenderRef("access")).addAttribute("additivity", false));