Skip to content

Commit

Permalink
Merge remote-tracking branch 'venfernand/fred-multi-value-table-impro…
Browse files Browse the repository at this point in the history 
…vement' into next
  • Loading branch information
@ArneBab
ArneBab committed Nov 30, 2024
2 parents ed64823 + 643cbee commit 1b1c950
Show file tree
Hide file tree
Showing 24 changed files with 1,090 additions and 692 deletions.
44 changes: 27 additions & 17 deletions src/freenet/clients/fcp/RequestStatusCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import freenet.client.ClientMetadata;
import freenet.client.FetchException.FetchExceptionMode;
Expand All @@ -28,16 +29,16 @@ public class RequestStatusCache {

private final ArrayList<RequestStatus> downloads;
private final ArrayList<RequestStatus> uploads;
private final HashMap<String, RequestStatus> requestsByIdentifier;
private final MultiValueTable<FreenetURI, RequestStatus> downloadsByURI;
private final Map<String, RequestStatus> requestsByIdentifier;
private final MultiValueTable<FreenetURI, DownloadRequestStatus> downloadsByURI;
private final MultiValueTable<FreenetURI, RequestStatus> uploadsByFinalURI;

RequestStatusCache() {
downloads = new ArrayList<RequestStatus>();
uploads = new ArrayList<RequestStatus>();
requestsByIdentifier = new HashMap<String, RequestStatus>();
downloadsByURI = new MultiValueTable<FreenetURI, RequestStatus>();
uploadsByFinalURI = new MultiValueTable<FreenetURI, RequestStatus>();
downloads = new ArrayList<>();
uploads = new ArrayList<>();
requestsByIdentifier = new HashMap<>();
downloadsByURI = new MultiValueTable<>();
uploadsByFinalURI = new MultiValueTable<>();
}

synchronized void addDownload(DownloadRequestStatus status) {
Expand Down Expand Up @@ -112,7 +113,7 @@ synchronized void removeByIdentifier(String identifier) {
downloads.remove(status);
FreenetURI uri = status.getURI();
assert(uri != null);
downloadsByURI.removeElement(uri, status);
downloadsByURI.removeElement(uri, (DownloadRequestStatus) status);
} else if(status instanceof UploadRequestStatus) {
uploads.remove(status);
FreenetURI uri = ((UploadRequestStatus) status).getFinalURI();
Expand Down Expand Up @@ -192,17 +193,26 @@ public synchronized void updateStarted(String identifier, FreenetURI redirect) {
}

public synchronized CacheFetchResult getShadowBucket(FreenetURI key, boolean noFilter) {
Object[] downloads = downloadsByURI.getArray(key);
if(downloads == null) return null;
for(Object o : downloads) {
DownloadRequestStatus download = (DownloadRequestStatus) o;
for (DownloadRequestStatus download : downloadsByURI.getAllAsList(key)) {
Bucket data = download.getDataShadow();
if(data == null) continue;
if(data.size() == 0) continue;
if(noFilter && download.filterData) continue;
if (data == null) {
continue;
}
if (data.size() == 0) {
continue;
}
if (noFilter && download.filterData) {
continue;
}
// FIXME it probably *is* worth the effort to allow this when it is overridden on the fetcher, since the user changed the type???
if(download.overriddenDataType) continue;
return new CacheFetchResult(new ClientMetadata(download.getMIMEType()), new NoFreeBucket(data), download.filterData);
if (download.overriddenDataType) {
continue;
}
return new CacheFetchResult(
new ClientMetadata(download.getMIMEType()),
new NoFreeBucket(data),
download.filterData
);
}
return null;
}
Expand Down
8 changes: 4 additions & 4 deletions src/freenet/clients/http/ConfigToadlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,12 @@ public void handleMethodPOST(URI uri, HTTPRequest request,
}
String params = paramsBuilder.toString();
if (directorySelector) {
MultiValueTable<String, String> headers = new MultiValueTable<String, String>(
1);
// params ends in &. Download directory browser starts in default
// download directory.
headers.put("Location", directoryBrowserPath + params + "path="
+ core.getDownloadsDir().getAbsolutePath());
MultiValueTable<String, String> headers = MultiValueTable.from(
"Location",
directoryBrowserPath + params + "path=" + core.getDownloadsDir().getAbsolutePath()
);
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
}
Expand Down
7 changes: 4 additions & 3 deletions src/freenet/clients/http/ConnectionsToadlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,10 @@ public void handleMethodGET(URI uri, final HTTPRequest request, ToadletContext c
if(path.endsWith("myref.fref")) {
SimpleFieldSet fs = getNoderef();
String noderefString = fs.toOrderedStringWithBase64();
MultiValueTable<String, String> extraHeaders = new MultiValueTable<String, String>();
// Force download to disk
extraHeaders.put("Content-Disposition", "attachment; filename=myref.fref");
MultiValueTable<String, String> extraHeaders = MultiValueTable.from(
// Force download to disk
"Content-Disposition", "attachment; filename=myref.fref"
);
writeReply(ctx, 200, "application/x-freenet-reference", "OK", extraHeaders, noderefString);
return;
}
Expand Down
24 changes: 12 additions & 12 deletions src/freenet/clients/http/ContentFilterToadlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class ContentFilterToadlet extends Toadlet implements LinkEnabledCallback
/**
* What to do the the output from the content filter.
*/
public static enum ResultHandling {
public enum ResultHandling {
DISPLAY,
SAVE
}
Expand Down Expand Up @@ -90,17 +90,17 @@ public void handleMethodPOST(URI uri, final HTTPRequest request, final ToadletCo
FilterOperation filterOperation = getFilterOperation(request);
ResultHandling resultHandling = getResultHandling(request);
String mimeType = request.getPartAsStringFailsafe("mime-type", 100);
MultiValueTable<String, String> responseHeaders = new MultiValueTable<String, String>();
responseHeaders.put("Location", LocalFileFilterToadlet.PATH
+ "?filter-operation=" + filterOperation
+ "&result-handling=" + resultHandling
+ "&mime-type=" + mimeType);
String location = LocalFileFilterToadlet.PATH
+ "?filter-operation=" + filterOperation
+ "&result-handling=" + resultHandling
+ "&mime-type=" + mimeType;
MultiValueTable<String, String> responseHeaders = MultiValueTable.from("Location", location);
ctx.sendReplyHeaders(302, "Found", responseHeaders, null, 0);
} catch (BadRequestException e) {
String invalidPart = e.getInvalidRequestPart();
if (invalidPart == "filter-operation") {
if ("filter-operation".equals(invalidPart)) {
writeBadRequestError(l10n("errorMustSpecifyFilterOperationTitle"), l10n("errorMustSpecifyFilterOperation"), ctx, true);
} else if (invalidPart == "result-handling") {
} else if ("result-handling".equals(invalidPart)) {
writeBadRequestError(l10n("errorMustSpecifyResultHandlingTitle"), l10n("errorMustSpecifyResultHandling"), ctx, true);
} else {
writeBadRequestError(l10n("errorBadRequestTitle"), l10n("errorBadRequest"), ctx, true);
Expand Down Expand Up @@ -243,11 +243,11 @@ private void handleFilterRequest(HTTPRequest request, ToadletContext ctx, NodeCl
}
} catch (BadRequestException e) {
String invalidPart = e.getInvalidRequestPart();
if (invalidPart == "filter-operation") {
if ("filter-operation".equals(invalidPart)) {
writeBadRequestError(l10n("errorMustSpecifyFilterOperationTitle"), l10n("errorMustSpecifyFilterOperation"), ctx, true);
} else if (invalidPart == "result-handling") {
} else if ("result-handling".equals(invalidPart)) {
writeBadRequestError(l10n("errorMustSpecifyResultHandlingTitle"), l10n("errorMustSpecifyResultHandling"), ctx, true);
} else if (invalidPart == "filename") {
} else if ("filename".equals(invalidPart)) {
writeBadRequestError(l10n("errorNoFileSelectedTitle"), l10n("errorNoFileSelected"), ctx, true);
} else {
writeBadRequestError(l10n("errorBadRequestTitle"), l10n("errorBadRequest"), ctx, true);
Expand Down Expand Up @@ -309,7 +309,7 @@ private void handleFilter(Bucket data, String mimeType, FilterOperation operatio
ctx.sendReplyHeaders(200, "OK", null, resultMimeType, resultBucket.size());
ctx.writeData(resultBucket);
} else if (resultHandling == ResultHandling.SAVE) {
MultiValueTable<String, String> headers = new MultiValueTable<String, String>();
MultiValueTable<String, String> headers = new MultiValueTable<>();
headers.put("Content-Disposition", "attachment; filename=\"" + resultFilename + '"');
headers.put("Cache-Control", "private");
headers.put("Content-Transfer-Encoding", "binary");
Expand Down
10 changes: 5 additions & 5 deletions src/freenet/clients/http/DarknetConnectionsToadlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,7 @@ protected void handleAltPost(URI uri, HTTPRequest request, ToadletContext ctx, b
}

private void redirectHere(ToadletContext ctx) throws ToadletContextClosedException, IOException {
MultiValueTable<String, String> headers = new MultiValueTable<String, String>();
headers.put("Location", "/friends/");
MultiValueTable<String, String> headers = MultiValueTable.from("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
}

Expand Down Expand Up @@ -514,9 +513,10 @@ private boolean tryHandlePeerNoderef(URI uri, HTTPRequest request,
if(fs == null) return false;
String filename = FileUtil.sanitizeFileNameWithExtras(peernode_name+".fref", "\" ");
String content = fs.toString();
MultiValueTable<String, String> extraHeaders = new MultiValueTable<String, String>();
// Force download to disk
extraHeaders.put("Content-Disposition", "attachment; filename="+filename);
MultiValueTable<String, String> extraHeaders = MultiValueTable.from(
// Force download to disk
"Content-Disposition", "attachment; filename="+filename
);
this.writeReply(ctx, 200, "application/x-freenet-reference", "OK", extraHeaders, content);
return true;
} else return false;
Expand Down
6 changes: 2 additions & 4 deletions src/freenet/clients/http/ExternalLinkToadlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,21 @@ public String path() {

public void handleMethodPOST(URI uri, HTTPRequest request, ToadletContext ctx) throws ToadletContextClosedException, IOException {
String url = request.getPartAsStringFailsafe(magicHTTPEscapeString, MAX_URL_LENGTH);
MultiValueTable<String, String> headers = new MultiValueTable<String, String>();
//If the user clicked cancel, or the URL is not defined, return to the main page.
//TODO: This will mean the beginning of the first time wizard if it's still in progress.
//TODO: Is it worth it to fix that?
if (request.getPartAsStringFailsafe("Go", 32).isEmpty() || url.isEmpty()) {
url = WelcomeToadlet.PATH;
}
headers.put("Location", url);
MultiValueTable<String, String> headers = MultiValueTable.from("Location", url);
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
}

public void handleMethodGET(URI uri, HTTPRequest request, ToadletContext ctx) throws ToadletContextClosedException, IOException {

//Unexpected: a URL should have been specified.
if (request.getParam(magicHTTPEscapeString).isEmpty()) {
MultiValueTable<String, String> headers = new MultiValueTable<String, String>();
headers.put("Location", WelcomeToadlet.PATH);
MultiValueTable<String, String> headers = MultiValueTable.from("Location", WelcomeToadlet.PATH);
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
}
Expand Down
88 changes: 48 additions & 40 deletions src/freenet/clients/http/FProxyFetchTracker.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package freenet.clients.http;

import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.stream.Collectors;

import freenet.client.FetchContext;
import freenet.client.FetchException;
Expand All @@ -28,7 +28,7 @@ public void shouldUpdate() {
});
}

final MultiValueTable<FreenetURI, FProxyFetchInProgress> fetchers;
private final MultiValueTable<FreenetURI, FProxyFetchInProgress> fetchers = new MultiValueTable<>();
final ClientContext context;
private long fetchIdentifiers;
private final FetchContext fctx;
Expand All @@ -37,7 +37,6 @@ public void shouldUpdate() {
private boolean requeue;

public FProxyFetchTracker(ClientContext context, FetchContext fctx, RequestClient rc) {
fetchers = new MultiValueTable<FreenetURI, FProxyFetchInProgress>();
this.context = context;
this.fctx = fctx;
this.rc = rc;
Expand Down Expand Up @@ -84,26 +83,40 @@ public FProxyFetchWaiter makeWaiterForFetchInProgress(FreenetURI key,long maxSiz
}
return null;
}

/** Gets an FProxyFetchInProgress identified by the URI and the maxsize. If no such FetchInProgress exists, then returns null.
* @param key - The URI of the fetch

/**
* Gets an {@link FProxyFetchInProgress} identified by the URI and having provided max size.
* If optional fetch context parameter is specified,
* then fetch context in {@link FProxyFetchInProgress} is compared to provided fetch context.
* If no such FetchInProgress exists, then returns {@code null}.
*
* @param key - The URI of the fetch
* @param maxSize - The maxSize of the fetch
* @param fctx TODO
* @return The FetchInProgress if found, null otherwise*/
public FProxyFetchInProgress getFetchInProgress(FreenetURI key, long maxSize, FetchContext fctx){
* @param fctx - Optional {@link FetchContext} with fetch parameters
* @return The FetchInProgress if found, {@code null} otherwise
*/
public FProxyFetchInProgress getFetchInProgress(FreenetURI key, long maxSize, FetchContext fctx) {
synchronized (fetchers) {
Object[] check = fetchers.getArray(key);
if(check != null) {
for(int i=0;i<check.length;i++) {
FProxyFetchInProgress progress = (FProxyFetchInProgress) check[i];
if((progress.maxSize == maxSize && progress.notFinishedOrFatallyFinished())
|| progress.hasData()){
if(logMINOR) Logger.minor(this, "Found "+progress);
if(fctx != null && !progress.fetchContextEquivalent(fctx)) continue;
if(logMINOR) Logger.minor(this, "Using "+progress);
return progress;
} else
if(logMINOR) Logger.minor(this, "Skipping "+progress);
for (FProxyFetchInProgress fetch : fetchers.getAllAsList(key)) {
if ((fetch.maxSize == maxSize && fetch.notFinishedOrFatallyFinished())
|| fetch.hasData()
) {
if (logMINOR) {
Logger.minor(this, "Found " + fetch);
}
if (fctx != null && !fetch.fetchContextEquivalent(fctx)) {
if (logMINOR) {
Logger.minor(this, "Fetch context does not match. Skipping " + fetch);
}
continue;
}
if (logMINOR) {
Logger.minor(this, "Using " + fetch);
}
return fetch;
}
if (logMINOR) {
Logger.minor(this, "Skipping " + fetch);
}
}
}
Expand All @@ -124,8 +137,10 @@ public void queueCancel(FProxyFetchInProgress progress) {

@Override
public void run() {
if(logMINOR) Logger.minor(this, "Removing old FProxyFetchInProgress's");
ArrayList<FProxyFetchInProgress> toRemove = null;
if (logMINOR) {
Logger.minor(this, "Removing old FProxyFetchInProgress's");
}
List<FProxyFetchInProgress> toRemove;
boolean needRequeue = false;
synchronized(fetchers) {
if(requeue) {
Expand All @@ -135,34 +150,27 @@ public void run() {
queuedJob = false;
}
// Horrible hack, FIXME
Enumeration<FreenetURI> e = fetchers.keys();
while(e.hasMoreElements()) {
FreenetURI uri = e.nextElement();
// Really horrible hack, FIXME
for(FProxyFetchInProgress f : fetchers.iterateAll(uri)) {
// FIXME remove on the fly, although cancel must wait
if(f.canCancel()) {
if(toRemove == null) toRemove = new ArrayList<FProxyFetchInProgress>();
toRemove.add(f);
}
}
}
if(toRemove != null)
toRemove = fetchers.values().stream()
// FIXME remove on the fly, although cancel must wait
.filter(FProxyFetchInProgress::canCancel)
.collect(Collectors.toList());

for(FProxyFetchInProgress r : toRemove) {
if(logMINOR){
Logger.minor(this,"Removed fetchinprogress:"+r);
}
fetchers.removeElement(r.uri, r);
}
}
if(toRemove != null)
for(FProxyFetchInProgress r : toRemove) {
if(logMINOR)
if (logMINOR) {
Logger.minor(this, "Cancelling for "+r);
}
r.finishCancel();
}
if(needRequeue)
if(needRequeue) {
context.ticker.queueTimedJob(this, FProxyFetchInProgress.LIFETIME);
}
}

public int makeRandomElementID() {
Expand Down
Loading

0 comments on commit 1b1c950

Please sign in to comment.