IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1009 from nosqlbench/nosqlbench-1007-docsblurbs

Browse Source 
remove double append of markdown prefix
This commit is contained in:
Jonathan Shook 2023-02-06 19:03:15 -06:00 committed by GitHub
commit 56fe08296e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java
View File

@ -33,9 +33,6 @@ import java.nio.file.StandardOpenOption;
import java.util.Date;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.function.Function;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@ -65,10 +62,7 @@ public class BundledMarkdownZipExporter {
}
}
ExecutorService executorService = Executors.newSingleThreadExecutor();
Future<Map<String, StringBuilder>> future = executorService.submit(new VirtDataGenDocsApp(null));
Map<String, StringBuilder> builderMap = future.get();
executorService.shutdown();
Map<String, StringBuilder> builderMap= new VirtDataGenDocsApp(null).call();
String bindingsPrefix ="bindings/";
for(Map.Entry<String, StringBuilder> entry : builderMap.entrySet())
{

44
virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java
View File

@ -29,7 +29,6 @@ import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFuncs;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
@ -73,48 +72,6 @@ public class VirtDataGenDocsApp implements Callable<Map<String, StringBuilder>>
public Map<String, StringBuilder> call() {
/*LinkedList<String> largs = new LinkedList<>(Arrays.asList(args));
if (args.length > 0 && args[0].contains("help")) {
System.out.println(
"usage:\n" +
"[basefile <name>] [basedir <dir>] [categories combined|split] [format json|markdown] " +
"[blurbsdirs <dir>[:...]]\n\n"
);
return result;
}
while (largs.peekFirst() != null) {
String argtype = largs.removeFirst();
if (largs.peekFirst() == null) {
throw new RuntimeException(VirtDataGenDocsApp.class + " expects args in param value couplets.");
}
String argval = largs.removeFirst().toLowerCase();
switch (argtype) {
case "basefile":
this.baseFileName = argval;
break;
case "basedir":
this.basedir = argval;
break;
case BLURBS_DIRS:
this.blurbsDirs = argval;
break;
case CATEGORIES:
if (!argval.equals(CATEGORIES_SPLIT) && !argval.equals(CATEGORIES_COMBINED)) {
throw new RuntimeException("categories must either be " + CATEGORIES_SPLIT + ", or " + CATEGORIES_COMBINED + ".");
}
this.categories = argval;
break;
case FORMAT:
if (!argval.equals(FORMAT_MARKDOWN) && !argval.equals(FORMAT_JSON)) {
throw new RuntimeException("format must either be " + FORMAT_MARKDOWN + ", or " + FORMAT_JSON + ".");
}
this.format = argval;
break;
default:
}
}*/
Optional<FDoc> docsinfo = loadAllDocs();
if (!docsinfo.isPresent()) {
@ -180,6 +137,7 @@ public class VirtDataGenDocsApp implements Callable<Map<String, StringBuilder>>
logger.debug("writing blurb to " + outputname);
builder.append(blurb);
break;
}
}
}