Skip to content

Commit 915537d

Browse files
committed
fixes [TO SQUASH]
1 parent be84f6d commit 915537d

File tree

3 files changed

+115
-202
lines changed

3 files changed

+115
-202
lines changed

datetime/config.lua

+3-25
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,6 @@ box.once("init", function()
2727
})
2828
s_1:truncate()
2929

30-
local s_2 = box.schema.space.create('testDatetime_2', {
31-
id = 525,
32-
if_not_exists = true,
33-
})
34-
s_2:format({
35-
{ 'Cid', type = 'unsigned' },
36-
{ 'Datetime', type = 'datetime' },
37-
{ 'Orig', type = 'unsigned' },
38-
{ 'Member', type = 'array' },
39-
})
40-
s_2:create_index('primary', {
41-
type = 'tree',
42-
parts = {
43-
{ field = 1, type = 'unsigned'},
44-
{ field = 2, type = 'datetime'},
45-
},
46-
if_not_exists = true
47-
})
48-
s_2:truncate()
49-
5030
local s_3 = box.schema.space.create('testDatetime_3', {
5131
id = 526,
5232
if_not_exists = true,
@@ -55,15 +35,13 @@ box.once("init", function()
5535
type = 'tree',
5636
parts = {
5737
{1, 'uint'},
58-
{2, 'datetime'}
5938
},
6039
if_not_exists = true
6140
})
6241
s_3:truncate()
6342

6443
box.schema.func.create('call_me_maybe')
6544
box.schema.user.grant('test', 'read,write', 'space', 'testDatetime_1', { if_not_exists = true })
66-
box.schema.user.grant('test', 'read,write', 'space', 'testDatetime_2', { if_not_exists = true })
6745
box.schema.user.grant('test', 'read,write', 'space', 'testDatetime_3', { if_not_exists = true })
6846
end)
6947

@@ -74,9 +52,9 @@ local function call_me_maybe()
7452
return {
7553
{
7654
5, "Poyekhali!", {
77-
{dt1, "Klushino"},
78-
{dt2, "Baikonur"},
79-
{dt3, "Novoselovo"},
55+
{"Klushino", dt1},
56+
{"Baikonur", dt2},
57+
{"Novoselovo", dt3},
8058
},
8159
}
8260
}

datetime/datetime.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ type DateTime struct {
7676

7777
// NewDateTime returns a pointer to a new datetime.DateTime that contains a
7878
// specified time.Time.
79-
func NewDateTime(t time.Time) DateTime {
79+
func NewDateTime(t time.Time) *DateTime {
8080
dt := new(DateTime)
8181
dt.time = t
82-
return *dt
82+
return dt
8383
}
8484

8585
// ToTime returns a time.Time that DateTime contains.
@@ -131,7 +131,7 @@ func (tm *DateTime) UnmarshalMsgpack(b []byte) error {
131131
dt.tzIndex = int16(binary.LittleEndian.Uint16(b[secondsSize+nsecSize+tzOffsetSize:]))
132132
}
133133
tt := time.Unix(dt.seconds, int64(dt.nsec)).UTC()
134-
*tm = NewDateTime(tt)
134+
*tm = *NewDateTime(tt)
135135

136136
return nil
137137
}

0 commit comments

Comments
 (0)