Repository: incubator-pirk Updated Branches: refs/heads/master 3324375c4 -> e34ec021b
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/FileIOUtils.Callable.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/FileIOUtils.Callable.html b/docs/org/apache/pirk/utils/FileIOUtils.Callable.html index 8e8203d..8d905e3 100644 --- a/docs/org/apache/pirk/utils/FileIOUtils.Callable.html +++ b/docs/org/apache/pirk/utils/FileIOUtils.Callable.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>FileIOUtils.Callable</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/FileIOUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/FileIOUtils.html b/docs/org/apache/pirk/utils/FileIOUtils.html index 58c33f3..8eec45a 100644 --- a/docs/org/apache/pirk/utils/FileIOUtils.html +++ b/docs/org/apache/pirk/utils/FileIOUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>FileIOUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/HDFS.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/HDFS.html b/docs/org/apache/pirk/utils/HDFS.html index 39b7e17..5c78e9e 100644 --- a/docs/org/apache/pirk/utils/HDFS.html +++ b/docs/org/apache/pirk/utils/HDFS.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>HDFS</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/ISO8601DateParser.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/ISO8601DateParser.html b/docs/org/apache/pirk/utils/ISO8601DateParser.html index 1722748..afc9eca 100644 --- a/docs/org/apache/pirk/utils/ISO8601DateParser.html +++ b/docs/org/apache/pirk/utils/ISO8601DateParser.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>ISO8601DateParser</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/KeyedHash.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/KeyedHash.html b/docs/org/apache/pirk/utils/KeyedHash.html index 2e5dfbd..4e919fe 100644 --- a/docs/org/apache/pirk/utils/KeyedHash.html +++ b/docs/org/apache/pirk/utils/KeyedHash.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>KeyedHash</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/PIRException.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/PIRException.html b/docs/org/apache/pirk/utils/PIRException.html index 299fe92..6d04d7d 100644 --- a/docs/org/apache/pirk/utils/PIRException.html +++ b/docs/org/apache/pirk/utils/PIRException.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>PIRException</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/QueryParserUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/QueryParserUtils.html b/docs/org/apache/pirk/utils/QueryParserUtils.html index 59315a5..57c48f6 100644 --- a/docs/org/apache/pirk/utils/QueryParserUtils.html +++ b/docs/org/apache/pirk/utils/QueryParserUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>QueryParserUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/QueryResultsWriter.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/QueryResultsWriter.html b/docs/org/apache/pirk/utils/QueryResultsWriter.html index af3383d..d530e29 100644 --- a/docs/org/apache/pirk/utils/QueryResultsWriter.html +++ b/docs/org/apache/pirk/utils/QueryResultsWriter.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>QueryResultsWriter</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/StopListUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/StopListUtils.html b/docs/org/apache/pirk/utils/StopListUtils.html index c12abda..641b06a 100644 --- a/docs/org/apache/pirk/utils/StopListUtils.html +++ b/docs/org/apache/pirk/utils/StopListUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>StopListUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/StringUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/StringUtils.html b/docs/org/apache/pirk/utils/StringUtils.html index 0b171c9..ec556a2 100644 --- a/docs/org/apache/pirk/utils/StringUtils.html +++ b/docs/org/apache/pirk/utils/StringUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>StringUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/SystemConfiguration.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/SystemConfiguration.html b/docs/org/apache/pirk/utils/SystemConfiguration.html index c9ce873..8338b0f 100644 --- a/docs/org/apache/pirk/utils/SystemConfiguration.html +++ b/docs/org/apache/pirk/utils/SystemConfiguration.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:23 EDT 2016 --> <title>SystemConfiguration</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -182,80 +182,86 @@ extends java.lang.Object</pre> </td> </tr> <tr id="i4" class="altColor"> +<td class="colFirst"><code>static java.util.Properties</code></td> +<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#getProperties--">getProperties</a></span>()</code> +<div class="block">Return the Properties object maintained by this class.</div> +</td> +</tr> +<tr id="i5" class="rowColor"> <td class="colFirst"><code>static java.lang.String</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#getProperty-java.lang.String-">getProperty</a></span>(java.lang.String propertyName)</code> <div class="block">Gets the specified property; returns <code>null</code> if the property isn't found.</div> </td> </tr> -<tr id="i5" class="rowColor"> +<tr id="i6" class="altColor"> <td class="colFirst"><code>static java.lang.String</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#getProperty-java.lang.String-java.lang.String-">getProperty</a></span>(java.lang.String propertyName, java.lang.String defaultValue)</code> <div class="block">Gets the specified property as a <code>String</code>, or the default value if the property isn't found.</div> </td> </tr> -<tr id="i6" class="altColor"> +<tr id="i7" class="rowColor"> <td class="colFirst"><code>static boolean</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#hasProperty-java.lang.String-">hasProperty</a></span>(java.lang.String propertyName)</code> <div class="block">Returns true iff the given property name is defined.</div> </td> </tr> -<tr id="i7" class="rowColor"> +<tr id="i8" class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#initialize--">initialize</a></span>()</code> </td> </tr> -<tr id="i8" class="altColor"> +<tr id="i9" class="rowColor"> <td class="colFirst"><code>static boolean</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#isSetTrue-java.lang.String-">isSetTrue</a></span>(java.lang.String propertyName)</code> <div class="block">Returns <code>true</code> iff the specified boolean property value is "true".</div> </td> </tr> -<tr id="i9" class="rowColor"> +<tr id="i10" class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#loadProperties-java.io.InputStream-">loadProperties</a></span>(java.io.InputStream stream)</code> <div class="block">Load the properties in the Properties object and then trim any whitespace</div> </td> </tr> -<tr id="i10" class="altColor"> +<tr id="i11" class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#loadPropsFromDir-java.lang.String-">loadPropsFromDir</a></span>(java.lang.String dirName)</code> <div class="block">Loads the properties from local properties file in the specified directory.</div> </td> </tr> -<tr id="i11" class="rowColor"> +<tr id="i12" class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#loadPropsFromFile-java.io.File-">loadPropsFromFile</a></span>(java.io.File file)</code> <div class="block">Loads the properties from the specified file.</div> </td> </tr> -<tr id="i12" class="altColor"> +<tr id="i13" class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#loadPropsFromFile-org.apache.hadoop.fs.Path-org.apache.hadoop.fs.FileSystem-">loadPropsFromFile</a></span>(org.apache.hadoop.fs.Path filePath, org.apache.hadoop.fs.FileSystem fs)</code> <div class="block">Loads the properties from the specified file in hdfs</div> </td> </tr> -<tr id="i13" class="rowColor"> +<tr id="i14" class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#loadPropsFromFile-java.lang.String-org.apache.hadoop.fs.FileSystem-">loadPropsFromFile</a></span>(java.lang.String filename, org.apache.hadoop.fs.FileSystem fs)</code> <div class="block">Loads the properties from the specified file in hdfs</div> </td> </tr> -<tr id="i14" class="altColor"> +<tr id="i15" class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#loadPropsFromHDFSDir-java.lang.String-org.apache.hadoop.fs.FileSystem-">loadPropsFromHDFSDir</a></span>(java.lang.String dirName, org.apache.hadoop.fs.FileSystem fs)</code> <div class="block">Loads the properties from local properties file in the specified directory in hdfs.</div> </td> </tr> -<tr id="i15" class="rowColor"> +<tr id="i16" class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#loadPropsFromResource-java.lang.String-">loadPropsFromResource</a></span>(java.lang.String name)</code> <div class="block">Loads the properties from the specified resource on the current classloader.</div> </td> </tr> -<tr id="i16" class="altColor"> +<tr id="i17" class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/pirk/utils/SystemConfiguration.html#setProperty-java.lang.String-java.lang.String-">setProperty</a></span>(java.lang.String propertyName, java.lang.String value)</code> @@ -310,6 +316,20 @@ extends java.lang.Object</pre> <pre>public static void initialize()</pre> </li> </ul> +<a name="getProperties--"> +<!-- --> +</a> +<ul class="blockList"> +<li class="blockList"> +<h4>getProperties</h4> +<pre>public static java.util.Properties getProperties()</pre> +<div class="block">Return the Properties object maintained by this class.</div> +<dl> +<dt><span class="returnLabel">Returns:</span></dt> +<dd>The system properties.</dd> +</dl> +</li> +</ul> <a name="getProperty-java.lang.String-"> <!-- --> </a> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/CSVOutputUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/CSVOutputUtils.html b/docs/org/apache/pirk/utils/class-use/CSVOutputUtils.html index 40c78fa..dc7ea0d 100644 --- a/docs/org/apache/pirk/utils/class-use/CSVOutputUtils.html +++ b/docs/org/apache/pirk/utils/class-use/CSVOutputUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.CSVOutputUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/EpochDateParser.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/EpochDateParser.html b/docs/org/apache/pirk/utils/class-use/EpochDateParser.html index 17e52c2..9f927f3 100644 --- a/docs/org/apache/pirk/utils/class-use/EpochDateParser.html +++ b/docs/org/apache/pirk/utils/class-use/EpochDateParser.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.EpochDateParser</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/FileConst.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/FileConst.html b/docs/org/apache/pirk/utils/class-use/FileConst.html index 5ff9a53..9cddd2d 100644 --- a/docs/org/apache/pirk/utils/class-use/FileConst.html +++ b/docs/org/apache/pirk/utils/class-use/FileConst.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.FileConst</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/FileIOUtils.Callable.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/FileIOUtils.Callable.html b/docs/org/apache/pirk/utils/class-use/FileIOUtils.Callable.html index e3e95d2..063e02d 100644 --- a/docs/org/apache/pirk/utils/class-use/FileIOUtils.Callable.html +++ b/docs/org/apache/pirk/utils/class-use/FileIOUtils.Callable.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Interface org.apache.pirk.utils.FileIOUtils.Callable</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/FileIOUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/FileIOUtils.html b/docs/org/apache/pirk/utils/class-use/FileIOUtils.html index 5c12c50..673a463 100644 --- a/docs/org/apache/pirk/utils/class-use/FileIOUtils.html +++ b/docs/org/apache/pirk/utils/class-use/FileIOUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.FileIOUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/HDFS.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/HDFS.html b/docs/org/apache/pirk/utils/class-use/HDFS.html index 2864182..beebbde 100644 --- a/docs/org/apache/pirk/utils/class-use/HDFS.html +++ b/docs/org/apache/pirk/utils/class-use/HDFS.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.HDFS</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/ISO8601DateParser.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/ISO8601DateParser.html b/docs/org/apache/pirk/utils/class-use/ISO8601DateParser.html index da465fc..f837fdb 100644 --- a/docs/org/apache/pirk/utils/class-use/ISO8601DateParser.html +++ b/docs/org/apache/pirk/utils/class-use/ISO8601DateParser.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.ISO8601DateParser</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/KeyedHash.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/KeyedHash.html b/docs/org/apache/pirk/utils/class-use/KeyedHash.html index 1f45ee3..def32aa 100644 --- a/docs/org/apache/pirk/utils/class-use/KeyedHash.html +++ b/docs/org/apache/pirk/utils/class-use/KeyedHash.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.KeyedHash</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/PIRException.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/PIRException.html b/docs/org/apache/pirk/utils/class-use/PIRException.html index 13affe3..b5011d7 100644 --- a/docs/org/apache/pirk/utils/class-use/PIRException.html +++ b/docs/org/apache/pirk/utils/class-use/PIRException.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.PIRException</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> @@ -169,42 +169,14 @@ <tr class="altColor"> <td class="colFirst"><code>java.math.BigInteger</code></td> <td class="colLast"><span class="typeNameLabel">Paillier.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/pirk/encryption/Paillier.html#encrypt-java.math.BigInteger-">encrypt</a></span>(java.math.BigInteger m)</code> -<div class="block">Encrypt - generate r</div> +<div class="block">Returns the encrypted value of <code>m</code> using a generated random value.</div> </td> </tr> <tr class="rowColor"> <td class="colFirst"><code>java.math.BigInteger</code></td> <td class="colLast"><span class="typeNameLabel">Paillier.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/pirk/encryption/Paillier.html#encrypt-java.math.BigInteger-java.math.BigInteger-">encrypt</a></span>(java.math.BigInteger m, java.math.BigInteger r)</code> -<div class="block">Encrypt - use provided r</div> -</td> -</tr> -</tbody> -</table> -<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation"> -<caption><span>Constructors in <a href="../../../../../org/apache/pirk/encryption/package-summary.html">org.apache.pirk.encryption</a> that throw <a href="../../../../../org/apache/pirk/utils/PIRException.html" title="class in org.apache.pirk.utils">PIRException</a></span><span class="tabEnd"> </span></caption> -<tr> -<th class="colOne" scope="col">Constructor and Description</th> -</tr> -<tbody> -<tr class="altColor"> -<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pirk/encryption/Paillier.html#Paillier-java.math.BigInteger-java.math.BigInteger-int-">Paillier</a></span>(java.math.BigInteger pInput, - java.math.BigInteger qInput, - int bitLengthInput)</code> -<div class="block">Constructor with all parameters p,q, and bitLengthInput specified</div> -</td> -</tr> -<tr class="rowColor"> -<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pirk/encryption/Paillier.html#Paillier-int-int-">Paillier</a></span>(int bitLengthInput, - int certainty)</code> -<div class="block">Constructor to generate keys given the desired bitLength and prime certainty value</div> -</td> -</tr> -<tr class="altColor"> -<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pirk/encryption/Paillier.html#Paillier-int-int-int-">Paillier</a></span>(int bitLengthInput, - int certainty, - int ensureBitSet)</code> -<div class="block">Constructor to generate keys given the desired bitLength and prime certainty value</div> +<div class="block">Returns the ciphertext of a message using the given random value.</div> </td> </tr> </tbody> @@ -244,6 +216,18 @@ </tr> <tbody> <tr class="altColor"> +<td class="colFirst"><code>java.util.Properties</code></td> +<td class="colLast"><span class="typeNameLabel">EncryptionPropertiesBuilder.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/pirk/querier/wideskies/EncryptionPropertiesBuilder.html#build--">build</a></span>()</code> </td> +</tr> +<tr class="rowColor"> +<td class="colFirst"><code>static <a href="../../../../../org/apache/pirk/querier/wideskies/Querier.html" title="class in org.apache.pirk.querier.wideskies">Querier</a></code></td> +<td class="colLast"><span class="typeNameLabel">QuerierFactory.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/pirk/querier/wideskies/QuerierFactory.html#createQuerier-java.util.UUID-java.util.List-java.util.Properties-">createQuerier</a></span>(java.util.UUID queryIdentifier, + java.util.List<java.lang.String> selectors, + java.util.Properties properties)</code> +<div class="block">Generates a <a href="../../../../../org/apache/pirk/querier/wideskies/Querier.html" title="class in org.apache.pirk.querier.wideskies"><code>Querier</code></a> containing the encrypted query.</div> +</td> +</tr> +<tr class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="typeNameLabel">QuerierDriver.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/pirk/querier/wideskies/QuerierDriver.html#main-java.lang.String...-">main</a></span>(java.lang.String... args)</code> </td> </tr> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/QueryParserUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/QueryParserUtils.html b/docs/org/apache/pirk/utils/class-use/QueryParserUtils.html index c117d93..5c3f073 100644 --- a/docs/org/apache/pirk/utils/class-use/QueryParserUtils.html +++ b/docs/org/apache/pirk/utils/class-use/QueryParserUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.QueryParserUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/QueryResultsWriter.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/QueryResultsWriter.html b/docs/org/apache/pirk/utils/class-use/QueryResultsWriter.html index a4f37a2..576cb37 100644 --- a/docs/org/apache/pirk/utils/class-use/QueryResultsWriter.html +++ b/docs/org/apache/pirk/utils/class-use/QueryResultsWriter.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.QueryResultsWriter</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/StopListUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/StopListUtils.html b/docs/org/apache/pirk/utils/class-use/StopListUtils.html index d9be24b..a0f86a1 100644 --- a/docs/org/apache/pirk/utils/class-use/StopListUtils.html +++ b/docs/org/apache/pirk/utils/class-use/StopListUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.StopListUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/StringUtils.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/StringUtils.html b/docs/org/apache/pirk/utils/class-use/StringUtils.html index 5713f18..8d31fbc 100644 --- a/docs/org/apache/pirk/utils/class-use/StringUtils.html +++ b/docs/org/apache/pirk/utils/class-use/StringUtils.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.StringUtils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/class-use/SystemConfiguration.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/class-use/SystemConfiguration.html b/docs/org/apache/pirk/utils/class-use/SystemConfiguration.html index d631b57..e89a051 100644 --- a/docs/org/apache/pirk/utils/class-use/SystemConfiguration.html +++ b/docs/org/apache/pirk/utils/class-use/SystemConfiguration.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.SystemConfiguration</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/package-frame.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/package-frame.html b/docs/org/apache/pirk/utils/package-frame.html index f7ed350..4254aa8 100644 --- a/docs/org/apache/pirk/utils/package-frame.html +++ b/docs/org/apache/pirk/utils/package-frame.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>org.apache.pirk.utils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/package-summary.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/package-summary.html b/docs/org/apache/pirk/utils/package-summary.html index 22cf740..e2dbfc5 100644 --- a/docs/org/apache/pirk/utils/package-summary.html +++ b/docs/org/apache/pirk/utils/package-summary.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>org.apache.pirk.utils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/package-tree.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/package-tree.html b/docs/org/apache/pirk/utils/package-tree.html index b93d57e..ee658d5 100644 --- a/docs/org/apache/pirk/utils/package-tree.html +++ b/docs/org/apache/pirk/utils/package-tree.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>org.apache.pirk.utils Class Hierarchy</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/utils/package-use.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/utils/package-use.html b/docs/org/apache/pirk/utils/package-use.html index df1a4bb..52c5eac 100644 --- a/docs/org/apache/pirk/utils/package-use.html +++ b/docs/org/apache/pirk/utils/package-use.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Package org.apache.pirk.utils</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/wideskies/standalone/StandaloneTest.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/wideskies/standalone/StandaloneTest.html b/docs/org/apache/pirk/wideskies/standalone/StandaloneTest.html index 8f0539d..cdb37b9 100644 --- a/docs/org/apache/pirk/wideskies/standalone/StandaloneTest.html +++ b/docs/org/apache/pirk/wideskies/standalone/StandaloneTest.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:44 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:22 EDT 2016 --> <title>StandaloneTest</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/wideskies/standalone/class-use/StandaloneTest.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/wideskies/standalone/class-use/StandaloneTest.html b/docs/org/apache/pirk/wideskies/standalone/class-use/StandaloneTest.html index 386b90c..81d5bb0 100644 --- a/docs/org/apache/pirk/wideskies/standalone/class-use/StandaloneTest.html +++ b/docs/org/apache/pirk/wideskies/standalone/class-use/StandaloneTest.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Class org.apache.pirk.wideskies.standalone.StandaloneTest</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/wideskies/standalone/package-frame.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/wideskies/standalone/package-frame.html b/docs/org/apache/pirk/wideskies/standalone/package-frame.html index 0189587..8156857 100644 --- a/docs/org/apache/pirk/wideskies/standalone/package-frame.html +++ b/docs/org/apache/pirk/wideskies/standalone/package-frame.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>org.apache.pirk.wideskies.standalone</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/wideskies/standalone/package-summary.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/wideskies/standalone/package-summary.html b/docs/org/apache/pirk/wideskies/standalone/package-summary.html index 43be767..378a973 100644 --- a/docs/org/apache/pirk/wideskies/standalone/package-summary.html +++ b/docs/org/apache/pirk/wideskies/standalone/package-summary.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>org.apache.pirk.wideskies.standalone</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/wideskies/standalone/package-tree.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/wideskies/standalone/package-tree.html b/docs/org/apache/pirk/wideskies/standalone/package-tree.html index c1fad9e..0d238cd 100644 --- a/docs/org/apache/pirk/wideskies/standalone/package-tree.html +++ b/docs/org/apache/pirk/wideskies/standalone/package-tree.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>org.apache.pirk.wideskies.standalone Class Hierarchy</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/org/apache/pirk/wideskies/standalone/package-use.html ---------------------------------------------------------------------- diff --git a/docs/org/apache/pirk/wideskies/standalone/package-use.html b/docs/org/apache/pirk/wideskies/standalone/package-use.html index 625e136..21f6452 100644 --- a/docs/org/apache/pirk/wideskies/standalone/package-use.html +++ b/docs/org/apache/pirk/wideskies/standalone/package-use.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Uses of Package org.apache.pirk.wideskies.standalone</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> <script type="text/javascript" src="../../../../../script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/overview-frame.html ---------------------------------------------------------------------- diff --git a/docs/overview-frame.html b/docs/overview-frame.html index 35ed1ed..98d26ce 100644 --- a/docs/overview-frame.html +++ b/docs/overview-frame.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Overview List</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> <script type="text/javascript" src="script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/overview-summary.html ---------------------------------------------------------------------- diff --git a/docs/overview-summary.html b/docs/overview-summary.html index 24a87d1..afaa277 100644 --- a/docs/overview-summary.html +++ b/docs/overview-summary.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Overview</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> <script type="text/javascript" src="script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/overview-tree.html ---------------------------------------------------------------------- diff --git a/docs/overview-tree.html b/docs/overview-tree.html index 50bd40b..3db28c8 100644 --- a/docs/overview-tree.html +++ b/docs/overview-tree.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:47 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Class Hierarchy</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> <script type="text/javascript" src="script.js"></script> </head> @@ -157,6 +157,7 @@ <li type="circle">org.apache.pirk.responder.wideskies.spark.<a href="org/apache/pirk/responder/wideskies/spark/EncColMultReducer.html" title="class in org.apache.pirk.responder.wideskies.spark"><span class="typeNameLink">EncColMultReducer</span></a> (implements org.apache.spark.api.java.function.Function2<T1,T2,R>)</li> <li type="circle">org.apache.pirk.responder.wideskies.spark.<a href="org/apache/pirk/responder/wideskies/spark/EncRowCalc.html" title="class in org.apache.pirk.responder.wideskies.spark"><span class="typeNameLink">EncRowCalc</span></a> (implements org.apache.spark.api.java.function.PairFlatMapFunction<T,K,V>)</li> <li type="circle">org.apache.pirk.responder.wideskies.spark.<a href="org/apache/pirk/responder/wideskies/spark/EncRowCalcPrecomputedCache.html" title="class in org.apache.pirk.responder.wideskies.spark"><span class="typeNameLink">EncRowCalcPrecomputedCache</span></a> (implements org.apache.spark.api.java.function.PairFlatMapFunction<T,K,V>)</li> +<li type="circle">org.apache.pirk.querier.wideskies.<a href="org/apache/pirk/querier/wideskies/EncryptionPropertiesBuilder.html" title="class in org.apache.pirk.querier.wideskies"><span class="typeNameLink">EncryptionPropertiesBuilder</span></a></li> <li type="circle">org.apache.pirk.querier.wideskies.encrypt.<a href="org/apache/pirk/querier/wideskies/encrypt/EncryptQuery.html" title="class in org.apache.pirk.querier.wideskies.encrypt"><span class="typeNameLink">EncryptQuery</span></a></li> <li type="circle">org.apache.pirk.utils.<a href="org/apache/pirk/utils/EpochDateParser.html" title="class in org.apache.pirk.utils"><span class="typeNameLink">EpochDateParser</span></a></li> <li type="circle">org.apache.pirk.responder.wideskies.spark.<a href="org/apache/pirk/responder/wideskies/spark/ExpKeyFilenameMap.html" title="class in org.apache.pirk.responder.wideskies.spark"><span class="typeNameLink">ExpKeyFilenameMap</span></a> (implements org.apache.spark.api.java.function.PairFlatMapFunction<T,K,V>)</li> @@ -205,7 +206,7 @@ </li> <li type="circle">org.apache.pirk.responder.wideskies.mapreduce.<a href="org/apache/pirk/responder/wideskies/mapreduce/MapReduceResponder.html" title="class in org.apache.pirk.responder.wideskies.mapreduce"><span class="typeNameLink">MapReduceResponder</span></a> (implements org.apache.pirk.responder.wideskies.spi.<a href="org/apache/pirk/responder/wideskies/spi/ResponderPlugin.html" title="interface in org.apache.pirk.responder.wideskies.spi">ResponderPlugin</a>)</li> <li type="circle">org.apache.pirk.encryption.<a href="org/apache/pirk/encryption/ModPowAbstraction.html" title="class in org.apache.pirk.encryption"><span class="typeNameLink">ModPowAbstraction</span></a></li> -<li type="circle">org.apache.pirk.encryption.<a href="org/apache/pirk/encryption/Paillier.html" title="class in org.apache.pirk.encryption"><span class="typeNameLink">Paillier</span></a> (implements java.lang.Cloneable, java.io.Serializable)</li> +<li type="circle">org.apache.pirk.encryption.<a href="org/apache/pirk/encryption/Paillier.html" title="class in org.apache.pirk.encryption"><span class="typeNameLink">Paillier</span></a> (implements java.io.Serializable)</li> <li type="circle">org.apache.pirk.benchmark.<a href="org/apache/pirk/benchmark/PaillierBenchmark.html" title="class in org.apache.pirk.benchmark"><span class="typeNameLink">PaillierBenchmark</span></a></li> <li type="circle">org.apache.pirk.benchmark.<a href="org/apache/pirk/benchmark/PaillierBenchmark.PaillierBenchmarkState.html" title="class in org.apache.pirk.benchmark"><span class="typeNameLink">PaillierBenchmark.PaillierBenchmarkState</span></a></li> <li type="circle">org.apache.pirk.general.<a href="org/apache/pirk/general/PaillierTest.html" title="class in org.apache.pirk.general"><span class="typeNameLink">PaillierTest</span></a></li> @@ -217,6 +218,7 @@ <li type="circle">org.apache.pirk.querier.wideskies.<a href="org/apache/pirk/querier/wideskies/QuerierCLI.html" title="class in org.apache.pirk.querier.wideskies"><span class="typeNameLink">QuerierCLI</span></a></li> <li type="circle">org.apache.pirk.querier.wideskies.<a href="org/apache/pirk/querier/wideskies/QuerierConst.html" title="class in org.apache.pirk.querier.wideskies"><span class="typeNameLink">QuerierConst</span></a></li> <li type="circle">org.apache.pirk.querier.wideskies.<a href="org/apache/pirk/querier/wideskies/QuerierDriver.html" title="class in org.apache.pirk.querier.wideskies"><span class="typeNameLink">QuerierDriver</span></a> (implements java.io.Serializable)</li> +<li type="circle">org.apache.pirk.querier.wideskies.<a href="org/apache/pirk/querier/wideskies/QuerierFactory.html" title="class in org.apache.pirk.querier.wideskies"><span class="typeNameLink">QuerierFactory</span></a></li> <li type="circle">org.apache.pirk.querier.wideskies.<a href="org/apache/pirk/querier/wideskies/QuerierProps.html" title="class in org.apache.pirk.querier.wideskies"><span class="typeNameLink">QuerierProps</span></a></li> <li type="circle">org.apache.pirk.query.wideskies.<a href="org/apache/pirk/query/wideskies/Query.html" title="class in org.apache.pirk.query.wideskies"><span class="typeNameLink">Query</span></a> (implements java.io.Serializable, org.apache.pirk.serialization.<a href="org/apache/pirk/serialization/Storable.html" title="interface in org.apache.pirk.serialization">Storable</a>)</li> <li type="circle">org.apache.pirk.query.wideskies.<a href="org/apache/pirk/query/wideskies/QueryInfo.html" title="class in org.apache.pirk.query.wideskies"><span class="typeNameLink">QueryInfo</span></a> (implements java.lang.Cloneable, java.io.Serializable)</li> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/docs/serialized-form.html ---------------------------------------------------------------------- diff --git a/docs/serialized-form.html b/docs/serialized-form.html index fdec1ca..fc279ea 100644 --- a/docs/serialized-form.html +++ b/docs/serialized-form.html @@ -2,9 +2,9 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (1.8.0_102) on Sat Sep 24 20:48:46 EDT 2016 --> +<!-- Generated by javadoc (1.8.0_102) on Thu Sep 29 17:03:24 EDT 2016 --> <title>Serialized Form</title> -<meta name="date" content="2016-09-24"> +<meta name="date" content="2016-09-29"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> <script type="text/javascript" src="script.js"></script> </head> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/src/main/java/org/apache/pirk/querier/wideskies/EncryptionPropertiesBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/querier/wideskies/EncryptionPropertiesBuilder.java b/src/main/java/org/apache/pirk/querier/wideskies/EncryptionPropertiesBuilder.java index 0cc2579..a30e9e9 100644 --- a/src/main/java/org/apache/pirk/querier/wideskies/EncryptionPropertiesBuilder.java +++ b/src/main/java/org/apache/pirk/querier/wideskies/EncryptionPropertiesBuilder.java @@ -31,80 +31,94 @@ import static org.apache.pirk.querier.wideskies.QuerierProps.*; */ public class EncryptionPropertiesBuilder { - private final Properties properties; - - public static EncryptionPropertiesBuilder newBuilder() { - return new EncryptionPropertiesBuilder(); - } - - private EncryptionPropertiesBuilder() { - this.properties = new Properties(); - - setGeneralDefaults(properties); - setEncryptionDefaults(properties); - } - - public EncryptionPropertiesBuilder numThreads(int numThreads) { - properties.setProperty(NUMTHREADS, String.valueOf(numThreads)); - return this; - } - - public EncryptionPropertiesBuilder bitSet(int bitSet) { - properties.setProperty(BITSET, String.valueOf(bitSet)); - return this; - } - - public EncryptionPropertiesBuilder queryType(String queryType) { - properties.setProperty(QUERYTYPE, queryType); - return this; - } - - public EncryptionPropertiesBuilder hashBitSize(int hashBitSize) { - properties.setProperty(HASHBITSIZE, String.valueOf(hashBitSize)); - return this; - } - - public EncryptionPropertiesBuilder hashKey(String hashKey) { - properties.setProperty(HASHKEY, hashKey); - return this; - } - - public EncryptionPropertiesBuilder dataPartitionBitSize(int dataPartitionBitSize) { - properties.setProperty(DATAPARTITIONSIZE, String.valueOf(dataPartitionBitSize)); - return this; - } - - public EncryptionPropertiesBuilder paillierBitSize(int paillierBitSize) { - properties.setProperty(PAILLIERBITSIZE, String.valueOf(paillierBitSize)); - return this; - } - - public EncryptionPropertiesBuilder certainty(int certainty) { - properties.setProperty(CERTAINTY, String.valueOf(certainty)); - return this; - } - - public EncryptionPropertiesBuilder embedSelector(boolean embedSelector) { - properties.setProperty(EMBEDSELECTOR, String.valueOf(embedSelector)); - return this; - } - - public EncryptionPropertiesBuilder useMemLookupTable(boolean useMemLookupTable) { - properties.setProperty(USEMEMLOOKUPTABLE, String.valueOf(useMemLookupTable)); - return this; - } - - public EncryptionPropertiesBuilder useHDFSLookupTable(boolean useHDFSLookupTable) { - properties.setProperty(USEHDFSLOOKUPTABLE, String.valueOf(useHDFSLookupTable)); - return this; - } - - public Properties build() throws PIRException + private final Properties properties; + + public static EncryptionPropertiesBuilder newBuilder() + { + return new EncryptionPropertiesBuilder(); + } + + private EncryptionPropertiesBuilder() + { + this.properties = new Properties(); + + setGeneralDefaults(properties); + setEncryptionDefaults(properties); + } + + public EncryptionPropertiesBuilder numThreads(int numThreads) + { + properties.setProperty(NUMTHREADS, String.valueOf(numThreads)); + return this; + } + + public EncryptionPropertiesBuilder bitSet(int bitSet) + { + properties.setProperty(BITSET, String.valueOf(bitSet)); + return this; + } + + public EncryptionPropertiesBuilder queryType(String queryType) + { + properties.setProperty(QUERYTYPE, queryType); + return this; + } + + public EncryptionPropertiesBuilder hashBitSize(int hashBitSize) + { + properties.setProperty(HASHBITSIZE, String.valueOf(hashBitSize)); + return this; + } + + public EncryptionPropertiesBuilder hashKey(String hashKey) + { + properties.setProperty(HASHKEY, hashKey); + return this; + } + + public EncryptionPropertiesBuilder dataPartitionBitSize(int dataPartitionBitSize) + { + properties.setProperty(DATAPARTITIONSIZE, String.valueOf(dataPartitionBitSize)); + return this; + } + + public EncryptionPropertiesBuilder paillierBitSize(int paillierBitSize) + { + properties.setProperty(PAILLIERBITSIZE, String.valueOf(paillierBitSize)); + return this; + } + + public EncryptionPropertiesBuilder certainty(int certainty) + { + properties.setProperty(CERTAINTY, String.valueOf(certainty)); + return this; + } + + public EncryptionPropertiesBuilder embedSelector(boolean embedSelector) + { + properties.setProperty(EMBEDSELECTOR, String.valueOf(embedSelector)); + return this; + } + + public EncryptionPropertiesBuilder useMemLookupTable(boolean useMemLookupTable) + { + properties.setProperty(USEMEMLOOKUPTABLE, String.valueOf(useMemLookupTable)); + return this; + } + + public EncryptionPropertiesBuilder useHDFSLookupTable(boolean useHDFSLookupTable) + { + properties.setProperty(USEHDFSLOOKUPTABLE, String.valueOf(useHDFSLookupTable)); + return this; + } + + public Properties build() throws PIRException + { + if (!validateQuerierEncryptionProperties(properties)) { - if(!validateQuerierEncryptionProperties(properties)) { - throw new PIRException("Encryption properties not valid. See log for details."); - } - return properties; + throw new PIRException("Encryption properties not valid. See log for details."); } + return properties; + } } http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/src/main/java/org/apache/pirk/querier/wideskies/QuerierCLI.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/querier/wideskies/QuerierCLI.java b/src/main/java/org/apache/pirk/querier/wideskies/QuerierCLI.java index 8f6e5a1..826c577 100644 --- a/src/main/java/org/apache/pirk/querier/wideskies/QuerierCLI.java +++ b/src/main/java/org/apache/pirk/querier/wideskies/QuerierCLI.java @@ -77,7 +77,8 @@ public class QuerierCLI /** * Determine if an option was provided by the user via the CLI * - * @param option - the option of interest + * @param option + * - the option of interest * @return true if option was provided, false otherwise */ public boolean hasOption(String option) @@ -88,7 +89,8 @@ public class QuerierCLI /** * Obtain the argument of the option provided by the user via the CLI * - * @param option - the option of interest + * @param option + * - the option of interest * @return value of the argument of the option */ public String getOptionValue(String option) @@ -128,8 +130,8 @@ public class QuerierCLI // Load the new local query and data schemas if (valid) { - logger.info("loading schemas: dataSchemas = " + SystemConfiguration.getProperty("data.schemas") + " querySchemas = " + SystemConfiguration - .getProperty("query.schemas")); + logger.info("loading schemas: dataSchemas = " + SystemConfiguration.getProperty("data.schemas") + " querySchemas = " + + SystemConfiguration.getProperty("query.schemas")); try { DataSchemaLoader.initialize(); @@ -173,20 +175,22 @@ public class QuerierCLI options.addOption(optionACTION); // INPUTFILE - Option optionINPUTFILE = new Option("i", QuerierProps.INPUTFILE, true, "required - Fully qualified file containing input " - + "-- \n The input is either: \n (1) For Encryption: A query file - Contains the query selectors, one per line; " - + "the first line must be the query number \n OR \n (2) For Decryption: A response file - Contains the serialized Response object"); + Option optionINPUTFILE = new Option("i", QuerierProps.INPUTFILE, true, + "required - Fully qualified file containing input " + + "-- \n The input is either: \n (1) For Encryption: A query file - Contains the query selectors, one per line; " + + "the first line must be the query number \n OR \n (2) For Decryption: A response file - Contains the serialized Response object"); optionINPUTFILE.setRequired(false); optionINPUTFILE.setArgName(QuerierProps.INPUTFILE); optionINPUTFILE.setType(String.class); options.addOption(optionINPUTFILE); // OUTPUTFILE - Option optionOUTPUTFILE = new Option("o", QuerierProps.OUTPUTFILE, true, "required - Fully qualified file for the result output. " - + "\n The output file specifies either: \n (1) For encryption: \n \t (a) A file to contain the serialized Querier object named: " + "<outputFile>-" - + QuerierConst.QUERIER_FILETAG + " AND \n \t " + "(b) A file to contain the serialized Query object named: <outputFile>-" + QuerierConst.QUERY_FILETAG - + "\n " + "OR \n (2) A file to contain the decryption results where each line is where each line " - + "corresponds to one hit and is a JSON object with the schema QuerySchema"); + Option optionOUTPUTFILE = new Option("o", QuerierProps.OUTPUTFILE, true, + "required - Fully qualified file for the result output. " + + "\n The output file specifies either: \n (1) For encryption: \n \t (a) A file to contain the serialized Querier object named: " + "<outputFile>-" + + QuerierConst.QUERIER_FILETAG + " AND \n \t " + "(b) A file to contain the serialized Query object named: <outputFile>-" + + QuerierConst.QUERY_FILETAG + "\n " + "OR \n (2) A file to contain the decryption results where each line is where each line " + + "corresponds to one hit and is a JSON object with the schema QuerySchema"); optionOUTPUTFILE.setRequired(false); optionOUTPUTFILE.setArgName(QuerierProps.OUTPUTFILE); optionOUTPUTFILE.setType(String.class); @@ -252,8 +256,8 @@ public class QuerierCLI // CERTAINTY Option optionCERTAINTY = new Option("c", QuerierProps.CERTAINTY, true, - "required for encryption -- Certainty of prime generation for Paillier -- must be greater than or " + "equal to " + SystemConfiguration - .getProperty("pir.primeCertainty") + ""); + "required for encryption -- Certainty of prime generation for Paillier -- must be greater than or " + "equal to " + + SystemConfiguration.getProperty("pir.primeCertainty") + ""); optionCERTAINTY.setRequired(false); optionCERTAINTY.setArgName(QuerierProps.CERTAINTY); optionCERTAINTY.setType(String.class); http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/src/main/java/org/apache/pirk/querier/wideskies/QuerierFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/querier/wideskies/QuerierFactory.java b/src/main/java/org/apache/pirk/querier/wideskies/QuerierFactory.java index f2b8cd7..3929b93 100644 --- a/src/main/java/org/apache/pirk/querier/wideskies/QuerierFactory.java +++ b/src/main/java/org/apache/pirk/querier/wideskies/QuerierFactory.java @@ -43,16 +43,22 @@ public class QuerierFactory /** * Generates a {@link Querier} containing the encrypted query. * - * @param queryIdentifier A unique identifier for this query. - * @param selectors A list of query selectors. - * @param properties A list of properties specifying PIRK configuration options. Use {@link EncryptionPropertiesBuilder} to construct this object. + * @param queryIdentifier + * A unique identifier for this query. + * @param selectors + * A list of query selectors. + * @param properties + * A list of properties specifying PIRK configuration options. Use {@link EncryptionPropertiesBuilder} to construct this object. * @return The encrypted query. - * @throws PIRException If the provided parameters violate one of the constraints of the PIRK algorithm. - * @throws InterruptedException If the encryption process is interrupted. + * @throws PIRException + * If the provided parameters violate one of the constraints of the PIRK algorithm. + * @throws InterruptedException + * If the encryption process is interrupted. */ public static Querier createQuerier(UUID queryIdentifier, List<String> selectors, Properties properties) throws PIRException, InterruptedException { - if(!QuerierProps.validateQuerierEncryptionProperties(properties)) { + if (!QuerierProps.validateQuerierEncryptionProperties(properties)) + { throw new PIRException("Invalid encryption properties."); } int numSelectors = selectors.size(); @@ -84,10 +90,9 @@ public class QuerierFactory throw new PIRException(message); } - // Set the necessary QueryInfo and Paillier objects - QueryInfo queryInfo = new QueryInfo(queryIdentifier, numSelectors, hashBitSize, hashKey, dataPartitionBitSize, queryType, useMemLookupTable, - embedSelector, useHDFSLookupTable); + QueryInfo queryInfo = new QueryInfo(queryIdentifier, numSelectors, hashBitSize, hashKey, dataPartitionBitSize, queryType, useMemLookupTable, embedSelector, + useHDFSLookupTable); if ("true".equals(properties.getProperty(QuerierProps.EMBEDQUERYSCHEMA, "false"))) { @@ -102,7 +107,8 @@ public class QuerierFactory BigInteger val = (BigInteger.valueOf(2)).pow(exp); if (val.compareTo(paillier.getN()) != -1) { - String message = "The number of selectors = " + numSelectors + " must be such that " + "2^{numSelector*dataPartitionBitSize} < N = " + paillier.getN().toString(2); + String message = "The number of selectors = " + numSelectors + " must be such that " + "2^{numSelector*dataPartitionBitSize} < N = " + + paillier.getN().toString(2); logger.error(message); throw new PIRException(message); http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/src/main/java/org/apache/pirk/querier/wideskies/QuerierProps.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/querier/wideskies/QuerierProps.java b/src/main/java/org/apache/pirk/querier/wideskies/QuerierProps.java index 5a29a42..b6da06c 100644 --- a/src/main/java/org/apache/pirk/querier/wideskies/QuerierProps.java +++ b/src/main/java/org/apache/pirk/querier/wideskies/QuerierProps.java @@ -59,28 +59,35 @@ public class QuerierProps // Decryption properties static final String QUERIERFILE = "querier.querierFile"; - static final List<String> PROPSLIST = Arrays - .asList(ACTION, INPUTFILE, OUTPUTFILE, QUERYTYPE, NUMTHREADS, EMBEDQUERYSCHEMA, HASHBITSIZE, HASHKEY, DATAPARTITIONSIZE, PAILLIERBITSIZE, BITSET, - CERTAINTY, QUERYSCHEMAS, DATASCHEMAS, EMBEDSELECTOR, USEMEMLOOKUPTABLE, USEHDFSLOOKUPTABLE, SR_ALGORITHM, SR_PROVIDER); + static final List<String> PROPSLIST = Arrays.asList(ACTION, INPUTFILE, OUTPUTFILE, QUERYTYPE, NUMTHREADS, EMBEDQUERYSCHEMA, HASHBITSIZE, HASHKEY, + DATAPARTITIONSIZE, PAILLIERBITSIZE, BITSET, CERTAINTY, QUERYSCHEMAS, DATASCHEMAS, EMBEDSELECTOR, USEMEMLOOKUPTABLE, USEHDFSLOOKUPTABLE, SR_ALGORITHM, + SR_PROVIDER); public static boolean validateQuerierProperties() { setGeneralDefaults(SystemConfiguration.getProperties()); - if(validateGeneralQuerierProperties(SystemConfiguration.getProperties())) { + if (validateGeneralQuerierProperties(SystemConfiguration.getProperties())) + { String action = SystemConfiguration.getProperty(ACTION).toLowerCase(); // Action is either "encrypt" or "decrypt", or else we can't get here. - if(action.equals("encrypt")) { + if (action.equals("encrypt")) + { setEncryptionDefaults(SystemConfiguration.getProperties()); return validateQuerierEncryptionProperties(SystemConfiguration.getProperties()); - } else { + } + else + { return validateQuerierDecryptionProperties(SystemConfiguration.getProperties()); } - } else { + } + else + { return false; } } - static void setGeneralDefaults(Properties properties) { + static void setGeneralDefaults(Properties properties) + { if (!properties.containsKey(EMBEDQUERYSCHEMA)) { properties.setProperty(EMBEDQUERYSCHEMA, "true"); @@ -130,7 +137,8 @@ public class QuerierProps return valid; } - static void setEncryptionDefaults(Properties properties) { + static void setEncryptionDefaults(Properties properties) + { if (!properties.containsKey(EMBEDSELECTOR)) { properties.setProperty(EMBEDSELECTOR, "true"); http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java b/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java index 6d7d514..3badff1 100644 --- a/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java +++ b/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java @@ -38,7 +38,8 @@ public class QuerySchemaRegistry * <p> * If there was an existing schema with the same name, it is replaced. * - * @param schema The query schema to add. + * @param schema + * The query schema to add. * @return the previous schema registered at the same name, or <code>null</code> if there were none. */ public static QuerySchema put(QuerySchema schema) @@ -49,7 +50,8 @@ public class QuerySchemaRegistry /** * Returns the query schema with the given name. * - * @param schemaName The query schema name to be returned. + * @param schemaName + * The query schema name to be returned. * @return The query schema, or <code>null</code> if no such schema. */ public static QuerySchema get(String schemaName) http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java b/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java index 33533d0..6022f84 100644 --- a/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java +++ b/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java @@ -76,16 +76,11 @@ public class StandaloneQuery logger.info("fileQuerier = " + fileQuerier.getAbsolutePath() + " fileQuery = " + fileQuery.getAbsolutePath() + " responseFile = " + fileResponse.getAbsolutePath() + " fileFinalResults = " + fileFinalResults.getAbsolutePath()); - Properties baseTestEncryptionProperties = EncryptionPropertiesBuilder.newBuilder() - .dataPartitionBitSize(BaseTests.dataPartitionBitSize) - .hashBitSize(BaseTests.hashBitSize) - .hashKey(BaseTests.hashKey) - .paillierBitSize(BaseTests.paillierBitSize) - .certainty(BaseTests.certainty) - .queryType(queryType) - .build(); - - Querier querier = QuerierFactory.createQuerier(BaseTests.queryIdentifier, selectors, baseTestEncryptionProperties); + Properties baseTestEncryptionProperties = EncryptionPropertiesBuilder.newBuilder().dataPartitionBitSize(BaseTests.dataPartitionBitSize) + .hashBitSize(BaseTests.hashBitSize).hashKey(BaseTests.hashKey).paillierBitSize(BaseTests.paillierBitSize).certainty(BaseTests.certainty) + .queryType(queryType).build(); + + Querier querier = QuerierFactory.createQuerier(BaseTests.queryIdentifier, selectors, baseTestEncryptionProperties); logger.info("Completed encryption of the selectors - completed formation of the encrypted query vectors:"); // Dork with the embedSelectorMap to generate a false positive for the last valid selector in selectors http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/e34ec021/src/main/java/org/apache/pirk/utils/SystemConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/utils/SystemConfiguration.java b/src/main/java/org/apache/pirk/utils/SystemConfiguration.java index c4f1c0c..98175d9 100755 --- a/src/main/java/org/apache/pirk/utils/SystemConfiguration.java +++ b/src/main/java/org/apache/pirk/utils/SystemConfiguration.java @@ -83,7 +83,8 @@ public class SystemConfiguration * * @return The system properties. */ - public static Properties getProperties() { + public static Properties getProperties() + { return props; }
