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.

Sign up for GitHub

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

Jump to bottom

Refactor cache into middleware #17

Open
wants to merge 32 commits into
base: main
Choose a base branch
from
Open

Refactor cache into middleware #17

wants to merge 32 commits into from

Conversation

toshinari123
Copy link
Contributor

No description provided.

@toshinari123
Copy link
Contributor Author

refer to toshinari123#1

@toshinari123
Copy link
Contributor Author

https://stackoverflow.com/questions/70176881/creating-a-github-pull-request-and-branch-based-on-another-pull-request-and-b

according to this github will automatically make the toshinari123#1 PR to oursky main after #15 is merged

@toshinari123
Copy link
Contributor Author

passed contentcache_test and cache_test

kiootic
kiootic reviewed Feb 20, 2024
View reviewed changes
Copy link
Collaborator

@kiootic kiootic left a comment

Choose a reason for hiding this comment

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

Please also rebase on main branch and cleanup the commit history.

internal/cache/contentcache.go Outdated Show resolved Hide resolved
internal/cache/contentcache.go Outdated Show resolved Hide resolved
internal/cache/contentcache.go Outdated Show resolved Hide resolved
internal/handler/site/context/context.go Outdated Show resolved Hide resolved
internal/handler/site/middleware.go Show resolved Hide resolved
internal/handler/site/middleware/cache.go Outdated Show resolved Hide resolved
internal/handler/site/middleware/cache.go Outdated Show resolved Hide resolved
@toshinari123
model type ContentCache
cfe4e18 
model type ContentCache

model type ContentCache (real)

corrected type ContentCache

write func NewContentCache

write func getContent
@toshinari123
Add OnExit in Ristretto to remove mutex entry
05d22c9
@toshinari123
Use io.Reader in contentcache GetContent
67f07e0
@toshinari123
Add ContentCache to serveFile
9007458
@toshinari123
Refactor duplicated logic
98cea47 
Fix contentcache implementation
@toshinari123
Create basic contentcache test
df9cb18 
Fix basic test
@toshinari123
Switch Read to ReadAll
9ab6eb9
@toshinari123
Test data race and Use sync.Map
1455d6d
@toshinari123
Upgrade contentCache implementation
cf4cff8 
Instead of storing key and value as value, use a reference-counted map of rwmutexes (it automatically deletes mutexes so no need onExit in Ristretto)

Separated into getContent and setContent in order to allow getContent call without io.ReadSeeker

Used generics
@toshinari123
Add keyToString as Ristretto doesnt support complex keys
ddb4c1e
@toshinari123
Test contentcache
479e5c3
@toshinari123
Remove caching in sitehandler
806c78c
@toshinari123
Write cache middleware
e6d6cff 
used context as a receiver to pass a reference of contentcache
@toshinari123
Convert middleware.Default to a closure
ae7afd6
@toshinari123
Move middleware.go to inside middleware
0e5500c 
in order to fix import cycle
@toshinari123
Move context.go
9902f91 
in order to fix import cycle in canon.go

Fix canon.go

Fix handler.go and site_handler.go

Fix serve.go
@toshinari123
Add and create contentCache in handler
e63547f
@toshinari123
Fix typo
05aee89
@toshinari123
Include encoding in contentcache key
d3272ba
@toshinari123
Refactor to deduceCompression
a419840
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kiootic kiootic kiootic left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@toshinari123 @kiootic