Skip to content

Commit ee89ea2

Browse files
authored
Merge pull request #1410 from ydb-platform/range-func
fixed build tags for range-over
2 parents fc13407 + fe525e0 commit ee89ea2

File tree

9 files changed

+13
-12
lines changed

9 files changed

+13
-12
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ jobs:
127127
YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem
128128
YDB_SESSIONS_SHUTDOWN_URLS: http://localhost:8765/actors/kqp_proxy?force_shutdown=all
129129
HIDE_APPLICATION_OUTPUT: 1
130-
GOEXPERIMENT: rangefunc
131130
steps:
132131
- name: Checkout code
133132
uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* Replaced requirements from go1.22 + experimantal flag to go1.23 for experimental range-over interface
2+
13
## v3.76.5
24
* Fixed out of index item creation in `internal/pool.Pool`
35
* Fixed tracing of `(*grpcClientStream).finish` event

internal/query/result_range_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build go1.22 && goexperiment.rangefunc
1+
//go:build go1.23
22

33
package query
44

internal/query/result_set_range_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build go1.22 && goexperiment.rangefunc
1+
//go:build go1.23
22

33
package query
44

internal/xiter/xiter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !go1.22 || !goexperiment.rangefunc
1+
//go:build !go1.23
22

33
package xiter
44

internal/xiter/xiter_experiment_go1.22.go renamed to internal/xiter/xiter_experiment_go1.23.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build go1.22 && goexperiment.rangefunc
1+
//go:build go1.23
22

33
package xiter
44

query/example_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build go1.22 && goexperiment.rangefunc
1+
//go:build go1.23
22

33
package query_test
44

@@ -94,12 +94,12 @@ func Example_rangeExperiment() {
9494
if err != nil {
9595
panic(err)
9696
}
97-
// for loop with ResultSets available with Go version 1.22+ and flag `GOEXPERIMENT=rangefunc`.
97+
// for loop with ResultSets available with Go version 1.23+
9898
for rs, err := range r.ResultSets(ctx) {
9999
if err != nil {
100100
panic(err)
101101
}
102-
// for loop with ResultSets available with Go version 1.22+ and flag `GOEXPERIMENT=rangefunc`.
102+
// for loop with ResultSets available with Go version 1.23+
103103
for row, err := range rs.Rows(ctx) {
104104
if err != nil {
105105
panic(err)

query/result.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type (
1818
NextResultSet(ctx context.Context) (ResultSet, error)
1919

2020
// ResultSets is experimental API for range iterators available
21-
// with Go version 1.22+ and flag `GOEXPERIMENT=rangefunc`.
21+
// with Go version 1.23+
2222
ResultSets(ctx context.Context) xiter.Seq2[ResultSet, error]
2323

2424
Stats() stats.QueryStats
@@ -29,7 +29,7 @@ type (
2929
ColumnTypes() []Type
3030
NextRow(ctx context.Context) (Row, error)
3131

32-
// Rows is experimental API for range iterators available with Go version 1.22+ and flag `GOEXPERIMENT=rangefunc`.
32+
// Rows is experimental API for range iterators available with Go version 1.23+
3333
Rows(ctx context.Context) xiter.Seq2[Row, error]
3434
}
3535
Row interface {

tests/integration/query_range_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build integration && go1.22 && goexperiment.rangefunc
2-
// +build integration,go1.22,goexperiment.rangefunc
1+
//go:build integration && go1.23
2+
// +build integration,go1.23
33

44
package integration
55

0 commit comments

Comments
 (0)