You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2024/01/25 15:56:57 UTC
(doris) branch branch-2.1 updated (6734fb10f9a -> 64f7a5f3957)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a change to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
from 6734fb10f9a Revert "[temporary](log) Add temporary log for debug insert into lost result (#30140)" (#30382)
new 2ae02efd46a [BugFix](MutilCatalog) fix local file system unavailable in iceberg hadoop catalog (#26769)
new 64f7a5f3957 [fix](fe)add from_unixtime to null_result_with_one_null_param_functions set (#30388)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../datasource/iceberg/IcebergHadoopExternalCatalog.java | 15 +++++++++------
gensrc/script/doris_builtins_functions.py | 3 ++-
2 files changed, 11 insertions(+), 7 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
(doris) 01/02: [BugFix](MutilCatalog) fix local file system unavailable in iceberg hadoop catalog (#26769)
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 2ae02efd46af993e1fa324de274fd10680a4866d
Author: GoGoWen <82...@users.noreply.github.com>
AuthorDate: Thu Jan 25 23:46:04 2024 +0800
[BugFix](MutilCatalog) fix local file system unavailable in iceberg hadoop catalog (#26769)
create catalog in local test/dev env like below:
create catalog iceberg PROPERTIES ('type'='iceberg','iceberg.catalog.type' = 'hadoop', 'warehouse' = '/export/workspace/warehouse');
we will get error: "Unrecognized 'warehouse' location format because name service is required."
---
.../datasource/iceberg/IcebergHadoopExternalCatalog.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java
index 06d1a4caaa2..b60360e9022 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java
@@ -38,13 +38,16 @@ public class IcebergHadoopExternalCatalog extends IcebergExternalCatalog {
String warehouse = props.get(CatalogProperties.WAREHOUSE_LOCATION);
Preconditions.checkArgument(StringUtils.isNotEmpty(warehouse),
"Cannot initialize Iceberg HadoopCatalog because 'warehouse' must not be null or empty");
- String nameService = StringUtils.substringBetween(warehouse, HdfsResource.HDFS_FILE_PREFIX, "/");
- if (StringUtils.isEmpty(nameService)) {
- throw new IllegalArgumentException("Unrecognized 'warehouse' location format"
- + " because name service is required.");
- }
+
catalogProperty = new CatalogProperty(resource, props);
- catalogProperty.addProperty(HdfsResource.HADOOP_FS_NAME, HdfsResource.HDFS_FILE_PREFIX + nameService);
+ if (StringUtils.startsWith(warehouse, HdfsResource.HDFS_PREFIX)) {
+ String nameService = StringUtils.substringBetween(warehouse, HdfsResource.HDFS_FILE_PREFIX, "/");
+ if (StringUtils.isEmpty(nameService)) {
+ throw new IllegalArgumentException("Unrecognized 'warehouse' location format"
+ + " because name service is required.");
+ }
+ catalogProperty.addProperty(HdfsResource.HADOOP_FS_NAME, HdfsResource.HDFS_FILE_PREFIX + nameService);
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
(doris) 02/02: [fix](fe)add from_unixtime to null_result_with_one_null_param_functions set (#30388)
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 64f7a5f39577f0c14918ac6ccb840ccfecbd0096
Author: starocean999 <40...@users.noreply.github.com>
AuthorDate: Thu Jan 25 23:55:03 2024 +0800
[fix](fe)add from_unixtime to null_result_with_one_null_param_functions set (#30388)
---
gensrc/script/doris_builtins_functions.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gensrc/script/doris_builtins_functions.py b/gensrc/script/doris_builtins_functions.py
index d6a01a8983e..103a4b2bb1f 100644
--- a/gensrc/script/doris_builtins_functions.py
+++ b/gensrc/script/doris_builtins_functions.py
@@ -2233,7 +2233,8 @@ null_result_with_one_null_param_functions = [
'ST_GeometryFromText',
'ST_LineFromText',
'ST_Polygon',
- 'ST_Contains'
+ 'ST_Contains',
+ 'from_unixtime'
]
invisible_functions = [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org