From 42ae2898e1562b340a045fc5b6fd9a367d03aff3 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Wed, 28 May 2014 10:11:17 +0200
Subject: [PATCH] Revert "More memory efficient index sending"

This reverts commit 593f098276206aad9fed607c36020ced096a4867.
---
 protocol/protocol.go | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/protocol/protocol.go b/protocol/protocol.go
index 67ac6073..442b185a 100644
--- a/protocol/protocol.go
+++ b/protocol/protocol.go
@@ -77,7 +77,7 @@ type rawConnection struct {
 	xw   *xdr.Writer
 	wmut sync.Mutex
 
-	indexSent map[string]uint64
+	indexSent map[string]map[string][2]int64
 	awaiting  []chan asyncResult
 	imut      sync.Mutex
 
@@ -117,8 +117,8 @@ func NewConnection(nodeID string, reader io.Reader, writer io.Writer, receiver M
 		cw:        cw,
 		wb:        wb,
 		xw:        xdr.NewWriter(wb),
-		indexSent: make(map[string]uint64),
 		awaiting:  make([]chan asyncResult, 0x1000),
+		indexSent: make(map[string]map[string][2]int64),
 		outbox:    make(chan []encodable),
 		nextID:    make(chan int),
 		closed:    make(chan struct{}),
@@ -140,29 +140,26 @@ func (c *rawConnection) ID() string {
 func (c *rawConnection) Index(repo string, idx []FileInfo) {
 	c.imut.Lock()
 	var msgType int
-	maxSent := c.indexSent[repo]
-	var newMaxSent uint64
-	if maxSent == 0 {
+	if c.indexSent[repo] == nil {
 		// This is the first time we send an index.
 		msgType = messageTypeIndex
+
+		c.indexSent[repo] = make(map[string][2]int64)
 		for _, f := range idx {
-			if f.Version > newMaxSent {
-				newMaxSent = f.Version
-			}
+			c.indexSent[repo][f.Name] = [2]int64{f.Modified, int64(f.Version)}
 		}
 	} else {
 		// We have sent one full index. Only send updates now.
 		msgType = messageTypeIndexUpdate
 		var diff []FileInfo
 		for _, f := range idx {
-			if f.Version > maxSent {
+			if vs, ok := c.indexSent[repo][f.Name]; !ok || f.Modified != vs[0] || int64(f.Version) != vs[1] {
 				diff = append(diff, f)
-				newMaxSent = f.Version
+				c.indexSent[repo][f.Name] = [2]int64{f.Modified, int64(f.Version)}
 			}
 		}
 		idx = diff
 	}
-	c.indexSent[repo] = newMaxSent
 	c.imut.Unlock()
 
 	c.send(header{0, -1, msgType}, IndexMessage{repo, idx})