From f014c01acc772dab8724365fd78caea10e5eb424 Mon Sep 17 00:00:00 2001 From: Rohith BCS Date: Mon, 30 Oct 2023 14:12:30 +0530 Subject: [PATCH] chore: replace golang.org/x/exp/slices to slices (#4031) --- .github/tools/matrixchecker/main.go | 2 +- enterprise/reporting/reporting.go | 7 ++++--- gateway/webhook/webhook.go | 2 +- jobsdb/internal/cache/cache.go | 2 +- jobsdb/jobsdb.go | 2 +- processor/eventfilter/eventfilter.go | 3 +-- processor/processor.go | 2 +- processor/transformer/transformer_test.go | 3 +-- router/batchrouter/handle.go | 2 +- router/batchrouter/handle_async.go | 2 +- router/batchrouter/handle_lifecycle.go | 5 +++-- router/batchrouter/util.go | 3 +-- router/batchrouter/worker.go | 2 +- .../customdestinationmanager/customdestinationmanager.go | 2 +- router/internal/partition/stats.go | 2 +- router/manager/manager.go | 2 +- router/utils/utils.go | 3 +-- router/worker.go | 3 +-- schema-forwarder/internal/forwarder/jobsforwarder.go | 2 +- services/debugger/source/eventUploader.go | 3 +-- warehouse/api/grpc.go | 2 +- warehouse/app.go | 2 +- warehouse/integrations/azure-synapse/azure-synapse.go | 3 +-- warehouse/integrations/bigquery/bigquery.go | 2 +- warehouse/integrations/bigquery/bigquery_test.go | 3 +-- warehouse/integrations/clickhouse/clickhouse.go | 3 +-- warehouse/integrations/deltalake/deltalake.go | 2 +- warehouse/integrations/deltalake/deltalake_test.go | 3 +-- warehouse/integrations/postgres/load.go | 2 +- warehouse/integrations/redshift/redshift.go | 3 +-- warehouse/integrations/redshift/redshift_test.go | 3 +-- warehouse/integrations/snowflake/snowflake_test.go | 3 +-- warehouse/internal/loadfiles/loadfiles.go | 2 +- warehouse/internal/loadfiles/mock_loadfile_repo_test.go | 3 +-- warehouse/internal/repo/schema_test.go | 3 +-- warehouse/internal/service/recovery.go | 3 +-- warehouse/router/router.go | 3 +-- warehouse/router/upload.go | 3 +-- warehouse/router/upload_stats.go | 3 +-- warehouse/schema/schema.go | 2 +- warehouse/slave/worker_job.go | 2 +- warehouse/slave/worker_job_test.go | 2 +- 42 files changed, 47 insertions(+), 64 deletions(-) diff --git a/.github/tools/matrixchecker/main.go b/.github/tools/matrixchecker/main.go index 2a3b6a9de4..e538e1f4c0 100644 --- a/.github/tools/matrixchecker/main.go +++ b/.github/tools/matrixchecker/main.go @@ -4,8 +4,8 @@ import ( "log" "os" "path/filepath" + "slices" - "golang.org/x/exp/slices" "gopkg.in/yaml.v2" ) diff --git a/enterprise/reporting/reporting.go b/enterprise/reporting/reporting.go index 8b72dcea0a..8e73541bd9 100644 --- a/enterprise/reporting/reporting.go +++ b/enterprise/reporting/reporting.go @@ -8,17 +8,18 @@ import ( "fmt" "io" "net/http" + "slices" "strconv" "strings" "sync" "time" + "go.uber.org/atomic" + "golang.org/x/sync/errgroup" + "github.com/cenkalti/backoff/v4" "github.com/lib/pq" "github.com/samber/lo" - "go.uber.org/atomic" - "golang.org/x/exp/slices" - "golang.org/x/sync/errgroup" "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/logger" diff --git a/gateway/webhook/webhook.go b/gateway/webhook/webhook.go index 6b72033d0d..3f352b01d3 100644 --- a/gateway/webhook/webhook.go +++ b/gateway/webhook/webhook.go @@ -9,6 +9,7 @@ import ( "mime/multipart" "net/http" "net/url" + "slices" "strconv" "strings" "sync" @@ -17,7 +18,6 @@ import ( "github.com/hashicorp/go-retryablehttp" "github.com/samber/lo" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-go-kit/logger" "github.com/rudderlabs/rudder-go-kit/stats" diff --git a/jobsdb/internal/cache/cache.go b/jobsdb/internal/cache/cache.go index 6f1e8b772a..f87e8b3b13 100644 --- a/jobsdb/internal/cache/cache.go +++ b/jobsdb/internal/cache/cache.go @@ -2,12 +2,12 @@ package cache import ( "fmt" + "slices" "sync" "time" "github.com/google/uuid" "github.com/samber/lo" - "golang.org/x/exp/slices" ) const ( diff --git a/jobsdb/jobsdb.go b/jobsdb/jobsdb.go index 9cd75522d6..89fb4cf068 100644 --- a/jobsdb/jobsdb.go +++ b/jobsdb/jobsdb.go @@ -28,6 +28,7 @@ import ( "encoding/json" "errors" "fmt" + "slices" "sort" "strconv" "strings" @@ -35,7 +36,6 @@ import ( "time" "unicode/utf8" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "github.com/samber/lo" diff --git a/processor/eventfilter/eventfilter.go b/processor/eventfilter/eventfilter.go index f34a3c516f..a57eff9d3e 100644 --- a/processor/eventfilter/eventfilter.go +++ b/processor/eventfilter/eventfilter.go @@ -1,10 +1,9 @@ package eventfilter import ( + "slices" "strings" - "golang.org/x/exp/slices" - "github.com/rudderlabs/rudder-go-kit/logger" backendconfig "github.com/rudderlabs/rudder-server/backend-config" "github.com/rudderlabs/rudder-server/processor/transformer" diff --git a/processor/processor.go b/processor/processor.go index 1a1862c2ed..2d7c95c483 100644 --- a/processor/processor.go +++ b/processor/processor.go @@ -9,12 +9,12 @@ import ( "io" "net/http" "runtime/trace" + "slices" "strconv" "strings" "sync" "time" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" jsoniter "github.com/json-iterator/go" diff --git a/processor/transformer/transformer_test.go b/processor/transformer/transformer_test.go index 2741636201..e966db1ece 100644 --- a/processor/transformer/transformer_test.go +++ b/processor/transformer/transformer_test.go @@ -8,6 +8,7 @@ import ( "net/http/httptest" "net/url" "os" + "slices" "strconv" "sync/atomic" "testing" @@ -17,8 +18,6 @@ import ( warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils" - "golang.org/x/exp/slices" - "github.com/rudderlabs/rudder-server/utils/misc" "github.com/rudderlabs/rudder-server/utils/types" diff --git a/router/batchrouter/handle.go b/router/batchrouter/handle.go index 9420a002d4..917365c415 100644 --- a/router/batchrouter/handle.go +++ b/router/batchrouter/handle.go @@ -8,6 +8,7 @@ import ( "net/http" "os" "path/filepath" + "slices" "sort" "strconv" "strings" @@ -20,7 +21,6 @@ import ( "github.com/samber/lo" "github.com/tidwall/gjson" "github.com/tidwall/sjson" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/filemanager" diff --git a/router/batchrouter/handle_async.go b/router/batchrouter/handle_async.go index 7b4f4edced..a556a0a870 100644 --- a/router/batchrouter/handle_async.go +++ b/router/batchrouter/handle_async.go @@ -8,12 +8,12 @@ import ( "net/http" "os" "path/filepath" + "slices" "strconv" "time" "github.com/google/uuid" "github.com/tidwall/gjson" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-server/jobsdb" "github.com/rudderlabs/rudder-server/router/batchrouter/asyncdestinationmanager" diff --git a/router/batchrouter/handle_lifecycle.go b/router/batchrouter/handle_lifecycle.go index f4488eb79e..f23ab1f5a8 100644 --- a/router/batchrouter/handle_lifecycle.go +++ b/router/batchrouter/handle_lifecycle.go @@ -8,14 +8,15 @@ import ( "net/http" "os" "path/filepath" + "slices" "strings" "sync" "time" + "golang.org/x/sync/errgroup" + "github.com/google/uuid" "github.com/tidwall/gjson" - "golang.org/x/exp/slices" - "golang.org/x/sync/errgroup" "github.com/rudderlabs/rudder-go-kit/bytesize" "github.com/rudderlabs/rudder-go-kit/config" diff --git a/router/batchrouter/util.go b/router/batchrouter/util.go index 9761be7701..ef23db27f3 100644 --- a/router/batchrouter/util.go +++ b/router/batchrouter/util.go @@ -3,12 +3,11 @@ package batchrouter import ( "context" "fmt" + "slices" "strings" "sync" "time" - "golang.org/x/exp/slices" - "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/filemanager" "github.com/rudderlabs/rudder-go-kit/logger" diff --git a/router/batchrouter/worker.go b/router/batchrouter/worker.go index 1152d12e1e..127f3a639b 100644 --- a/router/batchrouter/worker.go +++ b/router/batchrouter/worker.go @@ -3,13 +3,13 @@ package batchrouter import ( "context" "fmt" + "slices" "strings" "sync" "time" "github.com/samber/lo" "github.com/tidwall/gjson" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-go-kit/logger" "github.com/rudderlabs/rudder-go-kit/stats" diff --git a/router/customdestinationmanager/customdestinationmanager.go b/router/customdestinationmanager/customdestinationmanager.go index f2877ea454..2535d3ac9d 100644 --- a/router/customdestinationmanager/customdestinationmanager.go +++ b/router/customdestinationmanager/customdestinationmanager.go @@ -6,11 +6,11 @@ import ( "errors" "fmt" "reflect" + "slices" "sync" "time" "github.com/sony/gobreaker" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/logger" diff --git a/router/internal/partition/stats.go b/router/internal/partition/stats.go index 91fe989c53..607af04ccd 100644 --- a/router/internal/partition/stats.go +++ b/router/internal/partition/stats.go @@ -2,11 +2,11 @@ package partition import ( "math" + "slices" "sync" "time" "github.com/samber/lo" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-go-kit/stats/metric" ) diff --git a/router/manager/manager.go b/router/manager/manager.go index 7f04caed62..0ad196b984 100644 --- a/router/manager/manager.go +++ b/router/manager/manager.go @@ -3,8 +3,8 @@ package manager import ( "context" "fmt" + "slices" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "github.com/rudderlabs/rudder-go-kit/logger" diff --git a/router/utils/utils.go b/router/utils/utils.go index d2e5f0dada..2ef478016e 100644 --- a/router/utils/utils.go +++ b/router/utils/utils.go @@ -1,11 +1,10 @@ package utils import ( + "slices" "strings" "time" - "golang.org/x/exp/slices" - "github.com/tidwall/sjson" "github.com/rudderlabs/rudder-go-kit/config" diff --git a/router/worker.go b/router/worker.go index e0861d5f2a..85affe3412 100644 --- a/router/worker.go +++ b/router/worker.go @@ -5,13 +5,12 @@ import ( "encoding/json" "fmt" "net/http" + "slices" "sort" "strconv" "strings" "time" - "golang.org/x/exp/slices" - "github.com/samber/lo" "github.com/tidwall/gjson" diff --git a/schema-forwarder/internal/forwarder/jobsforwarder.go b/schema-forwarder/internal/forwarder/jobsforwarder.go index 7135a35d86..c3cd1abb04 100644 --- a/schema-forwarder/internal/forwarder/jobsforwarder.go +++ b/schema-forwarder/internal/forwarder/jobsforwarder.go @@ -5,10 +5,10 @@ import ( "context" "encoding/json" "fmt" + "slices" "sync" "time" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" pulsarType "github.com/apache/pulsar-client-go/pulsar" diff --git a/services/debugger/source/eventUploader.go b/services/debugger/source/eventUploader.go index bf58570118..ba32bf1394 100644 --- a/services/debugger/source/eventUploader.go +++ b/services/debugger/source/eventUploader.go @@ -4,11 +4,10 @@ import ( "context" "encoding/json" "fmt" + "slices" "sync" "time" - "golang.org/x/exp/slices" - "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/logger" backendconfig "github.com/rudderlabs/rudder-server/backend-config" diff --git a/warehouse/api/grpc.go b/warehouse/api/grpc.go index 85cb4f5b01..a35182b571 100644 --- a/warehouse/api/grpc.go +++ b/warehouse/api/grpc.go @@ -7,6 +7,7 @@ import ( "fmt" "net/http" "os" + "slices" "strconv" "sync" "time" @@ -19,7 +20,6 @@ import ( "github.com/samber/lo" - "golang.org/x/exp/slices" "google.golang.org/genproto/googleapis/rpc/code" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/warehouse/app.go b/warehouse/app.go index 6182cf8436..62f16e49cc 100644 --- a/warehouse/app.go +++ b/warehouse/app.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "os" + "slices" "sync" "time" @@ -25,7 +26,6 @@ import ( "github.com/rudderlabs/rudder-server/warehouse/integrations/middleware/sqlquerywrapper" "github.com/samber/lo" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "github.com/rudderlabs/rudder-go-kit/config" diff --git a/warehouse/integrations/azure-synapse/azure-synapse.go b/warehouse/integrations/azure-synapse/azure-synapse.go index 2c61e9087e..ef6a08e546 100644 --- a/warehouse/integrations/azure-synapse/azure-synapse.go +++ b/warehouse/integrations/azure-synapse/azure-synapse.go @@ -11,6 +11,7 @@ import ( "net" "net/url" "os" + "slices" "strconv" "strings" "time" @@ -25,8 +26,6 @@ import ( sqlmw "github.com/rudderlabs/rudder-server/warehouse/integrations/middleware/sqlquerywrapper" "github.com/rudderlabs/rudder-server/warehouse/logfield" - "golang.org/x/exp/slices" - "github.com/rudderlabs/rudder-server/warehouse/internal/service/loadfiles/downloader" "github.com/rudderlabs/rudder-go-kit/config" diff --git a/warehouse/integrations/bigquery/bigquery.go b/warehouse/integrations/bigquery/bigquery.go index 2f1bb5366d..018ef7cf8b 100644 --- a/warehouse/integrations/bigquery/bigquery.go +++ b/warehouse/integrations/bigquery/bigquery.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "regexp" + "slices" "strings" "time" @@ -14,7 +15,6 @@ import ( "github.com/samber/lo" "cloud.google.com/go/bigquery" - "golang.org/x/exp/slices" bqService "google.golang.org/api/bigquery/v2" "google.golang.org/api/googleapi" "google.golang.org/api/iterator" diff --git a/warehouse/integrations/bigquery/bigquery_test.go b/warehouse/integrations/bigquery/bigquery_test.go index fb384c9de7..ad3b812905 100644 --- a/warehouse/integrations/bigquery/bigquery_test.go +++ b/warehouse/integrations/bigquery/bigquery_test.go @@ -5,13 +5,12 @@ import ( "encoding/json" "fmt" "os" + "slices" "strconv" "strings" "testing" "time" - "golang.org/x/exp/slices" - "github.com/golang/mock/gomock" "github.com/rudderlabs/rudder-go-kit/config" diff --git a/warehouse/integrations/clickhouse/clickhouse.go b/warehouse/integrations/clickhouse/clickhouse.go index 0b57498a99..604cabc3d5 100644 --- a/warehouse/integrations/clickhouse/clickhouse.go +++ b/warehouse/integrations/clickhouse/clickhouse.go @@ -15,6 +15,7 @@ import ( "os" "path" "regexp" + "slices" "sort" "strconv" "strings" @@ -29,8 +30,6 @@ import ( "github.com/rudderlabs/rudder-server/warehouse/internal/model" - "golang.org/x/exp/slices" - "github.com/cenkalti/backoff/v4" "github.com/rudderlabs/rudder-go-kit/stats" diff --git a/warehouse/integrations/deltalake/deltalake.go b/warehouse/integrations/deltalake/deltalake.go index 04aff63b11..ccee4c253d 100644 --- a/warehouse/integrations/deltalake/deltalake.go +++ b/warehouse/integrations/deltalake/deltalake.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "regexp" + "slices" "strconv" "strings" "time" @@ -14,7 +15,6 @@ import ( dbsql "github.com/databricks/databricks-sql-go" dbsqllog "github.com/databricks/databricks-sql-go/logger" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/logger" diff --git a/warehouse/integrations/deltalake/deltalake_test.go b/warehouse/integrations/deltalake/deltalake_test.go index 8ab75a4c05..146ce8117c 100644 --- a/warehouse/integrations/deltalake/deltalake_test.go +++ b/warehouse/integrations/deltalake/deltalake_test.go @@ -7,13 +7,12 @@ import ( "errors" "fmt" "os" + "slices" "strconv" "strings" "testing" "time" - "golang.org/x/exp/slices" - "github.com/rudderlabs/rudder-go-kit/filemanager" "github.com/rudderlabs/rudder-server/warehouse/internal/model" diff --git a/warehouse/integrations/postgres/load.go b/warehouse/integrations/postgres/load.go index 4f9471a85c..89b9faa74c 100644 --- a/warehouse/integrations/postgres/load.go +++ b/warehouse/integrations/postgres/load.go @@ -9,6 +9,7 @@ import ( "fmt" "io" "os" + "slices" "strings" "github.com/rudderlabs/rudder-server/warehouse/integrations/types" @@ -19,7 +20,6 @@ import ( "github.com/rudderlabs/rudder-server/utils/misc" "github.com/lib/pq" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-server/warehouse/logfield" warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils" diff --git a/warehouse/integrations/redshift/redshift.go b/warehouse/integrations/redshift/redshift.go index 58041ec119..ed57b99b49 100644 --- a/warehouse/integrations/redshift/redshift.go +++ b/warehouse/integrations/redshift/redshift.go @@ -10,6 +10,7 @@ import ( "os" "path/filepath" "regexp" + "slices" "sort" "strings" "time" @@ -18,8 +19,6 @@ import ( "github.com/rudderlabs/rudder-server/warehouse/integrations/types" - "golang.org/x/exp/slices" - "github.com/lib/pq" "github.com/tidwall/gjson" diff --git a/warehouse/integrations/redshift/redshift_test.go b/warehouse/integrations/redshift/redshift_test.go index 483e18cd81..add684d4df 100644 --- a/warehouse/integrations/redshift/redshift_test.go +++ b/warehouse/integrations/redshift/redshift_test.go @@ -7,13 +7,12 @@ import ( "errors" "fmt" "os" + "slices" "strconv" "strings" "testing" "time" - "golang.org/x/exp/slices" - "github.com/golang/mock/gomock" "github.com/rudderlabs/rudder-go-kit/filemanager" diff --git a/warehouse/integrations/snowflake/snowflake_test.go b/warehouse/integrations/snowflake/snowflake_test.go index 3ff4a61204..5aeddfdb7e 100644 --- a/warehouse/integrations/snowflake/snowflake_test.go +++ b/warehouse/integrations/snowflake/snowflake_test.go @@ -7,13 +7,12 @@ import ( "errors" "fmt" "os" + "slices" "strconv" "strings" "testing" "time" - "golang.org/x/exp/slices" - "github.com/samber/lo" "github.com/rudderlabs/rudder-go-kit/filemanager" diff --git a/warehouse/internal/loadfiles/loadfiles.go b/warehouse/internal/loadfiles/loadfiles.go index ed88d4defc..1fd303289c 100644 --- a/warehouse/internal/loadfiles/loadfiles.go +++ b/warehouse/internal/loadfiles/loadfiles.go @@ -3,6 +3,7 @@ package loadfiles import ( "context" "fmt" + "slices" "strings" "time" @@ -12,7 +13,6 @@ import ( "github.com/samber/lo" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" jsoniter "github.com/json-iterator/go" diff --git a/warehouse/internal/loadfiles/mock_loadfile_repo_test.go b/warehouse/internal/loadfiles/mock_loadfile_repo_test.go index 199dd0a0e3..c50c941211 100644 --- a/warehouse/internal/loadfiles/mock_loadfile_repo_test.go +++ b/warehouse/internal/loadfiles/mock_loadfile_repo_test.go @@ -2,8 +2,7 @@ package loadfiles_test import ( "context" - - "golang.org/x/exp/slices" + "slices" "github.com/rudderlabs/rudder-server/warehouse/internal/model" ) diff --git a/warehouse/internal/repo/schema_test.go b/warehouse/internal/repo/schema_test.go index b893fa6b41..c16ad8daaf 100644 --- a/warehouse/internal/repo/schema_test.go +++ b/warehouse/internal/repo/schema_test.go @@ -3,11 +3,10 @@ package repo_test import ( "context" "errors" + "slices" "testing" "time" - "golang.org/x/exp/slices" - warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils" "github.com/stretchr/testify/require" diff --git a/warehouse/internal/service/recovery.go b/warehouse/internal/service/recovery.go index 502be55fa6..8d55525532 100644 --- a/warehouse/internal/service/recovery.go +++ b/warehouse/internal/service/recovery.go @@ -3,12 +3,11 @@ package service import ( "context" "fmt" + "slices" "sync" "github.com/rudderlabs/rudder-server/warehouse/internal/model" - "golang.org/x/exp/slices" - warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils" ) diff --git a/warehouse/router/router.go b/warehouse/router/router.go index 0f258e3eaf..440055ae7d 100644 --- a/warehouse/router/router.go +++ b/warehouse/router/router.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "math/rand" + "slices" "strconv" "sync" "sync/atomic" @@ -20,8 +21,6 @@ import ( "github.com/rudderlabs/rudder-server/warehouse/integrations/manager" - "golang.org/x/exp/slices" - "github.com/rudderlabs/rudder-server/services/controlplane" "github.com/rudderlabs/rudder-server/warehouse/multitenant" diff --git a/warehouse/router/upload.go b/warehouse/router/upload.go index 7ecc002f11..324bdac5a1 100644 --- a/warehouse/router/upload.go +++ b/warehouse/router/upload.go @@ -6,14 +6,13 @@ import ( "encoding/json" "errors" "fmt" + "slices" "strconv" "strings" "sync" "sync/atomic" "time" - "golang.org/x/exp/slices" - "github.com/cenkalti/backoff/v4" "github.com/samber/lo" diff --git a/warehouse/router/upload_stats.go b/warehouse/router/upload_stats.go index 2b2ef87051..7134f79bd7 100644 --- a/warehouse/router/upload_stats.go +++ b/warehouse/router/upload_stats.go @@ -2,11 +2,10 @@ package router import ( "fmt" + "slices" "strings" "time" - "golang.org/x/exp/slices" - "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/stats" "github.com/rudderlabs/rudder-server/utils/misc" diff --git a/warehouse/schema/schema.go b/warehouse/schema/schema.go index ae5e93996b..b864421458 100644 --- a/warehouse/schema/schema.go +++ b/warehouse/schema/schema.go @@ -5,10 +5,10 @@ import ( "fmt" "reflect" "regexp" + "slices" "sync" "github.com/samber/lo" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/logger" diff --git a/warehouse/slave/worker_job.go b/warehouse/slave/worker_job.go index 5e7b1dfeb0..21bc1814fc 100644 --- a/warehouse/slave/worker_job.go +++ b/warehouse/slave/worker_job.go @@ -6,6 +6,7 @@ import ( "fmt" "os" "path/filepath" + "slices" "sort" "strconv" "strings" @@ -19,7 +20,6 @@ import ( "github.com/rudderlabs/rudder-server/utils/timeutil" "go.uber.org/atomic" - "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" "github.com/rudderlabs/rudder-go-kit/config" diff --git a/warehouse/slave/worker_job_test.go b/warehouse/slave/worker_job_test.go index cf7eed69ef..f8367e8f7f 100644 --- a/warehouse/slave/worker_job_test.go +++ b/warehouse/slave/worker_job_test.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "os" + "slices" "strings" "testing" "time" @@ -19,7 +20,6 @@ import ( "github.com/google/uuid" "github.com/ory/dockertest/v3" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/logger"