From 6cd8ce964dea568709b74f94d9ccaa8d95327628 Mon Sep 17 00:00:00 2001
From: hongdongdong <hongdongdong@cmss.chinamobile.com>
Date: Mon, 25 Nov 2019 15:25:32 +0800
Subject: [PATCH] [HUDI-362] Adds a check for the existence of field

---
 .../src/main/java/org/apache/hudi/cli/HoodiePrintHelper.java  | 4 ++++
 hudi-cli/src/main/java/org/apache/hudi/cli/TableHeader.java   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/HoodiePrintHelper.java b/hudi-cli/src/main/java/org/apache/hudi/cli/HoodiePrintHelper.java
index 635097f8a5ad5..3cce3014049cf 100644
--- a/hudi-cli/src/main/java/org/apache/hudi/cli/HoodiePrintHelper.java
+++ b/hudi-cli/src/main/java/org/apache/hudi/cli/HoodiePrintHelper.java
@@ -59,6 +59,10 @@ public static String print(TableHeader rowHeader, Map<String, Function<Object, S
       return HoodiePrintHelper.print(rowHeader);
     }
 
+    if (!sortByField.isEmpty() && !rowHeader.containsField(sortByField)) {
+      return String.format("Field[%s] is not in table, given columns[%s]", sortByField, rowHeader.getFieldNames());
+    }
+
     Table table =
         new Table(rowHeader, fieldNameToConverterMap, Option.ofNullable(sortByField.isEmpty() ? null : sortByField),
             Option.ofNullable(isDescending), Option.ofNullable(limit <= 0 ? null : limit)).addAllRows(rows).flip();
diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/TableHeader.java b/hudi-cli/src/main/java/org/apache/hudi/cli/TableHeader.java
index 0472b0f73863b..e257e36a1609a 100644
--- a/hudi-cli/src/main/java/org/apache/hudi/cli/TableHeader.java
+++ b/hudi-cli/src/main/java/org/apache/hudi/cli/TableHeader.java
@@ -68,4 +68,8 @@ public String get(int index) {
   public int getNumFields() {
     return fieldNames.size();
   }
+
+  public boolean containsField(String fieldName) {
+    return fieldNames.contains(fieldName);
+  }
 }