You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/03/07 09:46:44 UTC
[linkis] branch dev-1.3.2 updated: [ISSUES-4135]fix hive ds bug (#4135)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 2e8c65288 [ISSUES-4135]fix hive ds bug (#4135)
2e8c65288 is described below
commit 2e8c6528847f21dc10c6c8eae2499dff1902beea
Author: huangKai-2323 <62...@users.noreply.github.com>
AuthorDate: Tue Mar 7 17:46:35 2023 +0800
[ISSUES-4135]fix hive ds bug (#4135)
* fix hive ds bug
---
.../apache/linkis/metadata/query/server/utils/MetadataUtils.java | 2 +-
.../org/apache/linkis/metadata/query/service/HiveMetaService.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
index 32ed7c53d..0107347e4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
@@ -53,7 +53,7 @@ public class MetadataUtils {
private static final Logger LOG = LoggerFactory.getLogger(MetadataUtils.class);
public static final String NAME_REGEX =
- CommonVars.apply("wds.linkis.metadata.query.regex", "^[a-zA-Z\\-\\d_\\.=/:]+$").getValue();
+ CommonVars.apply("linkis.metadata.query.regex", "^[a-zA-Z\\-\\d_\\.=/:,]+$").getValue();
public static final Pattern nameRegexPattern = Pattern.compile(NAME_REGEX);
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
index f0d728217..73c4e86f7 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
@@ -56,6 +56,7 @@ public class HiveMetaService extends AbstractDbMetaService<HiveConnection> {
private static final String PARTITION_PART_SEPARATOR = ",";
private static final String PARTITION_KV_SEPARATOR = "=";
+ private static final String PARTITION_CV_SEPARATOR = "/";
public HiveMetaService() {
client = BmlClientFactory.createBmlClient();
@@ -238,7 +239,11 @@ public class HiveMetaService extends AbstractDbMetaService<HiveConnection> {
try {
// Convert to pairs of (partition_key: partition_value)
Map<String, String> partitionParts =
- Arrays.stream(partition.split(PARTITION_PART_SEPARATOR))
+ Arrays.stream(
+ partition.split(
+ partition.contains(PARTITION_CV_SEPARATOR)
+ ? PARTITION_CV_SEPARATOR
+ : PARTITION_PART_SEPARATOR))
.map(part -> part.split(PARTITION_KV_SEPARATOR))
.collect(Collectors.toMap(kv -> kv[0], kv -> kv.length > 1 ? kv[1] : ""));
Table rawTable = client.getTable(database, table);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org