This is an automated email from the ASF dual-hosted git repository.
zykkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-flink-connector.git
The following commit(s) were added to refs/heads/master by this push:
new f658c61 [Fix] catalog queries fenodes compatibility (#281)
f658c61 is described below
commit f658c6149e6d567c5c1d5aa36281f4b4b59fde08
Author: wudi <[email protected]>
AuthorDate: Tue Dec 26 15:57:03 2023 +0800
[Fix] catalog queries fenodes compatibility (#281)
---
.../java/org/apache/doris/flink/catalog/DorisCatalog.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git
a/flink-doris-connector/src/main/java/org/apache/doris/flink/catalog/DorisCatalog.java
b/flink-doris-connector/src/main/java/org/apache/doris/flink/catalog/DorisCatalog.java
index a6535cd..99ca0a4 100644
---
a/flink-doris-connector/src/main/java/org/apache/doris/flink/catalog/DorisCatalog.java
+++
b/flink-doris-connector/src/main/java/org/apache/doris/flink/catalog/DorisCatalog.java
@@ -63,6 +63,7 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -239,8 +240,20 @@ public class DorisCatalog extends AbstractCatalog {
StringJoiner fenodes = new StringJoiner(",");
PreparedStatement ps = conn.prepareStatement("SHOW FRONTENDS");
ResultSet resultSet = ps.executeQuery();
+
+ // find target ip column name, Version 1.2 is IP, version 2.x is
Host
+ String field = "";
+ ResultSetMetaData metaData = resultSet.getMetaData();
+ for (int i = 1; i <= metaData.getColumnCount(); i++) {
+ String columnName = metaData.getColumnName(i);
+ if (columnName.equalsIgnoreCase("IP") ||
columnName.equalsIgnoreCase("Host")) {
+ field = columnName;
+ break;
+ }
+ }
+
while (resultSet.next()) {
- String ip = resultSet.getString("IP");
+ String ip = resultSet.getString(field);
String port = resultSet.getString("HttpPort");
fenodes.add(ip + ":" + port);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
