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

修复可能存在OOM的问题 #382

Merged
merged 1 commit into from Mar 22, 2020
Merged

修复可能存在OOM的问题 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 56 additions & 0 deletions src/main/java/com/blade/kit/LRUSet.java
View file
Open in desktop
@@ -0,0 +1,56 @@
package com.blade.kit;

import java.util.*;

/**
* @author darren
* @date 2019/10/16 13:39
*/
public class LRUSet<E> extends AbstractSet<E>{
private transient HashMap<E, Object> map;
private static final Object PRESENT = new Object();

public LRUSet(int capacity) {
this.map = new LinkedHashMap<E, Object>(Math.min(32,capacity), .75f, true) {
@Override
protected boolean removeEldestEntry(Map.Entry eldest) {
return size() > capacity;
}
};
}

@Override
public int size() {
return map.size();
}

@Override
public boolean isEmpty() {
return map.isEmpty();
}

@Override
public boolean contains(Object o) {
return map.get(o) == PRESENT;
}

@Override
public Iterator<E> iterator() {
return map.keySet().iterator();
}

@Override
public boolean add(E e) {
return map.put(e, PRESENT) == null;
}

@Override
public boolean remove(Object o) {
return map.remove(o) == PRESENT;
}

@Override
public void clear() {
map.clear();
}
}
8 changes: 3 additions & 5 deletions src/main/java/com/blade/server/netty/HttpServerHandler.java
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@
import com.blade.exception.BladeException;
import com.blade.exception.NotFoundException;
import com.blade.kit.BladeCache;
import com.blade.kit.LRUSet;
import com.blade.mvc.RouteContext;
import com.blade.mvc.WebContext;
import com.blade.mvc.handler.ExceptionHandler;
Expand Down Expand Up @@ -67,7 +68,7 @@ public class HttpServerHandler extends SimpleChannelInboundHandler<HttpRequest>

private final StaticFileHandler staticFileHandler = new StaticFileHandler(WebContext.blade());
private final RouteMethodHandler routeHandler = new RouteMethodHandler();
private final Set<String> notStaticUri = new HashSet<>(32);
private final Set<String> notStaticUri = new LRUSet<>(128);
private final RouteMatcher routeMatcher = WebContext.blade().routeMatcher();

@Override
Expand Down Expand Up @@ -189,10 +190,7 @@ private boolean isStaticFile(String method, String uri) {
return false;
}

Optional<String> result = WebContext.blade().getStatics().stream()
.filter(s -> s.equals(uri) || uri.startsWith(s)).findFirst();

if (!result.isPresent()) {
if (WebContext.blade().getStatics().stream().noneMatch(s -> s.equals(uri) || uri.startsWith(s))) {
notStaticUri.add(uri);
return false;
}
Expand Down