Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Move Join class to lib package. #20

Merged
merged 1 commit into from

2 participants

@robotoer

Small change. I figured that the Join class would be better served directly in the lib package so when joining, clients wouldn't have to:

import com.cloudera.crunch.lib.join.Join;

and instead:

import com.cloudera.crunch.lib.Join;

@jwills jwills merged commit 5e00775 into cloudera:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 4, 2012
  1. Moved Join class to top lib package.

    Robert Chu authored
This page is out of date. Refresh to see the latest.
View
3  scrunch/src/main/scala/com/cloudera/scrunch/PTable.scala
@@ -16,8 +16,7 @@ package com.cloudera.scrunch
import com.cloudera.crunch.{DoFn, Emitter, FilterFn, MapFn}
import com.cloudera.crunch.{GroupingOptions, PTable => JTable, Pair => CPair}
-import com.cloudera.crunch.lib.join.Join
-import com.cloudera.crunch.lib.{Aggregate, Cogroup, PTables}
+import com.cloudera.crunch.lib.{Join, Aggregate, Cogroup, PTables}
import java.util.{Collection => JCollect}
import scala.collection.JavaConversions._
View
2  src/main/java/com/cloudera/crunch/impl/mem/collect/MemTable.java
@@ -24,7 +24,7 @@
import com.cloudera.crunch.Target;
import com.cloudera.crunch.lib.Aggregate;
import com.cloudera.crunch.lib.Cogroup;
-import com.cloudera.crunch.lib.join.Join;
+import com.cloudera.crunch.lib.Join;
import com.cloudera.crunch.type.PTableType;
import com.cloudera.crunch.type.PType;
import com.google.common.collect.Lists;
View
2  src/main/java/com/cloudera/crunch/impl/mr/collect/PTableBase.java
@@ -23,7 +23,7 @@
import com.cloudera.crunch.Target;
import com.cloudera.crunch.lib.Aggregate;
import com.cloudera.crunch.lib.Cogroup;
-import com.cloudera.crunch.lib.join.Join;
+import com.cloudera.crunch.lib.Join;
import com.cloudera.crunch.type.PType;
import com.google.common.collect.Lists;
View
8 src/main/java/com/cloudera/crunch/lib/join/Join.java → src/main/java/com/cloudera/crunch/lib/Join.java
@@ -12,13 +12,19 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.lib.join;
+package com.cloudera.crunch.lib;
import com.cloudera.crunch.GroupingOptions;
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.PGroupedTable;
import com.cloudera.crunch.PTable;
import com.cloudera.crunch.Pair;
+import com.cloudera.crunch.lib.join.FullOuterJoinFn;
+import com.cloudera.crunch.lib.join.InnerJoinFn;
+import com.cloudera.crunch.lib.join.JoinFn;
+import com.cloudera.crunch.lib.join.JoinUtils;
+import com.cloudera.crunch.lib.join.LeftOuterJoinFn;
+import com.cloudera.crunch.lib.join.RightOuterJoinFn;
import com.cloudera.crunch.type.PTableType;
import com.cloudera.crunch.type.PTypeFamily;
View
2  src/test/java/com/cloudera/crunch/TFIDFTest.java
@@ -32,7 +32,7 @@
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.io.seq.SeqFileSourceTarget;
import com.cloudera.crunch.lib.Aggregate;
-import com.cloudera.crunch.lib.join.Join;
+import com.cloudera.crunch.lib.Join;
import com.cloudera.crunch.type.PTypeFamily;
import com.cloudera.crunch.type.writable.WritableTypeFamily;
import com.google.common.collect.Lists;
View
1  src/test/java/com/cloudera/crunch/lib/join/JoinTester.java
@@ -25,6 +25,7 @@
import com.cloudera.crunch.Pipeline;
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.lib.Aggregate;
+import com.cloudera.crunch.lib.Join;
import com.cloudera.crunch.test.FileHelper;
import com.cloudera.crunch.type.PTableType;
import com.cloudera.crunch.type.PTypeFamily;
Something went wrong with that request. Please try again.