Merge pull request #1349 from ydb-platform/fix-build-go1.20

Fixed build for go1.20

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fixed build for go1.20
+
 ## v3.75.1
 * Fixed return more than one row error if real error raised on try read next row
 * Fixed checking errors for session must be deleted

internal/xslices/diff_test.go

@@ -61,6 +61,59 @@ func TestDiff(t *testing.T) {
 			},
 			dropped: []int{},
 		},
+		{
+			name: "OnlyAddedWithDuplicatesInPrevious",
+			previous: []int{
+				1,
+				0,
+				1,
+				3,
+			},
+			newest: []int{
+				1,
+				3,
+				2,
+				0,
+			},
+			steady: []int{
+				0,
+				1,
+				3,
+			},
+			added: []int{
+				2,
+			},
+			dropped: []int{
+				1,
+			},
+		},
+		{
+			name: "OnlyAddedWithDuplicatesInNewest",
+			previous: []int{
+				1,
+				0,
+				3,
+			},
+			newest: []int{
+				1,
+				1,
+				3,
+				1,
+				2,
+				0,
+			},
+			steady: []int{
+				0,
+				1,
+				3,
+			},
+			added: []int{
+				1,
+				1,
+				2,
+			},
+			dropped: []int{},
+		},
 		{
 			name: "OnlyDropped",
 			previous: []int{
@@ -132,6 +185,34 @@ func TestDiff(t *testing.T) {
 				3,
 			},
 		},
+		{
+			name: "AddedWithDuplicates",
+			previous: []int{
+				1,
+				3,
+				3,
+				0,
+			},
+			newest: []int{
+				4,
+				7,
+				7,
+				8,
+			},
+			steady: []int{},
+			added: []int{
+				4,
+				7,
+				7,
+				8,
+			},
+			dropped: []int{
+				0,
+				1,
+				3,
+				3,
+			},
+		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
 			steady, added, dropped := Diff(tt.previous, tt.newest, func(lhs, rhs int) int {

internal/xslices/sort.go

@@ -7,14 +7,6 @@ import (
 	"slices"
 )
 
-func SortCopy[T any](in []T, cmp func(lhs, rhs T) int) (out []T) {
-	out = Clone(in)
-
-	Sort(out, cmp)
-
-	return out
-}
-
 func Sort[T any](in []T, cmp func(lhs, rhs T) int) {
 	slices.SortFunc(in, cmp)
 }

internal/xslices/sort_copy.go

@@ -0,0 +1,9 @@
+package xslices
+
+func SortCopy[T any](in []T, cmp func(lhs, rhs T) int) (out []T) {
+	out = Clone(in)
+
+	Sort(out, cmp)
+
+	return out
+}

internal/xslices/sort_copy_test.go

@@ -0,0 +1,18 @@
+package xslices
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestSortCopy(t *testing.T) {
+	src := []int{3, 2, 1}
+	dst := SortCopy(src, func(lhs, rhs int) int {
+		return lhs - rhs
+	})
+	require.Equal(t, len(src), len(dst))
+	require.NotEqual(t, src, dst)
+	require.Equal(t, []int{3, 2, 1}, src)
+	require.Equal(t, []int{1, 2, 3}, dst)
+}

internal/xslices/sort_go1.20.go

@@ -7,16 +7,6 @@ import (
 	"sort"
 )
 
-func SortCopy[T any](in []T, cmp func(lhs, rhs T) int) (out []T) {
-	out = Clone(in)
-
-	Sort(out, func(i, j int) bool {
-		return cmp(out[i], out[j]) < 0
-	})
-
-	return out
-}
-
 func Sort[T any](in []T, cmp func(lhs, rhs T) int) {
 	sort.Slice(in, func(i, j int) bool {
 		return cmp(in[i], in[j]) < 0

internal/xslices/sort_test.go

@@ -6,13 +6,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestSortCopy(t *testing.T) {
-	src := []int{3, 2, 1}
-	dst := SortCopy(src, func(lhs, rhs int) int {
+func TestSort(t *testing.T) {
+	ints := []int{1, 3, 2, 1}
+	Sort(ints, func(lhs, rhs int) int {
 		return lhs - rhs
 	})
-	require.Equal(t, len(src), len(dst))
-	require.NotEqual(t, src, dst)
-	require.Equal(t, []int{3, 2, 1}, src)
-	require.Equal(t, []int{1, 2, 3}, dst)
+	require.Equal(t, []int{1, 1, 2, 3}, ints)
 }