Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Renamed Crunch's type package to types to prevent issues in scala. #27

Merged
merged 1 commit into from

2 participants

Robert Chu Josh Wills
Robert Chu

As the summary says.

Josh Wills
Owner

So I hesitate on this one, as this will break all of the existing Java code that expects the type.* package. You have a use case where using the type trick won't work in Scala?

Robert Chu

I haven't encountered any huge problems with the type package, just issues coming from certain tools(intellij's idea) not having support for imports with escaped packages. All in all, having to import the type package with type just feels like a hack.

I understand entirely if you decide not to accept this change, I just thought it would be a good idea to at least bring it up before this becomes an apache incubator project.

Josh Wills
Owner

I'll start an email thread with the other initial committers and cc crunch-dev so folks can weigh in on it. I think we need to do it, it's mostly a question of when.

Josh Wills jwills merged commit d243a1a into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 19, 2012
  1. Robert Chu

    Renamed Crunch's type package to types to prevent issues in scala.

    robotoer authored
    In scala, the type keyword is reserved.
This page is out of date. Refresh to see the latest.
Showing with 299 additions and 280 deletions.
  1. +1 −1  scrunch/src/main/java/com/cloudera/scrunch/ScalaReflectDataFactory.java
  2. +1 −1  scrunch/src/main/scala/com/cloudera/scrunch/Conversions.scala
  3. +1 −3 scrunch/src/main/scala/com/cloudera/scrunch/IO.scala
  4. +3 −5 scrunch/src/main/scala/com/cloudera/scrunch/PCollectionLike.scala
  5. +7 −7 scrunch/src/main/scala/com/cloudera/scrunch/PTypeFamily.scala
  6. +3 −3 src/main/java/com/cloudera/crunch/PCollection.java
  7. +2 −2 src/main/java/com/cloudera/crunch/PTable.java
  8. +1 −1  src/main/java/com/cloudera/crunch/Source.java
  9. +1 −1  src/main/java/com/cloudera/crunch/TableSource.java
  10. +1 −1  src/main/java/com/cloudera/crunch/Target.java
  11. +2 −2 src/main/java/com/cloudera/crunch/impl/mem/MemPipeline.java
  12. +3 −3 src/main/java/com/cloudera/crunch/impl/mem/collect/MemCollection.java
  13. +3 −3 src/main/java/com/cloudera/crunch/impl/mem/collect/MemGroupedTable.java
  14. +2 −2 src/main/java/com/cloudera/crunch/impl/mem/collect/MemTable.java
  15. +2 −2 src/main/java/com/cloudera/crunch/impl/mr/MRPipeline.java
  16. +1 −1  src/main/java/com/cloudera/crunch/impl/mr/collect/DoCollectionImpl.java
  17. +2 −2 src/main/java/com/cloudera/crunch/impl/mr/collect/DoTableImpl.java
  18. +1 −1  src/main/java/com/cloudera/crunch/impl/mr/collect/InputCollection.java
  19. +2 −2 src/main/java/com/cloudera/crunch/impl/mr/collect/InputTable.java
  20. +3 −3 src/main/java/com/cloudera/crunch/impl/mr/collect/PCollectionImpl.java
  21. +2 −2 src/main/java/com/cloudera/crunch/impl/mr/collect/PGroupedTableImpl.java
  22. +1 −1  src/main/java/com/cloudera/crunch/impl/mr/collect/PTableBase.java
  23. +1 −1  src/main/java/com/cloudera/crunch/impl/mr/collect/UnionCollection.java
  24. +2 −2 src/main/java/com/cloudera/crunch/impl/mr/collect/UnionTable.java
  25. +1 −1  src/main/java/com/cloudera/crunch/impl/mr/emit/MultipleOutputEmitter.java
  26. +1 −1  src/main/java/com/cloudera/crunch/impl/mr/emit/OutputEmitter.java
  27. +3 −3 src/main/java/com/cloudera/crunch/impl/mr/plan/DoNode.java
  28. +1 −1  src/main/java/com/cloudera/crunch/impl/mr/plan/MSCROutputHandler.java
  29. +1 −1  src/main/java/com/cloudera/crunch/impl/mr/run/RTNode.java
  30. +4 −4 src/main/java/com/cloudera/crunch/io/At.java
  31. +5 −5 src/main/java/com/cloudera/crunch/io/From.java
  32. +1 −1  src/main/java/com/cloudera/crunch/io/MapReduceTarget.java
  33. +1 −1  src/main/java/com/cloudera/crunch/io/OutputHandler.java
  34. +1 −1  src/main/java/com/cloudera/crunch/io/PathTargetImpl.java
  35. +1 −1  src/main/java/com/cloudera/crunch/io/avro/AvroFileReaderFactory.java
  36. +3 −3 src/main/java/com/cloudera/crunch/io/avro/AvroFileSource.java
  37. +1 −1  src/main/java/com/cloudera/crunch/io/avro/AvroFileSourceTarget.java
  38. +4 −4 src/main/java/com/cloudera/crunch/io/avro/AvroFileTarget.java
  39. +3 −3 src/main/java/com/cloudera/crunch/io/hbase/HBaseSourceTarget.java
  40. +1 −1  src/main/java/com/cloudera/crunch/io/hbase/HBaseTarget.java
  41. +1 −1  src/main/java/com/cloudera/crunch/io/impl/FileSourceImpl.java
  42. +1 −1  src/main/java/com/cloudera/crunch/io/impl/FileTableSourceImpl.java
  43. +2 −2 src/main/java/com/cloudera/crunch/io/impl/FileTargetImpl.java
  44. +1 −1  src/main/java/com/cloudera/crunch/io/impl/SourcePathTargetImpl.java
  45. +1 −1  src/main/java/com/cloudera/crunch/io/impl/SourceTargetImpl.java
  46. +1 −1  src/main/java/com/cloudera/crunch/io/impl/TableSourcePathTargetImpl.java
  47. +1 −1  src/main/java/com/cloudera/crunch/io/impl/TableSourceTargetImpl.java
  48. +2 −2 src/main/java/com/cloudera/crunch/io/seq/SeqFileHelper.java
  49. +1 −1  src/main/java/com/cloudera/crunch/io/seq/SeqFileReaderFactory.java
  50. +1 −1  src/main/java/com/cloudera/crunch/io/seq/SeqFileSource.java
  51. +1 −1  src/main/java/com/cloudera/crunch/io/seq/SeqFileSourceTarget.java
  52. +2 −2 src/main/java/com/cloudera/crunch/io/seq/SeqFileTableReaderFactory.java
  53. +1 −1  src/main/java/com/cloudera/crunch/io/seq/SeqFileTableSource.java
  54. +1 −1  src/main/java/com/cloudera/crunch/io/seq/SeqFileTableSourceTarget.java
  55. +2 −2 src/main/java/com/cloudera/crunch/io/seq/SeqFileTarget.java
  56. +1 −1  src/main/java/com/cloudera/crunch/io/text/TextFileReaderFactory.java
  57. +3 −3 src/main/java/com/cloudera/crunch/io/text/TextFileSource.java
  58. +1 −1  src/main/java/com/cloudera/crunch/io/text/TextFileSourceTarget.java
  59. +2 −2 src/main/java/com/cloudera/crunch/io/text/TextFileTarget.java
  60. +3 −3 src/main/java/com/cloudera/crunch/lib/Aggregate.java
  61. +2 −2 src/main/java/com/cloudera/crunch/lib/Cogroup.java
  62. +2 −2 src/main/java/com/cloudera/crunch/lib/Join.java
  63. +2 −2 src/main/java/com/cloudera/crunch/lib/Set.java
  64. +7 −7 src/main/java/com/cloudera/crunch/lib/Sort.java
  65. +3 −3 src/main/java/com/cloudera/crunch/lib/join/JoinUtils.java
  66. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/Converter.java
  67. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/PGroupedTableType.java
  68. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/PTableType.java
  69. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/PType.java
  70. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/PTypeFamily.java
  71. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/PTypeUtils.java
  72. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/TupleFactory.java
  73. +4 −3 src/main/java/com/cloudera/crunch/{type → types}/avro/AvroGroupedTableType.java
  74. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/avro/AvroInputFormat.java
  75. +2 −2 src/main/java/com/cloudera/crunch/{type → types}/avro/AvroKeyConverter.java
  76. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/avro/AvroOutputFormat.java
  77. +3 −2 src/main/java/com/cloudera/crunch/{type → types}/avro/AvroPairConverter.java
  78. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/avro/AvroRecordReader.java
  79. +5 −4 src/main/java/com/cloudera/crunch/{type → types}/avro/AvroTableType.java
  80. +7 −4 src/main/java/com/cloudera/crunch/{type → types}/avro/AvroType.java
  81. +10 −6 src/main/java/com/cloudera/crunch/{type → types}/avro/AvroTypeFamily.java
  82. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/avro/AvroUtf8InputFormat.java
  83. +3 −3 src/main/java/com/cloudera/crunch/{type → types}/avro/Avros.java
  84. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/avro/ReflectDataFactory.java
  85. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/avro/SafeAvroSerialization.java
  86. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/writable/GenericArrayWritable.java
  87. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/writable/TextMapWritable.java
  88. +1 −1  src/main/java/com/cloudera/crunch/{type → types}/writable/TupleWritable.java
  89. +4 −3 src/main/java/com/cloudera/crunch/{type → types}/writable/WritableGroupedTableType.java
  90. +3 −2 src/main/java/com/cloudera/crunch/{type → types}/writable/WritablePairConverter.java
  91. +7 −6 src/main/java/com/cloudera/crunch/{type → types}/writable/WritableTableType.java
  92. +7 −4 src/main/java/com/cloudera/crunch/{type → types}/writable/WritableType.java
  93. +8 −9 src/main/java/com/cloudera/crunch/{type → types}/writable/WritableTypeFamily.java
  94. +3 −2 src/main/java/com/cloudera/crunch/{type → types}/writable/WritableValueConverter.java
  95. +3 −3 src/main/java/com/cloudera/crunch/{type → types}/writable/Writables.java
  96. +2 −2 src/main/java/com/cloudera/crunch/util/PTypes.java
  97. +3 −3 src/test/java/com/cloudera/crunch/CollectionsTest.java
  98. +3 −3 src/test/java/com/cloudera/crunch/MapsTest.java
  99. +3 −3 src/test/java/com/cloudera/crunch/MultipleOutputTest.java
  100. +3 −3 src/test/java/com/cloudera/crunch/PTableKeyValueTest.java
  101. +5 −5 src/test/java/com/cloudera/crunch/PageRankTest.java
  102. +2 −2 src/test/java/com/cloudera/crunch/TFIDFTest.java
  103. +2 −2 src/test/java/com/cloudera/crunch/TermFrequencyTest.java
  104. +1 −1  src/test/java/com/cloudera/crunch/TextPairTest.java
  105. +3 −3 src/test/java/com/cloudera/crunch/TupleNClassCastBugTest.java
  106. +1 −1  src/test/java/com/cloudera/crunch/TupleTest.java
  107. +1 −1  src/test/java/com/cloudera/crunch/WordCountHBaseTest.java
  108. +3 −3 src/test/java/com/cloudera/crunch/WordCountTest.java
  109. +4 −4 src/test/java/com/cloudera/crunch/impl/mr/collect/UnionCollectionTest.java
  110. +1 −1  src/test/java/com/cloudera/crunch/io/avro/AvroFileReaderFactoryTest.java
  111. +1 −1  src/test/java/com/cloudera/crunch/io/avro/AvroFileSourceTargetTest.java
  112. +2 −2 src/test/java/com/cloudera/crunch/io/avro/AvroFileSourceTest.java
  113. +6 −6 src/test/java/com/cloudera/crunch/lib/AggregateTest.java
  114. +3 −3 src/test/java/com/cloudera/crunch/lib/AvroTypeSortTest.java
  115. +4 −4 src/test/java/com/cloudera/crunch/lib/CogroupTest.java
  116. +3 −3 src/test/java/com/cloudera/crunch/lib/SetTest.java
  117. +4 −4 src/test/java/com/cloudera/crunch/lib/SortTest.java
  118. +2 −2 src/test/java/com/cloudera/crunch/lib/SpecificAvroGroupByTest.java
  119. +1 −1  src/test/java/com/cloudera/crunch/lib/TupleWritablePartitionerTest.java
  120. +4 −4 src/test/java/com/cloudera/crunch/lib/join/JoinTester.java
  121. +1 −1  src/test/java/com/cloudera/crunch/lib/join/MultiAvroSchemaJoinTest.java
  122. +12 −7 src/test/java/com/cloudera/crunch/{type → types}/PTypeUtilsTest.java
  123. +1 −1  src/test/java/com/cloudera/crunch/{type → types}/avro/AvroTypeTest.java
  124. +3 −2 src/test/java/com/cloudera/crunch/{type → types}/avro/AvrosTest.java
  125. +5 −4 src/test/java/com/cloudera/crunch/{type → types}/writable/WritablesTest.java
2  scrunch/src/main/java/com/cloudera/scrunch/ScalaReflectDataFactory.java
View
@@ -19,7 +19,7 @@
import org.apache.avro.reflect.ReflectDatumReader;
import org.apache.avro.reflect.ReflectDatumWriter;
-import com.cloudera.crunch.type.avro.ReflectDataFactory;
+import com.cloudera.crunch.types.avro.ReflectDataFactory;
/**
* An implementation of the {@code ReflectDataFactory} class to work with Scala classes.
2  scrunch/src/main/scala/com/cloudera/scrunch/Conversions.scala
View
@@ -16,7 +16,7 @@ package com.cloudera.scrunch
import com.cloudera.crunch.{PCollection => JCollection, PGroupedTable => JGroupedTable, PTable => JTable, DoFn, Emitter}
import com.cloudera.crunch.{Pair => CPair}
-import com.cloudera.crunch.`type`.PType
+import com.cloudera.crunch.types.PType
import java.nio.ByteBuffer
import scala.collection.Iterable
4 scrunch/src/main/scala/com/cloudera/scrunch/IO.scala
View
@@ -14,10 +14,8 @@
*/
package com.cloudera.scrunch
-import com.cloudera.crunch.{Source, SourceTarget, Target}
import com.cloudera.crunch.io.{From => from, To => to, At => at}
-import com.cloudera.crunch.`type`.PType
-import com.cloudera.crunch.`type`.avro.AvroType
+import com.cloudera.crunch.types.avro.AvroType
import org.apache.hadoop.fs.Path;
object From {
8 scrunch/src/main/scala/com/cloudera/scrunch/PCollectionLike.scala
View
@@ -14,11 +14,9 @@
*/
package com.cloudera.scrunch
-import com.cloudera.crunch.{DoFn, Emitter, FilterFn, MapFn}
-import com.cloudera.crunch.{PCollection => JCollection, PTable => JTable, Pair => JPair, Target}
-import com.cloudera.crunch.`type`.{PType, PTableType}
-import com.cloudera.crunch.`type`.writable.WritableTypeFamily
-import com.cloudera.scrunch.Conversions._
+import com.cloudera.crunch.DoFn
+import com.cloudera.crunch.{PCollection => JCollection, Pair => JPair, Target}
+import com.cloudera.crunch.types.{PType, PTableType}
trait PCollectionLike[S, +FullType, +NativeType <: JCollection[S]] {
val native: NativeType
14 scrunch/src/main/scala/com/cloudera/scrunch/PTypeFamily.scala
View
@@ -14,10 +14,10 @@
*/
package com.cloudera.scrunch
-import com.cloudera.crunch.{Pair => CPair, Tuple3 => CTuple3, Tuple4 => CTuple4, TupleN, MapFn}
-import com.cloudera.crunch.`type`.{PType, PTypeFamily => PTF}
-import com.cloudera.crunch.`type`.writable.WritableTypeFamily
-import com.cloudera.crunch.`type`.avro.{AvroTypeFamily, Avros => CAvros}
+import com.cloudera.crunch.{Pair => CPair, Tuple3 => CTuple3, Tuple4 => CTuple4, MapFn}
+import com.cloudera.crunch.types.{PType, PTypeFamily => PTF}
+import com.cloudera.crunch.types.writable.WritableTypeFamily
+import com.cloudera.crunch.types.avro.{AvroTypeFamily, Avros => CAvros}
import java.lang.{Long => JLong, Double => JDouble, Integer => JInt, Float => JFloat, Boolean => JBoolean}
import java.util.{Collection => JCollection}
import scala.collection.JavaConversions._
@@ -28,7 +28,7 @@ class TMapFn[S, T](f: S => T) extends MapFn[S, T] {
trait PTypeFamily {
- def ptf(): PTF
+ def ptf: PTF
val strings = ptf.strings()
@@ -112,11 +112,11 @@ trait PTypeFamily {
}
object Writables extends PTypeFamily {
- override def ptf() = WritableTypeFamily.getInstance()
+ override def ptf = WritableTypeFamily.getInstance()
}
object Avros extends PTypeFamily {
- override def ptf() = AvroTypeFamily.getInstance()
+ override def ptf = AvroTypeFamily.getInstance()
CAvros.REFLECT_DATA_FACTORY = new ScalaReflectDataFactory()
6 src/main/java/com/cloudera/crunch/PCollection.java
View
@@ -15,9 +15,9 @@
package com.cloudera.crunch;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
/**
* A representation of an immutable, distributed collection of elements
4 src/main/java/com/cloudera/crunch/PTable.java
View
@@ -17,8 +17,8 @@
import java.util.Collection;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
/**
* A sub-interface of {@code PCollection} that represents an immutable,
2  src/main/java/com/cloudera/crunch/Source.java
View
@@ -19,7 +19,7 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.Job;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
/**
* A {@code Source} represents an input data set that is an input to one
2  src/main/java/com/cloudera/crunch/TableSource.java
View
@@ -14,7 +14,7 @@
*/
package com.cloudera.crunch;
-import com.cloudera.crunch.type.PTableType;
+import com.cloudera.crunch.types.PTableType;
/**
* The interface {@code Source} implementations that return a {@link PTable}.
2  src/main/java/com/cloudera/crunch/Target.java
View
@@ -15,7 +15,7 @@
package com.cloudera.crunch;
import com.cloudera.crunch.io.OutputHandler;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
/**
* A {@code Target} represents the output destination of a Crunch job.
4 src/main/java/com/cloudera/crunch/impl/mem/MemPipeline.java
View
@@ -36,8 +36,8 @@
import com.cloudera.crunch.io.At;
import com.cloudera.crunch.io.PathTarget;
import com.cloudera.crunch.io.ReadableSource;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
6 src/main/java/com/cloudera/crunch/impl/mem/collect/MemCollection.java
View
@@ -30,9 +30,9 @@
import com.cloudera.crunch.lib.Sample;
import com.cloudera.crunch.lib.Sort;
import com.cloudera.crunch.test.InMemoryEmitter;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
6 src/main/java/com/cloudera/crunch/impl/mem/collect/MemGroupedTable.java
View
@@ -30,9 +30,9 @@
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.Pipeline;
import com.cloudera.crunch.Target;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
4 src/main/java/com/cloudera/crunch/impl/mem/collect/MemTable.java
View
@@ -27,8 +27,8 @@
import com.cloudera.crunch.lib.Cogroup;
import com.cloudera.crunch.lib.Join;
import com.cloudera.crunch.lib.PTables;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.Lists;
public class MemTable<K, V> extends MemCollection<Pair<K, V>> implements PTable<K, V> {
4 src/main/java/com/cloudera/crunch/impl/mr/MRPipeline.java
View
@@ -48,8 +48,8 @@
import com.cloudera.crunch.io.At;
import com.cloudera.crunch.io.ReadableSourceTarget;
import com.cloudera.crunch.materialize.MaterializableIterable;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
2  src/main/java/com/cloudera/crunch/impl/mr/collect/DoCollectionImpl.java
View
@@ -18,7 +18,7 @@
import com.cloudera.crunch.DoFn;
import com.cloudera.crunch.impl.mr.plan.DoNode;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
public class DoCollectionImpl<S> extends PCollectionImpl<S> {
4 src/main/java/com/cloudera/crunch/impl/mr/collect/DoTableImpl.java
View
@@ -21,8 +21,8 @@
import com.cloudera.crunch.PTable;
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.impl.mr.plan.DoNode;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
public class DoTableImpl<K, V> extends PTableBase<K, V> implements
2  src/main/java/com/cloudera/crunch/impl/mr/collect/InputCollection.java
View
@@ -21,7 +21,7 @@
import com.cloudera.crunch.Source;
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.impl.mr.plan.DoNode;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
public class InputCollection<S> extends PCollectionImpl<S> {
4 src/main/java/com/cloudera/crunch/impl/mr/collect/InputTable.java
View
@@ -20,8 +20,8 @@
import com.cloudera.crunch.TableSource;
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.impl.mr.plan.DoNode;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
public class InputTable<K, V> extends PTableBase<K, V> {
6 src/main/java/com/cloudera/crunch/impl/mr/collect/PCollectionImpl.java
View
@@ -31,9 +31,9 @@
import com.cloudera.crunch.lib.Aggregate;
import com.cloudera.crunch.lib.Sample;
import com.cloudera.crunch.lib.Sort;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.common.collect.Lists;
public abstract class PCollectionImpl<S> implements PCollection<S> {
4 src/main/java/com/cloudera/crunch/impl/mr/collect/PGroupedTableImpl.java
View
@@ -28,8 +28,8 @@
import com.cloudera.crunch.PTable;
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.impl.mr.plan.DoNode;
-import com.cloudera.crunch.type.PGroupedTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PGroupedTableType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
public class PGroupedTableImpl<K, V> extends
2  src/main/java/com/cloudera/crunch/impl/mr/collect/PTableBase.java
View
@@ -26,7 +26,7 @@
import com.cloudera.crunch.lib.Cogroup;
import com.cloudera.crunch.lib.Join;
import com.cloudera.crunch.lib.PTables;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.Lists;
public abstract class PTableBase<K, V> extends PCollectionImpl<Pair<K, V>>
2  src/main/java/com/cloudera/crunch/impl/mr/collect/UnionCollection.java
View
@@ -18,7 +18,7 @@
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.impl.mr.plan.DoNode;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
public class UnionCollection<S> extends PCollectionImpl<S> {
4 src/main/java/com/cloudera/crunch/impl/mr/collect/UnionTable.java
View
@@ -19,8 +19,8 @@
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.impl.mr.plan.DoNode;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
2  src/main/java/com/cloudera/crunch/impl/mr/emit/MultipleOutputEmitter.java
View
@@ -20,7 +20,7 @@
import com.cloudera.crunch.Emitter;
import com.cloudera.crunch.impl.mr.run.CrunchRuntimeException;
-import com.cloudera.crunch.type.Converter;
+import com.cloudera.crunch.types.Converter;
public class MultipleOutputEmitter<T, K, V> implements Emitter<T> {
2  src/main/java/com/cloudera/crunch/impl/mr/emit/OutputEmitter.java
View
@@ -20,7 +20,7 @@
import com.cloudera.crunch.Emitter;
import com.cloudera.crunch.impl.mr.run.CrunchRuntimeException;
-import com.cloudera.crunch.type.Converter;
+import com.cloudera.crunch.types.Converter;
public class OutputEmitter<T, K, V> implements Emitter<T> {
6 src/main/java/com/cloudera/crunch/impl/mr/plan/DoNode.java
View
@@ -23,9 +23,9 @@
import com.cloudera.crunch.Source;
import com.cloudera.crunch.impl.mr.run.NodeContext;
import com.cloudera.crunch.impl.mr.run.RTNode;
-import com.cloudera.crunch.type.Converter;
-import com.cloudera.crunch.type.PGroupedTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PGroupedTableType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
2  src/main/java/com/cloudera/crunch/impl/mr/plan/MSCROutputHandler.java
View
@@ -23,7 +23,7 @@
import com.cloudera.crunch.io.MapReduceTarget;
import com.cloudera.crunch.io.OutputHandler;
import com.cloudera.crunch.io.PathTarget;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.Lists;
public class MSCROutputHandler implements OutputHandler {
2  src/main/java/com/cloudera/crunch/impl/mr/run/RTNode.java
View
@@ -25,7 +25,7 @@
import com.cloudera.crunch.impl.mr.emit.IntermediateEmitter;
import com.cloudera.crunch.impl.mr.emit.MultipleOutputEmitter;
import com.cloudera.crunch.impl.mr.emit.OutputEmitter;
-import com.cloudera.crunch.type.Converter;
+import com.cloudera.crunch.types.Converter;
public class RTNode implements Serializable {
8 src/main/java/com/cloudera/crunch/io/At.java
View
@@ -23,10 +23,10 @@
import com.cloudera.crunch.io.seq.SeqFileSourceTarget;
import com.cloudera.crunch.io.seq.SeqFileTableSourceTarget;
import com.cloudera.crunch.io.text.TextFileSourceTarget;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroType;
-import com.cloudera.crunch.type.writable.Writables;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroType;
+import com.cloudera.crunch.types.writable.Writables;
/**
* Static factory methods for creating various {@link SourceTarget} types.
10 src/main/java/com/cloudera/crunch/io/From.java
View
@@ -28,11 +28,11 @@
import com.cloudera.crunch.io.seq.SeqFileSource;
import com.cloudera.crunch.io.seq.SeqFileTableSourceTarget;
import com.cloudera.crunch.io.text.TextFileSource;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroType;
-import com.cloudera.crunch.type.writable.Writables;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroType;
+import com.cloudera.crunch.types.writable.Writables;
/**
* Static factory methods for creating various {@link Source} types.
2  src/main/java/com/cloudera/crunch/io/MapReduceTarget.java
View
@@ -18,7 +18,7 @@
import org.apache.hadoop.mapreduce.Job;
import com.cloudera.crunch.Target;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public interface MapReduceTarget extends Target {
void configureForMapReduce(Job job, PType<?> ptype, Path outputPath, String name);
2  src/main/java/com/cloudera/crunch/io/OutputHandler.java
View
@@ -15,7 +15,7 @@
package com.cloudera.crunch.io;
import com.cloudera.crunch.Target;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public interface OutputHandler {
boolean configure(Target target, PType<?> ptype);
2  src/main/java/com/cloudera/crunch/io/PathTargetImpl.java
View
@@ -6,7 +6,7 @@
import org.apache.hadoop.mapreduce.lib.output.CrunchMultipleOutputs;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public abstract class PathTargetImpl implements PathTarget {
2  src/main/java/com/cloudera/crunch/io/avro/AvroFileReaderFactory.java
View
@@ -30,7 +30,7 @@
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.io.FileReaderFactory;
-import com.cloudera.crunch.type.avro.AvroType;
+import com.cloudera.crunch.types.avro.AvroType;
import com.google.common.collect.Iterators;
import com.google.common.collect.UnmodifiableIterator;
6 src/main/java/com/cloudera/crunch/io/avro/AvroFileSource.java
View
@@ -25,9 +25,9 @@
import com.cloudera.crunch.io.ReadableSource;
import com.cloudera.crunch.io.impl.FileSourceImpl;
import com.cloudera.crunch.io.impl.InputBundle;
-import com.cloudera.crunch.type.avro.AvroInputFormat;
-import com.cloudera.crunch.type.avro.AvroType;
-import com.cloudera.crunch.type.avro.Avros;
+import com.cloudera.crunch.types.avro.AvroInputFormat;
+import com.cloudera.crunch.types.avro.AvroType;
+import com.cloudera.crunch.types.avro.Avros;
public class AvroFileSource<T> extends FileSourceImpl<T> implements ReadableSource<T> {
2  src/main/java/com/cloudera/crunch/io/avro/AvroFileSourceTarget.java
View
@@ -17,7 +17,7 @@
import org.apache.hadoop.fs.Path;
import com.cloudera.crunch.io.impl.ReadableSourcePathTargetImpl;
-import com.cloudera.crunch.type.avro.AvroType;
+import com.cloudera.crunch.types.avro.AvroType;
public class AvroFileSourceTarget<T> extends ReadableSourcePathTargetImpl<T> {
public AvroFileSourceTarget(Path path, AvroType<T> atype) {
8 src/main/java/com/cloudera/crunch/io/avro/AvroFileTarget.java
View
@@ -23,10 +23,10 @@
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.io.OutputHandler;
import com.cloudera.crunch.io.impl.FileTargetImpl;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.avro.AvroOutputFormat;
-import com.cloudera.crunch.type.avro.AvroType;
-import com.cloudera.crunch.type.avro.Avros;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.avro.AvroOutputFormat;
+import com.cloudera.crunch.types.avro.AvroType;
+import com.cloudera.crunch.types.avro.Avros;
public class AvroFileTarget extends FileTargetImpl {
public AvroFileTarget(String path) {
6 src/main/java/com/cloudera/crunch/io/hbase/HBaseSourceTarget.java
View
@@ -33,9 +33,9 @@
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.TableSource;
import com.cloudera.crunch.impl.mr.run.CrunchMapper;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.writable.Writables;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.writable.Writables;
public class HBaseSourceTarget extends HBaseTarget implements SourceTarget<Pair<ImmutableBytesWritable, Result>>,
TableSource<ImmutableBytesWritable, Result> {
2  src/main/java/com/cloudera/crunch/io/hbase/HBaseTarget.java
View
@@ -29,7 +29,7 @@
import com.cloudera.crunch.impl.mr.run.CrunchRuntimeException;
import com.cloudera.crunch.io.MapReduceTarget;
import com.cloudera.crunch.io.OutputHandler;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public class HBaseTarget implements MapReduceTarget {
2  src/main/java/com/cloudera/crunch/io/impl/FileSourceImpl.java
View
@@ -28,7 +28,7 @@
import com.cloudera.crunch.Source;
import com.cloudera.crunch.impl.mr.run.CrunchInputs;
import com.cloudera.crunch.io.SourceTargetHelper;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public abstract class FileSourceImpl<T> implements Source<T> {
2  src/main/java/com/cloudera/crunch/io/impl/FileTableSourceImpl.java
View
@@ -19,7 +19,7 @@
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.TableSource;
-import com.cloudera.crunch.type.PTableType;
+import com.cloudera.crunch.types.PTableType;
public class FileTableSourceImpl<K, V> extends FileSourceImpl<Pair<K, V>>
implements TableSource<K, V> {
4 src/main/java/com/cloudera/crunch/io/impl/FileTargetImpl.java
View
@@ -23,8 +23,8 @@
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.io.OutputHandler;
import com.cloudera.crunch.io.PathTarget;
-import com.cloudera.crunch.type.Converter;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PType;
public class FileTargetImpl implements PathTarget {
2  src/main/java/com/cloudera/crunch/io/impl/SourcePathTargetImpl.java
View
@@ -19,7 +19,7 @@
import com.cloudera.crunch.Source;
import com.cloudera.crunch.io.PathTarget;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public class SourcePathTargetImpl<T> extends SourceTargetImpl<T> implements
PathTarget {
2  src/main/java/com/cloudera/crunch/io/impl/SourceTargetImpl.java
View
@@ -24,7 +24,7 @@
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.Target;
import com.cloudera.crunch.io.OutputHandler;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public class SourceTargetImpl<T> implements SourceTarget<T> {
2  src/main/java/com/cloudera/crunch/io/impl/TableSourcePathTargetImpl.java
View
@@ -17,7 +17,7 @@
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.TableSource;
import com.cloudera.crunch.io.PathTarget;
-import com.cloudera.crunch.type.PTableType;
+import com.cloudera.crunch.types.PTableType;
public class TableSourcePathTargetImpl<K, V> extends SourcePathTargetImpl<Pair<K, V>>
implements TableSource<K, V> {
2  src/main/java/com/cloudera/crunch/io/impl/TableSourceTargetImpl.java
View
@@ -17,7 +17,7 @@
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.TableSource;
import com.cloudera.crunch.Target;
-import com.cloudera.crunch.type.PTableType;
+import com.cloudera.crunch.types.PTableType;
public class TableSourceTargetImpl<K, V> extends SourceTargetImpl<Pair<K, V>>
implements TableSource<K, V> {
4 src/main/java/com/cloudera/crunch/io/seq/SeqFileHelper.java
View
@@ -19,8 +19,8 @@
import org.apache.hadoop.util.ReflectionUtils;
import com.cloudera.crunch.MapFn;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.writable.WritableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.writable.WritableType;
public class SeqFileHelper {
static <T> Writable newInstance(PType<T> ptype, Configuration conf) {
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileReaderFactory.java
View
@@ -28,7 +28,7 @@
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.io.FileReaderFactory;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.Iterators;
import com.google.common.collect.UnmodifiableIterator;
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileSource.java
View
@@ -24,7 +24,7 @@
import com.cloudera.crunch.io.CompositePathIterable;
import com.cloudera.crunch.io.ReadableSource;
import com.cloudera.crunch.io.impl.FileSourceImpl;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public class SeqFileSource<T> extends FileSourceImpl<T> implements
ReadableSource<T> {
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileSourceTarget.java
View
@@ -17,7 +17,7 @@
import org.apache.hadoop.fs.Path;
import com.cloudera.crunch.io.impl.ReadableSourcePathTargetImpl;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public class SeqFileSourceTarget<T> extends ReadableSourcePathTargetImpl<T> {
public SeqFileSourceTarget(String path, PType<T> ptype) {
4 src/main/java/com/cloudera/crunch/io/seq/SeqFileTableReaderFactory.java
View
@@ -28,8 +28,8 @@
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.io.FileReaderFactory;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.Iterators;
import com.google.common.collect.UnmodifiableIterator;
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileTableSource.java
View
@@ -25,7 +25,7 @@
import com.cloudera.crunch.io.CompositePathIterable;
import com.cloudera.crunch.io.ReadableSource;
import com.cloudera.crunch.io.impl.FileTableSourceImpl;
-import com.cloudera.crunch.type.PTableType;
+import com.cloudera.crunch.types.PTableType;
/**
*
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileTableSourceTarget.java
View
@@ -19,7 +19,7 @@
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.TableSource;
import com.cloudera.crunch.io.impl.ReadableSourcePathTargetImpl;
-import com.cloudera.crunch.type.PTableType;
+import com.cloudera.crunch.types.PTableType;
public class SeqFileTableSourceTarget<K, V> extends ReadableSourcePathTargetImpl<Pair<K,V>> implements TableSource<K, V> {
private final PTableType<K, V> tableType;
4 src/main/java/com/cloudera/crunch/io/seq/SeqFileTarget.java
View
@@ -19,8 +19,8 @@
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.io.impl.FileTargetImpl;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
public class SeqFileTarget extends FileTargetImpl {
public SeqFileTarget(String path) {
2  src/main/java/com/cloudera/crunch/io/text/TextFileReaderFactory.java
View
@@ -30,7 +30,7 @@
import com.cloudera.crunch.fn.CompositeMapFn;
import com.cloudera.crunch.fn.IdentityFn;
import com.cloudera.crunch.io.FileReaderFactory;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
import com.google.common.collect.Iterators;
import com.google.common.collect.UnmodifiableIterator;
6 src/main/java/com/cloudera/crunch/io/text/TextFileSource.java
View
@@ -25,9 +25,9 @@
import com.cloudera.crunch.io.CompositePathIterable;
import com.cloudera.crunch.io.ReadableSource;
import com.cloudera.crunch.io.impl.FileSourceImpl;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.avro.AvroUtf8InputFormat;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.avro.AvroUtf8InputFormat;
public class TextFileSource<T> extends FileSourceImpl<T> implements
ReadableSource<T> {
2  src/main/java/com/cloudera/crunch/io/text/TextFileSourceTarget.java
View
@@ -17,7 +17,7 @@
import org.apache.hadoop.fs.Path;
import com.cloudera.crunch.io.impl.ReadableSourcePathTargetImpl;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PType;
public class TextFileSourceTarget<T> extends ReadableSourcePathTargetImpl<T> {
public TextFileSourceTarget(String path, PType<T> ptype) {
4 src/main/java/com/cloudera/crunch/io/text/TextFileTarget.java
View
@@ -19,8 +19,8 @@
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.io.impl.FileTargetImpl;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
public class TextFileTarget extends FileTargetImpl {
public TextFileTarget(String path) {
6 src/main/java/com/cloudera/crunch/lib/Aggregate.java
View
@@ -28,9 +28,9 @@
import com.cloudera.crunch.PTable;
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.fn.MapValuesFn;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.common.collect.Lists;
/**
4 src/main/java/com/cloudera/crunch/lib/Cogroup.java
View
@@ -21,8 +21,8 @@
import com.cloudera.crunch.PTable;
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.fn.MapValuesFn;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.common.collect.Lists;
public class Cogroup {
4 src/main/java/com/cloudera/crunch/lib/Join.java
View
@@ -25,8 +25,8 @@
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;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PTypeFamily;
/**
* Utilities for joining multiple {@code PTable} instances based on a common lastKey.
4 src/main/java/com/cloudera/crunch/lib/Set.java
View
@@ -22,8 +22,8 @@
import com.cloudera.crunch.PTable;
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.Tuple3;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
/**
* Utilities for performing set operations (difference, intersection, etc) on
14 src/main/java/com/cloudera/crunch/lib/Sort.java
View
@@ -42,13 +42,13 @@
import com.cloudera.crunch.Tuple3;
import com.cloudera.crunch.Tuple4;
import com.cloudera.crunch.TupleN;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroType;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.writable.TupleWritable;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroType;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.writable.TupleWritable;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
6 src/main/java/com/cloudera/crunch/lib/join/JoinUtils.java
View
@@ -30,9 +30,9 @@
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Partitioner;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.writable.TupleWritable;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.writable.TupleWritable;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
/**
* Utilities that are useful in joining multiple data sets via a MapReduce.
2  ...main/java/com/cloudera/crunch/type/Converter.java → ...ain/java/com/cloudera/crunch/types/Converter.java
View
@@ -12,7 +12,7 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type;
+package com.cloudera.crunch.types;
import java.io.Serializable;
2  ...a/com/cloudera/crunch/type/PGroupedTableType.java → .../com/cloudera/crunch/types/PGroupedTableType.java
View
@@ -13,7 +13,7 @@
* License.
*/
-package com.cloudera.crunch.type;
+package com.cloudera.crunch.types;
import java.util.Iterator;
import java.util.List;
2  ...ain/java/com/cloudera/crunch/type/PTableType.java → ...in/java/com/cloudera/crunch/types/PTableType.java
View
@@ -13,7 +13,7 @@
* License.
*/
-package com.cloudera.crunch.type;
+package com.cloudera.crunch.types;
import com.cloudera.crunch.PTable;
import com.cloudera.crunch.Pair;
2  src/main/java/com/cloudera/crunch/type/PType.java → src/main/java/com/cloudera/crunch/types/PType.java
View
@@ -13,7 +13,7 @@
* License.
*/
-package com.cloudera.crunch.type;
+package com.cloudera.crunch.types;
import java.util.List;
2  ...in/java/com/cloudera/crunch/type/PTypeFamily.java → ...n/java/com/cloudera/crunch/types/PTypeFamily.java
View
@@ -13,7 +13,7 @@
* License.
*/
-package com.cloudera.crunch.type;
+package com.cloudera.crunch.types;
import java.nio.ByteBuffer;
import java.util.Collection;
2  ...ain/java/com/cloudera/crunch/type/PTypeUtils.java → ...in/java/com/cloudera/crunch/types/PTypeUtils.java
View
@@ -12,7 +12,7 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type;
+package com.cloudera.crunch.types;
import java.util.Collection;
import java.util.List;
2  ...n/java/com/cloudera/crunch/type/TupleFactory.java → .../java/com/cloudera/crunch/types/TupleFactory.java
View
@@ -12,7 +12,7 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type;
+package com.cloudera.crunch.types;
import java.io.Serializable;
import java.lang.reflect.Constructor;
7 ...oudera/crunch/type/avro/AvroGroupedTableType.java → ...udera/crunch/types/avro/AvroGroupedTableType.java
View
@@ -12,10 +12,11 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.util.Collection;
+import com.cloudera.crunch.types.Converter;
import org.apache.avro.mapred.AvroJob;
import org.apache.avro.mapred.AvroKey;
import org.apache.avro.mapred.AvroKeyComparator;
@@ -28,8 +29,8 @@
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.fn.PairMapFn;
-import com.cloudera.crunch.type.Converter;
-import com.cloudera.crunch.type.PGroupedTableType;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PGroupedTableType;
/**
*
2  ...om/cloudera/crunch/type/avro/AvroInputFormat.java → ...m/cloudera/crunch/types/avro/AvroInputFormat.java
View
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.io.IOException;
import java.util.ArrayList;
4 ...m/cloudera/crunch/type/avro/AvroKeyConverter.java → .../cloudera/crunch/types/avro/AvroKeyConverter.java
View
@@ -12,12 +12,12 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import org.apache.avro.mapred.AvroWrapper;
import org.apache.hadoop.io.NullWritable;
-import com.cloudera.crunch.type.Converter;
+import com.cloudera.crunch.types.Converter;
public class AvroKeyConverter<K> implements Converter<AvroWrapper<K>, NullWritable, K, Iterable<K>> {
private transient AvroWrapper<K> wrapper = null;
2  ...m/cloudera/crunch/type/avro/AvroOutputFormat.java → .../cloudera/crunch/types/avro/AvroOutputFormat.java
View
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.io.IOException;
5 .../cloudera/crunch/type/avro/AvroPairConverter.java → ...cloudera/crunch/types/avro/AvroPairConverter.java
View
@@ -12,15 +12,16 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.util.Iterator;
+import com.cloudera.crunch.types.Converter;
import org.apache.avro.mapred.AvroKey;
import org.apache.avro.mapred.AvroValue;
import com.cloudera.crunch.Pair;
-import com.cloudera.crunch.type.Converter;
+import com.cloudera.crunch.types.Converter;
public class AvroPairConverter<K, V> implements Converter<AvroKey<K>, AvroValue<V>, Pair<K, V>, Pair<K, Iterable<V>>> {
2  ...m/cloudera/crunch/type/avro/AvroRecordReader.java → .../cloudera/crunch/types/avro/AvroRecordReader.java
View
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.io.IOException;
9 .../com/cloudera/crunch/type/avro/AvroTableType.java → ...com/cloudera/crunch/types/avro/AvroTableType.java
View
@@ -12,17 +12,18 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
+import com.cloudera.crunch.types.PTableType;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.hadoop.conf.Configuration;
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.Pair;
-import com.cloudera.crunch.type.PGroupedTableType;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
+import com.cloudera.crunch.types.PGroupedTableType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
/**
* The implementation of the PTableType interface for Avro-based serialization.
11 .../java/com/cloudera/crunch/type/avro/AvroType.java → ...java/com/cloudera/crunch/types/avro/AvroType.java
View
@@ -12,10 +12,13 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.util.List;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import org.apache.avro.Schema;
import org.apache.avro.specific.SpecificRecord;
import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -25,9 +28,9 @@
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.fn.IdentityFn;
import com.cloudera.crunch.io.avro.AvroFileSourceTarget;
-import com.cloudera.crunch.type.Converter;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
16 ...com/cloudera/crunch/type/avro/AvroTypeFamily.java → ...om/cloudera/crunch/types/avro/AvroTypeFamily.java
View
@@ -12,12 +12,16 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Map;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.PTypeUtils;
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
@@ -27,11 +31,11 @@
import com.cloudera.crunch.Tuple3;
import com.cloudera.crunch.Tuple4;
import com.cloudera.crunch.TupleN;
-import com.cloudera.crunch.type.PGroupedTableType;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.PTypeUtils;
+import com.cloudera.crunch.types.PGroupedTableType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.PTypeUtils;
public class AvroTypeFamily implements PTypeFamily {
2  ...loudera/crunch/type/avro/AvroUtf8InputFormat.java → ...oudera/crunch/types/avro/AvroUtf8InputFormat.java
View
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.io.IOException;
6 ...ain/java/com/cloudera/crunch/type/avro/Avros.java → ...in/java/com/cloudera/crunch/types/avro/Avros.java
View
@@ -12,7 +12,7 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.nio.ByteBuffer;
import java.util.Collection;
@@ -36,8 +36,8 @@
import com.cloudera.crunch.TupleN;
import com.cloudera.crunch.fn.CompositeMapFn;
import com.cloudera.crunch.fn.IdentityFn;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.TupleFactory;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.TupleFactory;
import com.cloudera.crunch.util.PTypes;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
2  ...cloudera/crunch/type/avro/ReflectDataFactory.java → ...loudera/crunch/types/avro/ReflectDataFactory.java
View
@@ -12,7 +12,7 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import org.apache.avro.Schema;
import org.apache.avro.reflect.ReflectData;
2  ...udera/crunch/type/avro/SafeAvroSerialization.java → ...dera/crunch/types/avro/SafeAvroSerialization.java
View
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.cloudera.crunch.type.avro;
+package com.cloudera.crunch.types.avro;
import java.io.IOException;
import java.io.InputStream;
2  ...ra/crunch/type/writable/GenericArrayWritable.java → ...a/crunch/types/writable/GenericArrayWritable.java
View
@@ -12,7 +12,7 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
import java.io.DataInput;
import java.io.DataOutput;
2  ...loudera/crunch/type/writable/TextMapWritable.java → ...oudera/crunch/types/writable/TextMapWritable.java
View
@@ -13,7 +13,7 @@
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
import java.io.DataInput;
import java.io.DataOutput;
2  .../cloudera/crunch/type/writable/TupleWritable.java → ...cloudera/crunch/types/writable/TupleWritable.java
View
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
import java.io.DataInput;
import java.io.DataOutput;
7 ...runch/type/writable/WritableGroupedTableType.java → ...unch/types/writable/WritableGroupedTableType.java
View
@@ -12,15 +12,16 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
+import com.cloudera.crunch.types.Converter;
import org.apache.hadoop.mapreduce.Job;
import com.cloudera.crunch.GroupingOptions;
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.Pair;
-import com.cloudera.crunch.type.Converter;
-import com.cloudera.crunch.type.PGroupedTableType;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PGroupedTableType;
public class WritableGroupedTableType<K, V> extends PGroupedTableType<K, V> {
5 ...a/crunch/type/writable/WritablePairConverter.java → .../crunch/types/writable/WritablePairConverter.java
View
@@ -12,10 +12,11 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
import com.cloudera.crunch.Pair;
-import com.cloudera.crunch.type.Converter;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.Converter;
public class WritablePairConverter<K, V> implements Converter<K, V, Pair<K, V>, Pair<K, Iterable<V>>> {
13 ...udera/crunch/type/writable/WritableTableType.java → ...dera/crunch/types/writable/WritableTableType.java
View
@@ -12,10 +12,11 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
import java.util.List;
+import com.cloudera.crunch.types.PTypeFamily;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Writable;
@@ -25,11 +26,11 @@
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.fn.PairMapFn;
import com.cloudera.crunch.io.seq.SeqFileTableSourceTarget;
-import com.cloudera.crunch.type.Converter;
-import com.cloudera.crunch.type.PGroupedTableType;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PGroupedTableType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.common.collect.ImmutableList;
class WritableTableType<K, V> implements PTableType<K, V> {
11 ...m/cloudera/crunch/type/writable/WritableType.java → .../cloudera/crunch/types/writable/WritableType.java
View
@@ -12,19 +12,22 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
import java.util.List;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.hadoop.fs.Path;
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.SourceTarget;
import com.cloudera.crunch.io.seq.SeqFileSourceTarget;
-import com.cloudera.crunch.type.Converter;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.Converter;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.common.collect.ImmutableList;
public class WritableType<T, W> implements PType<T> {
17 ...dera/crunch/type/writable/WritableTypeFamily.java → ...era/crunch/types/writable/WritableTypeFamily.java
View
@@ -12,28 +12,27 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Map;
-import org.apache.hadoop.io.Writable;
-
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.Pair;
import com.cloudera.crunch.Tuple;
import com.cloudera.crunch.Tuple3;
import com.cloudera.crunch.Tuple4;
import com.cloudera.crunch.TupleN;
-import com.cloudera.crunch.type.PGroupedTableType;
-import com.cloudera.crunch.type.PTableType;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.PTypeUtils;
+import com.cloudera.crunch.types.PGroupedTableType;
+import com.cloudera.crunch.types.PTableType;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.PTypeUtils;
+import org.apache.hadoop.io.Writable;
/**
- * The {@link Writable}-based implementation of the {@link PTypeFamily}
+ * The {@link Writable}-based implementation of the {@link com.cloudera.crunch.types.PTypeFamily}
* interface.
*/
public class WritableTypeFamily implements PTypeFamily {
5 .../crunch/type/writable/WritableValueConverter.java → ...crunch/types/writable/WritableValueConverter.java
View
@@ -12,11 +12,12 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
+import com.cloudera.crunch.types.Converter;
import org.apache.hadoop.io.NullWritable;
-import com.cloudera.crunch.type.Converter;
+import com.cloudera.crunch.types.Converter;
class WritableValueConverter<W> implements Converter<Object, W, W, Iterable<W>> {
6 .../com/cloudera/crunch/type/writable/Writables.java → ...com/cloudera/crunch/types/writable/Writables.java
View
@@ -12,7 +12,7 @@
* the specific language governing permissions and limitations under the
* License.
*/
-package com.cloudera.crunch.type.writable;
+package com.cloudera.crunch.types.writable;
import java.nio.ByteBuffer;
import java.util.Collection;
@@ -39,8 +39,8 @@
import com.cloudera.crunch.TupleN;
import com.cloudera.crunch.fn.CompositeMapFn;
import com.cloudera.crunch.fn.IdentityFn;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.TupleFactory;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.TupleFactory;
import com.cloudera.crunch.util.PTypes;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
4 src/main/java/com/cloudera/crunch/util/PTypes.java
View
@@ -28,8 +28,8 @@
import com.cloudera.crunch.MapFn;
import com.cloudera.crunch.impl.mr.run.CrunchRuntimeException;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.Message;
6 src/test/java/com/cloudera/crunch/CollectionsTest.java
View
@@ -24,9 +24,9 @@
import com.cloudera.crunch.impl.mem.MemPipeline;
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
6 src/test/java/com/cloudera/crunch/MapsTest.java
View
@@ -6,9 +6,9 @@
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
6 src/test/java/com/cloudera/crunch/MultipleOutputTest.java
View
@@ -27,9 +27,9 @@
import com.cloudera.crunch.io.To;
import com.cloudera.crunch.lib.Aggregate;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
6 src/test/java/com/cloudera/crunch/PTableKeyValueTest.java
View
@@ -19,9 +19,9 @@
import com.cloudera.crunch.io.At;
import com.cloudera.crunch.lib.SetTest;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.collect.Lists;
@RunWith(value = Parameterized.class)
10 src/test/java/com/cloudera/crunch/PageRankTest.java
View
@@ -20,11 +20,11 @@
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.lib.Aggregate;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.PType;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.avro.Avros;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PType;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.avro.Avros;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.cloudera.crunch.util.PTypes;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
4 src/test/java/com/cloudera/crunch/TFIDFTest.java
View
@@ -33,8 +33,8 @@
import com.cloudera.crunch.io.seq.SeqFileSourceTarget;
import com.cloudera.crunch.lib.Aggregate;
import com.cloudera.crunch.lib.Join;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
4 src/test/java/com/cloudera/crunch/TermFrequencyTest.java
View
@@ -29,8 +29,8 @@
import com.cloudera.crunch.io.ReadableSourceTarget;
import com.cloudera.crunch.lib.Aggregate;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
@SuppressWarnings("serial")
public class TermFrequencyTest implements Serializable {
2  src/test/java/com/cloudera/crunch/TextPairTest.java
View
@@ -23,7 +23,7 @@
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.io.From;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.writable.Writables;
+import com.cloudera.crunch.types.writable.Writables;
public class TextPairTest {
6 src/test/java/com/cloudera/crunch/TupleNClassCastBugTest.java
View
@@ -16,9 +16,9 @@
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.lib.Aggregate;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.io.Files;
import org.junit.Test;
2  src/test/java/com/cloudera/crunch/TupleTest.java
View
@@ -21,7 +21,7 @@
import org.junit.Test;
-import com.cloudera.crunch.type.TupleFactory;
+import com.cloudera.crunch.types.TupleFactory;
public class TupleTest {
private String first = "foo";
2  src/test/java/com/cloudera/crunch/WordCountHBaseTest.java
View
@@ -41,7 +41,7 @@
import com.cloudera.crunch.io.hbase.HBaseSourceTarget;
import com.cloudera.crunch.io.hbase.HBaseTarget;
import com.cloudera.crunch.lib.Aggregate;
-import com.cloudera.crunch.type.writable.Writables;
+import com.cloudera.crunch.types.writable.Writables;
public class WordCountHBaseTest {
protected static final Log LOG = LogFactory.getLog(WordCountHBaseTest.class);
6 src/test/java/com/cloudera/crunch/WordCountTest.java
View
@@ -27,9 +27,9 @@
import com.cloudera.crunch.io.To;
import com.cloudera.crunch.lib.Aggregate;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
8 src/test/java/com/cloudera/crunch/impl/mr/collect/UnionCollectionTest.java
View
@@ -27,10 +27,10 @@
import com.cloudera.crunch.io.At;
import com.cloudera.crunch.io.To;
import com.cloudera.crunch.test.FileHelper;
-import com.cloudera.crunch.type.PTypeFamily;
-import com.cloudera.crunch.type.avro.AvroTypeFamily;
-import com.cloudera.crunch.type.avro.Avros;
-import com.cloudera.crunch.type.writable.WritableTypeFamily;
+import com.cloudera.crunch.types.PTypeFamily;
+import com.cloudera.crunch.types.avro.AvroTypeFamily;
+import com.cloudera.crunch.types.avro.Avros;
+import com.cloudera.crunch.types.writable.WritableTypeFamily;
import com.google.common.collect.Lists;
@RunWith(value = Parameterized.class)
2  src/test/java/com/cloudera/crunch/io/avro/AvroFileReaderFactoryTest.java
View
@@ -25,7 +25,7 @@
import org.junit.Test;
import com.cloudera.crunch.test.Person;
-import com.cloudera.crunch.type.avro.Avros;
+import com.cloudera.crunch.types.avro.Avros;
import com.google.common.collect.Lists;
import com.google.common.io.InputSupplier;
2  src/test/java/com/cloudera/crunch/io/avro/AvroFileSourceTargetTest.java
View
@@ -23,7 +23,7 @@
import com.cloudera.crunch.impl.mr.MRPipeline;
import com.cloudera.crunch.io.At;
import com.cloudera.crunch.test.Person;
-import com.cloudera.crunch.type.avro.Avros;
+import com.cloudera.crunch.types.avro.Avros;
import com.google.common.collect.Lists;
@SuppressWarnings("serial")
4 src/test/java/com/cloudera/crunch/io/avro/AvroFileSourceTest.java
View
@@ -16,8 +16,8 @@
import org.junit.Test;
import com.cloudera.crunch.test.Person;
-import com.cloudera.crunch.type.avro.AvroType;
-import com.cloudera.crunch.type.avro.Avros;
+import com.cloudera.crunch.types.avro.AvroType;
+import com.cloudera.crunch.types.avro.Avros;
public class AvroFileSourceTest {
12 src/test/java/com/cloudera/crunch/lib/AggregateTest.java