You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pirk.apache.org by ea...@apache.org on 2016/07/24 13:07:23 UTC
incubator-pirk git commit: PIRK-26 - Make Enum MRStats a top level
class - closes apache/incubator-pirk#24
Repository: incubator-pirk
Updated Branches:
refs/heads/master 99f9c624f -> 8a2b4c8b3
PIRK-26 - Make Enum MRStats a top level class - closes apache/incubator-pirk#24
Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/8a2b4c8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/8a2b4c8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/8a2b4c8b
Branch: refs/heads/master
Commit: 8a2b4c8b35cd86519eb792d33b16167bd55306c2
Parents: 99f9c62
Author: smarthi <sm...@apache.org>
Authored: Sun Jul 24 09:06:51 2016 -0400
Committer: eawilliams <ea...@apache.org>
Committed: Sun Jul 24 09:06:51 2016 -0400
----------------------------------------------------------------------
.../pirk/responder/wideskies/mapreduce/MRStats.Stats.html | 2 +-
.../wideskies/mapreduce/class-use/MRStats.Stats.html | 4 ++--
pom.xml | 1 +
.../responder/wideskies/mapreduce/ColumnMultReducer.java | 2 +-
.../wideskies/mapreduce/FinalResponseReducer.java | 5 ++---
.../pirk/responder/wideskies/mapreduce/MRStats.java | 10 ++++------
.../responder/wideskies/mapreduce/RowCalcReducer.java | 3 +--
7 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/8a2b4c8b/docs/org/apache/pirk/responder/wideskies/mapreduce/MRStats.Stats.html
----------------------------------------------------------------------
diff --git a/docs/org/apache/pirk/responder/wideskies/mapreduce/MRStats.Stats.html b/docs/org/apache/pirk/responder/wideskies/mapreduce/MRStats.Stats.html
index 9474b35..c71a303 100644
--- a/docs/org/apache/pirk/responder/wideskies/mapreduce/MRStats.Stats.html
+++ b/docs/org/apache/pirk/responder/wideskies/mapreduce/MRStats.Stats.html
@@ -90,7 +90,7 @@
<li>java.lang.Enum<<a href="../../../../../../org/apache/pirk/responder/wideskies/mapreduce/MRStats.Stats.html" title="enum in org.apache.pirk.responder.wideskies.mapreduce">MRStats.Stats</a>></li>
<li>
<ul class="inheritance">
-<li>org.apache.pirk.responder.wideskies.mapreduce.MRStats.Stats</li>
+<li>org.apache.pirk.responder.wideskies.mapreduce.MRStats</li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/8a2b4c8b/docs/org/apache/pirk/responder/wideskies/mapreduce/class-use/MRStats.Stats.html
----------------------------------------------------------------------
diff --git a/docs/org/apache/pirk/responder/wideskies/mapreduce/class-use/MRStats.Stats.html b/docs/org/apache/pirk/responder/wideskies/mapreduce/class-use/MRStats.Stats.html
index 615bcca..357c64d 100644
--- a/docs/org/apache/pirk/responder/wideskies/mapreduce/class-use/MRStats.Stats.html
+++ b/docs/org/apache/pirk/responder/wideskies/mapreduce/class-use/MRStats.Stats.html
@@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 08 11:57:21 EDT 2016 -->
-<title>Uses of Class org.apache.pirk.responder.wideskies.mapreduce.MRStats.Stats</title>
+<title>Uses of Class org.apache.pirk.responder.wideskies.mapreduce.MRStats</title>
<meta name="date" content="2016-07-08">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
</head>
@@ -63,7 +63,7 @@
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
<div class="header">
-<h2 title="Uses of Class org.apache.pirk.responder.wideskies.mapreduce.MRStats.Stats" class="title">Uses of Class<br>org.apache.pirk.responder.wideskies.mapreduce.MRStats.Stats</h2>
+<h2 title="Uses of Class org.apache.pirk.responder.wideskies.mapreduce.MRStats" class="title">Uses of Class<br>org.apache.pirk.responder.wideskies.mapreduce.MRStats</h2>
</div>
<div class="classUseContainer">
<ul class="blockList">
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/8a2b4c8b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b31b8c..3d4c1b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,6 +239,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.1</version>
<configuration>
<excludes>
<exclude>org/apache/pirk/benchmark/**</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/8a2b4c8b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ColumnMultReducer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ColumnMultReducer.java b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ColumnMultReducer.java
index 22c4cab..5330276 100644
--- a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ColumnMultReducer.java
+++ b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/ColumnMultReducer.java
@@ -62,7 +62,7 @@ public class ColumnMultReducer extends Reducer<LongWritable,Text,LongWritable,Te
public void reduce(LongWritable colNum, Iterable<Text> colVals, Context ctx) throws IOException, InterruptedException
{
logger.debug("Processing reducer for colNum = " + colNum.toString());
- ctx.getCounter(MRStats.Stats.NUM_COLUMNS).increment(1);
+ ctx.getCounter(MRStats.NUM_COLUMNS).increment(1);
BigInteger column = BigInteger.valueOf(1);
for (Text val : colVals)
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/8a2b4c8b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/FinalResponseReducer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/FinalResponseReducer.java b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/FinalResponseReducer.java
index 8f7cbe8..628c97c 100644
--- a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/FinalResponseReducer.java
+++ b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/FinalResponseReducer.java
@@ -45,7 +45,6 @@ public class FinalResponseReducer extends Reducer<LongWritable,Text,LongWritable
private Response response = null;
private String outputFile = null;
- private FileSystem fs = null;
private HadoopFileSystemStore storage = null;
private QueryInfo queryInfo = null;
@@ -57,7 +56,7 @@ public class FinalResponseReducer extends Reducer<LongWritable,Text,LongWritable
Text outputValue = new Text();
mos = new MultipleOutputs<>(ctx);
- fs = FileSystem.newInstance(ctx.getConfiguration());
+ FileSystem fs = FileSystem.newInstance(ctx.getConfiguration());
storage = new HadoopFileSystemStore(fs);
String queryDir = ctx.getConfiguration().get("pirMR.queryInputDir");
Query query = storage.recall(queryDir, Query.class);
@@ -72,7 +71,7 @@ public class FinalResponseReducer extends Reducer<LongWritable,Text,LongWritable
public void reduce(LongWritable colNum, Iterable<Text> colVals, Context ctx) throws IOException, InterruptedException
{
logger.debug("Processing reducer for colNum = " + colNum.toString());
- ctx.getCounter(MRStats.Stats.NUM_COLUMNS).increment(1);
+ ctx.getCounter(MRStats.NUM_COLUMNS).increment(1);
BigInteger column = null;
for (Text val : colVals) // there is only one column value
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/8a2b4c8b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/MRStats.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/MRStats.java b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/MRStats.java
index cce2939..78795c6 100644
--- a/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/MRStats.java
+++ b/src/main/java/org/apache/pirk/responder/wideskies/mapreduce/MRStats.java
@@ -18,10 +18,8 @@
*/
package org.apache.pirk.responder.wideskies.mapreduce;
-public class MRStats
-{
- public enum Stats
- {
- NUM_RECORDS_INIT_MAPPER, NUM_RECORDS_PROCESSED_INIT_MAPPER, NUM_HASHES_REDUCER, NUM_COLUMNS
- }
+
+public enum MRStats {
+ NUM_RECORDS_INIT_MAPPER, NUM_RECORDS_PROCESSED_INIT_MAPPER, NUM_HASHES_REDUCER, NUM_COLUMNS
}
+
http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/8a2b4c8b/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 ab1e7b9..8bbf652 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
@@ -34,7 +34,6 @@ import org.apache.pirk.query.wideskies.QueryInfo;
import org.apache.pirk.responder.wideskies.common.ComputeEncryptedRow;
import org.apache.pirk.schema.data.LoadDataSchemas;
import org.apache.pirk.schema.query.LoadQuerySchemas;
-import org.apache.pirk.schema.query.QuerySchema;
import org.apache.pirk.serialization.HadoopFileSystemStore;
import org.apache.pirk.utils.FileConst;
import org.apache.pirk.utils.SystemConfiguration;
@@ -113,7 +112,7 @@ public class RowCalcReducer extends Reducer<IntWritable,BytesArrayWritable,LongW
public void reduce(IntWritable rowIndex, Iterable<BytesArrayWritable> dataElementPartitions, Context ctx) throws IOException, InterruptedException
{
logger.debug("Processing reducer for hash = " + rowIndex);
- ctx.getCounter(MRStats.Stats.NUM_HASHES_REDUCER).increment(1);
+ ctx.getCounter(MRStats.NUM_HASHES_REDUCER).increment(1);
if (queryInfo.getUseHDFSExpLookupTable())
{