diff options
-rw-r--r-- | src/gnunet/service/dht/messages.go | 1 | ||||
-rw-r--r-- | src/gnunet/service/store/store_dht_meta.go | 17 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/gnunet/service/dht/messages.go b/src/gnunet/service/dht/messages.go index 6383dc6..9fedd10 100644 --- a/src/gnunet/service/dht/messages.go +++ b/src/gnunet/service/dht/messages.go | |||
@@ -602,6 +602,7 @@ func (m *Module) sendResult(ctx context.Context, query blocks.Query, blk blocks. | |||
602 | /* | 602 | /* |
603 | // DEBUG: | 603 | // DEBUG: |
604 | if out.BType == enums.BLOCK_TYPE_TEST { | 604 | if out.BType == enums.BLOCK_TYPE_TEST { |
605 | logger.Printf(logger.DBG, "result message = %s", util.Dump(out, "hex")) | ||
605 | logger.Printf(logger.DBG, "result message = %s", util.Dump(out, "json")) | 606 | logger.Printf(logger.DBG, "result message = %s", util.Dump(out, "json")) |
606 | } | 607 | } |
607 | */ | 608 | */ |
diff --git a/src/gnunet/service/store/store_dht_meta.go b/src/gnunet/service/store/store_dht_meta.go index 3564328..64f658b 100644 --- a/src/gnunet/service/store/store_dht_meta.go +++ b/src/gnunet/service/store/store_dht_meta.go | |||
@@ -100,7 +100,7 @@ func (db *FileMetaDB) Store(md *FileMetadata) (err error) { | |||
100 | sql := "replace into meta(qkey,btype,bhash,size,stored,expires,lastUsed,usedCount) values(?,?,?,?,?,?,?,?)" | 100 | sql := "replace into meta(qkey,btype,bhash,size,stored,expires,lastUsed,usedCount) values(?,?,?,?,?,?,?,?)" |
101 | _, err = db.conn.Exec(sql, | 101 | _, err = db.conn.Exec(sql, |
102 | md.key.Data, md.btype, md.bhash.Data, md.size, md.stored.Epoch(), | 102 | md.key.Data, md.btype, md.bhash.Data, md.size, md.stored.Epoch(), |
103 | md.expires.Epoch(), md.lastUsed.Epoch(), md.usedCount) | 103 | md.expires.Val, md.lastUsed.Epoch(), md.usedCount) |
104 | return | 104 | return |
105 | } | 105 | } |
106 | 106 | ||
@@ -123,8 +123,8 @@ func (db *FileMetaDB) Get(query blocks.Query) (mds []*FileMetadata, err error) { | |||
123 | md := NewFileMetadata() | 123 | md := NewFileMetadata() |
124 | md.key = query.Key() | 124 | md.key = query.Key() |
125 | md.btype = btype | 125 | md.btype = btype |
126 | var st, exp, lu uint64 | 126 | var st, lu uint64 |
127 | if err = rows.Scan(&md.size, &md.bhash.Data, &st, &exp, &lu, &md.usedCount); err != nil { | 127 | if err = rows.Scan(&md.size, &md.bhash.Data, &st, &md.expires.Val, &lu, &md.usedCount); err != nil { |
128 | if err == sql.ErrNoRows { | 128 | if err == sql.ErrNoRows { |
129 | md = nil | 129 | md = nil |
130 | err = nil | 130 | err = nil |
@@ -132,7 +132,6 @@ func (db *FileMetaDB) Get(query blocks.Query) (mds []*FileMetadata, err error) { | |||
132 | return | 132 | return |
133 | } | 133 | } |
134 | md.stored.Val = st * 1000000 | 134 | md.stored.Val = st * 1000000 |
135 | md.expires.Val = exp * 1000000 | ||
136 | md.lastUsed.Val = lu * 1000000 | 135 | md.lastUsed.Val = lu * 1000000 |
137 | mds = append(mds, md) | 136 | mds = append(mds, md) |
138 | } | 137 | } |
@@ -172,12 +171,11 @@ func (db *FileMetaDB) Obsolete(n int) (removable []*FileMetadata, err error) { | |||
172 | } | 171 | } |
173 | var md *FileMetadata | 172 | var md *FileMetadata |
174 | for rows.Next() { | 173 | for rows.Next() { |
175 | var st, exp, lu uint64 | 174 | var st, lu uint64 |
176 | if err = rows.Scan(&md.key, &md.btype, &md.size, &st, &exp, &lu, &md.usedCount); err != nil { | 175 | if err = rows.Scan(&md.key, &md.btype, &md.size, &st, &md.expires.Val, &lu, &md.usedCount); err != nil { |
177 | return | 176 | return |
178 | } | 177 | } |
179 | md.stored.Val = st * 1000000 | 178 | md.stored.Val = st * 1000000 |
180 | md.expires.Val = exp * 1000000 | ||
181 | md.lastUsed.Val = lu * 1000000 | 179 | md.lastUsed.Val = lu * 1000000 |
182 | removable = append(removable, md) | 180 | removable = append(removable, md) |
183 | } | 181 | } |
@@ -193,13 +191,12 @@ func (db *FileMetaDB) Traverse(f func(*FileMetadata)) error { | |||
193 | } | 191 | } |
194 | md := NewFileMetadata() | 192 | md := NewFileMetadata() |
195 | for rows.Next() { | 193 | for rows.Next() { |
196 | var st, exp, lu uint64 | 194 | var st, lu uint64 |
197 | err = rows.Scan(&md.key.Data, &md.btype, &md.bhash.Data, &md.size, &st, &exp, &lu, &md.usedCount) | 195 | err = rows.Scan(&md.key.Data, &md.btype, &md.bhash.Data, &md.size, &st, &md.expires.Val, &lu, &md.usedCount) |
198 | if err != nil { | 196 | if err != nil { |
199 | return err | 197 | return err |
200 | } | 198 | } |
201 | md.stored.Val = st * 1000000 | 199 | md.stored.Val = st * 1000000 |
202 | md.expires.Val = exp * 1000000 | ||
203 | md.lastUsed.Val = lu * 1000000 | 200 | md.lastUsed.Val = lu * 1000000 |
204 | // call process function | 201 | // call process function |
205 | f(md) | 202 | f(md) |