You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/12/08 15:10:23 UTC
Change in asterixdb[master]: Merge branch 'gerrit/stabilization-5e11053887'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14403 )
Change subject: Merge branch 'gerrit/stabilization-5e11053887'
......................................................................
Merge branch 'gerrit/stabilization-5e11053887'
Change-Id: I1cb9c41981ac7f143591a7fad58ef86b0285eafb
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M asterixdb/asterix-common/pom.xml
M asterixdb/asterix-external-data/pom.xml
M hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java
M hyracks-fullstack/pom.xml
7 files changed, 1 insertion(+), 72 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/03/14403/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 63bfb71..5b8b9e4 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -586,16 +586,6 @@
<artifactId>hadoop-hdfs</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -724,16 +714,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index d5f4028..8801ce7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -11036,11 +11036,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="string">
- <compilation-unit name="substr-ASTERIXDB-2949">
- <output-dir compare="Text">substr-ASTERIXDB-2949</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="string">
<compilation-unit name="substring-after-1">
<output-dir compare="Text">substring-after-1</output-dir>
</compilation-unit>
diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml
index 8c82a66..460ef69 100644
--- a/asterixdb/asterix-common/pom.xml
+++ b/asterixdb/asterix-common/pom.xml
@@ -161,11 +161,7 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
<artifactId>netty-codec</artifactId>
-=======
- <artifactId>netty-codec-http</artifactId>
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index 2982e13..b8a1206 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -210,10 +210,7 @@
<usedDependency>io.netty:netty-resolver-dns</usedDependency>
<usedDependency>io.netty:netty-codec-http2</usedDependency>
<usedDependency>io.netty:netty-transport-native-unix-common</usedDependency>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
<usedDependency>org.apache.tomcat:tomcat-annotations-api</usedDependency>
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
</usedDependencies>
</configuration>
</plugin>
@@ -431,17 +428,6 @@
<artifactId>hyracks-http</artifactId>
</dependency>
<dependency>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
-=======
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </dependency>
- <dependency>
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -506,7 +492,6 @@
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
@@ -523,8 +508,6 @@
<artifactId>hadoop-azure</artifactId>
</dependency>
<dependency>
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
</dependency>
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java
index fac66d9..2170c15 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java
@@ -37,46 +37,29 @@
private final File keyStoreFile;
private final File trustStoreFile;
private final String keyStorePassword;
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
private transient KeyStore keyStore;
private transient KeyStore trustStore;
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
private NetworkSecurityConfig(boolean sslEnabled, String keyStoreFile, String keyStorePassword,
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
String trustStoreFile, KeyStore keyStore, KeyStore trustStore) {
-=======
- String trustStoreFile) {
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
this.sslEnabled = sslEnabled;
this.keyStoreFile = keyStoreFile != null ? new File(keyStoreFile) : null;
this.keyStorePassword = keyStorePassword;
this.trustStoreFile = trustStoreFile != null ? new File(trustStoreFile) : null;
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
this.keyStore = keyStore;
this.trustStore = trustStore;
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
}
public static NetworkSecurityConfig of(boolean sslEnabled, String keyStoreFile, String keyStorePassword,
String trustStoreFile) {
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
return new NetworkSecurityConfig(sslEnabled, keyStoreFile, keyStorePassword, trustStoreFile, null, null);
-=======
- return new NetworkSecurityConfig(sslEnabled, keyStoreFile, keyStorePassword, trustStoreFile);
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
}
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
public static NetworkSecurityConfig of(boolean sslEnabled, KeyStore keyStore, String keyStorePassword,
KeyStore trustStore) {
return new NetworkSecurityConfig(sslEnabled, null, keyStorePassword, null, keyStore, trustStore);
}
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
@Override
public boolean isSslEnabled() {
return sslEnabled;
@@ -94,16 +77,12 @@
@Override
public KeyStore getKeyStore() {
- return null;
+ return keyStore;
}
@Override
public KeyStore getTrustStore() {
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
return trustStore;
-=======
- return null;
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
}
@Override
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index c5a50be..d0cbcb9 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -349,11 +349,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.8.3</version>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
- </dependency>
-=======
</dependency>
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14403
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I1cb9c41981ac7f143591a7fad58ef86b0285eafb
Gerrit-Change-Number: 14403
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/stabilization-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14403 )
Change subject: Merge branch 'gerrit/stabilization-5e11053887'
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14403
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I1cb9c41981ac7f143591a7fad58ef86b0285eafb
Gerrit-Change-Number: 14403
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Comment-Date: Wed, 08 Dec 2021 19:21:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/stabilization-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14403 )
Change subject: Merge branch 'gerrit/stabilization-5e11053887'
......................................................................
Merge branch 'gerrit/stabilization-5e11053887'
Change-Id: I1cb9c41981ac7f143591a7fad58ef86b0285eafb
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M asterixdb/asterix-common/pom.xml
M asterixdb/asterix-external-data/pom.xml
M hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java
M hyracks-fullstack/pom.xml
7 files changed, 1 insertion(+), 72 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/03/14403/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 63bfb71..5b8b9e4 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -586,16 +586,6 @@
<artifactId>hadoop-hdfs</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -724,16 +714,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index d5f4028..8801ce7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -11036,11 +11036,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="string">
- <compilation-unit name="substr-ASTERIXDB-2949">
- <output-dir compare="Text">substr-ASTERIXDB-2949</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="string">
<compilation-unit name="substring-after-1">
<output-dir compare="Text">substring-after-1</output-dir>
</compilation-unit>
diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml
index 8c82a66..460ef69 100644
--- a/asterixdb/asterix-common/pom.xml
+++ b/asterixdb/asterix-common/pom.xml
@@ -161,11 +161,7 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
<artifactId>netty-codec</artifactId>
-=======
- <artifactId>netty-codec-http</artifactId>
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index 2982e13..b8a1206 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -210,10 +210,7 @@
<usedDependency>io.netty:netty-resolver-dns</usedDependency>
<usedDependency>io.netty:netty-codec-http2</usedDependency>
<usedDependency>io.netty:netty-transport-native-unix-common</usedDependency>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
<usedDependency>org.apache.tomcat:tomcat-annotations-api</usedDependency>
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
</usedDependencies>
</configuration>
</plugin>
@@ -431,17 +428,6 @@
<artifactId>hyracks-http</artifactId>
</dependency>
<dependency>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
-=======
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </dependency>
- <dependency>
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -506,7 +492,6 @@
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
@@ -523,8 +508,6 @@
<artifactId>hadoop-azure</artifactId>
</dependency>
<dependency>
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
</dependency>
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java
index fac66d9..2170c15 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/security/NetworkSecurityConfig.java
@@ -37,46 +37,29 @@
private final File keyStoreFile;
private final File trustStoreFile;
private final String keyStorePassword;
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
private transient KeyStore keyStore;
private transient KeyStore trustStore;
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
private NetworkSecurityConfig(boolean sslEnabled, String keyStoreFile, String keyStorePassword,
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
String trustStoreFile, KeyStore keyStore, KeyStore trustStore) {
-=======
- String trustStoreFile) {
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
this.sslEnabled = sslEnabled;
this.keyStoreFile = keyStoreFile != null ? new File(keyStoreFile) : null;
this.keyStorePassword = keyStorePassword;
this.trustStoreFile = trustStoreFile != null ? new File(trustStoreFile) : null;
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
this.keyStore = keyStore;
this.trustStore = trustStore;
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
}
public static NetworkSecurityConfig of(boolean sslEnabled, String keyStoreFile, String keyStorePassword,
String trustStoreFile) {
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
return new NetworkSecurityConfig(sslEnabled, keyStoreFile, keyStorePassword, trustStoreFile, null, null);
-=======
- return new NetworkSecurityConfig(sslEnabled, keyStoreFile, keyStorePassword, trustStoreFile);
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
}
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
public static NetworkSecurityConfig of(boolean sslEnabled, KeyStore keyStore, String keyStorePassword,
KeyStore trustStore) {
return new NetworkSecurityConfig(sslEnabled, null, keyStorePassword, null, keyStore, trustStore);
}
-=======
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
@Override
public boolean isSslEnabled() {
return sslEnabled;
@@ -94,16 +77,12 @@
@Override
public KeyStore getKeyStore() {
- return null;
+ return keyStore;
}
@Override
public KeyStore getTrustStore() {
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
return trustStore;
-=======
- return null;
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
}
@Override
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index c5a50be..d0cbcb9 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -349,11 +349,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.8.3</version>
-<<<<<<< HEAD (9a0892 [ASTERIXDB-2994][EXT]: Fix broken parquet format for azure d)
- </dependency>
-=======
</dependency>
->>>>>>> BRANCH (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14403
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I1cb9c41981ac7f143591a7fad58ef86b0285eafb
Gerrit-Change-Number: 14403
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange