http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 4c07827..44d8e0a 100644 --- a/docs/org/apache/pirk/utils/class-use/CSVOutputUtils.html +++ b/docs/org/apache/pirk/utils/class-use/CSVOutputUtils.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.CSVOutputUtils</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 9355786..7b18e70 100644 --- a/docs/org/apache/pirk/utils/class-use/EpochDateParser.html +++ b/docs/org/apache/pirk/utils/class-use/EpochDateParser.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.EpochDateParser</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 6c627aa..69d6c02 100644 --- a/docs/org/apache/pirk/utils/class-use/FileConst.html +++ b/docs/org/apache/pirk/utils/class-use/FileConst.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.FileConst</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 9596a58..dc7a0bf 100644 --- a/docs/org/apache/pirk/utils/class-use/FileIOUtils.Callable.html +++ b/docs/org/apache/pirk/utils/class-use/FileIOUtils.Callable.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Interface org.apache.pirk.utils.FileIOUtils.Callable</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 3a989a1..ae77fe2 100644 --- a/docs/org/apache/pirk/utils/class-use/FileIOUtils.html +++ b/docs/org/apache/pirk/utils/class-use/FileIOUtils.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.FileIOUtils</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 ce1e816..39f1640 100644 --- a/docs/org/apache/pirk/utils/class-use/HDFS.html +++ b/docs/org/apache/pirk/utils/class-use/HDFS.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.HDFS</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 ddc7e77..3298b32 100644 --- a/docs/org/apache/pirk/utils/class-use/ISO8601DateParser.html +++ b/docs/org/apache/pirk/utils/class-use/ISO8601DateParser.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.ISO8601DateParser</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 4456af9..54e02de 100644 --- a/docs/org/apache/pirk/utils/class-use/KeyedHash.html +++ b/docs/org/apache/pirk/utils/class-use/KeyedHash.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.KeyedHash</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 fa6c68e..2233bfa 100644 --- a/docs/org/apache/pirk/utils/class-use/PIRException.html +++ b/docs/org/apache/pirk/utils/class-use/PIRException.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.PIRException</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> @@ -266,7 +266,9 @@ </tr> <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../org/apache/pirk/schema/data/DataSchema.html" title="class in org.apache.pirk.schema.data">DataSchema</a></code></td> -<td class="colLast"><span class="strong">DataSchemaLoader.</span><code><strong><a href="../../../../../org/apache/pirk/schema/data/DataSchemaLoader.html#loadSchemaFile(java.io.InputStream)">loadSchemaFile</a></strong>(java.io.InputStream stream)</code> </td> +<td class="colLast"><span class="strong">DataSchemaLoader.</span><code><strong><a href="../../../../../org/apache/pirk/schema/data/DataSchemaLoader.html#loadSchema(java.io.InputStream)">loadSchema</a></strong>(java.io.InputStream stream)</code> +<div class="block">Returns the data schema as defined in XML format on the given stream.</div> +</td> </tr> </tbody> </table> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 a45bb2d..892cc1d 100644 --- a/docs/org/apache/pirk/utils/class-use/QueryParserUtils.html +++ b/docs/org/apache/pirk/utils/class-use/QueryParserUtils.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.QueryParserUtils</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 6a34ce7..ce16fc2 100644 --- a/docs/org/apache/pirk/utils/class-use/StopListUtils.html +++ b/docs/org/apache/pirk/utils/class-use/StopListUtils.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.StopListUtils</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 9bab0e5..79eaec2 100644 --- a/docs/org/apache/pirk/utils/class-use/StringUtils.html +++ b/docs/org/apache/pirk/utils/class-use/StringUtils.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.StringUtils</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 20130a7..82816f7 100644 --- a/docs/org/apache/pirk/utils/class-use/SystemConfiguration.html +++ b/docs/org/apache/pirk/utils/class-use/SystemConfiguration.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class org.apache.pirk.utils.SystemConfiguration</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 6475e80..8cb0e4a 100644 --- a/docs/org/apache/pirk/utils/package-frame.html +++ b/docs/org/apache/pirk/utils/package-frame.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>org.apache.pirk.utils</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 3430e79..150d6c9 100644 --- a/docs/org/apache/pirk/utils/package-summary.html +++ b/docs/org/apache/pirk/utils/package-summary.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>org.apache.pirk.utils</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 fa25474..41aef82 100644 --- a/docs/org/apache/pirk/utils/package-tree.html +++ b/docs/org/apache/pirk/utils/package-tree.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>org.apache.pirk.utils Class Hierarchy</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/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 8a51046..b2093e3 100644 --- a/docs/org/apache/pirk/utils/package-use.html +++ b/docs/org/apache/pirk/utils/package-use.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Package org.apache.pirk.utils</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/overview-frame.html ---------------------------------------------------------------------- diff --git a/docs/overview-frame.html b/docs/overview-frame.html index dd9f53e..75f6630 100644 --- a/docs/overview-frame.html +++ b/docs/overview-frame.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:02 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:08 EDT 2016 --> <title>Overview List</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/overview-summary.html ---------------------------------------------------------------------- diff --git a/docs/overview-summary.html b/docs/overview-summary.html index 5c132a4..cbb10e7 100644 --- a/docs/overview-summary.html +++ b/docs/overview-summary.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Overview</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/overview-tree.html ---------------------------------------------------------------------- diff --git a/docs/overview-tree.html b/docs/overview-tree.html index eefb6ad..31c1bc0 100644 --- a/docs/overview-tree.html +++ b/docs/overview-tree.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Class Hierarchy</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> @@ -169,7 +169,6 @@ <li type="circle">org.apache.pirk.utils.<a href="org/apache/pirk/utils/KeyedHash.html" title="class in org.apache.pirk.utils"><span class="strong">KeyedHash</span></a></li> <li type="circle">test.general.<a href="test/general/KeyedHashTest.html" title="class in test.general"><span class="strong">KeyedHashTest</span></a></li> <li type="circle">test.schema.data.<a href="test/schema/data/LoadDataSchemaTest.html" title="class in test.schema.data"><span class="strong">LoadDataSchemaTest</span></a></li> -<li type="circle">org.apache.pirk.schema.query.<a href="org/apache/pirk/schema/query/LoadQuerySchemas.html" title="class in org.apache.pirk.schema.query"><span class="strong">LoadQuerySchemas</span></a></li> <li type="circle">test.schema.query.<a href="test/schema/query/LoadQuerySchemaTest.html" title="class in test.schema.query"><span class="strong">LoadQuerySchemaTest</span></a></li> <li type="circle">org.apache.pirk.serialization.<a href="org/apache/pirk/serialization/LocalFileSystemStore.html" title="class in org.apache.pirk.serialization"><span class="strong">LocalFileSystemStore</span></a></li> <li type="circle">org.apache.hadoop.mapreduce.Mapper<KEYIN,VALUEIN,KEYOUT,VALUEOUT> @@ -197,6 +196,8 @@ <li type="circle">test.general.<a href="test/general/QueryParserUtilsTest.html" title="class in test.general"><span class="strong">QueryParserUtilsTest</span></a></li> <li type="circle">org.apache.pirk.schema.response.<a href="org/apache/pirk/schema/response/QueryResponseJSON.html" title="class in org.apache.pirk.schema.response"><span class="strong">QueryResponseJSON</span></a> (implements java.io.Serializable)</li> <li type="circle">org.apache.pirk.schema.query.<a href="org/apache/pirk/schema/query/QuerySchema.html" title="class in org.apache.pirk.schema.query"><span class="strong">QuerySchema</span></a> (implements java.io.Serializable)</li> +<li type="circle">org.apache.pirk.schema.query.<a href="org/apache/pirk/schema/query/QuerySchemaLoader.html" title="class in org.apache.pirk.schema.query"><span class="strong">QuerySchemaLoader</span></a></li> +<li type="circle">org.apache.pirk.schema.query.<a href="org/apache/pirk/schema/query/QuerySchemaRegistry.html" title="class in org.apache.pirk.schema.query"><span class="strong">QuerySchemaRegistry</span></a></li> <li type="circle">org.apache.pirk.query.wideskies.<a href="org/apache/pirk/query/wideskies/QueryUtils.html" title="class in org.apache.pirk.query.wideskies"><span class="strong">QueryUtils</span></a></li> <li type="circle">org.apache.hadoop.mapreduce.RecordReader<KEYIN,VALUEIN> (implements java.io.Closeable) <ul> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/serialized-form.html ---------------------------------------------------------------------- diff --git a/docs/serialized-form.html b/docs/serialized-form.html index b7c5a9b..37d5696 100644 --- a/docs/serialized-form.html +++ b/docs/serialized-form.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Serialized Form</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> @@ -777,24 +777,24 @@ <pre>java.lang.String dataSchemaName</pre> </li> <li class="blockList"> -<h4>elementNames</h4> -<pre>java.util.TreeSet<E> elementNames</pre> +<h4>selectorName</h4> +<pre>java.lang.String selectorName</pre> </li> <li class="blockList"> -<h4>filter</h4> -<pre>java.lang.String filter</pre> +<h4>elementNames</h4> +<pre>java.util.List<E> elementNames</pre> </li> <li class="blockList"> -<h4>filterObj</h4> -<pre>java.lang.Object filterObj</pre> +<h4>filterTypeName</h4> +<pre>java.lang.String filterTypeName</pre> </li> <li class="blockList"> -<h4>filterElementNames</h4> -<pre>java.util.HashSet<E> filterElementNames</pre> +<h4>filter</h4> +<pre><a href="org/apache/pirk/schema/query/filter/DataFilter.html" title="interface in org.apache.pirk.schema.query.filter">DataFilter</a> filter</pre> </li> <li class="blockList"> -<h4>selectorName</h4> -<pre>java.lang.String selectorName</pre> +<h4>filteredElementNames</h4> +<pre>java.util.Set<E> filteredElementNames</pre> </li> <li class="blockListLast"> <h4>dataElementSize</h4> @@ -825,11 +825,11 @@ <ul class="blockList"> <li class="blockList"> <h4>filterSet</h4> -<pre>java.util.HashSet<E> filterSet</pre> +<pre>java.util.Set<E> filterSet</pre> </li> <li class="blockListLast"> <h4>stopList</h4> -<pre>java.util.HashSet<E> stopList</pre> +<pre>java.util.Set<E> stopList</pre> </li> </ul> </li> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/ISO8601DateParserTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/ISO8601DateParserTest.html b/docs/test/general/ISO8601DateParserTest.html index a417e44..2b5ea05 100644 --- a/docs/test/general/ISO8601DateParserTest.html +++ b/docs/test/general/ISO8601DateParserTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:02 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:08 EDT 2016 --> <title>ISO8601DateParserTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/KeyedHashTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/KeyedHashTest.html b/docs/test/general/KeyedHashTest.html index e46f861..a57a8eb 100644 --- a/docs/test/general/KeyedHashTest.html +++ b/docs/test/general/KeyedHashTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:02 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:08 EDT 2016 --> <title>KeyedHashTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/PaillierTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/PaillierTest.html b/docs/test/general/PaillierTest.html index 6d57ef0..63096b2 100644 --- a/docs/test/general/PaillierTest.html +++ b/docs/test/general/PaillierTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:02 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:08 EDT 2016 --> <title>PaillierTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/PartitionUtilsTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/PartitionUtilsTest.html b/docs/test/general/PartitionUtilsTest.html index ded49e9..e29692d 100644 --- a/docs/test/general/PartitionUtilsTest.html +++ b/docs/test/general/PartitionUtilsTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:02 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:08 EDT 2016 --> <title>PartitionUtilsTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/QueryParserUtilsTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/QueryParserUtilsTest.html b/docs/test/general/QueryParserUtilsTest.html index 5b31834..d46b583 100644 --- a/docs/test/general/QueryParserUtilsTest.html +++ b/docs/test/general/QueryParserUtilsTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:02 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:08 EDT 2016 --> <title>QueryParserUtilsTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/class-use/ISO8601DateParserTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/class-use/ISO8601DateParserTest.html b/docs/test/general/class-use/ISO8601DateParserTest.html index d2e5772..e118a4f 100644 --- a/docs/test/general/class-use/ISO8601DateParserTest.html +++ b/docs/test/general/class-use/ISO8601DateParserTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class test.general.ISO8601DateParserTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/class-use/KeyedHashTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/class-use/KeyedHashTest.html b/docs/test/general/class-use/KeyedHashTest.html index 1663492..0444cde 100644 --- a/docs/test/general/class-use/KeyedHashTest.html +++ b/docs/test/general/class-use/KeyedHashTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class test.general.KeyedHashTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/class-use/PaillierTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/class-use/PaillierTest.html b/docs/test/general/class-use/PaillierTest.html index f9261d3..85bf3b6 100644 --- a/docs/test/general/class-use/PaillierTest.html +++ b/docs/test/general/class-use/PaillierTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class test.general.PaillierTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/class-use/PartitionUtilsTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/class-use/PartitionUtilsTest.html b/docs/test/general/class-use/PartitionUtilsTest.html index 687f58a..afb087c 100644 --- a/docs/test/general/class-use/PartitionUtilsTest.html +++ b/docs/test/general/class-use/PartitionUtilsTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class test.general.PartitionUtilsTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/class-use/QueryParserUtilsTest.html ---------------------------------------------------------------------- diff --git a/docs/test/general/class-use/QueryParserUtilsTest.html b/docs/test/general/class-use/QueryParserUtilsTest.html index dbf93a4..58e4ab1 100644 --- a/docs/test/general/class-use/QueryParserUtilsTest.html +++ b/docs/test/general/class-use/QueryParserUtilsTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class test.general.QueryParserUtilsTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/package-frame.html ---------------------------------------------------------------------- diff --git a/docs/test/general/package-frame.html b/docs/test/general/package-frame.html index 0398c7d..ea32008 100644 --- a/docs/test/general/package-frame.html +++ b/docs/test/general/package-frame.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.general</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/package-summary.html ---------------------------------------------------------------------- diff --git a/docs/test/general/package-summary.html b/docs/test/general/package-summary.html index 752d26e..e76fca1 100644 --- a/docs/test/general/package-summary.html +++ b/docs/test/general/package-summary.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.general</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/package-tree.html ---------------------------------------------------------------------- diff --git a/docs/test/general/package-tree.html b/docs/test/general/package-tree.html index e6e042f..3e423bf 100644 --- a/docs/test/general/package-tree.html +++ b/docs/test/general/package-tree.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.general Class Hierarchy</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/general/package-use.html ---------------------------------------------------------------------- diff --git a/docs/test/general/package-use.html b/docs/test/general/package-use.html index 04dffae..2d72288 100644 --- a/docs/test/general/package-use.html +++ b/docs/test/general/package-use.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Package test.general</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/data/LoadDataSchemaTest.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/data/LoadDataSchemaTest.html b/docs/test/schema/data/LoadDataSchemaTest.html index 35c003d..f1b961e 100644 --- a/docs/test/schema/data/LoadDataSchemaTest.html +++ b/docs/test/schema/data/LoadDataSchemaTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:01 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:07 EDT 2016 --> <title>LoadDataSchemaTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/data/class-use/LoadDataSchemaTest.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/data/class-use/LoadDataSchemaTest.html b/docs/test/schema/data/class-use/LoadDataSchemaTest.html index 2bb1ca5..ff5979b 100644 --- a/docs/test/schema/data/class-use/LoadDataSchemaTest.html +++ b/docs/test/schema/data/class-use/LoadDataSchemaTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class test.schema.data.LoadDataSchemaTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/data/package-frame.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/data/package-frame.html b/docs/test/schema/data/package-frame.html index 581cb62..db29808 100644 --- a/docs/test/schema/data/package-frame.html +++ b/docs/test/schema/data/package-frame.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.schema.data</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/data/package-summary.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/data/package-summary.html b/docs/test/schema/data/package-summary.html index 916519c..916c193 100644 --- a/docs/test/schema/data/package-summary.html +++ b/docs/test/schema/data/package-summary.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.schema.data</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/data/package-tree.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/data/package-tree.html b/docs/test/schema/data/package-tree.html index 38d5f72..fb53036 100644 --- a/docs/test/schema/data/package-tree.html +++ b/docs/test/schema/data/package-tree.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.schema.data Class Hierarchy</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/data/package-use.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/data/package-use.html b/docs/test/schema/data/package-use.html index f84fcdb..883aa3f 100644 --- a/docs/test/schema/data/package-use.html +++ b/docs/test/schema/data/package-use.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Package test.schema.data</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/query/LoadQuerySchemaTest.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/query/LoadQuerySchemaTest.html b/docs/test/schema/query/LoadQuerySchemaTest.html index 8b95753..7c09cbc 100644 --- a/docs/test/schema/query/LoadQuerySchemaTest.html +++ b/docs/test/schema/query/LoadQuerySchemaTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:01 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:07 EDT 2016 --> <title>LoadQuerySchemaTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/query/class-use/LoadQuerySchemaTest.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/query/class-use/LoadQuerySchemaTest.html b/docs/test/schema/query/class-use/LoadQuerySchemaTest.html index 95bf610..b93b43b 100644 --- a/docs/test/schema/query/class-use/LoadQuerySchemaTest.html +++ b/docs/test/schema/query/class-use/LoadQuerySchemaTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class test.schema.query.LoadQuerySchemaTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/query/package-frame.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/query/package-frame.html b/docs/test/schema/query/package-frame.html index 6837b2c..1b01452 100644 --- a/docs/test/schema/query/package-frame.html +++ b/docs/test/schema/query/package-frame.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.schema.query</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/query/package-summary.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/query/package-summary.html b/docs/test/schema/query/package-summary.html index 9cdc2b4..a9a6c3b 100644 --- a/docs/test/schema/query/package-summary.html +++ b/docs/test/schema/query/package-summary.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.schema.query</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/query/package-tree.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/query/package-tree.html b/docs/test/schema/query/package-tree.html index aa8c08c..4b76f8a 100644 --- a/docs/test/schema/query/package-tree.html +++ b/docs/test/schema/query/package-tree.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.schema.query Class Hierarchy</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/schema/query/package-use.html ---------------------------------------------------------------------- diff --git a/docs/test/schema/query/package-use.html b/docs/test/schema/query/package-use.html index cc965d3..f90976a 100644 --- a/docs/test/schema/query/package-use.html +++ b/docs/test/schema/query/package-use.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Package test.schema.query</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/wideskies/standalone/StandaloneTest.html ---------------------------------------------------------------------- diff --git a/docs/test/wideskies/standalone/StandaloneTest.html b/docs/test/wideskies/standalone/StandaloneTest.html index 9639e4f..c4ce32a 100644 --- a/docs/test/wideskies/standalone/StandaloneTest.html +++ b/docs/test/wideskies/standalone/StandaloneTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:01 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:07 EDT 2016 --> <title>StandaloneTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/wideskies/standalone/class-use/StandaloneTest.html ---------------------------------------------------------------------- diff --git a/docs/test/wideskies/standalone/class-use/StandaloneTest.html b/docs/test/wideskies/standalone/class-use/StandaloneTest.html index 78541c1..a02a5d2 100644 --- a/docs/test/wideskies/standalone/class-use/StandaloneTest.html +++ b/docs/test/wideskies/standalone/class-use/StandaloneTest.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Class test.wideskies.standalone.StandaloneTest</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/wideskies/standalone/package-frame.html ---------------------------------------------------------------------- diff --git a/docs/test/wideskies/standalone/package-frame.html b/docs/test/wideskies/standalone/package-frame.html index b77fe32..ce413e3 100644 --- a/docs/test/wideskies/standalone/package-frame.html +++ b/docs/test/wideskies/standalone/package-frame.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.wideskies.standalone</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/wideskies/standalone/package-summary.html ---------------------------------------------------------------------- diff --git a/docs/test/wideskies/standalone/package-summary.html b/docs/test/wideskies/standalone/package-summary.html index 0e06d57..3745f60 100644 --- a/docs/test/wideskies/standalone/package-summary.html +++ b/docs/test/wideskies/standalone/package-summary.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.wideskies.standalone</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/wideskies/standalone/package-tree.html ---------------------------------------------------------------------- diff --git a/docs/test/wideskies/standalone/package-tree.html b/docs/test/wideskies/standalone/package-tree.html index 4dd8995..d7c8710 100644 --- a/docs/test/wideskies/standalone/package-tree.html +++ b/docs/test/wideskies/standalone/package-tree.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>test.wideskies.standalone Class Hierarchy</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/docs/test/wideskies/standalone/package-use.html ---------------------------------------------------------------------- diff --git a/docs/test/wideskies/standalone/package-use.html b/docs/test/wideskies/standalone/package-use.html index c04b4c8..abf0cf1 100644 --- a/docs/test/wideskies/standalone/package-use.html +++ b/docs/test/wideskies/standalone/package-use.html @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 08:53:03 EDT 2016 --> +<!-- Generated by javadoc (version 1.7.0_80) on Tue Jul 26 22:21:09 EDT 2016 --> <title>Uses of Package test.wideskies.standalone</title> <meta name="date" content="2016-07-26"> <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style"> http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/inputformat/hadoop/InputFormatConst.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/inputformat/hadoop/InputFormatConst.java b/src/main/java/org/apache/pirk/inputformat/hadoop/InputFormatConst.java index d904c53..8c33b2c 100644 --- a/src/main/java/org/apache/pirk/inputformat/hadoop/InputFormatConst.java +++ b/src/main/java/org/apache/pirk/inputformat/hadoop/InputFormatConst.java @@ -26,9 +26,9 @@ import java.util.Arrays; */ public class InputFormatConst { - public static String BASE_FORMAT = "base"; + public static final String BASE_FORMAT = "base"; - public static String ES = "elasticsearch"; + public static final String ES = "elasticsearch"; - public static ArrayList<String> ALLOWED_FORMATS = new ArrayList<>(Arrays.asList(BASE_FORMAT, ES)); + public static final ArrayList<String> ALLOWED_FORMATS = new ArrayList<>(Arrays.asList(BASE_FORMAT, ES)); } http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/inputformat/hadoop/json/JSONRecordReader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/inputformat/hadoop/json/JSONRecordReader.java b/src/main/java/org/apache/pirk/inputformat/hadoop/json/JSONRecordReader.java index 06e395f..5adf853 100644 --- a/src/main/java/org/apache/pirk/inputformat/hadoop/json/JSONRecordReader.java +++ b/src/main/java/org/apache/pirk/inputformat/hadoop/json/JSONRecordReader.java @@ -30,8 +30,8 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.lib.input.LineRecordReader; import org.apache.pirk.inputformat.hadoop.TextArrayWritable; import org.apache.pirk.schema.data.DataSchema; -import org.apache.pirk.schema.data.DataSchemaLoader; import org.apache.pirk.schema.data.DataSchemaRegistry; +import org.apache.pirk.schema.data.DataSchemaLoader; import org.apache.pirk.utils.QueryParserUtils; import org.apache.pirk.utils.StringUtils; import org.apache.pirk.utils.SystemConfiguration; http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriver.java b/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriver.java index efa0533..44f2ba0 100644 --- a/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriver.java +++ b/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriver.java @@ -28,7 +28,7 @@ import org.apache.pirk.querier.wideskies.decrypt.DecryptResponse; import org.apache.pirk.querier.wideskies.encrypt.EncryptQuery; import org.apache.pirk.query.wideskies.QueryInfo; import org.apache.pirk.response.wideskies.Response; -import org.apache.pirk.schema.query.LoadQuerySchemas; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.serialization.LocalFileSystemStore; import org.apache.pirk.utils.FileIOUtils; import org.apache.pirk.utils.PIRException; @@ -128,10 +128,13 @@ public class QuerierDriver implements Serializable } // Check to ensure we have a valid queryType - if (!LoadQuerySchemas.containsSchema(queryType)) + if (QuerySchemaRegistry.get(queryType) == null) { logger.error("Invalid schema: " + queryType + "; The following schemas are loaded:"); - LoadQuerySchemas.printSchemas(); + for (String schema : QuerySchemaRegistry.getNames()) + { + logger.info("schema = " + schema); + } System.exit(0); } @@ -167,7 +170,7 @@ public class QuerierDriver implements Serializable if (SystemConfiguration.getProperty("pir.embedQuerySchema").equals("true")) { - queryInfo.addQuerySchema(LoadQuerySchemas.getSchema(queryType)); + queryInfo.addQuerySchema(QuerySchemaRegistry.get(queryType)); } Paillier paillier = new Paillier(paillierBitSize, certainty, bitSet); // throws PIRException if certainty conditions are not satisfied http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriverCLI.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriverCLI.java b/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriverCLI.java index 879f028..b6dc2a7 100644 --- a/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriverCLI.java +++ b/src/main/java/org/apache/pirk/querier/wideskies/QuerierDriverCLI.java @@ -25,7 +25,7 @@ import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.pirk.schema.data.DataSchemaLoader; -import org.apache.pirk.schema.query.LoadQuerySchemas; +import org.apache.pirk.schema.query.QuerySchemaLoader; import org.apache.pirk.utils.SystemConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,28 +41,28 @@ public class QuerierDriverCLI private CommandLine commandLine = null; // General variables - public static String ACTION = "action"; - public static String INPUTFILE = "inputFile"; - public static String OUTPUTFILE = "outputFile"; - public static String TYPE = "queryType"; - public static String NUMTHREADS = "numThreads"; - public static String EMBEDQUERYSCHEMA = "embedQuerySchema"; + public static final String ACTION = "action"; + public static final String INPUTFILE = "inputFile"; + public static final String OUTPUTFILE = "outputFile"; + public static final String TYPE = "queryType"; + public static final String NUMTHREADS = "numThreads"; + public static final String EMBEDQUERYSCHEMA = "embedQuerySchema"; // Encryption variables - public static String HASHBITSIZE = "hashBitSize"; - public static String HASHKEY = "hashKey"; - public static String DATAPARTITIONSIZE = "dataPartitionBitSize"; - public static String PAILLIERBITSIZE = "paillierBitSize"; - public static String BITSET = "bitSet"; - public static String CERTAINTY = "certainty"; - public static String QUERYNAME = "queryName"; - public static String QUERYSCHEMAS = "querySchemas"; - public static String DATASCHEMAS = "dataSchemas"; - public static String EMBEDSELECTOR = "embedSelector"; - public static String USEMEMLOOKUPTABLE = "memLookupTable"; - public static String USEHDFSLOOKUPTABLE = "useHDFSLookupTable"; - public static String SR_ALGORITHM = "secureRandomAlg"; - public static String SR_PROVIDER = "secureRandomProvider"; + public static final String HASHBITSIZE = "hashBitSize"; + public static final String HASHKEY = "hashKey"; + public static final String DATAPARTITIONSIZE = "dataPartitionBitSize"; + public static final String PAILLIERBITSIZE = "paillierBitSize"; + public static final String BITSET = "bitSet"; + public static final String CERTAINTY = "certainty"; + public static final String QUERYNAME = "queryName"; + public static final String QUERYSCHEMAS = "querySchemas"; + public static final String DATASCHEMAS = "dataSchemas"; + public static final String EMBEDSELECTOR = "embedSelector"; + public static final String USEMEMLOOKUPTABLE = "memLookupTable"; + public static final String USEHDFSLOOKUPTABLE = "useHDFSLookupTable"; + public static final String SR_ALGORITHM = "secureRandomAlg"; + public static final String SR_PROVIDER = "secureRandomProvider"; // Decryption variables public static String QUERIERFILE = "querierFile"; @@ -316,7 +316,7 @@ public class QuerierDriverCLI try { DataSchemaLoader.initialize(); - LoadQuerySchemas.initialize(); + QuerySchemaLoader.initialize(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/querier/wideskies/decrypt/DecryptResponseRunnable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/querier/wideskies/decrypt/DecryptResponseRunnable.java b/src/main/java/org/apache/pirk/querier/wideskies/decrypt/DecryptResponseRunnable.java index ea9d6bb..6f1341c 100644 --- a/src/main/java/org/apache/pirk/querier/wideskies/decrypt/DecryptResponseRunnable.java +++ b/src/main/java/org/apache/pirk/querier/wideskies/decrypt/DecryptResponseRunnable.java @@ -25,8 +25,8 @@ import java.util.TreeMap; import org.apache.pirk.query.wideskies.QueryInfo; import org.apache.pirk.query.wideskies.QueryUtils; -import org.apache.pirk.schema.query.LoadQuerySchemas; import org.apache.pirk.schema.query.QuerySchema; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.schema.response.QueryResponseJSON; import org.apache.pirk.utils.SystemConfiguration; import org.slf4j.Logger; @@ -65,7 +65,7 @@ public class DecryptResponseRunnable implements Runnable { if ((qSchema = queryInfo.getQuerySchema()) == null) { - qSchema = LoadQuerySchemas.getSchema(queryInfo.getQueryType()); + qSchema = QuerySchemaRegistry.get(queryInfo.getQueryType()); } } resultMap = new HashMap<>(); @@ -83,7 +83,7 @@ public class DecryptResponseRunnable implements Runnable int dataPartitionBitSize = queryInfo.getDataPartitionBitSize(); int numPartitionsPerDataElement = queryInfo.getNumPartitionsPerDataElement(); - QuerySchema qSchema = LoadQuerySchemas.getSchema(queryInfo.getQueryType()); + QuerySchema qSchema = QuerySchemaRegistry.get(queryInfo.getQueryType()); String selectorName = qSchema.getSelectorName(); // Initialize - removes checks below http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/querier/wideskies/encrypt/EncryptQuery.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/querier/wideskies/encrypt/EncryptQuery.java b/src/main/java/org/apache/pirk/querier/wideskies/encrypt/EncryptQuery.java index df38851..b12e837 100644 --- a/src/main/java/org/apache/pirk/querier/wideskies/encrypt/EncryptQuery.java +++ b/src/main/java/org/apache/pirk/querier/wideskies/encrypt/EncryptQuery.java @@ -32,8 +32,8 @@ import org.apache.pirk.query.wideskies.QueryInfo; import org.apache.pirk.query.wideskies.QueryUtils; import org.apache.pirk.schema.data.DataSchema; import org.apache.pirk.schema.data.DataSchemaRegistry; -import org.apache.pirk.schema.query.LoadQuerySchemas; import org.apache.pirk.schema.query.QuerySchema; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.utils.KeyedHash; import org.apache.pirk.utils.PIRException; import org.slf4j.Logger; @@ -173,7 +173,7 @@ public class EncryptQuery private void populateEmbeddedSelectorMap() { - QuerySchema qSchema = LoadQuerySchemas.getSchema(queryInfo.getQueryType()); + QuerySchema qSchema = QuerySchemaRegistry.get(queryInfo.getQueryType()); DataSchema dSchema = DataSchemaRegistry.get(qSchema.getDataSchemaName()); String type = dSchema.getElementType(qSchema.getSelectorName()); int sNum = 0; http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/query/wideskies/QueryInfo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/query/wideskies/QueryInfo.java b/src/main/java/org/apache/pirk/query/wideskies/QueryInfo.java index 0822ca9..8c69fa9 100644 --- a/src/main/java/org/apache/pirk/query/wideskies/QueryInfo.java +++ b/src/main/java/org/apache/pirk/query/wideskies/QueryInfo.java @@ -20,8 +20,8 @@ package org.apache.pirk.query.wideskies; import java.io.Serializable; -import org.apache.pirk.schema.query.LoadQuerySchemas; import org.apache.pirk.schema.query.QuerySchema; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,7 +83,7 @@ public class QueryInfo implements Serializable useHDFSExpLookupTable = useHDFSExpLookupTableInput; embedSelector = embedSelectorInput; - numBitsPerDataElement = LoadQuerySchemas.getSchema(queryType).getDataElementSize(); + numBitsPerDataElement = QuerySchemaRegistry.get(queryType).getDataElementSize(); dataPartitionBitSize = dataPartitionBitSizeInput; numPartitionsPerDataElement = numBitsPerDataElement / dataPartitionBitSizeInput; http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/query/wideskies/QueryUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/query/wideskies/QueryUtils.java b/src/main/java/org/apache/pirk/query/wideskies/QueryUtils.java index 8344630..70273f8 100644 --- a/src/main/java/org/apache/pirk/query/wideskies/QueryUtils.java +++ b/src/main/java/org/apache/pirk/query/wideskies/QueryUtils.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.TreeSet; import org.apache.hadoop.io.ArrayWritable; import org.apache.hadoop.io.MapWritable; @@ -75,7 +74,7 @@ public class QueryUtils logger.debug("Extracted embedded selector = " + embeddedSelector + " parts.size() = " + parts.size()); } - TreeSet<String> dataFieldsToExtract = qSchema.getElementNames(); + List<String> dataFieldsToExtract = qSchema.getElementNames(); for (String fieldName : dataFieldsToExtract) { int numElements = 1; @@ -122,7 +121,7 @@ public class QueryUtils } // Add all appropriate data fields - TreeSet<String> dataFieldsToExtract = qSchema.getElementNames(); + List<String> dataFieldsToExtract = qSchema.getElementNames(); for (String fieldName : dataFieldsToExtract) { Object dataElement = null; @@ -185,7 +184,7 @@ public class QueryUtils } // Add all appropriate data fields - TreeSet<String> dataFieldsToExtract = qSchema.getElementNames(); + List<String> dataFieldsToExtract = qSchema.getElementNames(); for (String fieldName : dataFieldsToExtract) { Object dataElement = null; http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/responder/wideskies/ResponderCLI.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/responder/wideskies/ResponderCLI.java b/src/main/java/org/apache/pirk/responder/wideskies/ResponderCLI.java index 1a2fd32..d38867e 100644 --- a/src/main/java/org/apache/pirk/responder/wideskies/ResponderCLI.java +++ b/src/main/java/org/apache/pirk/responder/wideskies/ResponderCLI.java @@ -26,7 +26,7 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.pirk.inputformat.hadoop.InputFormatConst; import org.apache.pirk.schema.data.DataSchemaLoader; -import org.apache.pirk.schema.query.LoadQuerySchemas; +import org.apache.pirk.schema.query.QuerySchemaLoader; import org.apache.pirk.utils.SystemConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,35 +42,35 @@ public class ResponderCLI private CommandLine commandLine = null; // Required args - public static String PLATFORM = "platform"; - public static String QUERYINPUT = "queryInput"; - public static String DATAINPUTFORMAT = "dataInputFormat"; - public static String INPUTDATA = "inputData"; - public static String BASEQUERY = "baseQuery"; - public static String ESRESOURCE = "esResource"; - public static String ESQUERY = "esQuery"; - public static String OUTPUTFILE = "outputFile"; + public static final String PLATFORM = "platform"; + public static final String QUERYINPUT = "queryInput"; + public static final String DATAINPUTFORMAT = "dataInputFormat"; + public static final String INPUTDATA = "inputData"; + public static final String BASEQUERY = "baseQuery"; + public static final String ESRESOURCE = "esResource"; + public static final String ESQUERY = "esQuery"; + public static final String OUTPUTFILE = "outputFile"; // Optional args - public static String BASEINPUTFORMAT = "baseInputFormat"; - public static String STOPLISTFILE = "stopListFile"; - private static String NUMREDUCETASKS = "numReduceTasks"; - public static String USELOCALCACHE = "useLocalCache"; - public static String LIMITHITSPERSELECTOR = "limitHitsPerSelector"; - public static String MAXHITSPERSELECTOR = "maxHitsPerSelector"; - private static String MAPMEMORY = "mapreduceMapMemoryMb"; - private static String REDUCEMEMORY = "mapreduceReduceMemoryMb"; - private static String MAPJAVAOPTS = "mapreduceMapJavaOpts"; - private static String REDUCEJAVAOPTS = "mapreduceReduceJavaOpts"; - public static String QUERYSCHEMAS = "querySchemas"; - public static String DATASCHEMAS = "dataSchemas"; - public static String NUMEXPLOOKUPPARTS = "numExpLookupPartitions"; - private static String USEHDFSLOOKUPTABLE = "useHDFSLookupTable"; - private static String NUMDATAPARTITIONS = "numDataPartitions"; - public static String NUMCOLMULTPARTITIONS = "numColMultPartitions"; - public static String USEMODEXPJOIN = "useModExpJoin"; - public static String COLMULTREDUCEBYKEY = "colMultReduceByKey"; - public static String ALLOWEMBEDDEDQUERYSCHEMAS = "allowAdHocQuerySchemas"; + public static final String BASEINPUTFORMAT = "baseInputFormat"; + public static final String STOPLISTFILE = "stopListFile"; + private static final String NUMREDUCETASKS = "numReduceTasks"; + public static final String USELOCALCACHE = "useLocalCache"; + public static final String LIMITHITSPERSELECTOR = "limitHitsPerSelector"; + public static final String MAXHITSPERSELECTOR = "maxHitsPerSelector"; + private static final String MAPMEMORY = "mapreduceMapMemoryMb"; + private static final String REDUCEMEMORY = "mapreduceReduceMemoryMb"; + private static final String MAPJAVAOPTS = "mapreduceMapJavaOpts"; + private static final String REDUCEJAVAOPTS = "mapreduceReduceJavaOpts"; + public static final String QUERYSCHEMAS = "querySchemas"; + public static final String DATASCHEMAS = "dataSchemas"; + public static final String NUMEXPLOOKUPPARTS = "numExpLookupPartitions"; + private static final String USEHDFSLOOKUPTABLE = "useHDFSLookupTable"; + private static final String NUMDATAPARTITIONS = "numDataPartitions"; + public static final String NUMCOLMULTPARTITIONS = "numColMultPartitions"; + public static final String USEMODEXPJOIN = "useModExpJoin"; + public static final String COLMULTREDUCEBYKEY = "colMultReduceByKey"; + public static final String ALLOWEMBEDDEDQUERYSCHEMAS = "allowAdHocQuerySchemas"; /** * Create and parse allowable options @@ -357,7 +357,7 @@ public class ResponderCLI try { DataSchemaLoader.initialize(); - LoadQuerySchemas.initialize(); + QuerySchemaLoader.initialize(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ComputeResponseTool.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ComputeResponseTool.java b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ComputeResponseTool.java index f124bc2..5e3077f 100644 --- a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ComputeResponseTool.java +++ b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ComputeResponseTool.java @@ -47,8 +47,9 @@ import org.apache.pirk.inputformat.hadoop.InputFormatConst; import org.apache.pirk.query.wideskies.Query; import org.apache.pirk.query.wideskies.QueryInfo; import org.apache.pirk.schema.data.DataSchemaLoader; -import org.apache.pirk.schema.query.LoadQuerySchemas; import org.apache.pirk.schema.query.QuerySchema; +import org.apache.pirk.schema.query.QuerySchemaLoader; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.serialization.HadoopFileSystemStore; import org.apache.pirk.utils.FileConst; import org.apache.pirk.utils.HDFS; @@ -126,7 +127,7 @@ public class ComputeResponseTool extends Configured implements Tool // Load the schemas DataSchemaLoader.initialize(true, fs); - LoadQuerySchemas.initialize(true, fs); + QuerySchemaLoader.initialize(true, fs); query = new HadoopFileSystemStore(fs).recall(queryInputDir, Query.class); queryInfo = query.getQueryInfo(); @@ -136,7 +137,7 @@ public class ComputeResponseTool extends Configured implements Tool } if (qSchema == null) { - qSchema = LoadQuerySchemas.getSchema(queryInfo.getQueryType()); + qSchema = QuerySchemaRegistry.get(queryInfo.getQueryType()); } logger.info("outputFile = " + outputFile + " outputDirInit = " + outputDirInit + " outputDirColumnMult = " + outputDirColumnMult + " queryInputDir = " http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/HashSelectorsAndPartitionDataMapper.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/HashSelectorsAndPartitionDataMapper.java b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/HashSelectorsAndPartitionDataMapper.java index 73bc4cd..75186e4 100644 --- a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/HashSelectorsAndPartitionDataMapper.java +++ b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/HashSelectorsAndPartitionDataMapper.java @@ -33,8 +33,9 @@ import org.apache.pirk.responder.wideskies.common.HashSelectorAndPartitionData; import org.apache.pirk.schema.data.DataSchema; import org.apache.pirk.schema.data.DataSchemaLoader; import org.apache.pirk.schema.data.DataSchemaRegistry; -import org.apache.pirk.schema.query.LoadQuerySchemas; +import org.apache.pirk.schema.query.QuerySchemaLoader; import org.apache.pirk.schema.query.QuerySchema; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.schema.query.filter.DataFilter; import org.apache.pirk.serialization.HadoopFileSystemStore; import org.apache.pirk.utils.StringUtils; @@ -88,7 +89,7 @@ public class HashSelectorsAndPartitionDataMapper extends Mapper<Text,MapWritable SystemConfiguration.setProperty("pir.stopListFile", ctx.getConfiguration().get("pirMR.stopListFile")); DataSchemaLoader.initialize(true, fs); - LoadQuerySchemas.initialize(true, fs); + QuerySchemaLoader.initialize(true, fs); } catch (Exception e) { @@ -101,13 +102,13 @@ public class HashSelectorsAndPartitionDataMapper extends Mapper<Text,MapWritable } if (qSchema == null) { - qSchema = LoadQuerySchemas.getSchema(queryInfo.getQueryType()); + qSchema = QuerySchemaRegistry.get(queryInfo.getQueryType()); } dSchema = DataSchemaRegistry.get(qSchema.getDataSchemaName()); try { - filter = qSchema.getFilterInstance(); + filter = qSchema.getFilter(); } catch (Exception e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/RowCalcReducer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/RowCalcReducer.java b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/RowCalcReducer.java index 8da760e..6fb5574 100644 --- a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/RowCalcReducer.java +++ b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/RowCalcReducer.java @@ -33,13 +33,12 @@ import org.apache.pirk.query.wideskies.Query; import org.apache.pirk.query.wideskies.QueryInfo; import org.apache.pirk.responder.wideskies.common.ComputeEncryptedRow; import org.apache.pirk.schema.data.DataSchemaLoader; -import org.apache.pirk.schema.query.LoadQuerySchemas; +import org.apache.pirk.schema.query.QuerySchemaLoader; import org.apache.pirk.serialization.HadoopFileSystemStore; import org.apache.pirk.utils.FileConst; import org.apache.pirk.utils.SystemConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import scala.Tuple2; /** @@ -88,7 +87,7 @@ public class RowCalcReducer extends Reducer<IntWritable,BytesArrayWritable,LongW SystemConfiguration.setProperty("pir.stopListFile", ctx.getConfiguration().get("pirMR.stopListFile")); DataSchemaLoader.initialize(true, fs); - LoadQuerySchemas.initialize(true, fs); + QuerySchemaLoader.initialize(true, fs); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/responder/wideskies/spark/ComputeResponse.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/responder/wideskies/spark/ComputeResponse.java b/src/main/java/org/apache/pirk/responder/wideskies/spark/ComputeResponse.java index f7ae51c..cfe4a68 100644 --- a/src/main/java/org/apache/pirk/responder/wideskies/spark/ComputeResponse.java +++ b/src/main/java/org/apache/pirk/responder/wideskies/spark/ComputeResponse.java @@ -36,8 +36,9 @@ import org.apache.pirk.response.wideskies.Response; import org.apache.pirk.schema.data.DataSchema; import org.apache.pirk.schema.data.DataSchemaLoader; import org.apache.pirk.schema.data.DataSchemaRegistry; -import org.apache.pirk.schema.query.LoadQuerySchemas; import org.apache.pirk.schema.query.QuerySchema; +import org.apache.pirk.schema.query.QuerySchemaLoader; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.serialization.HadoopFileSystemStore; import org.apache.pirk.utils.PIRException; import org.apache.pirk.utils.SystemConfiguration; @@ -161,7 +162,7 @@ public class ComputeResponse { // Load the schemas DataSchemaLoader.initialize(true, fs); - LoadQuerySchemas.initialize(true, fs); + QuerySchemaLoader.initialize(true, fs); // Create the accumulators and broadcast variables accum = new Accumulators(sc); @@ -180,7 +181,7 @@ public class ComputeResponse } if (qSchema == null) { - qSchema = LoadQuerySchemas.getSchema(queryInfo.getQueryType()); + qSchema = QuerySchemaRegistry.get(queryInfo.getQueryType()); } DataSchema dSchema = DataSchemaRegistry.get(qSchema.getDataSchemaName()); bVars.setQuerySchema(qSchema); @@ -250,13 +251,13 @@ public class ComputeResponse job.getConfiguration().set("query", baseQuery); logger.debug("queryType = " + bVars.getQueryInfo().getQueryType()); - logger.debug("LoadQuerySchemas.getSchemaNames().size() = " + LoadQuerySchemas.getSchemaNames().size()); - for (String name : LoadQuerySchemas.getSchemaNames()) + logger.debug("QuerySchemaLoader.getSchemaNames().size() = " + QuerySchemaRegistry.getNames().size()); + for (String name : QuerySchemaRegistry.getNames()) { logger.debug("schemaName = " + name); } - QuerySchema qSchema = LoadQuerySchemas.getSchema(bVars.getQueryInfo().getQueryType()); + QuerySchema qSchema = QuerySchemaRegistry.get(bVars.getQueryInfo().getQueryType()); job.getConfiguration().set("dataSchemaName", qSchema.getDataSchemaName()); job.getConfiguration().set("data.schemas", SystemConfiguration.getProperty("data.schemas")); http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/responder/wideskies/spark/FilterData.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/responder/wideskies/spark/FilterData.java b/src/main/java/org/apache/pirk/responder/wideskies/spark/FilterData.java index cf4212e..fb87b06 100644 --- a/src/main/java/org/apache/pirk/responder/wideskies/spark/FilterData.java +++ b/src/main/java/org/apache/pirk/responder/wideskies/spark/FilterData.java @@ -22,8 +22,8 @@ import org.apache.hadoop.io.MapWritable; import org.apache.pirk.query.wideskies.QueryInfo; import org.apache.pirk.schema.data.DataSchema; import org.apache.pirk.schema.data.DataSchemaRegistry; -import org.apache.pirk.schema.query.LoadQuerySchemas; import org.apache.pirk.schema.query.QuerySchema; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.schema.query.filter.DataFilter; import org.apache.spark.api.java.function.Function; import org.slf4j.Logger; @@ -47,10 +47,10 @@ public class FilterData implements Function<MapWritable,Boolean> accum = accumIn; QueryInfo queryInfo = bbVarsIn.getQueryInfo(); - QuerySchema qSchema = LoadQuerySchemas.getSchema(queryInfo.getQueryType()); + QuerySchema qSchema = QuerySchemaRegistry.get(queryInfo.getQueryType()); dSchema = DataSchemaRegistry.get(qSchema.getDataSchemaName()); - filter = qSchema.getFilterInstance(); + filter = qSchema.getFilter(); logger.info("Initialized FilterData"); } http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java b/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java index 80baea5..9b15f3b 100644 --- a/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java +++ b/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java @@ -30,8 +30,8 @@ import org.apache.pirk.query.wideskies.Query; import org.apache.pirk.query.wideskies.QueryInfo; import org.apache.pirk.query.wideskies.QueryUtils; import org.apache.pirk.response.wideskies.Response; -import org.apache.pirk.schema.query.LoadQuerySchemas; import org.apache.pirk.schema.query.QuerySchema; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.serialization.LocalFileSystemStore; import org.apache.pirk.utils.KeyedHash; import org.apache.pirk.utils.SystemConfiguration; @@ -79,7 +79,7 @@ public class Responder } if (qSchema == null) { - qSchema = LoadQuerySchemas.getSchema(queryType); + qSchema = QuerySchemaRegistry.get(queryType); } response = new Response(queryInfo); http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java b/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java index 1a60d42..f0cca32 100644 --- a/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java +++ b/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java @@ -120,7 +120,7 @@ public class DataSchemaLoader try { - DataSchema dataSchema = loader.loadSchemaFile(is); + DataSchema dataSchema = loader.loadSchema(is); DataSchemaRegistry.put(dataSchema); } finally { @@ -136,7 +136,18 @@ public class DataSchemaLoader public DataSchemaLoader() {} - public DataSchema loadSchemaFile(InputStream stream) throws IOException, PIRException + /** + * Returns the data schema as defined in XML format on the given stream. + * + * @param stream + * The source of the XML data schema description. + * @return The data schema. + * @throws IOException + * A problem occurred reading from the given stream. + * @throws PIRException + * The schema description is invalid. + */ + public DataSchema loadSchema(InputStream stream) throws IOException, PIRException { // Read in and parse the XML schema file Document doc; http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/89052a78/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java b/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java index 2cd6673..82fa1da 100644 --- a/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java +++ b/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java @@ -20,6 +20,7 @@ package org.apache.pirk.schema.data; import java.util.HashMap; import java.util.Map; +import java.util.Set; /** * The data schema registry is a global location for data schema descriptors. @@ -63,4 +64,14 @@ public class DataSchemaRegistry { return registry.get(schemaName); } + + /** + * Returns the set of data schema names held in the registry. + * + * @return The possibly empty set of data schema names. + */ + public static Set<String> getNames() + { + return registry.keySet(); + } }
