Adding javadocs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/588d667a Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/588d667a Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/588d667a Branch: refs/heads/0.1.5 Commit: 588d667aed6a407802a9d86ff0e33b6a38d0831a Parents: 1685b2e Author: Aaron McCurry <[email protected]> Authored: Wed May 15 14:11:45 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed May 15 14:11:45 2013 -0400 ---------------------------------------------------------------------- .../apache/blur/mapreduce/csv/CsvBlurMapper.java | 56 ++++++++++++++- 1 files changed, 53 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/588d667a/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/csv/CsvBlurMapper.java ---------------------------------------------------------------------- diff --git a/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/csv/CsvBlurMapper.java b/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/csv/CsvBlurMapper.java index a75b4e6..f41c40c 100644 --- a/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/csv/CsvBlurMapper.java +++ b/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/csv/CsvBlurMapper.java @@ -35,8 +35,12 @@ import org.apache.hadoop.mapreduce.Job; import com.google.common.base.Splitter; +/** + * + */ public class CsvBlurMapper extends BlurMapper<LongWritable, Text> { + public static final String BLUR_CSV_SEPARATOR = "blur.csv.separator"; public static final String BLUR_CSV_FAMILY_COLUMN_PREFIX = "blur.csv.family."; public static final String BLUR_CSV_FAMILIES = "blur.csv.families"; @@ -44,6 +48,30 @@ public class CsvBlurMapper extends BlurMapper<LongWritable, Text> { private String separator = ","; private Splitter splitter; + /** + * Adds the column layout for the given family. + * + * @param job + * the job to apply the layout. + * @param family + * the family name. + * @param columns + * the column names. + */ + public static void addColumns(Job job, String family, String... columns) { + addColumns(job.getConfiguration(), family, columns); + } + + /** + * Adds the column layout for the given family. + * + * @param configuration + * the configuration to apply the layout. + * @param family + * the family name. + * @param columns + * the column names. + */ public static void addColumns(Configuration configuration, String family, String... columns) { Collection<String> families = new TreeSet<String>(configuration.getStringCollection(BLUR_CSV_FAMILIES)); families.add(family); @@ -51,6 +79,30 @@ public class CsvBlurMapper extends BlurMapper<LongWritable, Text> { configuration.setStrings(BLUR_CSV_FAMILY_COLUMN_PREFIX + family, columns); } + /** + * Sets the separator of the file, by default it is ",". + * + * @param job + * the job to apply the separator change. + * @param separator + * the separator. + */ + public static void setSeparator(Job job, String separator) { + setSeparator(job.getConfiguration(), separator); + } + + /** + * Sets the separator of the file, by default it is ",". + * + * @param configuration + * the configuration to apply the separator change. + * @param separator + * the separator. + */ + public static void setSeparator(Configuration configuration, String separator) { + configuration.set(BLUR_CSV_SEPARATOR, separator); + } + @Override protected void setup(Context context) throws IOException, InterruptedException { super.setup(context); @@ -62,6 +114,7 @@ public class CsvBlurMapper extends BlurMapper<LongWritable, Text> { columnNameMap.put(family, Arrays.asList(columnsNames)); } splitter = Splitter.on(separator); + separator = configuration.get(BLUR_CSV_SEPARATOR, separator); } @Override @@ -118,7 +171,4 @@ public class CsvBlurMapper extends BlurMapper<LongWritable, Text> { return lst; } - public static void addColumns(Job job, String family, String columns) { - addColumns(job.getConfiguration(), family, columns); - } }
