Skip to content
This repository

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

Merged
merged 1 commit into from about 2 years ago

2 participants

Robert Chu Josh Wills
Robert Chu

As the summary says.

Josh Wills
Owner
jwills commented

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
jwills commented

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
Josh Wills jwills closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

May 19, 2012
Robert Chu robotoer Renamed Crunch's type package to types to prevent issues in scala.
In scala, the type keyword is reserved.
1d62279
This page is out of date. Refresh to see the latest.

Showing 125 changed files with 299 additions and 280 deletions. Show diff stats Hide diff stats

  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
@@ -19,7 +19,7 @@
19 19 import org.apache.avro.reflect.ReflectDatumReader;
20 20 import org.apache.avro.reflect.ReflectDatumWriter;
21 21
22   -import com.cloudera.crunch.type.avro.ReflectDataFactory;
  22 +import com.cloudera.crunch.types.avro.ReflectDataFactory;
23 23
24 24 /**
25 25 * An implementation of the {@code ReflectDataFactory} class to work with Scala classes.
2  scrunch/src/main/scala/com/cloudera/scrunch/Conversions.scala
@@ -16,7 +16,7 @@ package com.cloudera.scrunch
16 16
17 17 import com.cloudera.crunch.{PCollection => JCollection, PGroupedTable => JGroupedTable, PTable => JTable, DoFn, Emitter}
18 18 import com.cloudera.crunch.{Pair => CPair}
19   -import com.cloudera.crunch.`type`.PType
  19 +import com.cloudera.crunch.types.PType
20 20 import java.nio.ByteBuffer
21 21 import scala.collection.Iterable
22 22
4 scrunch/src/main/scala/com/cloudera/scrunch/IO.scala
@@ -14,10 +14,8 @@
14 14 */
15 15 package com.cloudera.scrunch
16 16
17   -import com.cloudera.crunch.{Source, SourceTarget, Target}
18 17 import com.cloudera.crunch.io.{From => from, To => to, At => at}
19   -import com.cloudera.crunch.`type`.PType
20   -import com.cloudera.crunch.`type`.avro.AvroType
  18 +import com.cloudera.crunch.types.avro.AvroType
21 19 import org.apache.hadoop.fs.Path;
22 20
23 21 object From {
8 scrunch/src/main/scala/com/cloudera/scrunch/PCollectionLike.scala
@@ -14,11 +14,9 @@
14 14 */
15 15 package com.cloudera.scrunch
16 16
17   -import com.cloudera.crunch.{DoFn, Emitter, FilterFn, MapFn}
18   -import com.cloudera.crunch.{PCollection => JCollection, PTable => JTable, Pair => JPair, Target}
19   -import com.cloudera.crunch.`type`.{PType, PTableType}
20   -import com.cloudera.crunch.`type`.writable.WritableTypeFamily
21   -import com.cloudera.scrunch.Conversions._
  17 +import com.cloudera.crunch.DoFn
  18 +import com.cloudera.crunch.{PCollection => JCollection, Pair => JPair, Target}
  19 +import com.cloudera.crunch.types.{PType, PTableType}
22 20
23 21 trait PCollectionLike[S, +FullType, +NativeType <: JCollection[S]] {
24 22 val native: NativeType
14 scrunch/src/main/scala/com/cloudera/scrunch/PTypeFamily.scala
@@ -14,10 +14,10 @@
14 14 */
15 15 package com.cloudera.scrunch
16 16
17   -import com.cloudera.crunch.{Pair => CPair, Tuple3 => CTuple3, Tuple4 => CTuple4, TupleN, MapFn}
18   -import com.cloudera.crunch.`type`.{PType, PTypeFamily => PTF}
19   -import com.cloudera.crunch.`type`.writable.WritableTypeFamily
20   -import com.cloudera.crunch.`type`.avro.{AvroTypeFamily, Avros => CAvros}
  17 +import com.cloudera.crunch.{Pair => CPair, Tuple3 => CTuple3, Tuple4 => CTuple4, MapFn}
  18 +import com.cloudera.crunch.types.{PType, PTypeFamily => PTF}
  19 +import com.cloudera.crunch.types.writable.WritableTypeFamily
  20 +import com.cloudera.crunch.types.avro.{AvroTypeFamily, Avros => CAvros}
21 21 import java.lang.{Long => JLong, Double => JDouble, Integer => JInt, Float => JFloat, Boolean => JBoolean}
22 22 import java.util.{Collection => JCollection}
23 23 import scala.collection.JavaConversions._
@@ -28,7 +28,7 @@ class TMapFn[S, T](f: S => T) extends MapFn[S, T] {
28 28
29 29 trait PTypeFamily {
30 30
31   - def ptf(): PTF
  31 + def ptf: PTF
32 32
33 33 val strings = ptf.strings()
34 34
@@ -112,11 +112,11 @@ trait PTypeFamily {
112 112 }
113 113
114 114 object Writables extends PTypeFamily {
115   - override def ptf() = WritableTypeFamily.getInstance()
  115 + override def ptf = WritableTypeFamily.getInstance()
116 116 }
117 117
118 118 object Avros extends PTypeFamily {
119   - override def ptf() = AvroTypeFamily.getInstance()
  119 + override def ptf = AvroTypeFamily.getInstance()
120 120
121 121 CAvros.REFLECT_DATA_FACTORY = new ScalaReflectDataFactory()
122 122
6 src/main/java/com/cloudera/crunch/PCollection.java
@@ -15,9 +15,9 @@
15 15
16 16 package com.cloudera.crunch;
17 17
18   -import com.cloudera.crunch.type.PTableType;
19   -import com.cloudera.crunch.type.PType;
20   -import com.cloudera.crunch.type.PTypeFamily;
  18 +import com.cloudera.crunch.types.PTableType;
  19 +import com.cloudera.crunch.types.PType;
  20 +import com.cloudera.crunch.types.PTypeFamily;
21 21
22 22 /**
23 23 * A representation of an immutable, distributed collection of elements
4 src/main/java/com/cloudera/crunch/PTable.java
@@ -17,8 +17,8 @@
17 17
18 18 import java.util.Collection;
19 19
20   -import com.cloudera.crunch.type.PTableType;
21   -import com.cloudera.crunch.type.PType;
  20 +import com.cloudera.crunch.types.PTableType;
  21 +import com.cloudera.crunch.types.PType;
22 22
23 23 /**
24 24 * A sub-interface of {@code PCollection} that represents an immutable,
2  src/main/java/com/cloudera/crunch/Source.java
@@ -19,7 +19,7 @@
19 19 import org.apache.hadoop.conf.Configuration;
20 20 import org.apache.hadoop.mapreduce.Job;
21 21
22   -import com.cloudera.crunch.type.PType;
  22 +import com.cloudera.crunch.types.PType;
23 23
24 24 /**
25 25 * A {@code Source} represents an input data set that is an input to one
2  src/main/java/com/cloudera/crunch/TableSource.java
@@ -14,7 +14,7 @@
14 14 */
15 15 package com.cloudera.crunch;
16 16
17   -import com.cloudera.crunch.type.PTableType;
  17 +import com.cloudera.crunch.types.PTableType;
18 18
19 19 /**
20 20 * The interface {@code Source} implementations that return a {@link PTable}.
2  src/main/java/com/cloudera/crunch/Target.java
@@ -15,7 +15,7 @@
15 15 package com.cloudera.crunch;
16 16
17 17 import com.cloudera.crunch.io.OutputHandler;
18   -import com.cloudera.crunch.type.PType;
  18 +import com.cloudera.crunch.types.PType;
19 19
20 20 /**
21 21 * A {@code Target} represents the output destination of a Crunch job.
4 src/main/java/com/cloudera/crunch/impl/mem/MemPipeline.java
@@ -36,8 +36,8 @@
36 36 import com.cloudera.crunch.io.At;
37 37 import com.cloudera.crunch.io.PathTarget;
38 38 import com.cloudera.crunch.io.ReadableSource;
39   -import com.cloudera.crunch.type.PTableType;
40   -import com.cloudera.crunch.type.PType;
  39 +import com.cloudera.crunch.types.PTableType;
  40 +import com.cloudera.crunch.types.PType;
41 41 import com.google.common.collect.ImmutableList;
42 42 import com.google.common.collect.Lists;
43 43
6 src/main/java/com/cloudera/crunch/impl/mem/collect/MemCollection.java
@@ -30,9 +30,9 @@
30 30 import com.cloudera.crunch.lib.Sample;
31 31 import com.cloudera.crunch.lib.Sort;
32 32 import com.cloudera.crunch.test.InMemoryEmitter;
33   -import com.cloudera.crunch.type.PTableType;
34   -import com.cloudera.crunch.type.PType;
35   -import com.cloudera.crunch.type.PTypeFamily;
  33 +import com.cloudera.crunch.types.PTableType;
  34 +import com.cloudera.crunch.types.PType;
  35 +import com.cloudera.crunch.types.PTypeFamily;
36 36 import com.google.common.collect.ImmutableList;
37 37 import com.google.common.collect.Lists;
38 38
6 src/main/java/com/cloudera/crunch/impl/mem/collect/MemGroupedTable.java
@@ -30,9 +30,9 @@
30 30 import com.cloudera.crunch.Pair;
31 31 import com.cloudera.crunch.Pipeline;
32 32 import com.cloudera.crunch.Target;
33   -import com.cloudera.crunch.type.PTableType;
34   -import com.cloudera.crunch.type.PType;
35   -import com.cloudera.crunch.type.PTypeFamily;
  33 +import com.cloudera.crunch.types.PTableType;
  34 +import com.cloudera.crunch.types.PType;
  35 +import com.cloudera.crunch.types.PTypeFamily;
36 36 import com.google.common.collect.Lists;
37 37 import com.google.common.collect.Maps;
38 38
4 src/main/java/com/cloudera/crunch/impl/mem/collect/MemTable.java
@@ -27,8 +27,8 @@
27 27 import com.cloudera.crunch.lib.Cogroup;
28 28 import com.cloudera.crunch.lib.Join;
29 29 import com.cloudera.crunch.lib.PTables;
30   -import com.cloudera.crunch.type.PTableType;
31   -import com.cloudera.crunch.type.PType;
  30 +import com.cloudera.crunch.types.PTableType;
  31 +import com.cloudera.crunch.types.PType;
32 32 import com.google.common.collect.Lists;
33 33
34 34 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
@@ -48,8 +48,8 @@
48 48 import com.cloudera.crunch.io.At;
49 49 import com.cloudera.crunch.io.ReadableSourceTarget;
50 50 import com.cloudera.crunch.materialize.MaterializableIterable;
51   -import com.cloudera.crunch.type.PType;
52   -import com.cloudera.crunch.type.writable.WritableTypeFamily;
  51 +import com.cloudera.crunch.types.PType;
  52 +import com.cloudera.crunch.types.writable.WritableTypeFamily;
53 53 import com.google.common.collect.Maps;
54 54 import com.google.common.collect.Sets;
55 55
2  src/main/java/com/cloudera/crunch/impl/mr/collect/DoCollectionImpl.java
@@ -18,7 +18,7 @@
18 18
19 19 import com.cloudera.crunch.DoFn;
20 20 import com.cloudera.crunch.impl.mr.plan.DoNode;
21   -import com.cloudera.crunch.type.PType;
  21 +import com.cloudera.crunch.types.PType;
22 22 import com.google.common.collect.ImmutableList;
23 23
24 24 public class DoCollectionImpl<S> extends PCollectionImpl<S> {
4 src/main/java/com/cloudera/crunch/impl/mr/collect/DoTableImpl.java
@@ -21,8 +21,8 @@
21 21 import com.cloudera.crunch.PTable;
22 22 import com.cloudera.crunch.Pair;
23 23 import com.cloudera.crunch.impl.mr.plan.DoNode;
24   -import com.cloudera.crunch.type.PTableType;
25   -import com.cloudera.crunch.type.PType;
  24 +import com.cloudera.crunch.types.PTableType;
  25 +import com.cloudera.crunch.types.PType;
26 26 import com.google.common.collect.ImmutableList;
27 27
28 28 public class DoTableImpl<K, V> extends PTableBase<K, V> implements
2  src/main/java/com/cloudera/crunch/impl/mr/collect/InputCollection.java
@@ -21,7 +21,7 @@
21 21 import com.cloudera.crunch.Source;
22 22 import com.cloudera.crunch.impl.mr.MRPipeline;
23 23 import com.cloudera.crunch.impl.mr.plan.DoNode;
24   -import com.cloudera.crunch.type.PType;
  24 +import com.cloudera.crunch.types.PType;
25 25 import com.google.common.collect.ImmutableList;
26 26
27 27 public class InputCollection<S> extends PCollectionImpl<S> {
4 src/main/java/com/cloudera/crunch/impl/mr/collect/InputTable.java
@@ -20,8 +20,8 @@
20 20 import com.cloudera.crunch.TableSource;
21 21 import com.cloudera.crunch.impl.mr.MRPipeline;
22 22 import com.cloudera.crunch.impl.mr.plan.DoNode;
23   -import com.cloudera.crunch.type.PTableType;
24   -import com.cloudera.crunch.type.PType;
  23 +import com.cloudera.crunch.types.PTableType;
  24 +import com.cloudera.crunch.types.PType;
25 25 import com.google.common.collect.ImmutableList;
26 26
27 27 public class InputTable<K, V> extends PTableBase<K, V> {
6 src/main/java/com/cloudera/crunch/impl/mr/collect/PCollectionImpl.java
@@ -31,9 +31,9 @@
31 31 import com.cloudera.crunch.lib.Aggregate;
32 32 import com.cloudera.crunch.lib.Sample;
33 33 import com.cloudera.crunch.lib.Sort;
34   -import com.cloudera.crunch.type.PTableType;
35   -import com.cloudera.crunch.type.PType;
36   -import com.cloudera.crunch.type.PTypeFamily;
  34 +import com.cloudera.crunch.types.PTableType;
  35 +import com.cloudera.crunch.types.PType;
  36 +import com.cloudera.crunch.types.PTypeFamily;
37 37 import com.google.common.collect.Lists;
38 38
39 39 public abstract class PCollectionImpl<S> implements PCollection<S> {
4 src/main/java/com/cloudera/crunch/impl/mr/collect/PGroupedTableImpl.java
@@ -28,8 +28,8 @@
28 28 import com.cloudera.crunch.PTable;
29 29 import com.cloudera.crunch.Pair;
30 30 import com.cloudera.crunch.impl.mr.plan.DoNode;
31   -import com.cloudera.crunch.type.PGroupedTableType;
32   -import com.cloudera.crunch.type.PType;
  31 +import com.cloudera.crunch.types.PGroupedTableType;
  32 +import com.cloudera.crunch.types.PType;
33 33 import com.google.common.collect.ImmutableList;
34 34
35 35 public class PGroupedTableImpl<K, V> extends
2  src/main/java/com/cloudera/crunch/impl/mr/collect/PTableBase.java
@@ -26,7 +26,7 @@
26 26 import com.cloudera.crunch.lib.Cogroup;
27 27 import com.cloudera.crunch.lib.Join;
28 28 import com.cloudera.crunch.lib.PTables;
29   -import com.cloudera.crunch.type.PType;
  29 +import com.cloudera.crunch.types.PType;
30 30 import com.google.common.collect.Lists;
31 31
32 32 public abstract class PTableBase<K, V> extends PCollectionImpl<Pair<K, V>>
2  src/main/java/com/cloudera/crunch/impl/mr/collect/UnionCollection.java
@@ -18,7 +18,7 @@
18 18
19 19 import com.cloudera.crunch.impl.mr.MRPipeline;
20 20 import com.cloudera.crunch.impl.mr.plan.DoNode;
21   -import com.cloudera.crunch.type.PType;
  21 +import com.cloudera.crunch.types.PType;
22 22 import com.google.common.collect.ImmutableList;
23 23
24 24 public class UnionCollection<S> extends PCollectionImpl<S> {
4 src/main/java/com/cloudera/crunch/impl/mr/collect/UnionTable.java
@@ -19,8 +19,8 @@
19 19 import com.cloudera.crunch.Pair;
20 20 import com.cloudera.crunch.impl.mr.MRPipeline;
21 21 import com.cloudera.crunch.impl.mr.plan.DoNode;
22   -import com.cloudera.crunch.type.PTableType;
23   -import com.cloudera.crunch.type.PType;
  22 +import com.cloudera.crunch.types.PTableType;
  23 +import com.cloudera.crunch.types.PType;
24 24 import com.google.common.collect.ImmutableList;
25 25 import com.google.common.collect.Lists;
26 26
2  src/main/java/com/cloudera/crunch/impl/mr/emit/MultipleOutputEmitter.java
@@ -20,7 +20,7 @@
20 20
21 21 import com.cloudera.crunch.Emitter;
22 22 import com.cloudera.crunch.impl.mr.run.CrunchRuntimeException;
23   -import com.cloudera.crunch.type.Converter;
  23 +import com.cloudera.crunch.types.Converter;
24 24
25 25 public class MultipleOutputEmitter<T, K, V> implements Emitter<T> {
26 26
2  src/main/java/com/cloudera/crunch/impl/mr/emit/OutputEmitter.java
@@ -20,7 +20,7 @@
20 20
21 21 import com.cloudera.crunch.Emitter;
22 22 import com.cloudera.crunch.impl.mr.run.CrunchRuntimeException;
23   -import com.cloudera.crunch.type.Converter;
  23 +import com.cloudera.crunch.types.Converter;
24 24
25 25 public class OutputEmitter<T, K, V> implements Emitter<T> {
26 26
6 src/main/java/com/cloudera/crunch/impl/mr/plan/DoNode.java
@@ -23,9 +23,9 @@
23 23 import com.cloudera.crunch.Source;
24 24 import com.cloudera.crunch.impl.mr.run.NodeContext;
25 25 import com.cloudera.crunch.impl.mr.run.RTNode;
26   -import com.cloudera.crunch.type.Converter;
27   -import com.cloudera.crunch.type.PGroupedTableType;
28   -import com.cloudera.crunch.type.PType;
  26 +import com.cloudera.crunch.types.Converter;
  27 +import com.cloudera.crunch.types.PGroupedTableType;
  28 +import com.cloudera.crunch.types.PType;
29 29 import com.google.common.collect.ImmutableList;
30 30 import com.google.common.collect.Lists;
31 31
2  src/main/java/com/cloudera/crunch/impl/mr/plan/MSCROutputHandler.java
@@ -23,7 +23,7 @@
23 23 import com.cloudera.crunch.io.MapReduceTarget;
24 24 import com.cloudera.crunch.io.OutputHandler;
25 25 import com.cloudera.crunch.io.PathTarget;
26   -import com.cloudera.crunch.type.PType;
  26 +import com.cloudera.crunch.types.PType;
27 27 import com.google.common.collect.Lists;
28 28
29 29 public class MSCROutputHandler implements OutputHandler {
2  src/main/java/com/cloudera/crunch/impl/mr/run/RTNode.java
@@ -25,7 +25,7 @@
25 25 import com.cloudera.crunch.impl.mr.emit.IntermediateEmitter;
26 26 import com.cloudera.crunch.impl.mr.emit.MultipleOutputEmitter;
27 27 import com.cloudera.crunch.impl.mr.emit.OutputEmitter;
28   -import com.cloudera.crunch.type.Converter;
  28 +import com.cloudera.crunch.types.Converter;
29 29
30 30 public class RTNode implements Serializable {
31 31
8 src/main/java/com/cloudera/crunch/io/At.java
@@ -23,10 +23,10 @@
23 23 import com.cloudera.crunch.io.seq.SeqFileSourceTarget;
24 24 import com.cloudera.crunch.io.seq.SeqFileTableSourceTarget;
25 25 import com.cloudera.crunch.io.text.TextFileSourceTarget;
26   -import com.cloudera.crunch.type.PType;
27   -import com.cloudera.crunch.type.PTypeFamily;
28   -import com.cloudera.crunch.type.avro.AvroType;
29   -import com.cloudera.crunch.type.writable.Writables;
  26 +import com.cloudera.crunch.types.PType;
  27 +import com.cloudera.crunch.types.PTypeFamily;
  28 +import com.cloudera.crunch.types.avro.AvroType;
  29 +import com.cloudera.crunch.types.writable.Writables;
30 30
31 31 /**
32 32 * Static factory methods for creating various {@link SourceTarget} types.
10 src/main/java/com/cloudera/crunch/io/From.java
@@ -28,11 +28,11 @@
28 28 import com.cloudera.crunch.io.seq.SeqFileSource;
29 29 import com.cloudera.crunch.io.seq.SeqFileTableSourceTarget;
30 30 import com.cloudera.crunch.io.text.TextFileSource;
31   -import com.cloudera.crunch.type.PTableType;
32   -import com.cloudera.crunch.type.PType;
33   -import com.cloudera.crunch.type.PTypeFamily;
34   -import com.cloudera.crunch.type.avro.AvroType;
35   -import com.cloudera.crunch.type.writable.Writables;
  31 +import com.cloudera.crunch.types.PTableType;
  32 +import com.cloudera.crunch.types.PType;
  33 +import com.cloudera.crunch.types.PTypeFamily;
  34 +import com.cloudera.crunch.types.avro.AvroType;
  35 +import com.cloudera.crunch.types.writable.Writables;
36 36
37 37 /**
38 38 * Static factory methods for creating various {@link Source} types.
2  src/main/java/com/cloudera/crunch/io/MapReduceTarget.java
@@ -18,7 +18,7 @@
18 18 import org.apache.hadoop.mapreduce.Job;
19 19
20 20 import com.cloudera.crunch.Target;
21   -import com.cloudera.crunch.type.PType;
  21 +import com.cloudera.crunch.types.PType;
22 22
23 23 public interface MapReduceTarget extends Target {
24 24 void configureForMapReduce(Job job, PType<?> ptype, Path outputPath, String name);
2  src/main/java/com/cloudera/crunch/io/OutputHandler.java
@@ -15,7 +15,7 @@
15 15 package com.cloudera.crunch.io;
16 16
17 17 import com.cloudera.crunch.Target;
18   -import com.cloudera.crunch.type.PType;
  18 +import com.cloudera.crunch.types.PType;
19 19
20 20 public interface OutputHandler {
21 21 boolean configure(Target target, PType<?> ptype);
2  src/main/java/com/cloudera/crunch/io/PathTargetImpl.java
@@ -6,7 +6,7 @@
6 6 import org.apache.hadoop.mapreduce.lib.output.CrunchMultipleOutputs;
7 7 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
8 8
9   -import com.cloudera.crunch.type.PType;
  9 +import com.cloudera.crunch.types.PType;
10 10
11 11 public abstract class PathTargetImpl implements PathTarget {
12 12
2  src/main/java/com/cloudera/crunch/io/avro/AvroFileReaderFactory.java
@@ -30,7 +30,7 @@
30 30
31 31 import com.cloudera.crunch.MapFn;
32 32 import com.cloudera.crunch.io.FileReaderFactory;
33   -import com.cloudera.crunch.type.avro.AvroType;
  33 +import com.cloudera.crunch.types.avro.AvroType;
34 34 import com.google.common.collect.Iterators;
35 35 import com.google.common.collect.UnmodifiableIterator;
36 36
6 src/main/java/com/cloudera/crunch/io/avro/AvroFileSource.java
@@ -25,9 +25,9 @@
25 25 import com.cloudera.crunch.io.ReadableSource;
26 26 import com.cloudera.crunch.io.impl.FileSourceImpl;
27 27 import com.cloudera.crunch.io.impl.InputBundle;
28   -import com.cloudera.crunch.type.avro.AvroInputFormat;
29   -import com.cloudera.crunch.type.avro.AvroType;
30   -import com.cloudera.crunch.type.avro.Avros;
  28 +import com.cloudera.crunch.types.avro.AvroInputFormat;
  29 +import com.cloudera.crunch.types.avro.AvroType;
  30 +import com.cloudera.crunch.types.avro.Avros;
31 31
32 32 public class AvroFileSource<T> extends FileSourceImpl<T> implements ReadableSource<T> {
33 33
2  src/main/java/com/cloudera/crunch/io/avro/AvroFileSourceTarget.java
@@ -17,7 +17,7 @@
17 17 import org.apache.hadoop.fs.Path;
18 18
19 19 import com.cloudera.crunch.io.impl.ReadableSourcePathTargetImpl;
20   -import com.cloudera.crunch.type.avro.AvroType;
  20 +import com.cloudera.crunch.types.avro.AvroType;
21 21
22 22 public class AvroFileSourceTarget<T> extends ReadableSourcePathTargetImpl<T> {
23 23 public AvroFileSourceTarget(Path path, AvroType<T> atype) {
8 src/main/java/com/cloudera/crunch/io/avro/AvroFileTarget.java
@@ -23,10 +23,10 @@
23 23 import com.cloudera.crunch.SourceTarget;
24 24 import com.cloudera.crunch.io.OutputHandler;
25 25 import com.cloudera.crunch.io.impl.FileTargetImpl;
26   -import com.cloudera.crunch.type.PType;
27   -import com.cloudera.crunch.type.avro.AvroOutputFormat;
28   -import com.cloudera.crunch.type.avro.AvroType;
29   -import com.cloudera.crunch.type.avro.Avros;
  26 +import com.cloudera.crunch.types.PType;
  27 +import com.cloudera.crunch.types.avro.AvroOutputFormat;
  28 +import com.cloudera.crunch.types.avro.AvroType;
  29 +import com.cloudera.crunch.types.avro.Avros;
30 30
31 31 public class AvroFileTarget extends FileTargetImpl {
32 32 public AvroFileTarget(String path) {
6 src/main/java/com/cloudera/crunch/io/hbase/HBaseSourceTarget.java
@@ -33,9 +33,9 @@
33 33 import com.cloudera.crunch.SourceTarget;
34 34 import com.cloudera.crunch.TableSource;
35 35 import com.cloudera.crunch.impl.mr.run.CrunchMapper;
36   -import com.cloudera.crunch.type.PTableType;
37   -import com.cloudera.crunch.type.PType;
38   -import com.cloudera.crunch.type.writable.Writables;
  36 +import com.cloudera.crunch.types.PTableType;
  37 +import com.cloudera.crunch.types.PType;
  38 +import com.cloudera.crunch.types.writable.Writables;
39 39
40 40 public class HBaseSourceTarget extends HBaseTarget implements SourceTarget<Pair<ImmutableBytesWritable, Result>>,
41 41 TableSource<ImmutableBytesWritable, Result> {
2  src/main/java/com/cloudera/crunch/io/hbase/HBaseTarget.java
@@ -29,7 +29,7 @@
29 29 import com.cloudera.crunch.impl.mr.run.CrunchRuntimeException;
30 30 import com.cloudera.crunch.io.MapReduceTarget;
31 31 import com.cloudera.crunch.io.OutputHandler;
32   -import com.cloudera.crunch.type.PType;
  32 +import com.cloudera.crunch.types.PType;
33 33
34 34 public class HBaseTarget implements MapReduceTarget {
35 35
2  src/main/java/com/cloudera/crunch/io/impl/FileSourceImpl.java
@@ -28,7 +28,7 @@
28 28 import com.cloudera.crunch.Source;
29 29 import com.cloudera.crunch.impl.mr.run.CrunchInputs;
30 30 import com.cloudera.crunch.io.SourceTargetHelper;
31   -import com.cloudera.crunch.type.PType;
  31 +import com.cloudera.crunch.types.PType;
32 32
33 33 public abstract class FileSourceImpl<T> implements Source<T> {
34 34
2  src/main/java/com/cloudera/crunch/io/impl/FileTableSourceImpl.java
@@ -19,7 +19,7 @@
19 19
20 20 import com.cloudera.crunch.Pair;
21 21 import com.cloudera.crunch.TableSource;
22   -import com.cloudera.crunch.type.PTableType;
  22 +import com.cloudera.crunch.types.PTableType;
23 23
24 24 public class FileTableSourceImpl<K, V> extends FileSourceImpl<Pair<K, V>>
25 25 implements TableSource<K, V> {
4 src/main/java/com/cloudera/crunch/io/impl/FileTargetImpl.java
@@ -23,8 +23,8 @@
23 23 import com.cloudera.crunch.SourceTarget;
24 24 import com.cloudera.crunch.io.OutputHandler;
25 25 import com.cloudera.crunch.io.PathTarget;
26   -import com.cloudera.crunch.type.Converter;
27   -import com.cloudera.crunch.type.PType;
  26 +import com.cloudera.crunch.types.Converter;
  27 +import com.cloudera.crunch.types.PType;
28 28
29 29 public class FileTargetImpl implements PathTarget {
30 30
2  src/main/java/com/cloudera/crunch/io/impl/SourcePathTargetImpl.java
@@ -19,7 +19,7 @@
19 19
20 20 import com.cloudera.crunch.Source;
21 21 import com.cloudera.crunch.io.PathTarget;
22   -import com.cloudera.crunch.type.PType;
  22 +import com.cloudera.crunch.types.PType;
23 23
24 24 public class SourcePathTargetImpl<T> extends SourceTargetImpl<T> implements
25 25 PathTarget {
2  src/main/java/com/cloudera/crunch/io/impl/SourceTargetImpl.java
@@ -24,7 +24,7 @@
24 24 import com.cloudera.crunch.SourceTarget;
25 25 import com.cloudera.crunch.Target;
26 26 import com.cloudera.crunch.io.OutputHandler;
27   -import com.cloudera.crunch.type.PType;
  27 +import com.cloudera.crunch.types.PType;
28 28
29 29 public class SourceTargetImpl<T> implements SourceTarget<T> {
30 30
2  src/main/java/com/cloudera/crunch/io/impl/TableSourcePathTargetImpl.java
@@ -17,7 +17,7 @@
17 17 import com.cloudera.crunch.Pair;
18 18 import com.cloudera.crunch.TableSource;
19 19 import com.cloudera.crunch.io.PathTarget;
20   -import com.cloudera.crunch.type.PTableType;
  20 +import com.cloudera.crunch.types.PTableType;
21 21
22 22 public class TableSourcePathTargetImpl<K, V> extends SourcePathTargetImpl<Pair<K, V>>
23 23 implements TableSource<K, V> {
2  src/main/java/com/cloudera/crunch/io/impl/TableSourceTargetImpl.java
@@ -17,7 +17,7 @@
17 17 import com.cloudera.crunch.Pair;
18 18 import com.cloudera.crunch.TableSource;
19 19 import com.cloudera.crunch.Target;
20   -import com.cloudera.crunch.type.PTableType;
  20 +import com.cloudera.crunch.types.PTableType;
21 21
22 22 public class TableSourceTargetImpl<K, V> extends SourceTargetImpl<Pair<K, V>>
23 23 implements TableSource<K, V> {
4 src/main/java/com/cloudera/crunch/io/seq/SeqFileHelper.java
@@ -19,8 +19,8 @@
19 19 import org.apache.hadoop.util.ReflectionUtils;
20 20
21 21 import com.cloudera.crunch.MapFn;
22   -import com.cloudera.crunch.type.PType;
23   -import com.cloudera.crunch.type.writable.WritableType;
  22 +import com.cloudera.crunch.types.PType;
  23 +import com.cloudera.crunch.types.writable.WritableType;
24 24
25 25 public class SeqFileHelper {
26 26 static <T> Writable newInstance(PType<T> ptype, Configuration conf) {
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileReaderFactory.java
@@ -28,7 +28,7 @@
28 28
29 29 import com.cloudera.crunch.MapFn;
30 30 import com.cloudera.crunch.io.FileReaderFactory;
31   -import com.cloudera.crunch.type.PType;
  31 +import com.cloudera.crunch.types.PType;
32 32 import com.google.common.collect.Iterators;
33 33 import com.google.common.collect.UnmodifiableIterator;
34 34
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileSource.java
@@ -24,7 +24,7 @@
24 24 import com.cloudera.crunch.io.CompositePathIterable;
25 25 import com.cloudera.crunch.io.ReadableSource;
26 26 import com.cloudera.crunch.io.impl.FileSourceImpl;
27   -import com.cloudera.crunch.type.PType;
  27 +import com.cloudera.crunch.types.PType;
28 28
29 29 public class SeqFileSource<T> extends FileSourceImpl<T> implements
30 30 ReadableSource<T> {
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileSourceTarget.java
@@ -17,7 +17,7 @@
17 17 import org.apache.hadoop.fs.Path;
18 18
19 19 import com.cloudera.crunch.io.impl.ReadableSourcePathTargetImpl;
20   -import com.cloudera.crunch.type.PType;
  20 +import com.cloudera.crunch.types.PType;
21 21
22 22 public class SeqFileSourceTarget<T> extends ReadableSourcePathTargetImpl<T> {
23 23 public SeqFileSourceTarget(String path, PType<T> ptype) {
4 src/main/java/com/cloudera/crunch/io/seq/SeqFileTableReaderFactory.java
@@ -28,8 +28,8 @@
28 28 import com.cloudera.crunch.MapFn;
29 29 import com.cloudera.crunch.Pair;
30 30 import com.cloudera.crunch.io.FileReaderFactory;
31   -import com.cloudera.crunch.type.PTableType;
32   -import com.cloudera.crunch.type.PType;
  31 +import com.cloudera.crunch.types.PTableType;
  32 +import com.cloudera.crunch.types.PType;
33 33 import com.google.common.collect.Iterators;
34 34 import com.google.common.collect.UnmodifiableIterator;
35 35
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileTableSource.java
@@ -25,7 +25,7 @@
25 25 import com.cloudera.crunch.io.CompositePathIterable;
26 26 import com.cloudera.crunch.io.ReadableSource;
27 27 import com.cloudera.crunch.io.impl.FileTableSourceImpl;
28   -import com.cloudera.crunch.type.PTableType;
  28 +import com.cloudera.crunch.types.PTableType;
29 29
30 30 /**
31 31 *
2  src/main/java/com/cloudera/crunch/io/seq/SeqFileTableSourceTarget.java
@@ -19,7 +19,7 @@
19 19 import com.cloudera.crunch.Pair;
20 20 import com.cloudera.crunch.TableSource;
21 21 import com.cloudera.crunch.io.impl.ReadableSourcePathTargetImpl;
22   -import com.cloudera.crunch.type.PTableType;
  22 +import com.cloudera.crunch.types.PTableType;
23 23
24 24 public class SeqFileTableSourceTarget<K, V> extends ReadableSourcePathTargetImpl<Pair<K,V>> implements TableSource<K, V> {
25 25 private final PTableType<K, V> tableType;
4 src/main/java/com/cloudera/crunch/io/seq/SeqFileTarget.java
@@ -19,8 +19,8 @@
19 19
20 20 import com.cloudera.crunch.SourceTarget;
21 21 import com.cloudera.crunch.io.impl.FileTargetImpl;
22   -import com.cloudera.crunch.type.PTableType;
23   -import com.cloudera.crunch.type.PType;
  22 +import com.cloudera.crunch.types.PTableType;
  23 +import com.cloudera.crunch.types.PType;
24 24
25 25 public class SeqFileTarget extends FileTargetImpl {
26 26 public SeqFileTarget(String path) {
2  src/main/java/com/cloudera/crunch/io/text/TextFileReaderFactory.java
@@ -30,7 +30,7 @@
30 30 import com.cloudera.crunch.fn.CompositeMapFn;
31 31 import com.cloudera.crunch.fn.IdentityFn;
32 32 import com.cloudera.crunch.io.FileReaderFactory;
33   -import com.cloudera.crunch.type.PType;
  33 +import com.cloudera.crunch.types.PType;
34 34 import com.google.common.collect.Iterators;
35 35 import com.google.common.collect.UnmodifiableIterator;
36 36
6 src/main/java/com/cloudera/crunch/io/text/TextFileSource.java
@@ -25,9 +25,9 @@
25 25 import com.cloudera.crunch.io.CompositePathIterable;
26 26 import com.cloudera.crunch.io.ReadableSource;
27 27 import com.cloudera.crunch.io.impl.FileSourceImpl;
28   -import com.cloudera.crunch.type.PType;
29   -import com.cloudera.crunch.type.avro.AvroTypeFamily;
30   -import com.cloudera.crunch.type.avro.AvroUtf8InputFormat;
  28 +import com.cloudera.crunch.types.PType;
  29 +import com.cloudera.crunch.types.avro.AvroTypeFamily;
  30 +import com.cloudera.crunch.types.avro.AvroUtf8InputFormat;
31 31
32 32 public class TextFileSource<T> extends FileSourceImpl<T> implements
33 33 ReadableSource<T> {
2  src/main/java/com/cloudera/crunch/io/text/TextFileSourceTarget.java
@@ -17,7 +17,7 @@
17 17 import org.apache.hadoop.fs.Path;
18 18
19 19 import com.cloudera.crunch.io.impl.ReadableSourcePathTargetImpl;
20   -import com.cloudera.crunch.type.PType;
  20 +import com.cloudera.crunch.types.PType;
21 21
22 22 public class TextFileSourceTarget<T> extends ReadableSourcePathTargetImpl<T> {
23 23 public TextFileSourceTarget(String path, PType<T> ptype) {
4 src/main/java/com/cloudera/crunch/io/text/TextFileTarget.java
@@ -19,8 +19,8 @@
19 19
20 20 import com.cloudera.crunch.SourceTarget;
21 21 import com.cloudera.crunch.io.impl.FileTargetImpl;
22   -import com.cloudera.crunch.type.PTableType;
23   -import com.cloudera.crunch.type.PType;
  22 +import com.cloudera.crunch.types.PTableType;
  23 +import com.cloudera.crunch.types.PType;
24 24
25 25 public class TextFileTarget extends FileTargetImpl {
26 26 public TextFileTarget(String path) {
6 src/main/java/com/cloudera/crunch/lib/Aggregate.java
@@ -28,9 +28,9 @@
28 28 import com.cloudera.crunch.PTable;
29 29 import com.cloudera.crunch.Pair;
30 30 import com.cloudera.crunch.fn.MapValuesFn;
31   -import com.cloudera.crunch.type.PTableType;
32   -import com.cloudera.crunch.type.PType;
33   -import com.cloudera.crunch.type.PTypeFamily;
  31 +import com.cloudera.crunch.types.PTableType;
  32 +import com.cloudera.crunch.types.PType;
  33 +import com.cloudera.crunch.types.PTypeFamily;
34 34 import com.google.common.collect.Lists;
35 35
36 36 /**
4 src/main/java/com/cloudera/crunch/lib/Cogroup.java
@@ -21,8 +21,8 @@
21 21 import com.cloudera.crunch.PTable;
22 22 import com.cloudera.crunch.Pair;
23 23 import com.cloudera.crunch.fn.MapValuesFn;
24   -import com.cloudera.crunch.type.PType;
25   -import com.cloudera.crunch.type.PTypeFamily;
  24 +import com.cloudera.crunch.types.PType;
  25 +import com.cloudera.crunch.types.PTypeFamily;
26 26 import com.google.common.collect.Lists;
27 27
28 28 public class Cogroup {
4 src/main/java/com/cloudera/crunch/lib/Join.java
@@ -25,8 +25,8 @@
25 25 import com.cloudera.crunch.lib.join.JoinUtils;
26 26 import com.cloudera.crunch.lib.join.LeftOuterJoinFn;
27 27 import com.cloudera.crunch.lib.join.RightOuterJoinFn;
28   -import com.cloudera.crunch.type.PTableType;
29   -import com.cloudera.crunch.type.PTypeFamily;
  28 +import com.cloudera.crunch.types.PTableType;
  29 +import com.cloudera.crunch.types.PTypeFamily;
30 30
31 31 /**
32 32 * Utilities for joining multiple {@code PTable} instances based on a common lastKey.
4 src/main/java/com/cloudera/crunch/lib/Set.java
@@ -22,8 +22,8 @@
22 22 import com.cloudera.crunch.PTable;
23 23 import com.cloudera.crunch.Pair;
24 24 import com.cloudera.crunch.Tuple3;
25   -import com.cloudera.crunch.type.PType;
26   -import com.cloudera.crunch.type.PTypeFamily;
  25 +import com.cloudera.crunch.types.PType;
  26 +import com.cloudera.crunch.types.PTypeFamily;
27 27
28 28 /**
29 29 * Utilities for performing set operations (difference, intersection, etc) on
14 src/main/java/com/cloudera/crunch/lib/Sort.java
@@ -42,13 +42,13 @@
42 42 import com.cloudera.crunch.Tuple3;
43 43 import com.cloudera.crunch.Tuple4;
44 44 import com.cloudera.crunch.TupleN;
45   -import com.cloudera.crunch.type.PTableType;
46   -import com.cloudera.crunch.type.PType;
47   -import com.cloudera.crunch.type.PTypeFamily;
48   -import com.cloudera.crunch.type.avro.AvroType;
49   -import com.cloudera.crunch.type.avro.AvroTypeFamily;
50   -import com.cloudera.crunch.type.writable.TupleWritable;
51   -import com.cloudera.crunch.type.writable.WritableTypeFamily;
  45 +import com.cloudera.crunch.types.PTableType;
  46 +import com.cloudera.crunch.types.PType;
  47 +import com.cloudera.crunch.types.PTypeFamily;
  48 +import com.cloudera.crunch.types.avro.AvroType;
  49 +import com.cloudera.crunch.types.avro.AvroTypeFamily;
  50 +import com.cloudera.crunch.types.writable.TupleWritable;
  51 +import com.cloudera.crunch.types.writable.WritableTypeFamily;
52 52 import com.google.common.base.Function;
53 53 import com.google.common.base.Joiner;
54 54 import com.google.common.collect.ImmutableList;
6 src/main/java/com/cloudera/crunch/lib/join/JoinUtils.java
@@ -30,9 +30,9 @@
30 30 import org.apache.hadoop.io.WritableComparable;
31 31 import org.apache.hadoop.mapreduce.Partitioner;
32 32
33   -import com.cloudera.crunch.type.PTypeFamily;
34   -import com.cloudera.crunch.type.writable.TupleWritable;
35   -import com.cloudera.crunch.type.writable.WritableTypeFamily;
  33 +import com.cloudera.crunch.types.PTypeFamily;
  34 +import com.cloudera.crunch.types.writable.TupleWritable;
  35 +import com.cloudera.crunch.types.writable.WritableTypeFamily;
36 36
37 37 /**
38 38 * 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
@@ -12,7 +12,7 @@
12 12 * the specific language governing permissions and limitations under the
13 13 * License.
14 14 */
15   -package com.cloudera.crunch.type;
  15 +package com.cloudera.crunch.types;
16 16
17 17 import java.io.Serializable;
18 18
2  ...a/com/cloudera/crunch/type/PGroupedTableType.java → .../com/cloudera/crunch/types/PGroupedTableType.java
@@ -13,7 +13,7 @@
13 13 * License.
14 14 */
15 15
16   -package com.cloudera.crunch.type;
  16 +package com.cloudera.crunch.types;
17 17
18 18 import java.util.Iterator;
19 19 import java.util.List;
2  ...ain/java/com/cloudera/crunch/type/PTableType.java → ...in/java/com/cloudera/crunch/types/PTableType.java
@@ -13,7 +13,7 @@
13 13 * License.
14 14 */
15 15
16   -package com.cloudera.crunch.type;
  16 +package com.cloudera.crunch.types;
17 17
18 18 import com.cloudera.crunch.PTable;
19 19 import com.cloudera.crunch.Pair;
2  src/main/java/com/cloudera/crunch/type/PType.java → src/main/java/com/cloudera/crunch/types/PType.java
@@ -13,7 +13,7 @@
13 13 * License.
14 14 */
15 15
16   -package com.cloudera.crunch.type;
  16 +package com.cloudera.crunch.types;
17 17
18 18 import java.util.List;
19 19
2  ...in/java/com/cloudera/crunch/type/PTypeFamily.java → ...n/java/com/cloudera/crunch/types/PTypeFamily.java
@@ -13,7 +13,7 @@
13 13 * License.
14 14 */
15 15
16   -package com.cloudera.crunch.type;
  16 +package com.cloudera.crunch.types;
17 17
18 18 import java.nio.ByteBuffer;
19 19 import java.util.Collection;
2  ...ain/java/com/cloudera/crunch/type/PTypeUtils.java → ...in/java/com/cloudera/crunch/types/PTypeUtils.java
@@ -12,7 +12,7 @@
12 12 * the specific language governing permissions and limitations under the
13 13 * License.
14 14 */
15   -package com.cloudera.crunch.type;
  15 +package com.cloudera.crunch.types;
16 16
17 17 import java.util.Collection;
18 18 import java.util.List;
2  ...n/java/com/cloudera/crunch/type/TupleFactory.java → .../java/com/cloudera/crunch/types/TupleFactory.java
@@ -12,7 +12,7 @@
12 12 * the specific language governing permissions and limitations under the
13 13 * License.
14 14 */
15   -package com.cloudera.crunch.type;
  15 +package com.cloudera.crunch.types;
16 16
17 17 import java.io.Serializable;
18 18 import java.lang.reflect.Constructor;
7 ...oudera/crunch/type/avro/AvroGroupedTableType.java → ...udera/crunch/types/avro/AvroGroupedTableType.java
@@ -12,10 +12,11 @@
12 12 * the specific language governing permissions and limitations under the
13 13 * License.
14 14 */
15   -package com.cloudera.crunch.type.avro;
  15 +package com.cloudera.crunch.types.avro;
16 16
17 17 import java.util.Collection;
18 18
  19 +import com.cloudera.crunch.types.Converter;
19 20 import org.apache.avro.mapred.AvroJob;
20 21 import org.ap