Skip to content

Commit be970f3

Browse files
jycorjycor
committed
[ga-format-pr] Run ./format_repo.sh to fix formatting
1 parent 59b2983 commit be970f3

File tree

2 files changed

+125
-126
lines changed

2 files changed

+125
-126
lines changed

‎enginetest/queries/script_queries.go‎

Lines changed: 123 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -8108,7 +8108,7 @@ where
81088108
},
81098109
},
81108110
{
8111-
Name: "ntile tests",
8111+
Name: "ntile tests",
81128112
Dialect: "mysql",
81138113
SetUpScript: []string{
81148114
"create table t (i int primary key, j int);",
@@ -8120,190 +8120,190 @@ where
81208120
ExpectedErr: sql.ErrInvalidArgument,
81218121
},
81228122
{
8123-
Query: "select i, ntile(0) over() from t;",
8123+
Query: "select i, ntile(0) over() from t;",
81248124
ExpectedErr: sql.ErrInvalidArgument,
81258125
},
81268126
{
8127-
Query: "select i, ntile(-1) over() from t;",
8127+
Query: "select i, ntile(-1) over() from t;",
81288128
ExpectedErr: sql.ErrInvalidArgument,
81298129
},
81308130
{
8131-
Query: "select i, ntile(100) over() from t;",
8131+
Query: "select i, ntile(100) over() from t;",
81328132
Expected: []sql.Row{
8133-
{1, uint64(1)},
8134-
{2, uint64(2)},
8135-
{3, uint64(3)},
8136-
{4, uint64(4)},
8137-
{5, uint64(5)},
8138-
{6, uint64(6)},
8139-
{7, uint64(7)},
8140-
{8, uint64(8)},
8141-
{9, uint64(9)},
8133+
{1, uint64(1)},
8134+
{2, uint64(2)},
8135+
{3, uint64(3)},
8136+
{4, uint64(4)},
8137+
{5, uint64(5)},
8138+
{6, uint64(6)},
8139+
{7, uint64(7)},
8140+
{8, uint64(8)},
8141+
{9, uint64(9)},
81428142
{10, uint64(10)},
81438143
},
81448144
},
81458145
{
8146-
Query: "select i, ntile(10) over() from t;",
8146+
Query: "select i, ntile(10) over() from t;",
81478147
Expected: []sql.Row{
8148-
{1, uint64(1)},
8149-
{2, uint64(2)},
8150-
{3, uint64(3)},
8151-
{4, uint64(4)},
8152-
{5, uint64(5)},
8153-
{6, uint64(6)},
8154-
{7, uint64(7)},
8155-
{8, uint64(8)},
8156-
{9, uint64(9)},
8148+
{1, uint64(1)},
8149+
{2, uint64(2)},
8150+
{3, uint64(3)},
8151+
{4, uint64(4)},
8152+
{5, uint64(5)},
8153+
{6, uint64(6)},
8154+
{7, uint64(7)},
8155+
{8, uint64(8)},
8156+
{9, uint64(9)},
81578157
{10, uint64(10)},
81588158
},
81598159
},
81608160
{
8161-
Query: "select i, ntile(9) over() from t;",
8161+
Query: "select i, ntile(9) over() from t;",
81628162
Expected: []sql.Row{
8163-
{1, uint64(1)},
8164-
{2, uint64(1)},
8165-
{3, uint64(2)},
8166-
{4, uint64(3)},
8167-
{5, uint64(4)},
8168-
{6, uint64(5)},
8169-
{7, uint64(6)},
8170-
{8, uint64(7)},
8171-
{9, uint64(8)},
8163+
{1, uint64(1)},
8164+
{2, uint64(1)},
8165+
{3, uint64(2)},
8166+
{4, uint64(3)},
8167+
{5, uint64(4)},
8168+
{6, uint64(5)},
8169+
{7, uint64(6)},
8170+
{8, uint64(7)},
8171+
{9, uint64(8)},
81728172
{10, uint64(9)},
81738173
},
81748174
},
81758175
{
8176-
Query: "select i, ntile(8) over() from t;",
8176+
Query: "select i, ntile(8) over() from t;",
81778177
Expected: []sql.Row{
8178-
{1, uint64(1)},
8179-
{2, uint64(1)},
8180-
{3, uint64(2)},
8181-
{4, uint64(2)},
8182-
{5, uint64(3)},
8183-
{6, uint64(4)},
8184-
{7, uint64(5)},
8185-
{8, uint64(6)},
8186-
{9, uint64(7)},
8178+
{1, uint64(1)},
8179+
{2, uint64(1)},
8180+
{3, uint64(2)},
8181+
{4, uint64(2)},
8182+
{5, uint64(3)},
8183+
{6, uint64(4)},
8184+
{7, uint64(5)},
8185+
{8, uint64(6)},
8186+
{9, uint64(7)},
81878187
{10, uint64(8)},
81888188
},
81898189
},
81908190
{
8191-
Query: "select i, ntile(7) over() from t;",
8191+
Query: "select i, ntile(7) over() from t;",
81928192
Expected: []sql.Row{
8193-
{1, uint64(1)},
8194-
{2, uint64(1)},
8195-
{3, uint64(2)},
8196-
{4, uint64(2)},
8197-
{5, uint64(3)},
8198-
{6, uint64(3)},
8199-
{7, uint64(4)},
8200-
{8, uint64(5)},
8201-
{9, uint64(6)},
8193+
{1, uint64(1)},
8194+
{2, uint64(1)},
8195+
{3, uint64(2)},
8196+
{4, uint64(2)},
8197+
{5, uint64(3)},
8198+
{6, uint64(3)},
8199+
{7, uint64(4)},
8200+
{8, uint64(5)},
8201+
{9, uint64(6)},
82028202
{10, uint64(7)},
82038203
},
82048204
},
82058205
{
8206-
Query: "select i, ntile(6) over() from t;",
8206+
Query: "select i, ntile(6) over() from t;",
82078207
Expected: []sql.Row{
8208-
{1, uint64(1)},
8209-
{2, uint64(1)},
8210-
{3, uint64(2)},
8211-
{4, uint64(2)},
8212-
{5, uint64(3)},
8213-
{6, uint64(3)},
8214-
{7, uint64(4)},
8215-
{8, uint64(4)},
8216-
{9, uint64(5)},
8208+
{1, uint64(1)},
8209+
{2, uint64(1)},
8210+
{3, uint64(2)},
8211+
{4, uint64(2)},
8212+
{5, uint64(3)},
8213+
{6, uint64(3)},
8214+
{7, uint64(4)},
8215+
{8, uint64(4)},
8216+
{9, uint64(5)},
82178217
{10, uint64(6)},
82188218
},
82198219
},
82208220
{
8221-
Query: "select i, ntile(5) over() from t;",
8221+
Query: "select i, ntile(5) over() from t;",
82228222
Expected: []sql.Row{
8223-
{1, uint64(1)},
8224-
{2, uint64(1)},
8225-
{3, uint64(2)},
8226-
{4, uint64(2)},
8227-
{5, uint64(3)},
8228-
{6, uint64(3)},
8229-
{7, uint64(4)},
8230-
{8, uint64(4)},
8231-
{9, uint64(5)},
8223+
{1, uint64(1)},
8224+
{2, uint64(1)},
8225+
{3, uint64(2)},
8226+
{4, uint64(2)},
8227+
{5, uint64(3)},
8228+
{6, uint64(3)},
8229+
{7, uint64(4)},
8230+
{8, uint64(4)},
8231+
{9, uint64(5)},
82328232
{10, uint64(5)},
82338233
},
82348234
},
82358235
{
8236-
Query: "select i, ntile(4) over() from t;",
8236+
Query: "select i, ntile(4) over() from t;",
82378237
Expected: []sql.Row{
8238-
{1, uint64(1)},
8239-
{2, uint64(1)},
8240-
{3, uint64(1)},
8241-
{4, uint64(2)},
8242-
{5, uint64(2)},
8243-
{6, uint64(2)},
8244-
{7, uint64(3)},
8245-
{8, uint64(3)},
8246-
{9, uint64(4)},
8238+
{1, uint64(1)},
8239+
{2, uint64(1)},
8240+
{3, uint64(1)},
8241+
{4, uint64(2)},
8242+
{5, uint64(2)},
8243+
{6, uint64(2)},
8244+
{7, uint64(3)},
8245+
{8, uint64(3)},
8246+
{9, uint64(4)},
82478247
{10, uint64(4)},
82488248
},
82498249
},
82508250
{
8251-
Query: "select i, ntile(3) over() from t;",
8251+
Query: "select i, ntile(3) over() from t;",
82528252
Expected: []sql.Row{
8253-
{1, uint64(1)},
8254-
{2, uint64(1)},
8255-
{3, uint64(1)},
8256-
{4, uint64(1)},
8257-
{5, uint64(2)},
8258-
{6, uint64(2)},
8259-
{7, uint64(2)},
8260-
{8, uint64(3)},
8261-
{9, uint64(3)},
8253+
{1, uint64(1)},
8254+
{2, uint64(1)},
8255+
{3, uint64(1)},
8256+
{4, uint64(1)},
8257+
{5, uint64(2)},
8258+
{6, uint64(2)},
8259+
{7, uint64(2)},
8260+
{8, uint64(3)},
8261+
{9, uint64(3)},
82628262
{10, uint64(3)},
82638263
},
82648264
},
82658265
{
8266-
Query: "select i, ntile(2) over() from t;",
8266+
Query: "select i, ntile(2) over() from t;",
82678267
Expected: []sql.Row{
8268-
{1, uint64(1)},
8269-
{2, uint64(1)},
8270-
{3, uint64(1)},
8271-
{4, uint64(1)},
8272-
{5, uint64(1)},
8273-
{6, uint64(2)},
8274-
{7, uint64(2)},
8275-
{8, uint64(2)},
8276-
{9, uint64(2)},
8268+
{1, uint64(1)},
8269+
{2, uint64(1)},
8270+
{3, uint64(1)},
8271+
{4, uint64(1)},
8272+
{5, uint64(1)},
8273+
{6, uint64(2)},
8274+
{7, uint64(2)},
8275+
{8, uint64(2)},
8276+
{9, uint64(2)},
82778277
{10, uint64(2)},
82788278
},
82798279
},
82808280
{
8281-
Query: "select i, ntile(1) over() from t;",
8281+
Query: "select i, ntile(1) over() from t;",
82828282
Expected: []sql.Row{
8283-
{1, uint64(1)},
8284-
{2, uint64(1)},
8285-
{3, uint64(1)},
8286-
{4, uint64(1)},
8287-
{5, uint64(1)},
8288-
{6, uint64(1)},
8289-
{7, uint64(1)},
8290-
{8, uint64(1)},
8291-
{9, uint64(1)},
8283+
{1, uint64(1)},
8284+
{2, uint64(1)},
8285+
{3, uint64(1)},
8286+
{4, uint64(1)},
8287+
{5, uint64(1)},
8288+
{6, uint64(1)},
8289+
{7, uint64(1)},
8290+
{8, uint64(1)},
8291+
{9, uint64(1)},
82928292
{10, uint64(1)},
82938293
},
82948294
},
82958295
{
8296-
Query: "select i, j, ntile(2) over(partition by j) from t;",
8296+
Query: "select i, j, ntile(2) over(partition by j) from t;",
82978297
Expected: []sql.Row{
8298-
{1, 1, uint64(1)},
8299-
{2, 1, uint64(1)},
8300-
{3, 1, uint64(1)},
8301-
{4, 1, uint64(2)},
8302-
{5, 1, uint64(2)},
8303-
{6, 2, uint64(1)},
8304-
{7, 2, uint64(1)},
8305-
{8, 2, uint64(1)},
8306-
{9, 2, uint64(2)},
8298+
{1, 1, uint64(1)},
8299+
{2, 1, uint64(1)},
8300+
{3, 1, uint64(1)},
8301+
{4, 1, uint64(2)},
8302+
{5, 1, uint64(2)},
8303+
{6, 2, uint64(1)},
8304+
{7, 2, uint64(1)},
8305+
{8, 2, uint64(1)},
8306+
{9, 2, uint64(2)},
83078307
{10, 2, uint64(2)},
83088308
},
83098309
},

‎sql/expression/function/aggregation/window_functions.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,20 +1410,19 @@ func (n *NTile) Compute(ctx *sql.Context, interval sql.WindowInterval, buf sql.W
14101410

14111411
// the first n.bigBuckets buckets are of size n.bucketSize + 1
14121412
// the remaining buckets are of size n.bucketSize
1413-
if n.bigBuckets > 0 && n.pos % (n.bucketSize + 1) == 0 {
1413+
if n.bigBuckets > 0 && n.pos%(n.bucketSize+1) == 0 {
14141414
n.bucket++
14151415
n.bigBuckets--
14161416
if n.bigBuckets == 0 {
14171417
n.pos = 0
14181418
}
1419-
} else if n.bigBuckets == 0 && n.pos % n.bucketSize == 0 {
1419+
} else if n.bigBuckets == 0 && n.pos%n.bucketSize == 0 {
14201420
n.bucket++
14211421
}
14221422

14231423
return n.bucket
14241424
}
14251425

1426-
14271426
type Lag struct {
14281427
leadLagBase
14291428
}

0 commit comments

Comments
 (0)