From 177f3add8166d53dd9f6fce7549e9f3afb828216 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sat, 4 May 2019 08:47:11 -0700
Subject: [PATCH] adjust memory layout to avoid possible nil pointer

---
 weed/storage/needle_map.go        | 4 ++--
 weed/storage/needle_map_memory.go | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/weed/storage/needle_map.go b/weed/storage/needle_map.go
index a22125682..634685175 100644
--- a/weed/storage/needle_map.go
+++ b/weed/storage/needle_map.go
@@ -37,10 +37,10 @@ type NeedleMapper interface {
 }
 
 type baseNeedleMapper struct {
+	mapMetric
+
 	indexFile           *os.File
 	indexFileAccessLock sync.Mutex
-
-	mapMetric
 }
 
 func (nm *baseNeedleMapper) IndexFileSize() uint64 {
diff --git a/weed/storage/needle_map_memory.go b/weed/storage/needle_map_memory.go
index 727049a13..bda4a5c8f 100644
--- a/weed/storage/needle_map_memory.go
+++ b/weed/storage/needle_map_memory.go
@@ -10,9 +10,8 @@ import (
 )
 
 type NeedleMap struct {
-	m needle_map.NeedleValueMap
-
 	baseNeedleMapper
+	m needle_map.NeedleValueMap
 }
 
 func NewCompactNeedleMap(file *os.File) *NeedleMap {