You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2018/06/11 14:24:09 UTC
flink git commit: [hotfix] [sql-client] Fix NPE when column is null
Repository: flink
Updated Branches:
refs/heads/master e8e74a648 -> 5f11df6ee
[hotfix] [sql-client] Fix NPE when column is null
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5f11df6e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5f11df6e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5f11df6e
Branch: refs/heads/master
Commit: 5f11df6eedf64f81ffdbf4afc2ad5d84b1b2ae65
Parents: e8e74a6
Author: Timo Walther <tw...@apache.org>
Authored: Mon Jun 11 16:19:51 2018 +0200
Committer: Timo Walther <tw...@apache.org>
Committed: Mon Jun 11 16:23:10 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/table/client/cli/CliStrings.java | 1 +
.../main/java/org/apache/flink/table/client/cli/CliUtils.java | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5f11df6e/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
index 6ded8fa..1e8f696 100644
--- a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
+++ b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
@@ -35,6 +35,7 @@ public final class CliStrings {
public static final String CLI_NAME = "Flink SQL CLI Client";
public static final String DEFAULT_MARGIN = " ";
+ public static final String NULL_COLUMN = "(NULL)";
// --------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5f11df6e/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java
index d0adaa1..77894e8 100644
--- a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java
+++ b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java
@@ -93,7 +93,12 @@ public final class CliUtils {
public static String[] rowToString(Row row) {
final String[] fields = new String[row.getArity()];
for (int i = 0; i < row.getArity(); i++) {
- fields[i] = row.getField(i).toString();
+ final Object field = row.getField(i);
+ if (field == null) {
+ fields[i] = CliStrings.NULL_COLUMN;
+ } else {
+ fields[i] = field.toString();
+ }
}
return fields;
}