From fca34ec337f2aaec18ccb5dee331c0421aaab556 Mon Sep 17 00:00:00 2001 From: slothever <18522955+wsjz@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:36:48 +0800 Subject: [PATCH] [fix](multi-catalog)support bit type and hidden mc secret key (#24124) support max compute bit type and mask mc secret key bool type will use bit arrow vector should mask secret key: close #24019 --- .../org/apache/doris/maxcompute/MaxComputeColumnValue.java | 5 +++-- .../main/java/org/apache/doris/common/util/PrintableMap.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fe/be-java-extensions/max-compute-scanner/src/main/java/org/apache/doris/maxcompute/MaxComputeColumnValue.java b/fe/be-java-extensions/max-compute-scanner/src/main/java/org/apache/doris/maxcompute/MaxComputeColumnValue.java index 5dfd5a0bcf..57b67bacf4 100644 --- a/fe/be-java-extensions/max-compute-scanner/src/main/java/org/apache/doris/maxcompute/MaxComputeColumnValue.java +++ b/fe/be-java-extensions/max-compute-scanner/src/main/java/org/apache/doris/maxcompute/MaxComputeColumnValue.java @@ -20,6 +20,7 @@ package org.apache.doris.maxcompute; import org.apache.doris.common.jni.vec.ColumnValue; import org.apache.arrow.vector.BigIntVector; +import org.apache.arrow.vector.BitVector; import org.apache.arrow.vector.DateDayVector; import org.apache.arrow.vector.DateMilliVector; import org.apache.arrow.vector.DecimalVector; @@ -83,8 +84,8 @@ public class MaxComputeColumnValue implements ColumnValue { @Override public boolean getBoolean() { skippedIfNull(); - TinyIntVector tinyIntCol = (TinyIntVector) column; - return tinyIntCol.get(idx++) > 0; + BitVector bitCol = (BitVector) column; + return bitCol.get(idx++) != 0; } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java index 3a5f5e0cd5..33e5624a51 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java @@ -21,6 +21,7 @@ import org.apache.doris.datasource.property.constants.CosProperties; import org.apache.doris.datasource.property.constants.DLFProperties; import org.apache.doris.datasource.property.constants.GCSProperties; import org.apache.doris.datasource.property.constants.GlueProperties; +import org.apache.doris.datasource.property.constants.MCProperties; import org.apache.doris.datasource.property.constants.ObsProperties; import org.apache.doris.datasource.property.constants.OssProperties; import org.apache.doris.datasource.property.constants.S3Properties; @@ -55,7 +56,7 @@ public class PrintableMap { SENSITIVE_KEY.add("jdbc.password"); SENSITIVE_KEY.add("elasticsearch.password"); SENSITIVE_KEY.addAll(Arrays.asList(S3Properties.SECRET_KEY, ObsProperties.SECRET_KEY, OssProperties.SECRET_KEY, - GCSProperties.SECRET_KEY, CosProperties.SECRET_KEY, GlueProperties.SECRET_KEY, + GCSProperties.SECRET_KEY, CosProperties.SECRET_KEY, GlueProperties.SECRET_KEY, MCProperties.SECRET_KEY, DLFProperties.SECRET_KEY)); HIDDEN_KEY = Sets.newHashSet(); HIDDEN_KEY.addAll(S3Properties.Env.FS_KEYS);