inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed benchmark folder creation algorithm.

Browse Source 
Added ability to upload multiple files at a time.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-24 09:44:38 +00:00
parent 76afd86b11
commit b4ec9a4992
5 changed files with 142 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/model/filefolder/loader/FileFolderRemoteLoader.java
View File

@@ -265,7 +265,7 @@ public class FileFolderRemoteLoader
String valuesStr = properties.getProperty(propertyName);
FileFolderRemoteLoader.checkProperty(propertyName, valuesStr);
// Parse it into the well-known values
String[] strValues = new String[] {"1", "0", "0", "1", "false"};
String[] strValues = new String[] {"1", "0", "0", "1", "false", "1"};
int index = 0;
StringTokenizer tokenizer = new StringTokenizer(valuesStr, ",");
while (tokenizer.hasMoreTokens())
@@ -286,6 +286,7 @@ public class FileFolderRemoteLoader
long testTotal = 0L;
long testDepth = 1L;
boolean testVerbose = false;
long filesPerUpload = 1;
try
{
testCount = Long.parseLong(strValues[0]);
@@ -293,12 +294,13 @@ public class FileFolderRemoteLoader
testTotal = Long.parseLong(strValues[2]);
testDepth = Long.parseLong(strValues[3]);
testVerbose = Boolean.parseBoolean(strValues[4]);
filesPerUpload = Long.parseLong(strValues[5]);
}
catch (Throwable e)
{
throw new LoaderClientException(
"Unable to parse the loader configuration for '" + name + "'. " + LoaderSession.getLineEnding() +
"The correct format is [threadCount], [period(ms)], [total], [folder depth], [verbose]");
"The correct format is [threadCount], [period(ms)], [total], [folder depth], [verbose]<, [filesPerUpload]>");
}
// Construct
@@ -307,7 +309,7 @@ public class FileFolderRemoteLoader
AbstractLoaderThread thread = null;
if (type.equals("upload"))
{
thread = new LoaderUploadThread(session, name, testPeriod, testTotal, testDepth, testVerbose);
thread = new LoaderUploadThread(session, name, testPeriod, testTotal, testDepth, testVerbose, filesPerUpload);
}
else if (type.equals("totals"))
{

51
source/java/org/alfresco/repo/model/filefolder/loader/LoaderUploadThread.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.repo.model.filefolder.loader;
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.sf.ehcache.Cache;
@@ -60,15 +61,19 @@ public class LoaderUploadThread extends AbstractLoaderThread
pathCache.setCache(cache);
}
private int filesPerUpload;
public LoaderUploadThread(
LoaderSession session,
String loaderName,
long testPeriod,
long testTotal,
long testLoadDepth,
boolean verbose)
boolean verbose,
long filesPerUpload)
{
super(session, loaderName, testPeriod, testTotal, testLoadDepth, verbose);
this.filesPerUpload = (int) filesPerUpload;
}
/**
@@ -101,7 +106,7 @@ public class LoaderUploadThread extends AbstractLoaderThread
FileInfo folderInfo = serverProxy.fileFolderRemote.makeFolders(
serverProxy.ticket,
currentParentNodeRef,
currentPath,
Collections.singletonList(pathElement),
ContentModel.TYPE_FOLDER);
currentParentNodeRef = folderInfo.getNodeRef();
// Cache the new node
@@ -119,29 +124,41 @@ public class LoaderUploadThread extends AbstractLoaderThread
// Make sure the folder exists
NodeRef folderNodeRef = makeFolders(serverProxy.ticket, serverProxy, workingRootNodeRef, folderPath);
// Get a random file
File file = getFile();
byte[] bytes = FileCopyUtils.copyToByteArray(file);
// Get the extension
String filename = GUID.generate();
int index = file.getName().lastIndexOf('.');
if (index > 0)
// Build a set of files to upload
byte[][] bytes = new byte[filesPerUpload][];
String[] filenames = new String[filesPerUpload];
for (int i = 0; i < filesPerUpload; i++)
{
String ext = file.getName().substring(index + 1, file.getName().length());
filename += ("." + ext);
// Get a random file
File file = getFile();
bytes[i] = FileCopyUtils.copyToByteArray(file);
// Get the extension
filenames[i] = GUID.generate();
int index = file.getName().lastIndexOf('.');
if (index > 0)
{
String ext = file.getName().substring(index + 1, file.getName().length());
filenames[i] += ("." + ext);
}
}
// Upload it
FileInfo fileInfo = serverProxy.fileFolderRemote.create(
FileInfo[] fileInfos = serverProxy.loaderRemote.uploadContent(
serverProxy.ticket,
folderNodeRef,
filename,
ContentModel.TYPE_CONTENT);
NodeRef fileNodeRef = fileInfo.getNodeRef();
serverProxy.fileFolderRemote.putContent(serverProxy.ticket, fileNodeRef, bytes, filename);
filenames,
bytes);
// Done
String msg = String.format("Uploaded %s to folder: %s", filename, folderPath.toString());
String msg = String.format("Uploaded %d files to folder: %s", fileInfos.length, folderPath.toString());
return msg;
}
@Override
public String getSummary()
{
String summary = super.getSummary();
summary += (String.format("%d files per iteration", filesPerUpload));
return summary;
}
}