From 8c15edf6981a454f026bc469772d4bb4d9ce923d Mon Sep 17 00:00:00 2001
From: Arina Ielchiieva <arina.yelchiyeva@gmail.com>
Date: Fri, 1 Sep 2017 14:51:46 +0300
Subject: [PATCH] DRILL-5763: Fix NPE during MapRDBSubScan deserialization

---
 .../exec/store/mapr/db/MapRDBSubScan.java     | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScan.java
index 98335f3abdc..95471863660 100644
--- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScan.java
+++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScan.java
@@ -71,14 +71,32 @@ public MapRDBSubScan(String userName, MapRDBFormatPlugin formatPlugin,
     this.tableType = tableType;
   }
 
+
+  @JsonProperty("formatPluginConfig")
+  public MapRDBFormatPluginConfig getFormatPluginConfig() {
+    return (MapRDBFormatPluginConfig) formatPlugin.getConfig();
+  }
+
+  @JsonProperty("storageConfig")
+  public StoragePluginConfig getStorageConfig(){
+    return formatPlugin.getStorageConfig();
+  }
+
+  @JsonProperty("regionScanSpecList")
   public List<MapRDBSubScanSpec> getRegionScanSpecList() {
     return regionScanSpecList;
   }
 
+  @JsonProperty("columns")
   public List<SchemaPath> getColumns() {
     return columns;
   }
 
+  @JsonProperty("tableType")
+  public String getTableType() {
+    return tableType;
+  }
+
   @Override
   public boolean isExecutable() {
     return false;
@@ -105,18 +123,9 @@ public int getOperatorType() {
     return 1001;
   }
 
-  public String getTableType() {
-    return tableType;
-  }
-
   @JsonIgnore
   public MapRDBFormatPlugin getFormatPlugin() {
     return formatPlugin;
   }
 
-  @JsonIgnore
-  public MapRDBFormatPluginConfig getFormatPluginConfig() {
-    return (MapRDBFormatPluginConfig) formatPlugin.getConfig();
-  }
-
 }