This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new ab0a7c89600 [enhance](paimon)paimon scanner code optimization #42606
(#42874)
ab0a7c89600 is described below
commit ab0a7c896007f09b39f43e94afe6d35d0be14828
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Wed Oct 30 12:51:32 2024 +0800
[enhance](paimon)paimon scanner code optimization #42606 (#42874)
cherry pick from #42606
Co-authored-by: zhangdong <[email protected]>
---
.../org/apache/doris/paimon/PaimonJniScanner.java | 6 +++---
.../{PaimonScannerUtils.java => PaimonUtils.java} | 25 +++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git
a/fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonJniScanner.java
b/fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonJniScanner.java
index 4ef40d9fa1a..f229134e9d8 100644
---
a/fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonJniScanner.java
+++
b/fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonJniScanner.java
@@ -135,7 +135,7 @@ public class PaimonJniScanner extends JniScanner {
}
private List<Predicate> getPredicates() {
- List<Predicate> predicates =
PaimonScannerUtils.decodeStringToObject(paimonPredicate);
+ List<Predicate> predicates = PaimonUtils.deserialize(paimonPredicate);
if (LOG.isDebugEnabled()) {
LOG.debug("predicates:{}", predicates);
}
@@ -143,7 +143,7 @@ public class PaimonJniScanner extends JniScanner {
}
private Split getSplit() {
- Split split = PaimonScannerUtils.decodeStringToObject(paimonSplit);
+ Split split = PaimonUtils.deserialize(paimonSplit);
if (LOG.isDebugEnabled()) {
LOG.debug("split:{}", split);
}
@@ -224,7 +224,7 @@ public class PaimonJniScanner extends JniScanner {
tableExt = PaimonTableCache.getTable(key);
}
this.table = tableExt.getTable();
- paimonAllFieldNames =
PaimonScannerUtils.fieldNames(this.table.rowType());
+ paimonAllFieldNames = PaimonUtils.getFieldNames(this.table.rowType());
if (LOG.isDebugEnabled()) {
LOG.debug("paimonAllFieldNames:{}", paimonAllFieldNames);
}
diff --git
a/fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonScannerUtils.java
b/fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonUtils.java
similarity index 72%
rename from
fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonScannerUtils.java
rename to
fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonUtils.java
index 9b1a493874e..44ffb298c98 100644
---
a/fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonScannerUtils.java
+++
b/fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonUtils.java
@@ -25,22 +25,23 @@ import java.util.Base64;
import java.util.List;
import java.util.stream.Collectors;
-public class PaimonScannerUtils {
- private static final Base64.Decoder BASE64_DECODER =
Base64.getUrlDecoder();
+public class PaimonUtils {
+ private static final Base64.Decoder DECODER = Base64.getUrlDecoder();
- public static <T> T decodeStringToObject(String encodedStr) {
- final byte[] bytes =
BASE64_DECODER.decode(encodedStr.getBytes(java.nio.charset.StandardCharsets.UTF_8));
- try {
- return InstantiationUtil.deserializeObject(bytes,
PaimonScannerUtils.class.getClassLoader());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- public static List<String> fieldNames(RowType rowType) {
+ public static List<String> getFieldNames(RowType rowType) {
return rowType.getFields().stream()
.map(DataField::name)
.map(String::toLowerCase)
.collect(Collectors.toList());
}
+
+ public static <T> T deserialize(String encodedStr) {
+ try {
+ return InstantiationUtil.deserializeObject(
+
DECODER.decode(encodedStr.getBytes(java.nio.charset.StandardCharsets.UTF_8)),
+ PaimonUtils.class.getClassLoader());
+ } catch (Throwable e) {
+ throw new RuntimeException(e);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
