proto: Update 'Compression' to int to support different compression algorithms

With nexedi/neoppod@fd80cc30 NEO/py added support to encode the compression
algorithm with the 'Compression' parameter. Before this, compression could
only be true (= with compression) or false (= without compression). Now
the absence of compression is encoded with 0. Any other number than 0
encodes a compression algorithm. The mapping is currently:

	1 = zlib

In the future, 2 could mean zstd [1].

[1] https://github.com/facebook/zstd/issues/1134

go/go.sum

-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797/go.mod h1:sXBiorCo8c46JlQV3oXPKINnZ8mcqnye1EkVkqsectk=
-crawshaw.io/sqlite v0.3.2 h1:N6IzTjkiw9FItHAa0jp+ZKC6tuLzXqAYIv+ccIWos1I=
-crawshaw.io/sqlite v0.3.2/go.mod h1:igAO5JulrQ1DbdZdtVq48mnZUBAPOeFzer7VhDWNtW4=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DataDog/czlib v0.0.0-20160811164712-4bc9a24e37f2 h1:/Xf0UwdF1dlv6cNu0q1TWTQgfSsALgXrdHNtBMj7ybU=
-github.com/DataDog/czlib v0.0.0-20160811164712-4bc9a24e37f2/go.mod h1:xK7es18l1aQtR1g0i6RhEQ78ckvRAWiwlG0vBFud/Jk=
-github.com/DataDog/czlib v0.0.0-20210322182103-8087f4e14ae7 h1:6ZJZdzkbvKb6HRXmZ12ICZ0IbqfR+0Cd2C0IutWHHIA=
-github.com/DataDog/czlib v0.0.0-20210322182103-8087f4e14ae7/go.mod h1:ROY4muaTWpoeQAx/oUkvxe9zKCmgU5xDGXsfEbA+omc=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso=
-github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
-github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 h1:MZRmHqDBd0vxNwenEbKSQqRVT24d3C05ft8kduSwlqM=
-github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fsnotify/fsnotify v1.4.10-0.20200417215612-7f4cf4dd2b52 h1:0NmERxogGTU8hgzOhRKNoKivtBZkDW29GeuJtK9e0sc=
-github.com/fsnotify/fsnotify v1.4.10-0.20200417215612-7f4cf4dd2b52/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gwenn/gosqlite v0.0.0-20201008200117-82e079acf5b6 h1:GUdDtRtiCm0bipN/Hc03rqJl++aX2wdWs+F3pGCaPTU=
-github.com/gwenn/gosqlite v0.0.0-20201008200117-82e079acf5b6/go.mod h1:WBYs9HfQGOYDCz7rFwMk7aHkbTTB0cUkQe3pZQARvIg=
-github.com/gwenn/gosqlite v0.0.0-20211101095637-b18efb2e44c8 h1:sWkgaGez8CNa2KHGBTTop16/mC03VP6MDqPKfvhEmCU=
-github.com/gwenn/gosqlite v0.0.0-20211101095637-b18efb2e44c8/go.mod h1:WBYs9HfQGOYDCz7rFwMk7aHkbTTB0cUkQe3pZQARvIg=
-github.com/gwenn/yacr v0.0.0-20200110180258-a66d8c42d0ff/go.mod h1:5SNcBGxZ5OaJAMJCSI/x3V7SGsvXqbwnwP/sHZLgYsw=
-github.com/gwenn/yacr v0.0.0-20200112083327-bbe82c1f4d60 h1:JX4Yy6S9U/f3Jix82M58NLIAFeW/UjBFVrnYn5GS4X8=
-github.com/gwenn/yacr v0.0.0-20200112083327-bbe82c1f4d60/go.mod h1:Ps/gikIXcn2rRmeP0HQ9EvUYJrfrjAi51Wg8acsrkP0=
-github.com/gwenn/yacr v0.0.0-20211101095056-492fb0c571bc h1:AUv494HF3D9ht26o89DuJjqM9QDHwZeYCNU/JSU5jqI=
-github.com/gwenn/yacr v0.0.0-20211101095056-492fb0c571bc/go.mod h1:Ps/gikIXcn2rRmeP0HQ9EvUYJrfrjAi51Wg8acsrkP0=
-github.com/kisielk/og-rek v1.1.0 h1:u10TvQbPtrlY/6H4+BiFsBywwSVTGFsx0YOVtpx3IbI=
-github.com/kisielk/og-rek v1.1.0/go.mod h1:6ihsOSzSAxR/65S3Bn9zNihoEqRquhDQZ2c6I2+MG3c=
-github.com/kisielk/og-rek v1.2.0 h1:CTvDIin+YnetsSQAYbe+QNAxXU3B50C5hseEz8xEoJw=
-github.com/kisielk/og-rek v1.2.0/go.mod h1:6ihsOSzSAxR/65S3Bn9zNihoEqRquhDQZ2c6I2+MG3c=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ=
-github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/shamaton/msgpack v1.2.1 h1:40cwW7YAEdOIxcxIsUkAxSMUyYWZUyNiazI5AyiBntI=
-github.com/shamaton/msgpack v1.2.1/go.mod h1:ibiaNQRTCUISAYkkyOpaSCEBiCAxXe6u6Mu1sQ6945U=
-github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
-github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5 h1:GJTW+uNMIV1RKwox+T4aN0/sQlYRg78uHZf2H0aBcDw=
-github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
-github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
-github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
-github.com/someonegg/gocontainer v1.0.0 h1:9MMUFbQf7g+g9sMG4ggBHPDS1+Iz+wd9Ee/O4BNRdw0=
-github.com/someonegg/gocontainer v1.0.0/go.mod h1:zGJcXRK0ikzEYPFKTaFXi6UU/ulNuJypfADX4UQGtMw=
-github.com/someonegg/gox v1.0.0/go.mod h1:pngAcWxBFnyYM4oY+h9Rgv0WaikLkSfY5dBYuabUnBE=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
-github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
-github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw=
-github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw=
-github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211111160137-58aab5ef257a h1:c83jeVQW0KGKNaKBRfelNYNHaev+qawl9yaA825s8XE=
-golang.org/x/net v0.0.0-20211111160137-58aab5ef257a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210301091718-77cc2087c03b h1:kHlr0tATeLRMEiZJu5CknOw/E8V6h69sXXQFGoPtjcc=
-golang.org/x/sys v0.0.0-20210301091718-77cc2087c03b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211111213525-f221eed1c01e h1:zeJt6jBtVDK23XK9QXcmG0FvO0elikp0dYZQZOeL1y0=
-golang.org/x/sys v0.0.0-20211111213525-f221eed1c01e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705 h1:PYBmACG+YEv8uQPW0r1kJj8tR+gkF0UWq7iFdUezwEw=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.36.0 h1:o1bcQ6imQMIOpdrO3SWf2z5RV72WbDwdXuK0MDlc8As=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc/examples v0.0.0-20210301210255-fc8f38cccf75 h1:IFbcGka/Xo8VIhRtCz9UBaDblKK7/iwLiXwm9D62Jzk=
-google.golang.org/grpc/examples v0.0.0-20210301210255-fc8f38cccf75/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-lab.nexedi.com/kirr/go123 v0.0.0-20210128150852-c20e95f0f789 h1:IP+xm2DdYqLn81x8J8PdRkoMrCxLDBsXYe4KZm3FkME=
-lab.nexedi.com/kirr/go123 v0.0.0-20210128150852-c20e95f0f789/go.mod h1:1wkWl3WhmutZiho+wsE7ymOKvRkN7hV3YZtL0f0gXTo=
-lab.nexedi.com/kirr/go123 v0.0.0-20210906140734-c9eb28d9e408 h1:H7YpNUDfTSvvRpKivUMrL9C09tQssQ6brEoX6K/OxOw=
-lab.nexedi.com/kirr/go123 v0.0.0-20210906140734-c9eb28d9e408/go.mod h1:pwDpdCuvtz0QxisDzV/z9eUb9zc/rMQec520h4i8VWQ=
-lab.nexedi.com/kirr/go123 v0.0.0-20211124154638-01e8697d1901 h1:a0G1/+ZqFf3OeaJOP479Xeg1Rw7wmKPWf5F2t7nJ4rM=
-lab.nexedi.com/kirr/go123 v0.0.0-20211124154638-01e8697d1901/go.mod h1:pwDpdCuvtz0QxisDzV/z9eUb9zc/rMQec520h4i8VWQ=

go/neo/client.go

@@ -381,7 +381,10 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z
 		}
 	}
 
-	if resp.Compression {
+	if resp.Compression != 0 {
+		if resp.Compression != 1 {
+			return nil, 0, fmt.Errorf("unsupported compression algorithm: %v", resp.Compression)
+		}
 		buf2 := &mem.Buf{Data: nil}
 		udata, err := xzlib.Decompress(buf.Data)
 		buf.Release()

go/neo/neo_test.go

@@ -257,7 +257,7 @@ func _TestMasterStorage(t0 *tEnv) {
 		Oid:		xid1.Oid,
 		Serial:		serial1,
 		NextSerial:	proto.INVALID_TID,
-		Compression:	false,
+		Compression:	0,
 		Data:		buf1,
 		DataSerial:	0,		// XXX
 		Checksum:	sha1.Sum(buf1.Data),
@@ -292,7 +292,7 @@ func _TestMasterStorage(t0 *tEnv) {
 		Oid:		xid1prev.Oid,
 		Serial:		serial1prev,
 		NextSerial:	serial1,
-		Compression:	false,
+		Compression:	0,
 		Data:		buf1prev,
 		DataSerial:	0,		// XXX
 		Checksum:	sha1.Sum(buf1prev.Data),

go/neo/proto/proto.go

@@ -336,6 +336,11 @@ func (a *Address) neoDecodeN(b []byte) (uint64, bool) {
 // Checksum is a SHA1 hash.
 type Checksum [20]byte
 
+// Compression is an integer that tells the compression algorithm:
+//	0 = no compression algorithm is used
+//	1 = zlib is used
+type Compression uint64
+
 // PTid is Partition Table identifier.
 //
 // Zero value means "invalid id" (<-> None in py.PPTID, nil in msgpack)
@@ -715,7 +720,7 @@ type AnswerRebaseObject struct {
 	Serial         zodb.Tid
 	ConflictSerial zodb.Tid
 	// FIXME POption('data')
-		Compression bool
+		Compression Compression
 		Checksum    Checksum
 		Data        *mem.Buf
 }
@@ -729,7 +734,7 @@ type AnswerRebaseObject struct {
 type StoreObject struct {
 	Oid         zodb.Oid
 	Serial      zodb.Tid
-	Compression bool
+	Compression Compression
 	Checksum    Checksum
 	Data        []byte // TODO -> msg.Buf, separately (for writev)
 	DataSerial  zodb.Tid
@@ -784,7 +789,7 @@ type AnswerObject struct {
 	Oid         zodb.Oid
 	Serial      zodb.Tid
 	NextSerial  zodb.Tid
-	Compression bool
+	Compression Compression
 	Checksum    Checksum
 	Data        *mem.Buf // TODO encode -> separately (for writev)
 	DataSerial  zodb.Tid
@@ -1219,7 +1224,7 @@ type AddTransaction struct {
 type AddObject struct {
 	Oid         zodb.Oid
 	Serial      zodb.Tid
-	Compression bool
+	Compression Compression
 	Checksum    Checksum
 	Data        *mem.Buf
 	DataSerial  zodb.Tid

go/neo/proto/zproto-marshal.go

@@ -5094,18 +5094,18 @@ func (*AnswerRebaseObject) neoMsgCode() uint16 {
 }
 
 func (p *AnswerRebaseObject) neoMsgEncodedLenN() int {
-	return 41 + len(p.Data.XData())
+	return 48 + len(p.Data.XData())
 }
 
 func (p *AnswerRebaseObject) neoMsgEncodeN(data []byte) {
 	binary.BigEndian.PutUint64(data[0:], uint64(p.Serial))
 	binary.BigEndian.PutUint64(data[8:], uint64(p.ConflictSerial))
-	(data[16:])[0] = bool2byte(p.Compression)
-	copy(data[17:], p.Checksum[:])
+	binary.BigEndian.PutUint64(data[16:], uint64(p.Compression))
+	copy(data[24:], p.Checksum[:])
 	{
 		l := uint32(len(p.Data.XData()))
-		binary.BigEndian.PutUint32(data[37:], l)
-		data = data[41:]
+		binary.BigEndian.PutUint32(data[44:], l)
+		data = data[48:]
 		copy(data, p.Data.XData())
 		data = data[l:]
 	}
@@ -5113,16 +5113,16 @@ func (p *AnswerRebaseObject) neoMsgEncodeN(data []byte) {
 
 func (p *AnswerRebaseObject) neoMsgDecodeN(data []byte) (int, error) {
 	var nread uint64
-	if len(data) < 41 {
+	if len(data) < 48 {
 		goto overflow
 	}
 	p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8]))
 	p.ConflictSerial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
-	p.Compression = byte2bool((data[16 : 16+1])[0])
-	copy(p.Checksum[:], data[17:37])
+	p.Compression = Compression(binary.BigEndian.Uint64(data[16 : 16+8]))
+	copy(p.Checksum[:], data[24:44])
 	{
-		l := binary.BigEndian.Uint32(data[37 : 37+4])
-		data = data[41:]
+		l := binary.BigEndian.Uint32(data[44 : 44+4])
+		data = data[48:]
 		if uint64(len(data)) < uint64(l) {
 			goto overflow
 		}
@@ -5131,7 +5131,7 @@ func (p *AnswerRebaseObject) neoMsgDecodeN(data []byte) (int, error) {
 		copy(p.Data.Data, data[:l])
 		data = data[l:]
 	}
-	return 41 + int(nread), nil
+	return 48 + int(nread), nil
 
 overflow:
 	return 0, ErrDecodeOverflow
@@ -5149,7 +5149,7 @@ func (p *AnswerRebaseObject) neoMsgEncodedLenM() int {
 	} else {
 		size += 1 + 1 + 8 // mbin8 + 8 + [8]data
 	}
-	return 24 + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
+	return 23 + msgpack.Uint64Size(uint64(p.Compression)) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
 }
 
 func (p *AnswerRebaseObject) neoMsgEncodeM(data []byte) {
@@ -5172,14 +5172,17 @@ func (p *AnswerRebaseObject) neoMsgEncodeM(data []byte) {
 		binary.BigEndian.PutUint64(data[2:], uint64(p.ConflictSerial))
 		data = data[10:]
 	}
-	data[0] = byte(msgpack.Bool(p.Compression))
-	data[1] = byte(msgpack.Bin8)
-	data[2] = 20
-	copy(data[3:], p.Checksum[:])
+	{
+		n := msgpack.PutUint64(data[0:], uint64(p.Compression))
+		data = data[0+n:]
+	}
+	data[0] = byte(msgpack.Bin8)
+	data[1] = 20
+	copy(data[2:], p.Checksum[:])
 	{
 		l := len(p.Data.XData())
-		n := msgpack.PutBinHead(data[23:], l)
-		data = data[23+n:]
+		n := msgpack.PutBinHead(data[22:], l)
+		data = data[22+n:]
 		copy(data, p.Data.XData())
 		data = data[l:]
 	}
@@ -5234,25 +5237,26 @@ func (p *AnswerRebaseObject) neoMsgDecodeM(data []byte) (int, error) {
 		p.ConflictSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
 		data = data[10:]
 	}
-	if len(data) < 23 {
-		goto overflow
+	{
+		v, tail, err := msgp.ReadUint64Bytes(data)
+		if err != nil {
+			return 0, mdecodeErr("AnswerRebaseObject.Compression", err)
 		}
-	switch op := msgpack.Op(data[0]); op {
-	default:
-		return 0, mdecodeOpErr("AnswerRebaseObject.Compression", op, msgpack.True, msgpack.False)
-	case msgpack.True:
-		p.Compression = true
-	case msgpack.False:
-		p.Compression = false
+		p.Compression = Compression(v)
+		nread += uint64(len(data) - len(tail))
+		data = tail
 	}
-	if op := msgpack.Op(data[1]); op != msgpack.Bin8 {
+	if len(data) < 22 {
+		goto overflow
+	}
+	if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
 		return 0, mdecodeOpErr("AnswerRebaseObject.Checksum", op, msgpack.Bin8)
 	}
-	if l := data[2]; l != 20 {
+	if l := data[1]; l != 20 {
 		return 0, mdecodeLen8Err("AnswerRebaseObject.Checksum", l, 20)
 	}
-	copy(p.Checksum[:], data[3:23])
-	data = data[23:]
+	copy(p.Checksum[:], data[2:22])
+	data = data[22:]
 	{
 		b, tail, err := msgp.ReadBytesZC(data)
 		if err != nil {
@@ -5263,7 +5267,7 @@ func (p *AnswerRebaseObject) neoMsgDecodeM(data []byte) (int, error) {
 		nread += uint64(len(data) - len(tail))
 		data = tail
 	}
-	return 24 + int(nread), nil
+	return 23 + int(nread), nil
 
 overflow:
 	return 0, ErrDecodeOverflow
@@ -5276,18 +5280,18 @@ func (*StoreObject) neoMsgCode() uint16 {
 }
 
 func (p *StoreObject) neoMsgEncodedLenN() int {
-	return 57 + len(p.Data)
+	return 64 + len(p.Data)
 }
 
 func (p *StoreObject) neoMsgEncodeN(data []byte) {
 	binary.BigEndian.PutUint64(data[0:], uint64(p.Oid))
 	binary.BigEndian.PutUint64(data[8:], uint64(p.Serial))
-	(data[16:])[0] = bool2byte(p.Compression)
-	copy(data[17:], p.Checksum[:])
+	binary.BigEndian.PutUint64(data[16:], uint64(p.Compression))
+	copy(data[24:], p.Checksum[:])
 	{
 		l := uint32(len(p.Data))
-		binary.BigEndian.PutUint32(data[37:], l)
-		data = data[41:]
+		binary.BigEndian.PutUint32(data[44:], l)
+		data = data[48:]
 		copy(data, p.Data)
 		data = data[l:]
 	}
@@ -5297,16 +5301,16 @@ func (p *StoreObject) neoMsgEncodeN(data []byte) {
 
 func (p *StoreObject) neoMsgDecodeN(data []byte) (int, error) {
 	var nread uint64
-	if len(data) < 41 {
+	if len(data) < 48 {
 		goto overflow
 	}
 	p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8]))
 	p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
-	p.Compression = byte2bool((data[16 : 16+1])[0])
-	copy(p.Checksum[:], data[17:37])
+	p.Compression = Compression(binary.BigEndian.Uint64(data[16 : 16+8]))
+	copy(p.Checksum[:], data[24:44])
 	{
-		l := binary.BigEndian.Uint32(data[37 : 37+4])
-		data = data[41:]
+		l := binary.BigEndian.Uint32(data[44 : 44+4])
+		data = data[48:]
 		if uint64(len(data)) < 16+uint64(l) {
 			goto overflow
 		}
@@ -5317,7 +5321,7 @@ func (p *StoreObject) neoMsgDecodeN(data []byte) (int, error) {
 	}
 	p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8]))
 	p.Tid = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
-	return 41 + int(nread), nil
+	return 48 + int(nread), nil
 
 overflow:
 	return 0, ErrDecodeOverflow
@@ -5345,7 +5349,7 @@ func (p *StoreObject) neoMsgEncodedLenM() int {
 	} else {
 		size += 1 + 1 + 8 // mbin8 + 8 + [8]data
 	}
-	return 24 + msgpack.BinHeadSize(len(p.Data)) + len(p.Data) + size
+	return 23 + msgpack.Uint64Size(uint64(p.Compression)) + msgpack.BinHeadSize(len(p.Data)) + len(p.Data) + size
 }
 
 func (p *StoreObject) neoMsgEncodeM(data []byte) {
@@ -5368,14 +5372,17 @@ func (p *StoreObject) neoMsgEncodeM(data []byte) {
 		binary.BigEndian.PutUint64(data[2:], uint64(p.Serial))
 		data = data[10:]
 	}
-	data[0] = byte(msgpack.Bool(p.Compression))
-	data[1] = byte(msgpack.Bin8)
-	data[2] = 20
-	copy(data[3:], p.Checksum[:])
+	{
+		n := msgpack.PutUint64(data[0:], uint64(p.Compression))
+		data = data[0+n:]
+	}
+	data[0] = byte(msgpack.Bin8)
+	data[1] = 20
+	copy(data[2:], p.Checksum[:])
 	{
 		l := len(p.Data)
-		n := msgpack.PutBinHead(data[23:], l)
-		data = data[23+n:]
+		n := msgpack.PutBinHead(data[22:], l)
+		data = data[22+n:]
 		copy(data, p.Data)
 		data = data[l:]
 	}
@@ -5448,25 +5455,26 @@ func (p *StoreObject) neoMsgDecodeM(data []byte) (int, error) {
 		p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
 		data = data[10:]
 	}
-	if len(data) < 23 {
-		goto overflow
+	{
+		v, tail, err := msgp.ReadUint64Bytes(data)
+		if err != nil {
+			return 0, mdecodeErr("StoreObject.Compression", err)
 		}
-	switch op := msgpack.Op(data[0]); op {
-	default:
-		return 0, mdecodeOpErr("StoreObject.Compression", op, msgpack.True, msgpack.False)
-	case msgpack.True:
-		p.Compression = true
-	case msgpack.False:
-		p.Compression = false
+		p.Compression = Compression(v)
+		nread += uint64(len(data) - len(tail))
+		data = tail
 	}
-	if op := msgpack.Op(data[1]); op != msgpack.Bin8 {
+	if len(data) < 22 {
+		goto overflow
+	}
+	if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
 		return 0, mdecodeOpErr("StoreObject.Checksum", op, msgpack.Bin8)
 	}
-	if l := data[2]; l != 20 {
+	if l := data[1]; l != 20 {
 		return 0, mdecodeLen8Err("StoreObject.Checksum", l, 20)
 	}
-	copy(p.Checksum[:], data[3:23])
-	data = data[23:]
+	copy(p.Checksum[:], data[2:22])
+	data = data[22:]
 	{
 		b, tail, err := msgp.ReadBytesZC(data)
 		if err != nil {
@@ -5511,7 +5519,7 @@ func (p *StoreObject) neoMsgDecodeM(data []byte) (int, error) {
 		p.Tid = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
 		data = data[10:]
 	}
-	return 24 + int(nread), nil
+	return 23 + int(nread), nil
 
 overflow:
 	return 0, ErrDecodeOverflow
@@ -6342,19 +6350,19 @@ func (*AnswerObject) neoMsgCode() uint16 {
 }
 
 func (p *AnswerObject) neoMsgEncodedLenN() int {
-	return 57 + len(p.Data.XData())
+	return 64 + len(p.Data.XData())
 }
 
 func (p *AnswerObject) neoMsgEncodeN(data []byte) {
 	binary.BigEndian.PutUint64(data[0:], uint64(p.Oid))
 	binary.BigEndian.PutUint64(data[8:], uint64(p.Serial))
 	binary.BigEndian.PutUint64(data[16:], uint64(p.NextSerial))
-	(data[24:])[0] = bool2byte(p.Compression)
-	copy(data[25:], p.Checksum[:])
+	binary.BigEndian.PutUint64(data[24:], uint64(p.Compression))
+	copy(data[32:], p.Checksum[:])
 	{
 		l := uint32(len(p.Data.XData()))
-		binary.BigEndian.PutUint32(data[45:], l)
-		data = data[49:]
+		binary.BigEndian.PutUint32(data[52:], l)
+		data = data[56:]
 		copy(data, p.Data.XData())
 		data = data[l:]
 	}
@@ -6363,17 +6371,17 @@ func (p *AnswerObject) neoMsgEncodeN(data []byte) {
 
 func (p *AnswerObject) neoMsgDecodeN(data []byte) (int, error) {
 	var nread uint64
-	if len(data) < 49 {
+	if len(data) < 56 {
 		goto overflow
 	}
 	p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8]))
 	p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
 	p.NextSerial = zodb.Tid(binary.BigEndian.Uint64(data[16 : 16+8]))
-	p.Compression = byte2bool((data[24 : 24+1])[0])
-	copy(p.Checksum[:], data[25:45])
+	p.Compression = Compression(binary.BigEndian.Uint64(data[24 : 24+8]))
+	copy(p.Checksum[:], data[32:52])
 	{
-		l := binary.BigEndian.Uint32(data[45 : 45+4])
-		data = data[49:]
+		l := binary.BigEndian.Uint32(data[52 : 52+4])
+		data = data[56:]
 		if uint64(len(data)) < 8+uint64(l) {
 			goto overflow
 		}
@@ -6383,7 +6391,7 @@ func (p *AnswerObject) neoMsgDecodeN(data []byte) (int, error) {
 		data = data[l:]
 	}
 	p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8]))
-	return 49 + int(nread), nil
+	return 56 + int(nread), nil
 
 overflow:
 	return 0, ErrDecodeOverflow
@@ -6411,7 +6419,7 @@ func (p *AnswerObject) neoMsgEncodedLenM() int {
 	} else {
 		size += 1 + 1 + 8 // mbin8 + 8 + [8]data
 	}
-	return 24 + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
+	return 23 + msgpack.Uint64Size(uint64(p.Compression)) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
 }
 
 func (p *AnswerObject) neoMsgEncodeM(data []byte) {
@@ -6443,14 +6451,17 @@ func (p *AnswerObject) neoMsgEncodeM(data []byte) {
 		binary.BigEndian.PutUint64(data[2:], uint64(p.NextSerial))
 		data = data[10:]
 	}
-	data[0] = byte(msgpack.Bool(p.Compression))
-	data[1] = byte(msgpack.Bin8)
-	data[2] = 20
-	copy(data[3:], p.Checksum[:])
+	{
+		n := msgpack.PutUint64(data[0:], uint64(p.Compression))
+		data = data[0+n:]
+	}
+	data[0] = byte(msgpack.Bin8)
+	data[1] = 20
+	copy(data[2:], p.Checksum[:])
 	{
 		l := len(p.Data.XData())
-		n := msgpack.PutBinHead(data[23:], l)
-		data = data[23+n:]
+		n := msgpack.PutBinHead(data[22:], l)
+		data = data[22+n:]
 		copy(data, p.Data.XData())
 		data = data[l:]
 	}
@@ -6531,25 +6542,26 @@ func (p *AnswerObject) neoMsgDecodeM(data []byte) (int, error) {
 		p.NextSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
 		data = data[10:]
 	}
-	if len(data) < 23 {
-		goto overflow
+	{
+		v, tail, err := msgp.ReadUint64Bytes(data)
+		if err != nil {
+			return 0, mdecodeErr("AnswerObject.Compression", err)
 		}
-	switch op := msgpack.Op(data[0]); op {
-	default:
-		return 0, mdecodeOpErr("AnswerObject.Compression", op, msgpack.True, msgpack.False)
-	case msgpack.True:
-		p.Compression = true
-	case msgpack.False:
-		p.Compression = false
+		p.Compression = Compression(v)
+		nread += uint64(len(data) - len(tail))
+		data = tail
 	}
-	if op := msgpack.Op(data[1]); op != msgpack.Bin8 {
+	if len(data) < 22 {
+		goto overflow
+	}
+	if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
 		return 0, mdecodeOpErr("AnswerObject.Checksum", op, msgpack.Bin8)
 	}
-	if l := data[2]; l != 20 {
+	if l := data[1]; l != 20 {
 		return 0, mdecodeLen8Err("AnswerObject.Checksum", l, 20)
 	}
-	copy(p.Checksum[:], data[3:23])
-	data = data[23:]
+	copy(p.Checksum[:], data[2:22])
+	data = data[22:]
 	{
 		b, tail, err := msgp.ReadBytesZC(data)
 		if err != nil {
@@ -6577,7 +6589,7 @@ func (p *AnswerObject) neoMsgDecodeM(data []byte) (int, error) {
 		p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
 		data = data[10:]
 	}
-	return 24 + int(nread), nil
+	return 23 + int(nread), nil
 
 overflow:
 	return 0, ErrDecodeOverflow
@@ -13566,18 +13578,18 @@ func (*AddObject) neoMsgCode() uint16 {
 }
 
 func (p *AddObject) neoMsgEncodedLenN() int {
-	return 49 + len(p.Data.XData())
+	return 56 + len(p.Data.XData())
 }
 
 func (p *AddObject) neoMsgEncodeN(data []byte) {
 	binary.BigEndian.PutUint64(data[0:], uint64(p.Oid))
 	binary.BigEndian.PutUint64(data[8:], uint64(p.Serial))
-	(data[16:])[0] = bool2byte(p.Compression)
-	copy(data[17:], p.Checksum[:])
+	binary.BigEndian.PutUint64(data[16:], uint64(p.Compression))
+	copy(data[24:], p.Checksum[:])
 	{
 		l := uint32(len(p.Data.XData()))
-		binary.BigEndian.PutUint32(data[37:], l)
-		data = data[41:]
+		binary.BigEndian.PutUint32(data[44:], l)
+		data = data[48:]
 		copy(data, p.Data.XData())
 		data = data[l:]
 	}
@@ -13586,16 +13598,16 @@ func (p *AddObject) neoMsgEncodeN(data []byte) {
 
 func (p *AddObject) neoMsgDecodeN(data []byte) (int, error) {
 	var nread uint64
-	if len(data) < 41 {
+	if len(data) < 48 {
 		goto overflow
 	}
 	p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8]))
 	p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
-	p.Compression = byte2bool((data[16 : 16+1])[0])
-	copy(p.Checksum[:], data[17:37])
+	p.Compression = Compression(binary.BigEndian.Uint64(data[16 : 16+8]))
+	copy(p.Checksum[:], data[24:44])
 	{
-		l := binary.BigEndian.Uint32(data[37 : 37+4])
-		data = data[41:]
+		l := binary.BigEndian.Uint32(data[44 : 44+4])
+		data = data[48:]
 		if uint64(len(data)) < 8+uint64(l) {
 			goto overflow
 		}
@@ -13605,7 +13617,7 @@ func (p *AddObject) neoMsgDecodeN(data []byte) (int, error) {
 		data = data[l:]
 	}
 	p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8]))
-	return 41 + int(nread), nil
+	return 48 + int(nread), nil
 
 overflow:
 	return 0, ErrDecodeOverflow
@@ -13628,7 +13640,7 @@ func (p *AddObject) neoMsgEncodedLenM() int {
 	} else {
 		size += 1 + 1 + 8 // mbin8 + 8 + [8]data
 	}
-	return 24 + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
+	return 23 + msgpack.Uint64Size(uint64(p.Compression)) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
 }
 
 func (p *AddObject) neoMsgEncodeM(data []byte) {
@@ -13651,14 +13663,17 @@ func (p *AddObject) neoMsgEncodeM(data []byte) {
 		binary.BigEndian.PutUint64(data[2:], uint64(p.Serial))
 		data = data[10:]
 	}
-	data[0] = byte(msgpack.Bool(p.Compression))
-	data[1] = byte(msgpack.Bin8)
-	data[2] = 20
-	copy(data[3:], p.Checksum[:])
+	{
+		n := msgpack.PutUint64(data[0:], uint64(p.Compression))
+		data = data[0+n:]
+	}
+	data[0] = byte(msgpack.Bin8)
+	data[1] = 20
+	copy(data[2:], p.Checksum[:])
 	{
 		l := len(p.Data.XData())
-		n := msgpack.PutBinHead(data[23:], l)
-		data = data[23+n:]
+		n := msgpack.PutBinHead(data[22:], l)
+		data = data[22+n:]
 		copy(data, p.Data.XData())
 		data = data[l:]
 	}
@@ -13722,25 +13737,26 @@ func (p *AddObject) neoMsgDecodeM(data []byte) (int, error) {
 		p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
 		data = data[10:]
 	}
-	if len(data) < 23 {
-		goto overflow
+	{
+		v, tail, err := msgp.ReadUint64Bytes(data)
+		if err != nil {
+			return 0, mdecodeErr("AddObject.Compression", err)
 		}
-	switch op := msgpack.Op(data[0]); op {
-	default:
-		return 0, mdecodeOpErr("AddObject.Compression", op, msgpack.True, msgpack.False)
-	case msgpack.True:
-		p.Compression = true
-	case msgpack.False:
-		p.Compression = false
+		p.Compression = Compression(v)
+		nread += uint64(len(data) - len(tail))
+		data = tail
 	}
-	if op := msgpack.Op(data[1]); op != msgpack.Bin8 {
+	if len(data) < 22 {
+		goto overflow
+	}
+	if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
 		return 0, mdecodeOpErr("AddObject.Checksum", op, msgpack.Bin8)
 	}
-	if l := data[2]; l != 20 {
+	if l := data[1]; l != 20 {
 		return 0, mdecodeLen8Err("AddObject.Checksum", l, 20)
 	}
-	copy(p.Checksum[:], data[3:23])
-	data = data[23:]
+	copy(p.Checksum[:], data[2:22])
+	data = data[22:]
 	{
 		b, tail, err := msgp.ReadBytesZC(data)
 		if err != nil {
@@ -13768,7 +13784,7 @@ func (p *AddObject) neoMsgDecodeM(data []byte) (int, error) {
 		p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
 		data = data[10:]
 	}
-	return 24 + int(nread), nil
+	return 23 + int(nread), nil
 
 overflow:
 	return 0, ErrDecodeOverflow

go/neo/storage/fs1/fs1.go

@@ -87,7 +87,7 @@ func (f *Backend) Load(ctx context.Context, xid zodb.Xid) (*proto.AnswerObject,
 		Serial:     serial,
 		NextSerial: nextSerial,
 
-		Compression: false,
+		Compression: 0,
 		Data:        buf,
 		Checksum:    xsha1.NEOSum(buf.Data),	// XXX computing every time