From 7f41c0256ca49ed607608eb01237fda80c359bb9 Mon Sep 17 00:00:00 2001
From: Travis Turner <travis@pilosa.com>
Date: Sun, 29 Apr 2018 16:40:32 -0500
Subject: [PATCH] avoid creating a slice of nil timestamps on Import()

---
 frame.go | 6 +++++-
 index.go | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/frame.go b/frame.go
index 0c87210bf..3de3f3613 100644
--- a/frame.go
+++ b/frame.go
@@ -834,7 +834,11 @@ func (f *Frame) Import(rowIDs, columnIDs []uint64, timestamps []*time.Time) erro
 	// Split import data by fragment.
 	dataByFragment := make(map[importKey]importData)
 	for i := range rowIDs {
-		rowID, columnID, timestamp := rowIDs[i], columnIDs[i], timestamps[i]
+		rowID, columnID := rowIDs[i], columnIDs[i]
+		var timestamp *time.Time
+		if len(timestamps) > i {
+			timestamp = timestamps[i]
+		}
 
 		var standard, inverse []string
 		if timestamp == nil {
diff --git a/index.go b/index.go
index 00ee98f11..dc676c304 100644
--- a/index.go
+++ b/index.go
@@ -642,7 +642,8 @@ func (i *Index) openInputDefinitions() error {
 // InputBits Process the []Bit though the Frame import process
 func (i *Index) InputBits(frame string, bits []*Bit) error {
 	var rowIDs, columnIDs []uint64
-	timestamps := make([]*time.Time, len(bits))
+	var timestamps []*time.Time
+
 	f := i.Frame(frame)
 	if f == nil {
 		return fmt.Errorf("Frame not found: %s", frame)
@@ -657,6 +658,11 @@ func (i *Index) InputBits(frame string, bits []*Bit) error {
 
 		// Convert timestamps to time.Time.
 		if bit.Timestamp > 0 {
+			// Don't create a full timestamps slice unless
+			// at least one bit contains a timestamp.
+			if len(timestamps) == 0 {
+				timestamps = make([]*time.Time, len(bits))
+			}
 			t := time.Unix(bit.Timestamp, 0)
 			timestamps[i] = &t
 		}