TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 100 Pull requests 4 Projects Releases 1 Activity Actions

locode: Use quadtree to find continent #830

Closed
Nesterfifa wants to merge 6 commits from Nesterfifa/frostfs-node:782-use-quadtree into master
pull from: Nesterfifa/frostfs-node:782-use-quadtree
merge into: TrueCloudLab:master
Conversation 4 Commits 6 Files changed 4 +84 -15
Nesterfifa commented 2023-11-28 11:40:33 +00:00
Collaborator
Copy link

Benchmarking results can be found in attachments
slow containts the result on master
mid -- this branch with <=4 CPUs on IterateAll
fast -- this branch with <=16 CPUs

Benchmarking results can be found in attachments `slow` containts the result on master `mid` -- this branch with <=4 CPUs on IterateAll `fast` -- this branch with <=16 CPUs
fast.txt
787 B
benchstat.txt
1.1 KiB
slow.txt
787 B
mid.txt
787 B
Nesterfifa added 1 commit 2023-11-28 11:40:38 +00:00
[#782] pkg: use quadtree to find continent
Some checks failed
Vulncheck / Vulncheck (pull_request) Failing after 1m45s
Details
DCO action / DCO (pull_request) Successful in 2m0s
Details
Build / Build Components (1.21) (pull_request) Successful in 5m11s
Details
Build / Build Components (1.20) (pull_request) Successful in 5m17s
Details
Tests and linters / Staticcheck (pull_request) Successful in 5m39s
Details
Tests and linters / Lint (pull_request) Successful in 6m6s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 7m59s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 7m56s
Details
Tests and linters / Tests with -race (pull_request) Successful in 7m51s
Details
7578fd46e5 
Signed-off-by: nesterfifa <vemeyzer@gmail.com>
fyrchik commented 2023-11-29 06:23:43 +00:00
Owner
Copy link
  1. Could you mention the benchmark you used to compare?
  2. Can we add some local benchmarks here?
1. Could you mention the benchmark you used to compare? 2. Can we add some local benchmarks here?
dstepanov-yadro requested changes 2023-11-29 06:59:04 +00:00
pkg/services/control/ir/service.pb.go Outdated
@ -12,2 +10,4 @@
reflect "reflect"
sync "sync"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
dstepanov-yadro commented 2023-11-29 06:58:15 +00:00
Member
Copy link

Please drop this changes. These are generated files, so there is no need for automatic formatting.

Please drop this changes. These are generated files, so there is no need for automatic formatting.
dstepanov-yadro marked this conversation as resolved
fyrchik changed title from [#782] pkg: use quadtree to find continent to locode: Use quadtree to find continent 2023-11-30 13:14:19 +00:00
fyrchik approved these changes 2023-11-30 13:14:34 +00:00
cmd/frostfs-cli/modules/util/locode_generate_test.go Outdated
@ -0,0 +14,4 @@
out = flag.String(locodeGenerateOutputFlag, "", "Target path for generated database")
)
func BenchmarkLocodeGenerate(b *testing.B) {
fyrchik commented 2023-11-30 12:57:36 +00:00
Owner
Copy link

Could you also attach benchmark results on master vs this branch?
You can use https://pkg.go.dev/golang.org/x/perf/cmd/benchstat to compare gobench results.

Could you also attach benchmark results on master vs this branch? You can use https://pkg.go.dev/golang.org/x/perf/cmd/benchstat to compare gobench results.
pkg/util/locode/db/db.go Outdated
@ -81,3 +81,3 @@
// Pick some sane default, after this the performance stopped increasing.
errG.SetLimit(runtime.NumCPU() * 4)
errG.SetLimit(runtime.NumCPU() * 16)
fyrchik commented 2023-11-30 12:56:49 +00:00
Owner
Copy link

This change seems unrelated to the commit. Can we move it to a separate commit and describe the WHY?

git rebase and git reset commands might be helpful, especially git reset -p.

This change seems unrelated to the commit. Can we move it to a separate commit and describe the WHY? `git rebase` and `git reset` commands might be helpful, especially `git reset -p`.
dstepanov-yadro approved these changes 2023-11-30 13:46:32 +00:00
achuprov requested changes 2023-11-30 15:23:01 +00:00
pkg/util/locode/db/continents/geojson/calls.go Outdated
@ -76,0 +91,4 @@
Max: orb.Point{180, 180},
})
for _, feature := range db.features {
achuprov commented 2023-11-30 15:21:32 +00:00
Member
Copy link

Is there a way to simplify this code?
cff78d77c2/pkg/util/locode/db/continents/geojson/calls.go (L94-L110)

Is there a way to simplify this code? https://git.frostfs.info/TrueCloudLab/frostfs-node/src/commit/cff78d77c22b788a398a958a9a9d1f02b43b6148/pkg/util/locode/db/continents/geojson/calls.go#L94-L110
Nesterfifa commented 2023-12-12 11:08:23 +00:00
Author
Collaborator
Copy link

Reduced the nesting depth to 2

Reduced the nesting depth to 2
acid-ant commented 2023-12-04 07:43:11 +00:00
Member
Copy link

Please use capital letters in commit messages after :.

Please use capital letters in commit messages after `:`.
acid-ant approved these changes 2023-12-04 07:43:20 +00:00
Nesterfifa force-pushed 782-use-quadtree from cff78d77c2 to 91fe0d3531 2023-12-04 16:42:05 +00:00 Compare
Nesterfifa added 1 commit 2023-12-12 10:22:03 +00:00
[#782] locode: Simplify build quadtree
Some checks failed
Tests and linters / Lint (pull_request) Failing after 10s
Details
DCO action / DCO (pull_request) Successful in 2m34s
Details
Vulncheck / Vulncheck (pull_request) Failing after 3m7s
Details
Build / Build Components (1.21) (pull_request) Successful in 3m57s
Details
Tests and linters / Staticcheck (pull_request) Successful in 4m43s
Details
Build / Build Components (1.20) (pull_request) Successful in 5m35s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 8m8s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 8m20s
Details
Tests and linters / Tests with -race (pull_request) Successful in 8m14s
Details
f31b4c1a7b 
Signed-off-by: nesterfifa <vemeyzer@gmail.com>
fyrchik reviewed 2023-12-12 11:23:15 +00:00
pkg/util/locode/db/continents/geojson/calls.go Outdated
@ -5,2 +5,4 @@
"os"
"github.com/paulmach/orb/quadtree"
fyrchik commented 2023-12-12 11:16:43 +00:00
Owner
Copy link

Please, attach all non-stdlib imports in a single group (see paulmach/orb below).

Please, attach all non-stdlib imports in a single group (see `paulmach/orb` below).
Nesterfifa commented 2023-12-12 12:07:12 +00:00
Author
Collaborator
Copy link

Fixed

Fixed
fyrchik marked this conversation as resolved
pkg/util/locode/db/continents/geojson/calls.go
@ -76,0 +92,4 @@
})
for _, feature := range db.features {
multiPolygon := make(orb.MultiPolygon, 0)
fyrchik commented 2023-12-12 11:22:19 +00:00
Owner
Copy link

What about var multiPolygon orb.MultiPolygon? make(_, 0) is usually never needed: nil acts good enough as the default value.

What about `var multiPolygon orb.MultiPolygon`? `make(_, 0)` is usually never needed: `nil` acts good enough as the default value.
Nesterfifa commented 2023-12-12 12:07:21 +00:00
Author
Collaborator
Copy link

Fixed

Fixed
fyrchik marked this conversation as resolved
Nesterfifa added 1 commit 2023-12-12 11:35:18 +00:00
[#782] locode: Fix imports, var init
Some checks failed
DCO action / DCO (pull_request) Successful in 14m44s
Details
Tests and linters / Staticcheck (pull_request) Successful in 16m33s
Details
Vulncheck / Vulncheck (pull_request) Failing after 16m51s
Details
Build / Build Components (1.21) (pull_request) Successful in 18m47s
Details
Build / Build Components (1.20) (pull_request) Successful in 19m24s
Details
Tests and linters / Tests (1.20) (pull_request) Failing after 20m0s
Details
Tests and linters / Tests (1.21) (pull_request) Failing after 19m58s
Details
Tests and linters / Tests with -race (pull_request) Failing after 19m55s
Details
Tests and linters / Lint (pull_request) Successful in 22m48s
Details
6999993fd2 
Signed-off-by: nesterfifa <vemeyzer@gmail.com>
fyrchik approved these changes 2023-12-27 09:37:45 +00:00
fyrchik left a comment
Owner
Copy link

LTGM
The last commit with import fix could be squashed onto an earlier one: it is nice when every commit passes all linter checks, not just the top of the PR (we do not squash on merge).

LTGM The last commit with import fix could be squashed onto an earlier one: it is nice when every commit passes all linter checks, not just the top of the PR (we do not squash on merge).
george.bartolomey commented 2024-07-22 07:12:09 +00:00
Member
Copy link

Please, push these changes into TrueCloudLab/frostfs-locode-db. frostfs-node should depends on frostfs-locode-db Go package (https://git.frostfs.info/TrueCloudLab/frostfs-locode-db/pkg/locode) now, because we want to eliminate inter-dependencies between frostfs-node and frostfs-locode-db.

Please, push these changes into [TrueCloudLab/frostfs-locode-db](https://git.frostfs.info/TrueCloudLab/frostfs-locode-db). frostfs-node should depends on frostfs-locode-db Go package (https://git.frostfs.info/TrueCloudLab/frostfs-locode-db/pkg/locode) now, because we want to eliminate inter-dependencies between frostfs-node and frostfs-locode-db.
👍 1
fyrchik commented 2024-10-02 07:29:10 +00:00
Owner
Copy link

Will be done in another repo TrueCloudLab/frostfs-locode-db#15

Will be done in another repo https://git.frostfs.info/TrueCloudLab/frostfs-locode-db/pulls/15
fyrchik closed this pull request 2024-10-02 07:29:11 +00:00
Some checks failed
DCO action / DCO (pull_request) Successful in 14m44s
Required
Details
Tests and linters / Staticcheck (pull_request) Successful in 16m33s
Required
Details
Vulncheck / Vulncheck (pull_request) Failing after 16m51s
Required
Details
Build / Build Components (1.21) (pull_request) Successful in 18m47s
Required
Details
Build / Build Components (1.20) (pull_request) Successful in 19m24s
Required
Details
Tests and linters / Tests (1.20) (pull_request) Failing after 20m0s
Required
Details
Tests and linters / Tests (1.21) (pull_request) Failing after 19m58s
Required
Details
Tests and linters / Tests with -race (pull_request) Failing after 19m55s
Required
Details
Tests and linters / Lint (pull_request) Successful in 22m48s
Required
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
dstepanov-yadro
achuprov
acid-ant
fyrchik
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
badger

Badger DB related issues

  
frostfs-adm

   
frostfs-cli

   
frostfs-ir

   
frostfs-lens

   
frostfs-node

   
good first issue

Good for newcomers

  
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
6 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#830
No description provided.
Delete branch "Nesterfifa/frostfs-node:782-use-quadtree"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?