This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-datasketches-characterization.git
The following commit(s) were added to refs/heads/master by this push:
new cd5d410 Update HLL speed config
cd5d410 is described below
commit cd5d410c57348a768c4309572e3d5bd71c753e60
Author: Lee Rhodes <[email protected]>
AuthorDate: Fri Oct 18 11:07:13 2019 -0700
Update HLL speed config
---
src/main/java/org/apache/datasketches/Job.java | 10 +++++++---
src/main/resources/hll/HllSpeedJob.conf | 10 +++++-----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/datasketches/Job.java
b/src/main/java/org/apache/datasketches/Job.java
index f2df64d..f90a7c0 100644
--- a/src/main/java/org/apache/datasketches/Job.java
+++ b/src/main/java/org/apache/datasketches/Job.java
@@ -22,6 +22,7 @@ package org.apache.datasketches;
import static org.apache.datasketches.Files.isFileValid;
import static org.apache.datasketches.Files.openPrintWriter;
import static org.apache.datasketches.Util.milliSecToString;
+import static org.apache.datasketches.memory.Util.getResourcePath;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
@@ -54,10 +55,13 @@ public class Job {
* JobProfile to be run.
*/
public Job(final String jobConfigureFileName) {
- if (!isFileValid(jobConfigureFileName)) {
- throw new IllegalArgumentException("File not valid. " +
jobConfigureFileName);
+ final String jobConfStr;
+ if (isFileValid(jobConfigureFileName)) { //assumes fully qualified
+ jobConfStr = Files.fileToString(jobConfigureFileName); //includes line
feeds
+ } else {
+ final String path = getResourcePath(jobConfigureFileName); //try
resources
+ jobConfStr = Files.fileToString(path); //includes line feeds
}
- final String jobConfStr = Files.fileToString(jobConfigureFileName);
//includes line feeds
prop = parseJobProperties(jobConfStr);
profile = createJobProfile();
diff --git a/src/main/resources/hll/HllSpeedJob.conf
b/src/main/resources/hll/HllSpeedJob.conf
index 949c414..8b44ab0 100644
--- a/src/main/resources/hll/HllSpeedJob.conf
+++ b/src/main/resources/hll/HllSpeedJob.conf
@@ -23,7 +23,7 @@ Trials_lgMaxU=20 #How high the # uniques go
Trials_UPPO=16 #The horizontal x-resolution of trials points
# Trials Profile
-Trials_lgMaxT=23 #Max trials at start (low counts)
+Trials_lgMaxT=24 #Max trials at start (low counts)
Trials_lgMinT=4 #Min trials at tail (high counts)
#Trails Speed related
@@ -40,7 +40,7 @@ ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
JobProfile=org.apache.datasketches.characterization.hll.HllUpdateSpeedProfile
LgK=12
HLL_direct=false #only for Theta, HLL. See javadocs.
-HLL_tgtHllType=HLL4
-HLL_useComposite=false
-HLL_compact=true
-HLL_wrap=false
+HLL_tgtHllType=HLL8
+HLL_useComposite=false #HllAccuracyProfie
+HLL_compact=true #HllSerDeProfile
+HLL_wrap=false #HllSerDeProfile
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
