This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 9a0a1c6 [fix] fix NPE in thrift when forwarding stmt to master FE
9a0a1c6 is described below
commit 9a0a1c693e3adeb97ab9820e48be7dca7379d1f0
Author: Jibing-Li <[email protected]>
AuthorDate: Tue Mar 22 11:41:13 2022 +0800
[fix] fix NPE in thrift when forwarding stmt to master FE
---
fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java
index a2c852d..f19e898 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java
@@ -21,6 +21,7 @@ import com.google.common.collect.Lists;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.PrimitiveType;
import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.common.FeConstants;
import org.apache.doris.thrift.TColumnDefinition;
import org.apache.doris.thrift.TShowResultSet;
import org.apache.doris.thrift.TShowResultSetMetaData;
@@ -65,7 +66,7 @@ public class ShowResultSet extends AbstractResultSet {
for (int i = 0; i < resultRows.size(); i ++) {
ArrayList<String> list = Lists.newArrayList();
for (int j = 0; j < resultRows.get(i).size(); j ++) {
- list.add(resultRows.get(i).get(j));
+ list.add(resultRows.get(i).get(j) == null ?
FeConstants.null_string : resultRows.get(i).get(j));
}
set.resultRows.add(list);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
