.

go/neo/client.go

@@ -36,7 +36,6 @@ import (
 
 	"lab.nexedi.com/kirr/neo/go/neo/neonet"
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
-	"lab.nexedi.com/kirr/neo/go/neo/internal/common"
 	"lab.nexedi.com/kirr/neo/go/zodb"
 	"lab.nexedi.com/kirr/neo/go/xcommon/log"
 	"lab.nexedi.com/kirr/neo/go/xcommon/task"
@@ -436,7 +435,7 @@ func (c *Client) _Load(ctx context.Context, xid zodb.Xid) (*mem.Buf, zodb.Tid, e
 	// on the wire it comes as "before", not "at"
 	req := proto.GetObject{
 		Oid:    xid.Oid,
-		Tid:    common.At2Before(xid.At),
+		Tid:    at2Before(xid.At),
 		Serial: proto.INVALID_TID,
 	}
 

go/neo/internal/common/common.go

-// Copyright (C) 2017  Nexedi SA and Contributors.
-//                     Kirill Smelkov <kirr@nexedi.com>
-//
-// This program is free software: you can Use, Study, Modify and Redistribute
-// it under the terms of the GNU General Public License version 3, or (at your
-// option) any later version, as published by the Free Software Foundation.
-//
-// You can also Link and Combine this program with other software covered by
-// the terms of any of the Free Software licenses or any of the Open Source
-// Initiative approved licenses and Convey the resulting work. Corresponding
-// source of such a combination shall include the source code for all other
-// software used.
-//
-// This program is distributed WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//
-// See COPYING file for full licensing terms.
-// See https://www.nexedi.com/licensing for rationale and options.
-
-// Package common provides internal bits shared in between NEO client and server packages.
-package common
-
-import (
-	"lab.nexedi.com/kirr/neo/go/zodb"
-)
-
-// At2Before converts at to before for ZODB load semantics taking edge cases into account.
-//
-// For most values it is
-//
-//	before = at + 1		; at < ∞
-//
-// but at ∞ (zodb.TidMax) it is just
-//
-//	before = at		; at = ∞
-func At2Before(at zodb.Tid) (before zodb.Tid) {
-	if at < zodb.TidMax {
-		return at + 1
-	} else {
-		// XXX do we need to care here also for at > zodb.TidMax (zodb.Tid is currently unsigned)
-		return zodb.TidMax
-	}
-}
-
-// Before2At is the reverse function to At2Before
-func Before2At(before zodb.Tid) (at zodb.Tid) {
-	if before < zodb.TidMax {
-		// XXX before = 0 ?
-		return before - 1
-	} else {
-		// XXX before > zodb.TidMax (same as in At2Before) ?
-		return zodb.TidMax
-	}
-}

go/neo/storage.go

@@ -30,7 +30,6 @@ import (
 
 	"lab.nexedi.com/kirr/neo/go/neo/neonet"
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
-	"lab.nexedi.com/kirr/neo/go/neo/internal/common"
 	"lab.nexedi.com/kirr/neo/go/zodb"
 	"lab.nexedi.com/kirr/neo/go/zodb/storage/fs1"
 	"lab.nexedi.com/kirr/neo/go/xcommon/log"
@@ -536,7 +535,7 @@ func (stor *Storage) serveClient1(ctx context.Context, req proto.Msg) (resp prot
 		if req.Serial != proto.INVALID_TID {
 			xid.At = req.Serial
 		} else {
-			xid.At = common.Before2At(req.Tid)
+			xid.At = before2At(req.Tid)
 		}
 
 		// FIXME kill nextSerial support after neo/py cache does not depend on next_serial

go/neo/util.go

@@ -28,6 +28,7 @@ import (
 	"io"
 	"os"
 
+	"lab.nexedi.com/kirr/neo/go/zodb"
 	"lab.nexedi.com/kirr/neo/go/xcommon/log"
 )
 
@@ -85,3 +86,33 @@ func sha1Sum(b []byte) [sha1.Size]byte {
 
 	return [sha1.Size]byte{} // all 0
 }
+
+
+// at2Before converts at to before for ZODB load semantics taking edge cases into account.
+//
+// For most values it is
+//
+//	before = at + 1		; at < ∞
+//
+// but at ∞ (zodb.TidMax) it is just
+//
+//	before = at		; at = ∞
+func at2Before(at zodb.Tid) (before zodb.Tid) {
+	if at < zodb.TidMax {
+		return at + 1
+	} else {
+		// XXX do we need to care here also for at > zodb.TidMax (zodb.Tid is currently unsigned)
+		return zodb.TidMax
+	}
+}
+
+// before2At is the reverse function to at2Before
+func before2At(before zodb.Tid) (at zodb.Tid) {
+	if before < zodb.TidMax {
+		// XXX before = 0 ?
+		return before - 1
+	} else {
+		// XXX before > zodb.TidMax (same as in at2Before) ?
+		return zodb.TidMax
+	}
+}