This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new abe0e68f3d [cherry-pick](branch-1.2) support special partition path
pattern (#23513)
abe0e68f3d is described below
commit abe0e68f3def80188940dda44cd37085a0823264
Author: Siyang Tang <[email protected]>
AuthorDate: Fri Aug 25 22:29:17 2023 +0800
[cherry-pick](branch-1.2) support special partition path pattern (#23513)
pick: #21778
---
.../src/main/java/org/apache/doris/common/util/BrokerUtil.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java
b/fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java
index 0d03b3b5d2..96f9ca3d44 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java
@@ -134,15 +134,21 @@ public class BrokerUtil {
}
String[] columns = new String[columnsFromPath.size()];
int size = 0;
+ boolean skipOnce = true;
for (int i = strings.length - 2; i >= 0; i--) {
String str = strings[i];
if (str != null && str.isEmpty()) {
continue;
}
if (str == null || !str.contains("=")) {
+ if (skipOnce) {
+ skipOnce = false;
+ continue;
+ }
throw new UserException("Fail to parse columnsFromPath,
expected: "
+ columnsFromPath + ", filePath: " + filePath);
}
+ skipOnce = false;
String[] pair = str.split("=", 2);
if (pair.length != 2) {
throw new UserException("Fail to parse columnsFromPath,
expected: "
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]