Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add slice Splice an element or multiple elements at index i. #371

Merged
merged 6 commits into from
Jun 29, 2024

Conversation

wenlingang
Copy link
Contributor

Inserts an element or multiple elements at index i.

Copy link

@1800alex 1800alex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code looks good to me, anything preventing this from being merged? Would like to make use of it

@1800alex
Copy link

On second glance, something seems off

package slices

import (
	"testing"
)

// Insert inserts an element at index i.
// Play: https://go.dev/play/p/Eu3pk6_ODVQ
func Insert[T any](collection []T, i int, element T) []T {
	result := make([]T, len(collection)+1)
	copy(result, collection[:i])
	result[i] = element
	copy(result[i+1:], collection[i:])

	return result
}

// Insert inserts an element at index i.
func Insert2[T any](collection []T, i int, element T) []T {
	return append(collection[:i], append([]T{element}, collection[i:]...)...)
}

func BenchmarkInsertSlice(b *testing.B) {
	data := make([]int, 0)
	for i := 0; i < b.N; i++ {
		data = Insert(data, i, i)
	}
}

func BenchmarkInsertSlice2(b *testing.B) {
	data := make([]int, 0)
	for i := 0; i < b.N; i++ {
		data = Insert2(data, i, i)
	}
}

Running a benchmark of this seems way off from how I would expect an insert to look.

goos: linux
goarch: amd64
pkg: slices
cpu: AMD Ryzen 9 7900X 12-Core Processor
BenchmarkInsertSlice-24           153384            112324 ns/op
BenchmarkInsertSlice2-24        189345357                6.104 ns/op

@wenlingang
Copy link
Contributor Author

wenlingang commented May 27, 2024

On second glance, something seems off

package slices

import (
	"testing"
)

// Insert inserts an element at index i.
// Play: https://go.dev/play/p/Eu3pk6_ODVQ
func Insert[T any](collection []T, i int, element T) []T {
	result := make([]T, len(collection)+1)
	copy(result, collection[:i])
	result[i] = element
	copy(result[i+1:], collection[i:])

	return result
}

// Insert inserts an element at index i.
func Insert2[T any](collection []T, i int, element T) []T {
	return append(collection[:i], append([]T{element}, collection[i:]...)...)
}

func BenchmarkInsertSlice(b *testing.B) {
	data := make([]int, 0)
	for i := 0; i < b.N; i++ {
		data = Insert(data, i, i)
	}
}

func BenchmarkInsertSlice2(b *testing.B) {
	data := make([]int, 0)
	for i := 0; i < b.N; i++ {
		data = Insert2(data, i, i)
	}
}

Running a benchmark of this seems way off from how I would expect an insert to look.

goos: linux
goarch: amd64
pkg: slices
cpu: AMD Ryzen 9 7900X 12-Core Processor
BenchmarkInsertSlice-24           153384            112324 ns/op
BenchmarkInsertSlice2-24        189345357                6.104 ns/op

Thank you. After testing, it is indeed as you said, and I modified it again, this is my test result

goos: darwin
goarch: arm64

BenchmarkInsert-8 100000000 13.07 ns/op
BenchmarkInsertSlice-8 202900190 11.44 ns/op

@samber
Copy link
Owner

samber commented Jun 28, 2024

Wow, the difference between both versions is impressive!

Sorry for the delay.

I like your helper, but I'm not sure calling it Insert is self-explanatory.

JS, PHP, C++ and Rust named it "splice".

@samber
Copy link
Owner

samber commented Jun 28, 2024

And I think we should leverage vaargs to write a single helper instead of 2.

@wenlingang wenlingang changed the title Add slice Insert & InsertSlice, Inserts elements at index i. Add slice Splice an element or multiple elements at index i. Jun 29, 2024
@wenlingang
Copy link
Contributor Author

@samber Thank you for your suggestion. I found that it can be further optimized, and I have already done it. Additionally, the name 'Insert' is borrowed from Ruby's Array#insert, though 'Splice' is also a good name.

@codecov-commenter
Copy link

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 28.57143% with 5 lines in your changes missing coverage. Please review.

Project coverage is 94.12%. Comparing base (89ca7c6) to head (0066bed).
Report is 1 commits behind head on master.

Files Patch % Lines
slice.go 28.57% 3 Missing and 2 partials ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #371      +/-   ##
==========================================
- Coverage   94.30%   94.12%   -0.18%     
==========================================
  Files          17       17              
  Lines        2633     2640       +7     
==========================================
+ Hits         2483     2485       +2     
- Misses        148      151       +3     
- Partials        2        4       +2     
Flag Coverage Δ
unittests 94.12% <28.57%> (-0.18%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

slice_test.go Outdated
@@ -801,3 +801,16 @@ func TestIsSortedByKey(t *testing.T) {
return ret
}))
}

func TestInsertSlice(t *testing.T) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func TestInsertSlice(t *testing.T) {
func TestSplice(t *testing.T) {

@samber
Copy link
Owner

samber commented Jun 29, 2024

I made some changes:

  • handle overflow
  • negative index
  • insert into newly allocated slice instead of append()

@samber samber merged commit fe16ff7 into samber:master Jun 29, 2024
7 checks passed
github-actions bot pushed a commit to kairos-io/provider-kairos that referenced this pull request Jun 30, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [github.com/samber/lo](https://github.com/samber/lo) | `v1.43.0` ->
`v1.44.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fsamber%2flo/v1.44.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fsamber%2flo/v1.44.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fsamber%2flo/v1.43.0/v1.44.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fsamber%2flo/v1.43.0/v1.44.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>samber/lo (github.com/samber/lo)</summary>

### [`v1.44.0`](https://github.com/samber/lo/releases/tag/v1.44.0)

[Compare
Source](https://github.com/samber/lo/compare/v1.43.0...v1.44.0)

#### What's Changed

- feat: Add slice Splice an element or multiple elements at index i. by
[@&#8203;wenlingang](https://github.com/wenlingang) in
[samber/lo#371
- feat: Make Filter() preserve type. by
[@&#8203;FGasper](https://github.com/FGasper) in
[samber/lo#365
- feat: Added DropByIndex helper for slice by
[@&#8203;phith0n](https://github.com/phith0n) in
[samber/lo#398
- feat: upgrade to math/rand/v2 by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#483
- chore: remove `golang.org/x/exp` since it doesn't follow go 1
compatibility promise by [@&#8203;trim21](https://github.com/trim21)
in
[samber/lo#478

#### New Contributors

- [@&#8203;wenlingang](https://github.com/wenlingang) made their first
contribution in
[samber/lo#371
- [@&#8203;jason-zhj](https://github.com/jason-zhj) made their first
contribution in
[samber/lo#376
- [@&#8203;FGasper](https://github.com/FGasper) made their first
contribution in
[samber/lo#365
- [@&#8203;phith0n](https://github.com/phith0n) made their first
contribution in
[samber/lo#398

**Full Changelog**:
samber/lo@v1.43.0...v1.44.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 11pm every weekday,before 7am
every weekday,every weekend" in timezone Europe/Brussels, Automerge - At
any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/kairos-io/provider-kairos).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjAuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQyMC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
codeboten pushed a commit to open-telemetry/opentelemetry-collector-contrib that referenced this pull request Jul 2, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [github.com/samber/lo](https://github.com/samber/lo) | `v1.39.0` ->
`v1.44.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fsamber%2flo/v1.44.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fsamber%2flo/v1.44.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fsamber%2flo/v1.39.0/v1.44.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fsamber%2flo/v1.39.0/v1.44.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>samber/lo (github.com/samber/lo)</summary>

### [`v1.44.0`](https://github.com/samber/lo/releases/tag/v1.44.0)

[Compare
Source](https://github.com/samber/lo/compare/v1.43.0...v1.44.0)

#### What's Changed

- feat: Add slice Splice an element or multiple elements at index i. by
[@&#8203;wenlingang](https://github.com/wenlingang) in
[samber/lo#371
- feat: Make Filter() preserve type. by
[@&#8203;FGasper](https://github.com/FGasper) in
[samber/lo#365
- feat: Added DropByIndex helper for slice by
[@&#8203;phith0n](https://github.com/phith0n) in
[samber/lo#398
- feat: upgrade to math/rand/v2 by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#483
- chore: remove `golang.org/x/exp` since it doesn't follow go 1
compatibility promise by [@&#8203;trim21](https://github.com/trim21)
in
[samber/lo#478

#### New Contributors

- [@&#8203;wenlingang](https://github.com/wenlingang) made their first
contribution in
[samber/lo#371
- [@&#8203;jason-zhj](https://github.com/jason-zhj) made their first
contribution in
[samber/lo#376
- [@&#8203;FGasper](https://github.com/FGasper) made their first
contribution in
[samber/lo#365
- [@&#8203;phith0n](https://github.com/phith0n) made their first
contribution in
[samber/lo#398

**Full Changelog**:
samber/lo@v1.43.0...v1.44.0

### [`v1.43.0`](https://github.com/samber/lo/releases/tag/v1.43.0)

[Compare
Source](https://github.com/samber/lo/compare/v1.42.0...v1.43.0)

#### What's Changed

- feat: adding HasKey by [@&#8203;samber](https://github.com/samber)
in
[samber/lo#477
- feat: adding lo.WaitFor by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#269
- improvement: Optimize the performance of union method, avoid repeated
expansion by [@&#8203;cwb2819259](https://github.com/cwb2819259) in
[samber/lo#397

#### New Contributors

- [@&#8203;cwb2819259](https://github.com/cwb2819259) made their first
contribution in
[samber/lo#397

**Full Changelog**:
samber/lo@v1.42.0...v1.43.0

### [`v1.42.0`](https://github.com/samber/lo/releases/tag/v1.42.0)

[Compare
Source](https://github.com/samber/lo/compare/v1.41.0...v1.42.0)

#### What's Changed

- feat: add Nil by [@&#8203;gubtos](https://github.com/gubtos) in
[samber/lo#383
- feat: Add First and FirstOrZeroValue functions by
[@&#8203;Alireza-Kiani](https://github.com/Alireza-Kiani) in
[samber/lo#451
- feat: adding LastOrEmpty and LastOr by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#474
- feat: Feature/contains iterate by index by
[@&#8203;lennon-guan](https://github.com/lennon-guan) in
[samber/lo#428
- feat: speed up loops by reducing allocations by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#475
- doc: inconsistent expression in README.md by
[@&#8203;rolancia](https://github.com/rolancia) in
[samber/lo#406

#### New Contributors

- [@&#8203;gubtos](https://github.com/gubtos) made their first
contribution in
[samber/lo#383
- [@&#8203;Alireza-Kiani](https://github.com/Alireza-Kiani) made their
first contribution in
[samber/lo#451
- [@&#8203;rolancia](https://github.com/rolancia) made their first
contribution in
[samber/lo#406
- [@&#8203;lennon-guan](https://github.com/lennon-guan) made their
first contribution in
[samber/lo#428

**Full Changelog**:
samber/lo@v1.41.0...v1.42.0

### [`v1.41.0`](https://github.com/samber/lo/releases/tag/v1.41.0)

[Compare
Source](https://github.com/samber/lo/compare/v1.40.0...v1.41.0)

#### What's Changed

- feat: adding Elipse by [@&#8203;samber](https://github.com/samber)
in
[samber/lo#470
- feat: adding CoalesceOrEmpty by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#469
- feat: adding Earliest and Latest by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#468
- feat: adding duration by [@&#8203;samber](https://github.com/samber)
in
[samber/lo#471
- feat: adding FilterReject by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#472
- feat: adding RejectMap by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#473

**Full Changelog**:
samber/lo@v1.34.0...v1.41.0

### [`v1.40.0`](https://github.com/samber/lo/releases/tag/v1.40.0)

[Compare
Source](https://github.com/samber/lo/compare/v1.39.0...v1.40.0)

#### What's Changed

##### Improvements

- Use map indexing to speed up PickByKeys and OmitByKeys by
[@&#8203;ericleb010](https://github.com/ericleb010) in
[samber/lo#447
- ToSlicePtr: reduce allocations and improving speed by
[@&#8203;yanmhlv](https://github.com/yanmhlv) in
[samber/lo#465
- Feat: Adding zipby + unzipby by
[@&#8203;samber](https://github.com/samber) in
[samber/lo#449
- feat: add string conversion functions by
[@&#8203;eiixy](https://github.com/eiixy) in
[samber/lo#466
- Adding Mean and MeanBy by
[@&#8203;usman1100](https://github.com/usman1100) in
[samber/lo#414

##### Doc & style

- Fix typos by [@&#8203;szepeviktor](https://github.com/szepeviktor)
in
[samber/lo#384
- fix: instantiate typo by
[@&#8203;testwill](https://github.com/testwill) in
[samber/lo#374
- Fix typo in README.md by
[@&#8203;eltociear](https://github.com/eltociear) in
[samber/lo#369
- docs: update description for FindOrElse by
[@&#8203;slomek](https://github.com/slomek) in
[samber/lo#370
- style: no extra any type parameter by
[@&#8203;d-enk](https://github.com/d-enk) in
[samber/lo#429
- Fix IsNil link for pkg.go.dev by
[@&#8203;invzhi](https://github.com/invzhi) in
[samber/lo#418
- Docs: should use type int64 for lo.FlatMap in example by
[@&#8203;apriil15](https://github.com/apriil15) in
[samber/lo#435

##### CI

- CI: tests on multi go versions by
[@&#8203;jiro4989](https://github.com/jiro4989) in
[samber/lo#445

#### New Contributors

- [@&#8203;szepeviktor](https://github.com/szepeviktor) made their
first contribution in
[samber/lo#384
- [@&#8203;testwill](https://github.com/testwill) made their first
contribution in
[samber/lo#374
- [@&#8203;eltociear](https://github.com/eltociear) made their first
contribution in
[samber/lo#369
- [@&#8203;slomek](https://github.com/slomek) made their first
contribution in
[samber/lo#370
- [@&#8203;ericleb010](https://github.com/ericleb010) made their first
contribution in
[samber/lo#447
- [@&#8203;yanmhlv](https://github.com/yanmhlv) made their first
contribution in
[samber/lo#465
- [@&#8203;eiixy](https://github.com/eiixy) made their first
contribution in
[samber/lo#466
- [@&#8203;jiro4989](https://github.com/jiro4989) made their first
contribution in
[samber/lo#445
- [@&#8203;d-enk](https://github.com/d-enk) made their first
contribution in
[samber/lo#429
- [@&#8203;usman1100](https://github.com/usman1100) made their first
contribution in
[samber/lo#414
- [@&#8203;invzhi](https://github.com/invzhi) made their first
contribution in
[samber/lo#418
- [@&#8203;apriil15](https://github.com/apriil15) made their first
contribution in
[samber/lo#435

**Full Changelog**:
samber/lo@v1.39.0...v1.40.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any
time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjQyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
Co-authored-by: Yang Song <songy23@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants