Commit 515968ad authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 6dfc0ba4
...@@ -23,7 +23,7 @@ package zodb ...@@ -23,7 +23,7 @@ package zodb
import ( import (
"context" "context"
"fmt" "fmt"
"log" // "log"
"net/url" "net/url"
"strings" "strings"
"sync" "sync"
...@@ -128,8 +128,8 @@ func Open(ctx context.Context, zurl string, opt *OpenOptions) (IStorage, error) ...@@ -128,8 +128,8 @@ func Open(ctx context.Context, zurl string, opt *OpenOptions) (IStorage, error)
cache = NewCache(storDriver, 128 * 4*1024) cache = NewCache(storDriver, 128 * 4*1024)
// FIXME teach cache for watching and remove vvv // FIXME teach cache for watching and remove vvv
log.Printf("zodb: FIXME: open %s: raw cache is not ready for invalidations" + //log.Printf("zodb: FIXME: open %s: raw cache is not ready for invalidations" +
" -> NoCache forced", zurl) // " -> NoCache forced", zurl)
cache = nil cache = nil
} }
......
...@@ -44,7 +44,7 @@ import ( ...@@ -44,7 +44,7 @@ import (
"sync" "sync"
"syscall" "syscall"
"lab.nexedi.com/kirr/go123/mem" // "lab.nexedi.com/kirr/go123/mem"
"lab.nexedi.com/kirr/go123/xerr" "lab.nexedi.com/kirr/go123/xerr"
"lab.nexedi.com/kirr/go123/xsync" "lab.nexedi.com/kirr/go123/xsync"
"lab.nexedi.com/kirr/neo/go/zodb" "lab.nexedi.com/kirr/neo/go/zodb"
...@@ -113,7 +113,8 @@ func (zb *ZBlk0) loadBlkData(ctx context.Context) (_ []byte, _ zodb.Tid, err err ...@@ -113,7 +113,8 @@ func (zb *ZBlk0) loadBlkData(ctx context.Context) (_ []byte, _ zodb.Tid, err err
} }
defer zb.PDeactivate() defer zb.PDeactivate()
return mem.Bytes(zb.blkdata), zb.PSerial(), nil //return mem.Bytes(zb.blkdata), zb.PSerial(), nil // XXX -> []bytes(zb.blkdata)
return []byte(zb.blkdata), zb.PSerial(), nil
} }
// ---- ZBlk1 --- // ---- ZBlk1 ---
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment