Refactor: Move some classes to another package

Ahmed Eldawy · Ahmed Eldawy · commit bc410d7e3c25 · 2013-02-10T12:34:12.000-06:00
diff --git a/src/edu/umn/cs/spatialHadoop/CommandLineArguments.java b/src/edu/umn/cs/spatialHadoop/CommandLineArguments.java
@@ -1,4 +1,4 @@
-package edu.umn.cs;
+package edu.umn.cs.spatialHadoop;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -22,7 +22,6 @@
 import org.apache.hadoop.spatial.ResultCollector;
 import org.apache.hadoop.spatial.Shape;
 
-import edu.umn.cs.spatialHadoop.TigerShape;
 import edu.umn.cs.spatialHadoop.operations.Sampler;
 
 public class CommandLineArguments {
@@ -61,7 +60,7 @@ public Path[] getPaths() {
   
   public Path getPath() {
     Path[] paths = getPaths();
-    return paths.length > 1? paths[0] : null;
+    return paths.length > 0? paths[0] : null;
   }
   
   public GridInfo getGridInfo() {
diff --git a/src/edu/umn/cs/spatialHadoop/Estimator.java b/src/edu/umn/cs/spatialHadoop/Estimator.java
@@ -1,4 +1,4 @@
-package edu.umn.cs;
+package edu.umn.cs.spatialHadoop;
 
 /**
  * Estimates a given value by taking a random sample from sample space until
diff --git a/src/edu/umn/cs/spatialHadoop/RandomSpatialGenerator.java b/src/edu/umn/cs/spatialHadoop/RandomSpatialGenerator.java
@@ -1,4 +1,4 @@
-package edu.umn.cs;
+package edu.umn.cs.spatialHadoop;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -23,6 +23,7 @@
 import org.apache.hadoop.spatial.SpatialSite;
 
 
+
 /**
  * Generates a random file of rectangles or points based on some user
  * parameters
diff --git a/src/edu/umn/cs/spatialHadoop/ReadFile.java b/src/edu/umn/cs/spatialHadoop/ReadFile.java
@@ -1,4 +1,4 @@
-package edu.umn.cs;
+package edu.umn.cs.spatialHadoop;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/edu/umn/cs/spatialHadoop/operations/DistributedJoin.java b/src/edu/umn/cs/spatialHadoop/operations/DistributedJoin.java
@@ -49,7 +49,7 @@
 import org.apache.hadoop.util.LineReader;
 import org.apache.hadoop.util.QuickSort;
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 /**
  * Performs a spatial join between two or more files using the redistribute-join
diff --git a/src/edu/umn/cs/spatialHadoop/operations/FileMBR.java b/src/edu/umn/cs/spatialHadoop/operations/FileMBR.java
@@ -26,7 +26,7 @@
 import org.apache.hadoop.spatial.SpatialSite;
 import org.apache.hadoop.util.LineReader;
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 /**
  * Finds the minimal bounding rectangle for a file.
diff --git a/src/edu/umn/cs/spatialHadoop/operations/KNN.java b/src/edu/umn/cs/spatialHadoop/operations/KNN.java
@@ -50,7 +50,7 @@
 import org.apache.hadoop.util.LineReader;
 import org.apache.hadoop.util.PriorityQueue;
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 /**
  * Performs k Nearest Neighbor (kNN) query over a spatial file.
diff --git a/src/edu/umn/cs/spatialHadoop/operations/LineRandomizer.java b/src/edu/umn/cs/spatialHadoop/operations/LineRandomizer.java
@@ -22,7 +22,7 @@
 import org.apache.hadoop.mapred.TextOutputFormat;
 import org.apache.hadoop.spatial.CellInfo;
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 
 /**
diff --git a/src/edu/umn/cs/spatialHadoop/operations/Main.java b/src/edu/umn/cs/spatialHadoop/operations/Main.java
@@ -1,6 +1,6 @@
 package edu.umn.cs.spatialHadoop.operations;
 
-import edu.umn.cs.RandomSpatialGenerator;
+import edu.umn.cs.spatialHadoop.RandomSpatialGenerator;
 
 /**
  * The main entry point to all queries.
diff --git a/src/edu/umn/cs/spatialHadoop/operations/RangeQuery.java b/src/edu/umn/cs/spatialHadoop/operations/RangeQuery.java
@@ -36,7 +36,7 @@
 import org.apache.hadoop.spatial.SpatialSite;
 import org.apache.hadoop.util.LineReader;
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 /**
  * Performs a range query over a spatial file.
diff --git a/src/edu/umn/cs/spatialHadoop/operations/RecordCount.java b/src/edu/umn/cs/spatialHadoop/operations/RecordCount.java
@@ -23,8 +23,8 @@
 import org.apache.hadoop.spatial.CellInfo;
 import org.apache.hadoop.util.LineReader;
 
-import edu.umn.cs.CommandLineArguments;
-import edu.umn.cs.Estimator;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.Estimator;
 
 
 /**
diff --git a/src/edu/umn/cs/spatialHadoop/operations/Repartition.java b/src/edu/umn/cs/spatialHadoop/operations/Repartition.java
@@ -39,7 +39,7 @@
 import org.apache.hadoop.spatial.ShapeRecordWriter;
 import org.apache.hadoop.spatial.SpatialSite;
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 /**
  * Repartitions a file according to a different grid through a MapReduce job
@@ -90,7 +90,7 @@ public void map(
       shape.toText(shapeText);
       for (int cellIndex = 0; cellIndex < cellInfos.length; cellIndex++) {
         if (cellInfos[cellIndex].isIntersected(shape)) {
-          cellId.set((int)cellInfos[cellIndex].cellId);
+          cellId.set((byte)cellInfos[cellIndex].cellId);
           output.collect(cellId, shapeText);
         }
       }
@@ -109,14 +109,15 @@ public static class Reduce extends MapReduceBase implements
     public void reduce(IntWritable cellId, Iterator<Text> values,
         OutputCollector<IntWritable, Text> output, Reporter reporter)
             throws IOException {
+      IntWritable cid = new IntWritable(cellId.get());
       // Initial check which avoids closing the cell for empty partitions
       if (values.hasNext()) {
         while (values.hasNext()) {
           Text value = values.next();
-          output.collect(cellId, value);
+          output.collect(cid, value);
         }
         // Close this cell as we will not write any more data to it
-        output.collect(cellId, new Text());
+        output.collect(cid, new Text());
       }
     }
   }
diff --git a/src/edu/umn/cs/spatialHadoop/operations/SJMR.java b/src/edu/umn/cs/spatialHadoop/operations/SJMR.java
@@ -44,7 +44,7 @@
 import org.apache.hadoop.spatial.SpatialSite;
 import org.apache.hadoop.util.LineReader;
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 /**
  * An implementation of Spatial Join MapReduce as it appears in
diff --git a/src/edu/umn/cs/spatialHadoop/operations/Sampler.java b/src/edu/umn/cs/spatialHadoop/operations/Sampler.java
@@ -31,7 +31,7 @@
 import org.apache.hadoop.util.LineReader;
 
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 /**
  * Reads a random sample of a file.
diff --git a/src/edu/umn/cs/spatialHadoop/operations/Tail.java b/src/edu/umn/cs/spatialHadoop/operations/Tail.java
@@ -12,7 +12,7 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.spatial.ResultCollector;
 
-import edu.umn.cs.CommandLineArguments;
+import edu.umn.cs.spatialHadoop.CommandLineArguments;
 
 /**
  * Reads the last n lines of a text file

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package edu.umn.cs;`
	`1`	`+package edu.umn.cs.spatialHadoop;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Estimates a given value by taking a random sample from sample space until`