From: Michael Vrable <mvrable@cs.ucsd.edu>
Date: Sat, 31 May 2008 00:22:08 +0000 (-0700)
Subject: Fix a bug in signature loading for sub-file incrementals.
X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=commitdiff_plain;h=908cfc1af3e761d3243d31a68420fb8994840721

Fix a bug in signature loading for sub-file incrementals.

Signatures for sub-file chunks were being written properly, but were not
being loaded properly (signature data and the algorithm string were
being swapped), so no sub-file incrementals were being generated.
---

diff --git a/localdb.cc b/localdb.cc
index ecf83aa..2f5af6e 100644
--- a/localdb.cc
+++ b/localdb.cc
@@ -535,7 +535,7 @@ bool LocalDb::LoadChunkSignatures(ObjectReference ref,
     sqlite3_stmt *stmt;
     int found = false;
 
-    stmt = Prepare("select algorithm, signatures from subblock_signatures "
+    stmt = Prepare("select signatures, algorithm from subblock_signatures "
                    "where blockid = (select blockid from block_index "
                    "                 where segmentid = ? and object = ?)");
     sqlite3_bind_int64(stmt, 1, SegmentToId(ref.get_segment()));