From 8c5a2d4a6d1ff5c9990466a6766c78855dcc392d Mon Sep 17 00:00:00 2001
From: Jason Aten <jason.aten@molecula.com>
Date: Sun, 4 Oct 2020 16:17:54 -0500
Subject: [PATCH] ensure that Inspect generates a result for every header item

This was previously done for the path where an index did not have keys
and this commit does it for the paths which do have keys.

This was originally two commits as there was some tricky cases that
needed multiple else statments within a single type.
---
 server/grpc.go | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/server/grpc.go b/server/grpc.go
index acbd95e0e..0e0361632 100644
--- a/server/grpc.go
+++ b/server/grpc.go
@@ -657,6 +657,8 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 					return nil
 				}
 				cols = limitedCols
+			} else {
+				return errors.Errorf("expected 1 result for inspect query; got %d on index %s", len(resp.Results), req.Index)
 			}
 		}
 
@@ -698,7 +700,13 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_Uint64ArrayVal{Uint64ArrayVal: &pb.Uint64Array{Vals: ids.Rows}}})
 							colAdded++
+						} else {
+							rowResp.Columns = append(rowResp.Columns,
+								&pb.ColumnResponse{ColumnVal: nil})
 						}
+					} else {
+						rowResp.Columns = append(rowResp.Columns,
+							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
 				case "mutex":
@@ -730,6 +738,9 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: nil})
 						}
+					} else {
+						rowResp.Columns = append(rowResp.Columns,
+							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
 				case "int":
@@ -766,7 +777,13 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 										value = vals[0]
 										exists = true
 									}
+								} else {
+									rowResp.Columns = append(rowResp.Columns,
+										&pb.ColumnResponse{ColumnVal: nil})
 								}
+							} else {
+								rowResp.Columns = append(rowResp.Columns,
+									&pb.ColumnResponse{ColumnVal: nil})
 							}
 						} else {
 							value, exists, err = field.StringValue(id)
@@ -803,6 +820,9 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 								rowResp.Columns = append(rowResp.Columns,
 									&pb.ColumnResponse{ColumnVal: nil})
 							}
+						} else {
+							rowResp.Columns = append(rowResp.Columns,
+								&pb.ColumnResponse{ColumnVal: nil})
 						}
 					}
 
@@ -827,6 +847,9 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: nil})
 						}
+					} else {
+						rowResp.Columns = append(rowResp.Columns,
+							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
 				case "bool":
@@ -858,9 +881,12 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: nil})
 						}
+					} else {
+						rowResp.Columns = append(rowResp.Columns,
+							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
-				case "time":
+				default:
 					rowResp.Columns = append(rowResp.Columns,
 						&pb.ColumnResponse{ColumnVal: nil})
 				}