.

go/internal/xtesting/xtesting.go

@@ -90,7 +90,7 @@ func NeedPy(t testing.TB, modules ...string) {
 // ZRawObject represents raw ZODB object state.
 type ZRawObject struct {
 	Oid  zodb.Oid
-	Data string // raw serialized zodb data
+	Data []byte // raw serialized zodb data
 }
 
 // ZPyCommitRaw commits new transaction into database @ zurl with raw data specified by objv.
@@ -106,7 +106,7 @@ func ZPyCommitRaw(zurl string, at zodb.Tid, objv ...ZRawObject) (_ zodb.Tid, err
 	fmt.Fprintf(zin, "extension %q\n", "")
 	for _, obj := range objv {
 		fmt.Fprintf(zin, "obj %s %d null:00\n", obj.Oid, len(obj.Data))
-		zin.WriteString(obj.Data)
+		zin.Write(obj.Data)
 		zin.WriteString("\n")
 	}
 	zin.WriteString("\n")

go/zodb/btree/btree.go.in

@@ -467,7 +467,7 @@ func (bt *btreeState) PyGetState() interface{} {
 	// btree with 1 child bucket without oid
 	if len(bt.data) == 1 {
 		bucket, ok := bt.data[0].child.(*Bucket)
-		if ok && bucket.POid() == zodb.InvalidOid { // XXX recheck vs "NULL oid"
+		if ok && bucket.POid() == zodb.InvalidOid {
 			return pickle.Tuple{pickle.Tuple{((*bucketState)(bucket)).PyGetState()}}
 		}
 	}

go/zodb/btree/ziobtree.go

@@ -469,7 +469,7 @@ func (bt *iobtreeState) PyGetState() interface{} {
 	// btree with 1 child bucket without oid
 	if len(bt.data) == 1 {
 		bucket, ok := bt.data[0].child.(*IOBucket)
-		if ok && bucket.POid() == zodb.InvalidOid { // XXX recheck vs "NULL oid"
+		if ok && bucket.POid() == zodb.InvalidOid {
 			return pickle.Tuple{pickle.Tuple{((*iobucketState)(bucket)).PyGetState()}}
 		}
 	}

go/zodb/btree/zlobtree.go

@@ -469,7 +469,7 @@ func (bt *lobtreeState) PyGetState() interface{} {
 	// btree with 1 child bucket without oid
 	if len(bt.data) == 1 {
 		bucket, ok := bt.data[0].child.(*LOBucket)
-		if ok && bucket.POid() == zodb.InvalidOid { // XXX recheck vs "NULL oid"
+		if ok && bucket.POid() == zodb.InvalidOid {
 			return pickle.Tuple{pickle.Tuple{((*lobucketState)(bucket)).PyGetState()}}
 		}
 	}

go/zodb/import_x_test.go

@@ -27,18 +27,23 @@ import (
 	_ "lab.nexedi.com/kirr/neo/go/zodb/wks"
 )
 
-// import at runtime few things into zodb, that zodb cannot import itself due to cyclic dependency.
+// import at runtime few things into zodb tests, that zodb cannot import itself
+// due to cyclic dependency.
 
 func init() {
 	zodb.ZPyCommit = ZPyCommit
 }
 
+// ZPyCommit commits new transaction with specified objects.
+//
+// The objects need to be alive, but do not need to be marked as changed.
+// The commit is performed via zodb/py.
 func ZPyCommit(zurl string, at zodb.Tid, objv ...zodb.IPersistent) (zodb.Tid, error) {
 	var rawobjv []xtesting.ZRawObject // raw zodb objects data to commit
 	for _, obj := range objv {
 		rawobj := xtesting.ZRawObject{
 			Oid:  obj.POid(),
-			Data: string(zodb.PSerialize(obj).XData()),
+			Data: zodb.PSerialize(obj).XData(), // not releasing buf, but its ok
 		}
 		rawobjv = append(rawobjv, rawobj)
 	}

go/zodb/persistent.go

@@ -116,8 +116,10 @@ type Stateful interface {
 
 	// GetState should return state of the in-RAM object as raw data.
 	//
-	// XXX called only when state is not dropped.
-	// XXX buf ownership.
+	// GetState is called only by persistent machinery and only when object
+	// has its state - in other words only on non-ghost objects.
+	//
+	// XXX buf ownership?
 	GetState() *mem.Buf
 }
 
@@ -125,8 +127,11 @@ type Stateful interface {
 
 // pSerialize implements IPersistent.
 func (obj *Persistent) pSerialize() *mem.Buf {
-	// XXX locking
-	// XXX panic on state == GHOST
+	obj.mu.Lock()
+	defer obj.mu.Unlock()
+	if obj.state == GHOST {
+		panic(obj.badf("serialize: ghost object"))
+	}
 
 	switch istate := obj.istate().(type) {
 	case Stateful:

go/zodb/persistent_api.go

@@ -100,14 +100,15 @@ type IPersistent interface {
 	// XXX probably don't need this.
 	//PState()  ObjectState	// in-RAM object state.
 
-	// XXX move vvv -> iPersistent?
+	// XXX move vvv -> iPersistent? (-> into persistent.go)
+	// XXX do we need to put vvv into IPersistent at all?
 
 	// pSerialize returns object in serialized form to be saved in the database.
 	//
 	// pSerialize is non-public method that is exposed and used only by ZODB internally.
+	// pSerialize is called only on non-ghost objects.
 	//
 	// XXX more text.
-	// XXX when called? invariants?
 	pSerialize() *mem.Buf
 }
 

go/zodb/zodbpy.go

@@ -40,7 +40,9 @@ type PyStateful interface {
 	// PyGetState should return state of the in-RAM object as Python data.
 	// Analog of __getstate__() in Python.
 	//
-	// XXX called only when state is not dropped.
+	// PyGetState is called only by persistent machinery and only when
+	// object has its state - in other words only on non-ghost objects.
+	//
 	// XXX state ownership?
 	PyGetState() interface{}
 }