>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20566?usp=email )
Change subject: Merge branch 'gerrit/phoenix' into 'master'
......................................................................
Merge branch 'gerrit/phoenix' into 'master'
* [ASTERIXDB-3670][COMP] Fix ArrayIndexOutOfBoundsException with array index
(MB-69201)
* [NO ISSUR][EXT]: fix reading parquet with assume role auth (MB-69108)
* [ASTERIXDB-3669][CLOUD] Introduced S3 sync client for parallel downloader
(MB-69226)
* [ASTERIXDB-3669][CLOUD] Retry downloadDirectories in parallel downloader
(MB-69226)
* [ASTERIXDB-3671][IDX] Incorrect result with array index and index nested
loop join (MB-69202)
* [NO ISSUE][CLOUD] Fix premature buffer release caused by flatMap cancel
(MB-69283)
* [ASTERIXDB-3668][EXT]: support disableSslVerify + AD auth for parquet
(MB-68900)
* [ASTERIXDB-3672][EXT] Fix reading array null elements (MB-66766)
Change-Id: Id8177dceab07593e92a01cb8ba30c8ac78d5eafa
---
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
2 files changed, 32 insertions(+), 30 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
index 5c72b02..3794610 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
@@ -18,12 +18,9 @@
*/
package org.apache.asterix.external.util;
-<<<<<<< HEAD (9bafae [ASTERIXDB-3658][COMP] Fix serialization error in query
with)
+import static
org.apache.asterix.common.exceptions.ErrorCode.INVALID_PARAM_VALUE_ALLOWED_VALUE;
import static org.apache.asterix.common.exceptions.ErrorCode.PARSE_ERROR;
import static
org.apache.asterix.common.exceptions.ErrorCode.PROPERTY_INVALID_VALUE_TYPE;
-=======
-import static
org.apache.asterix.common.exceptions.ErrorCode.INVALID_PARAM_VALUE_ALLOWED_VALUE;
->>>>>>> BRANCH (7bd62f [ASTERIXDB-3672][EXT] Fix reading array null elements)
import static
org.apache.asterix.common.metadata.MetadataConstants.DEFAULT_DATABASE;
import static org.apache.asterix.common.utils.CSVConstants.KEY_DELIMITER;
import static
org.apache.asterix.common.utils.CSVConstants.KEY_EMPTY_STRING_AS_NULL;
@@ -93,20 +90,14 @@
import org.apache.asterix.external.util.aws.AwsConstants;
import org.apache.asterix.external.util.aws.s3.S3Constants;
import org.apache.asterix.external.util.aws.s3.S3Utils;
-<<<<<<< HEAD (9bafae [ASTERIXDB-3658][COMP] Fix serialization error in query
with)
-import org.apache.asterix.external.util.azure.blob_storage.AzureConstants;
-import org.apache.asterix.external.util.google.gcs.GCSConstants;
-import org.apache.asterix.external.util.google.gcs.GCSUtils;
+import org.apache.asterix.external.util.azure.AzureConstants;
+import org.apache.asterix.external.util.google.GCSConstants;
+import org.apache.asterix.external.util.google.GCSUtils;
import org.apache.asterix.object.base.AdmArrayNode;
import org.apache.asterix.object.base.AdmBooleanNode;
import org.apache.asterix.object.base.AdmObjectNode;
import org.apache.asterix.object.base.AdmStringNode;
import org.apache.asterix.object.base.IAdmNode;
-=======
-import org.apache.asterix.external.util.azure.AzureConstants;
-import org.apache.asterix.external.util.google.GCSConstants;
-import org.apache.asterix.external.util.google.GCSUtils;
->>>>>>> BRANCH (7bd62f [ASTERIXDB-3672][EXT] Fix reading array null elements)
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
@@ -1211,7 +1202,22 @@
return
ExternalDataConstants.KEY_COMPRESSION_GZIP.equalsIgnoreCase(compression);
}
-<<<<<<< HEAD (9bafae [ASTERIXDB-3658][COMP] Fix serialization error in query
with)
+ public static boolean getDisableSslVerify(Map<String, String>
configuration) throws CompilationException {
+ String disableSslVerifyString =
configuration.get(DISABLE_SSL_VERIFY_FIELD_NAME);
+ return validateAndGetBooleanProperty(DISABLE_SSL_VERIFY_FIELD_NAME,
disableSslVerifyString);
+ }
+
+ public static boolean validateAndGetBooleanProperty(String propertyKey,
String propertyValue)
+ throws CompilationException {
+ if (propertyValue == null) {
+ return false;
+ }
+ if (!"true".equalsIgnoreCase(propertyValue) &&
!"false".equalsIgnoreCase(propertyValue)) {
+ throw new CompilationException(INVALID_PARAM_VALUE_ALLOWED_VALUE,
propertyKey, "true, false");
+ }
+ return "true".equalsIgnoreCase(propertyValue);
+ }
+
public static Map<String, String>
convertStringArrayParamIntoNumberedParameters(AdmObjectNode withObjectNode,
SourceLocation sourceLocation) throws CompilationException {
Map<String, String> properties = new HashMap<>();
@@ -1245,21 +1251,5 @@
properties.put(fieldName, fieldValueStr);
}
return properties;
-=======
- public static boolean getDisableSslVerify(Map<String, String>
configuration) throws CompilationException {
- String disableSslVerifyString =
configuration.get(DISABLE_SSL_VERIFY_FIELD_NAME);
- return validateAndGetBooleanProperty(DISABLE_SSL_VERIFY_FIELD_NAME,
disableSslVerifyString);
- }
-
- public static boolean validateAndGetBooleanProperty(String propertyKey,
String propertyValue)
- throws CompilationException {
- if (propertyValue == null) {
- return false;
- }
- if (!"true".equalsIgnoreCase(propertyValue) &&
!"false".equalsIgnoreCase(propertyValue)) {
- throw new CompilationException(INVALID_PARAM_VALUE_ALLOWED_VALUE,
propertyKey, "true, false");
- }
- return "true".equalsIgnoreCase(propertyValue);
->>>>>>> BRANCH (7bd62f [ASTERIXDB-3672][EXT] Fix reading array null elements)
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20566?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Id8177dceab07593e92a01cb8ba30c8ac78d5eafa
Gerrit-Change-Number: 20566
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
