File tree 3 files changed +12
-5
lines changed
3 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -156,8 +156,8 @@ func TestAnonSlaveSubscribeExpectedReplicaSetUUIDFail(t *testing.T) {
156
156
157
157
ver , err := tntBoxVersion (box )
158
158
require .NoError (err )
159
- if ver >= version2_8_0 && ver < version2_9_0 {
160
- t .Skip ("Tarantool 2.8 returns an empty replicaset UUID, skip check" )
159
+ if ver >= version2_8_0 && ver < version2_9_0 || ver >= version2_11_0 {
160
+ t .Skip ("Tarantool 2.8/2.11 returns an empty replicaset UUID, skip check" )
161
161
}
162
162
163
163
s , _ := NewAnonSlave (box .Listen , Options {
Original file line number Diff line number Diff line change @@ -32,6 +32,7 @@ const (
32
32
KeyLSN = uint (0x03 )
33
33
KeyTimestamp = uint (0x04 )
34
34
KeySchemaID = uint (0x05 )
35
+ KeyVersionID = uint (0x06 )
35
36
KeySpaceNo = uint (0x10 )
36
37
KeyIndexNo = uint (0x11 )
37
38
KeyLimit = uint (0x12 )
@@ -378,7 +379,8 @@ const (
378
379
// 2.3.1 is min version for anonymous replication
379
380
version2_3_1 = uint32 (131841 ) // VersionID(2, 3, 1)
380
381
// Add box.info.replication_anon
381
- version2_5_1 = uint32 (132353 ) // VersionID(2, 5, 1)
382
- version2_8_0 = uint32 (133120 ) // VersionID(2, 8, 0)
383
- version2_9_0 = uint32 (133376 ) // VersionID(2, 9, 0)
382
+ version2_5_1 = uint32 (132353 ) // VersionID(2, 5, 1)
383
+ version2_8_0 = uint32 (133120 ) // VersionID(2, 8, 0)
384
+ version2_9_0 = uint32 (133376 ) // VersionID(2, 9, 0)
385
+ version2_11_0 = uint32 (133888 ) // VersionID(2, 11, 0)
384
386
)
Original file line number Diff line number Diff line change 1
1
package tarantool
2
2
3
+ import "github.com/tinylib/msgp/msgp"
4
+
3
5
// FetchSnapshot is the FETCH_SNAPSHOT command
4
6
type FetchSnapshot struct {}
5
7
@@ -12,6 +14,9 @@ func (q *FetchSnapshot) GetCommandID() uint {
12
14
// MarshalMsg implements msgp.Marshaler
13
15
func (q * FetchSnapshot ) MarshalMsg (b []byte ) (o []byte , err error ) {
14
16
o = b
17
+ o = msgp .AppendMapHeader (o , 1 )
18
+ o = msgp .AppendUint (o , KeyVersionID )
19
+ o = msgp .AppendUint (o , uint (version2_9_0 ))
15
20
return o , nil
16
21
}
17
22
You can’t perform that action at this time.
0 commit comments