http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html index ab7c471..b04126d 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html @@ -31,31 +31,31 @@ <span class="sourceLineNo">023</span>import java.io.File;<a name="line.23"></a> <span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a> <span class="sourceLineNo">025</span>import java.util.ArrayList;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.util.HashSet;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import java.util.Set;<a name="line.27"></a> -<span class="sourceLineNo">028</span><a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.commons.lang3.StringUtils;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configured;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.Path;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HConstants;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableName;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.slf4j.Logger;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.slf4j.LoggerFactory;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.Put;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.47"></a> -<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Table;<a name="line.48"></a> -<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.49"></a> -<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.50"></a> +<span class="sourceLineNo">026</span>import java.util.Base64;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.util.HashSet;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.util.Set;<a name="line.28"></a> +<span class="sourceLineNo">029</span><a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.commons.lang3.StringUtils;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configuration;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hadoop.conf.Configured;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.Path;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HConstants;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableName;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.Put;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.48"></a> +<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a> +<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.50"></a> <span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.51"></a> <span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.52"></a> <span class="sourceLineNo">053</span>import org.apache.hadoop.io.Text;<a name="line.53"></a> @@ -479,7 +479,7 @@ <span class="sourceLineNo">471</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.471"></a> <span class="sourceLineNo">472</span> if (actualSeparator != null) {<a name="line.472"></a> <span class="sourceLineNo">473</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.473"></a> -<span class="sourceLineNo">474</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.474"></a> +<span class="sourceLineNo">474</span> Bytes.toString(Base64.getEncoder().encode(actualSeparator.getBytes())));<a name="line.474"></a> <span class="sourceLineNo">475</span> }<a name="line.475"></a> <span class="sourceLineNo">476</span><a name="line.476"></a> <span class="sourceLineNo">477</span> // See if a non-default Mapper was set<a name="line.477"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html index ab7c471..b04126d 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html @@ -31,31 +31,31 @@ <span class="sourceLineNo">023</span>import java.io.File;<a name="line.23"></a> <span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a> <span class="sourceLineNo">025</span>import java.util.ArrayList;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.util.HashSet;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import java.util.Set;<a name="line.27"></a> -<span class="sourceLineNo">028</span><a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.commons.lang3.StringUtils;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configured;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.Path;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HConstants;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableName;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.slf4j.Logger;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.slf4j.LoggerFactory;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.Put;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.47"></a> -<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Table;<a name="line.48"></a> -<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.49"></a> -<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.50"></a> +<span class="sourceLineNo">026</span>import java.util.Base64;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.util.HashSet;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.util.Set;<a name="line.28"></a> +<span class="sourceLineNo">029</span><a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.commons.lang3.StringUtils;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configuration;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hadoop.conf.Configured;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.Path;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HConstants;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableName;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.Put;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.48"></a> +<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a> +<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.50"></a> <span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.51"></a> <span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.52"></a> <span class="sourceLineNo">053</span>import org.apache.hadoop.io.Text;<a name="line.53"></a> @@ -479,7 +479,7 @@ <span class="sourceLineNo">471</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.471"></a> <span class="sourceLineNo">472</span> if (actualSeparator != null) {<a name="line.472"></a> <span class="sourceLineNo">473</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.473"></a> -<span class="sourceLineNo">474</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.474"></a> +<span class="sourceLineNo">474</span> Bytes.toString(Base64.getEncoder().encode(actualSeparator.getBytes())));<a name="line.474"></a> <span class="sourceLineNo">475</span> }<a name="line.475"></a> <span class="sourceLineNo">476</span><a name="line.476"></a> <span class="sourceLineNo">477</span> // See if a non-default Mapper was set<a name="line.477"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html index ab7c471..b04126d 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html @@ -31,31 +31,31 @@ <span class="sourceLineNo">023</span>import java.io.File;<a name="line.23"></a> <span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a> <span class="sourceLineNo">025</span>import java.util.ArrayList;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.util.HashSet;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import java.util.Set;<a name="line.27"></a> -<span class="sourceLineNo">028</span><a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.commons.lang3.StringUtils;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configured;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.Path;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HConstants;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableName;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.slf4j.Logger;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.slf4j.LoggerFactory;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.Put;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.47"></a> -<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Table;<a name="line.48"></a> -<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.49"></a> -<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.50"></a> +<span class="sourceLineNo">026</span>import java.util.Base64;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.util.HashSet;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.util.Set;<a name="line.28"></a> +<span class="sourceLineNo">029</span><a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.commons.lang3.StringUtils;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configuration;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hadoop.conf.Configured;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.Path;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HConstants;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableName;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.Put;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.48"></a> +<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a> +<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.50"></a> <span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.51"></a> <span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.52"></a> <span class="sourceLineNo">053</span>import org.apache.hadoop.io.Text;<a name="line.53"></a> @@ -479,7 +479,7 @@ <span class="sourceLineNo">471</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.471"></a> <span class="sourceLineNo">472</span> if (actualSeparator != null) {<a name="line.472"></a> <span class="sourceLineNo">473</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.473"></a> -<span class="sourceLineNo">474</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.474"></a> +<span class="sourceLineNo">474</span> Bytes.toString(Base64.getEncoder().encode(actualSeparator.getBytes())));<a name="line.474"></a> <span class="sourceLineNo">475</span> }<a name="line.475"></a> <span class="sourceLineNo">476</span><a name="line.476"></a> <span class="sourceLineNo">477</span> // See if a non-default Mapper was set<a name="line.477"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html index ab7c471..b04126d 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html @@ -31,31 +31,31 @@ <span class="sourceLineNo">023</span>import java.io.File;<a name="line.23"></a> <span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a> <span class="sourceLineNo">025</span>import java.util.ArrayList;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.util.HashSet;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import java.util.Set;<a name="line.27"></a> -<span class="sourceLineNo">028</span><a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.commons.lang3.StringUtils;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configured;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.Path;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HConstants;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableName;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.slf4j.Logger;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.slf4j.LoggerFactory;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.Put;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.47"></a> -<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Table;<a name="line.48"></a> -<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.49"></a> -<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.50"></a> +<span class="sourceLineNo">026</span>import java.util.Base64;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.util.HashSet;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.util.Set;<a name="line.28"></a> +<span class="sourceLineNo">029</span><a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.commons.lang3.StringUtils;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configuration;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hadoop.conf.Configured;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.Path;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HConstants;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableName;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.Put;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.48"></a> +<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a> +<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.50"></a> <span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.51"></a> <span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.52"></a> <span class="sourceLineNo">053</span>import org.apache.hadoop.io.Text;<a name="line.53"></a> @@ -479,7 +479,7 @@ <span class="sourceLineNo">471</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.471"></a> <span class="sourceLineNo">472</span> if (actualSeparator != null) {<a name="line.472"></a> <span class="sourceLineNo">473</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.473"></a> -<span class="sourceLineNo">474</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.474"></a> +<span class="sourceLineNo">474</span> Bytes.toString(Base64.getEncoder().encode(actualSeparator.getBytes())));<a name="line.474"></a> <span class="sourceLineNo">475</span> }<a name="line.475"></a> <span class="sourceLineNo">476</span><a name="line.476"></a> <span class="sourceLineNo">477</span> // See if a non-default Mapper was set<a name="line.477"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html index fe63405..b7cf0bd 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html @@ -26,129 +26,130 @@ <span class="sourceLineNo">018</span> */<a name="line.18"></a> <span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.mapreduce;<a name="line.19"></a> <span class="sourceLineNo">020</span><a name="line.20"></a> -<span class="sourceLineNo">021</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.21"></a> -<span class="sourceLineNo">022</span>import org.slf4j.Logger;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import org.slf4j.LoggerFactory;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configurable;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.hadoop.conf.Configuration;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.mapreduce.Partitioner;<a name="line.29"></a> -<span class="sourceLineNo">030</span><a name="line.30"></a> -<span class="sourceLineNo">031</span>/**<a name="line.31"></a> -<span class="sourceLineNo">032</span> * A partitioner that takes start and end keys and uses bigdecimal to figure<a name="line.32"></a> -<span class="sourceLineNo">033</span> * which reduce a key belongs to. Pass the start and end<a name="line.33"></a> -<span class="sourceLineNo">034</span> * keys in the Configuration using <code>hbase.simpletotalorder.start</code><a name="line.34"></a> -<span class="sourceLineNo">035</span> * and <code>hbase.simpletotalorder.end</code>. The end key needs to be<a name="line.35"></a> -<span class="sourceLineNo">036</span> * exclusive; i.e. one larger than the biggest key in your key space.<a name="line.36"></a> -<span class="sourceLineNo">037</span> * You may be surprised at how this class partitions the space; it may not<a name="line.37"></a> -<span class="sourceLineNo">038</span> * align with preconceptions; e.g. a start key of zero and an end key of 100<a name="line.38"></a> -<span class="sourceLineNo">039</span> * divided in ten will not make regions whose range is 0-10, 10-20, and so on.<a name="line.39"></a> -<span class="sourceLineNo">040</span> * Make your own partitioner if you need the region spacing to come out a<a name="line.40"></a> -<span class="sourceLineNo">041</span> * particular way.<a name="line.41"></a> -<span class="sourceLineNo">042</span> * @param <VALUE><a name="line.42"></a> -<span class="sourceLineNo">043</span> * @see #START<a name="line.43"></a> -<span class="sourceLineNo">044</span> * @see #END<a name="line.44"></a> -<span class="sourceLineNo">045</span> */<a name="line.45"></a> -<span class="sourceLineNo">046</span>@InterfaceAudience.Public<a name="line.46"></a> -<span class="sourceLineNo">047</span>public class SimpleTotalOrderPartitioner<VALUE> extends Partitioner<ImmutableBytesWritable, VALUE><a name="line.47"></a> -<span class="sourceLineNo">048</span>implements Configurable {<a name="line.48"></a> -<span class="sourceLineNo">049</span> private final static Logger LOG = LoggerFactory.getLogger(SimpleTotalOrderPartitioner.class);<a name="line.49"></a> -<span class="sourceLineNo">050</span><a name="line.50"></a> -<span class="sourceLineNo">051</span> @Deprecated<a name="line.51"></a> -<span class="sourceLineNo">052</span> public static final String START = "hbase.simpletotalorder.start";<a name="line.52"></a> -<span class="sourceLineNo">053</span> @Deprecated<a name="line.53"></a> -<span class="sourceLineNo">054</span> public static final String END = "hbase.simpletotalorder.end";<a name="line.54"></a> -<span class="sourceLineNo">055</span><a name="line.55"></a> -<span class="sourceLineNo">056</span> static final String START_BASE64 = "hbase.simpletotalorder.start.base64";<a name="line.56"></a> -<span class="sourceLineNo">057</span> static final String END_BASE64 = "hbase.simpletotalorder.end.base64";<a name="line.57"></a> -<span class="sourceLineNo">058</span><a name="line.58"></a> -<span class="sourceLineNo">059</span> private Configuration c;<a name="line.59"></a> -<span class="sourceLineNo">060</span> private byte [] startkey;<a name="line.60"></a> -<span class="sourceLineNo">061</span> private byte [] endkey;<a name="line.61"></a> -<span class="sourceLineNo">062</span> private byte [][] splits;<a name="line.62"></a> -<span class="sourceLineNo">063</span> private int lastReduces = -1;<a name="line.63"></a> -<span class="sourceLineNo">064</span><a name="line.64"></a> -<span class="sourceLineNo">065</span> public static void setStartKey(Configuration conf, byte[] startKey) {<a name="line.65"></a> -<span class="sourceLineNo">066</span> conf.set(START_BASE64, Base64.encodeBytes(startKey));<a name="line.66"></a> -<span class="sourceLineNo">067</span> }<a name="line.67"></a> -<span class="sourceLineNo">068</span><a name="line.68"></a> -<span class="sourceLineNo">069</span> public static void setEndKey(Configuration conf, byte[] endKey) {<a name="line.69"></a> -<span class="sourceLineNo">070</span> conf.set(END_BASE64, Base64.encodeBytes(endKey));<a name="line.70"></a> -<span class="sourceLineNo">071</span> }<a name="line.71"></a> -<span class="sourceLineNo">072</span><a name="line.72"></a> -<span class="sourceLineNo">073</span> @SuppressWarnings("deprecation")<a name="line.73"></a> -<span class="sourceLineNo">074</span> static byte[] getStartKey(Configuration conf) {<a name="line.74"></a> -<span class="sourceLineNo">075</span> return getKeyFromConf(conf, START_BASE64, START);<a name="line.75"></a> -<span class="sourceLineNo">076</span> }<a name="line.76"></a> -<span class="sourceLineNo">077</span><a name="line.77"></a> -<span class="sourceLineNo">078</span> @SuppressWarnings("deprecation")<a name="line.78"></a> -<span class="sourceLineNo">079</span> static byte[] getEndKey(Configuration conf) {<a name="line.79"></a> -<span class="sourceLineNo">080</span> return getKeyFromConf(conf, END_BASE64, END);<a name="line.80"></a> -<span class="sourceLineNo">081</span> }<a name="line.81"></a> -<span class="sourceLineNo">082</span><a name="line.82"></a> -<span class="sourceLineNo">083</span> private static byte[] getKeyFromConf(Configuration conf,<a name="line.83"></a> -<span class="sourceLineNo">084</span> String base64Key, String deprecatedKey) {<a name="line.84"></a> -<span class="sourceLineNo">085</span> String encoded = conf.get(base64Key);<a name="line.85"></a> -<span class="sourceLineNo">086</span> if (encoded != null) {<a name="line.86"></a> -<span class="sourceLineNo">087</span> return Base64.decode(encoded);<a name="line.87"></a> -<span class="sourceLineNo">088</span> }<a name="line.88"></a> -<span class="sourceLineNo">089</span> String oldStyleVal = conf.get(deprecatedKey);<a name="line.89"></a> -<span class="sourceLineNo">090</span> if (oldStyleVal == null) {<a name="line.90"></a> -<span class="sourceLineNo">091</span> return null;<a name="line.91"></a> -<span class="sourceLineNo">092</span> }<a name="line.92"></a> -<span class="sourceLineNo">093</span> LOG.warn("Using deprecated configuration " + deprecatedKey +<a name="line.93"></a> -<span class="sourceLineNo">094</span> " - please use static accessor methods instead.");<a name="line.94"></a> -<span class="sourceLineNo">095</span> return Bytes.toBytesBinary(oldStyleVal);<a name="line.95"></a> -<span class="sourceLineNo">096</span> }<a name="line.96"></a> -<span class="sourceLineNo">097</span><a name="line.97"></a> -<span class="sourceLineNo">098</span> @Override<a name="line.98"></a> -<span class="sourceLineNo">099</span> public int getPartition(final ImmutableBytesWritable key, final VALUE value,<a name="line.99"></a> -<span class="sourceLineNo">100</span> final int reduces) {<a name="line.100"></a> -<span class="sourceLineNo">101</span> if (reduces == 1) return 0;<a name="line.101"></a> -<span class="sourceLineNo">102</span> if (this.lastReduces != reduces) {<a name="line.102"></a> -<span class="sourceLineNo">103</span> this.splits = Bytes.split(this.startkey, this.endkey, reduces - 1);<a name="line.103"></a> -<span class="sourceLineNo">104</span> for (int i = 0; i < splits.length; i++) {<a name="line.104"></a> -<span class="sourceLineNo">105</span> LOG.info(Bytes.toStringBinary(splits[i]));<a name="line.105"></a> -<span class="sourceLineNo">106</span> }<a name="line.106"></a> -<span class="sourceLineNo">107</span> this.lastReduces = reduces;<a name="line.107"></a> -<span class="sourceLineNo">108</span> }<a name="line.108"></a> -<span class="sourceLineNo">109</span> int pos = Bytes.binarySearch(this.splits, key.get(), key.getOffset(),<a name="line.109"></a> -<span class="sourceLineNo">110</span> key.getLength());<a name="line.110"></a> -<span class="sourceLineNo">111</span> // Below code is from hfile index search.<a name="line.111"></a> -<span class="sourceLineNo">112</span> if (pos < 0) {<a name="line.112"></a> -<span class="sourceLineNo">113</span> pos++;<a name="line.113"></a> -<span class="sourceLineNo">114</span> pos *= -1;<a name="line.114"></a> -<span class="sourceLineNo">115</span> if (pos == 0) {<a name="line.115"></a> -<span class="sourceLineNo">116</span> // falls before the beginning of the file.<a name="line.116"></a> -<span class="sourceLineNo">117</span> throw new RuntimeException("Key outside start/stop range: " +<a name="line.117"></a> -<span class="sourceLineNo">118</span> key.toString());<a name="line.118"></a> -<span class="sourceLineNo">119</span> }<a name="line.119"></a> -<span class="sourceLineNo">120</span> pos--;<a name="line.120"></a> -<span class="sourceLineNo">121</span> }<a name="line.121"></a> -<span class="sourceLineNo">122</span> return pos;<a name="line.122"></a> -<span class="sourceLineNo">123</span> }<a name="line.123"></a> -<span class="sourceLineNo">124</span><a name="line.124"></a> -<span class="sourceLineNo">125</span> @Override<a name="line.125"></a> -<span class="sourceLineNo">126</span> public Configuration getConf() {<a name="line.126"></a> -<span class="sourceLineNo">127</span> return this.c;<a name="line.127"></a> -<span class="sourceLineNo">128</span> }<a name="line.128"></a> -<span class="sourceLineNo">129</span><a name="line.129"></a> -<span class="sourceLineNo">130</span> @Override<a name="line.130"></a> -<span class="sourceLineNo">131</span> public void setConf(Configuration conf) {<a name="line.131"></a> -<span class="sourceLineNo">132</span> this.c = conf;<a name="line.132"></a> -<span class="sourceLineNo">133</span> this.startkey = getStartKey(conf);<a name="line.133"></a> -<span class="sourceLineNo">134</span> this.endkey = getEndKey(conf);<a name="line.134"></a> -<span class="sourceLineNo">135</span> if (startkey == null || endkey == null) {<a name="line.135"></a> -<span class="sourceLineNo">136</span> throw new RuntimeException(this.getClass() + " not configured");<a name="line.136"></a> -<span class="sourceLineNo">137</span> }<a name="line.137"></a> -<span class="sourceLineNo">138</span> LOG.info("startkey=" + Bytes.toStringBinary(startkey) +<a name="line.138"></a> -<span class="sourceLineNo">139</span> ", endkey=" + Bytes.toStringBinary(endkey));<a name="line.139"></a> -<span class="sourceLineNo">140</span> // Reset last reduces count on change of Start / End key<a name="line.140"></a> -<span class="sourceLineNo">141</span> this.lastReduces = -1;<a name="line.141"></a> -<span class="sourceLineNo">142</span> }<a name="line.142"></a> -<span class="sourceLineNo">143</span>}<a name="line.143"></a> +<span class="sourceLineNo">021</span>import java.util.Base64;<a name="line.21"></a> +<span class="sourceLineNo">022</span><a name="line.22"></a> +<span class="sourceLineNo">023</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import org.slf4j.Logger;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import org.slf4j.LoggerFactory;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import org.apache.hadoop.conf.Configurable;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configuration;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.mapreduce.Partitioner;<a name="line.30"></a> +<span class="sourceLineNo">031</span><a name="line.31"></a> +<span class="sourceLineNo">032</span>/**<a name="line.32"></a> +<span class="sourceLineNo">033</span> * A partitioner that takes start and end keys and uses bigdecimal to figure<a name="line.33"></a> +<span class="sourceLineNo">034</span> * which reduce a key belongs to. Pass the start and end<a name="line.34"></a> +<span class="sourceLineNo">035</span> * keys in the Configuration using <code>hbase.simpletotalorder.start</code><a name="line.35"></a> +<span class="sourceLineNo">036</span> * and <code>hbase.simpletotalorder.end</code>. The end key needs to be<a name="line.36"></a> +<span class="sourceLineNo">037</span> * exclusive; i.e. one larger than the biggest key in your key space.<a name="line.37"></a> +<span class="sourceLineNo">038</span> * You may be surprised at how this class partitions the space; it may not<a name="line.38"></a> +<span class="sourceLineNo">039</span> * align with preconceptions; e.g. a start key of zero and an end key of 100<a name="line.39"></a> +<span class="sourceLineNo">040</span> * divided in ten will not make regions whose range is 0-10, 10-20, and so on.<a name="line.40"></a> +<span class="sourceLineNo">041</span> * Make your own partitioner if you need the region spacing to come out a<a name="line.41"></a> +<span class="sourceLineNo">042</span> * particular way.<a name="line.42"></a> +<span class="sourceLineNo">043</span> * @param <VALUE><a name="line.43"></a> +<span class="sourceLineNo">044</span> * @see #START<a name="line.44"></a> +<span class="sourceLineNo">045</span> * @see #END<a name="line.45"></a> +<span class="sourceLineNo">046</span> */<a name="line.46"></a> +<span class="sourceLineNo">047</span>@InterfaceAudience.Public<a name="line.47"></a> +<span class="sourceLineNo">048</span>public class SimpleTotalOrderPartitioner<VALUE> extends Partitioner<ImmutableBytesWritable, VALUE><a name="line.48"></a> +<span class="sourceLineNo">049</span>implements Configurable {<a name="line.49"></a> +<span class="sourceLineNo">050</span> private final static Logger LOG = LoggerFactory.getLogger(SimpleTotalOrderPartitioner.class);<a name="line.50"></a> +<span class="sourceLineNo">051</span><a name="line.51"></a> +<span class="sourceLineNo">052</span> @Deprecated<a name="line.52"></a> +<span class="sourceLineNo">053</span> public static final String START = "hbase.simpletotalorder.start";<a name="line.53"></a> +<span class="sourceLineNo">054</span> @Deprecated<a name="line.54"></a> +<span class="sourceLineNo">055</span> public static final String END = "hbase.simpletotalorder.end";<a name="line.55"></a> +<span class="sourceLineNo">056</span><a name="line.56"></a> +<span class="sourceLineNo">057</span> static final String START_BASE64 = "hbase.simpletotalorder.start.base64";<a name="line.57"></a> +<span class="sourceLineNo">058</span> static final String END_BASE64 = "hbase.simpletotalorder.end.base64";<a name="line.58"></a> +<span class="sourceLineNo">059</span><a name="line.59"></a> +<span class="sourceLineNo">060</span> private Configuration c;<a name="line.60"></a> +<span class="sourceLineNo">061</span> private byte [] startkey;<a name="line.61"></a> +<span class="sourceLineNo">062</span> private byte [] endkey;<a name="line.62"></a> +<span class="sourceLineNo">063</span> private byte [][] splits;<a name="line.63"></a> +<span class="sourceLineNo">064</span> private int lastReduces = -1;<a name="line.64"></a> +<span class="sourceLineNo">065</span><a name="line.65"></a> +<span class="sourceLineNo">066</span> public static void setStartKey(Configuration conf, byte[] startKey) {<a name="line.66"></a> +<span class="sourceLineNo">067</span> conf.set(START_BASE64, Bytes.toString(Base64.getEncoder().encode(startKey)));<a name="line.67"></a> +<span class="sourceLineNo">068</span> }<a name="line.68"></a> +<span class="sourceLineNo">069</span><a name="line.69"></a> +<span class="sourceLineNo">070</span> public static void setEndKey(Configuration conf, byte[] endKey) {<a name="line.70"></a> +<span class="sourceLineNo">071</span> conf.set(END_BASE64, Bytes.toString(Base64.getEncoder().encode(endKey)));<a name="line.71"></a> +<span class="sourceLineNo">072</span> }<a name="line.72"></a> +<span class="sourceLineNo">073</span><a name="line.73"></a> +<span class="sourceLineNo">074</span> @SuppressWarnings("deprecation")<a name="line.74"></a> +<span class="sourceLineNo">075</span> static byte[] getStartKey(Configuration conf) {<a name="line.75"></a> +<span class="sourceLineNo">076</span> return getKeyFromConf(conf, START_BASE64, START);<a name="line.76"></a> +<span class="sourceLineNo">077</span> }<a name="line.77"></a> +<span class="sourceLineNo">078</span><a name="line.78"></a> +<span class="sourceLineNo">079</span> @SuppressWarnings("deprecation")<a name="line.79"></a> +<span class="sourceLineNo">080</span> static byte[] getEndKey(Configuration conf) {<a name="line.80"></a> +<span class="sourceLineNo">081</span> return getKeyFromConf(conf, END_BASE64, END);<a name="line.81"></a> +<span class="sourceLineNo">082</span> }<a name="line.82"></a> +<span class="sourceLineNo">083</span><a name="line.83"></a> +<span class="sourceLineNo">084</span> private static byte[] getKeyFromConf(Configuration conf,<a name="line.84"></a> +<span class="sourceLineNo">085</span> String base64Key, String deprecatedKey) {<a name="line.85"></a> +<span class="sourceLineNo">086</span> String encoded = conf.get(base64Key);<a name="line.86"></a> +<span class="sourceLineNo">087</span> if (encoded != null) {<a name="line.87"></a> +<span class="sourceLineNo">088</span> return Base64.getDecoder().decode(encoded);<a name="line.88"></a> +<span class="sourceLineNo">089</span> }<a name="line.89"></a> +<span class="sourceLineNo">090</span> String oldStyleVal = conf.get(deprecatedKey);<a name="line.90"></a> +<span class="sourceLineNo">091</span> if (oldStyleVal == null) {<a name="line.91"></a> +<span class="sourceLineNo">092</span> return null;<a name="line.92"></a> +<span class="sourceLineNo">093</span> }<a name="line.93"></a> +<span class="sourceLineNo">094</span> LOG.warn("Using deprecated configuration " + deprecatedKey +<a name="line.94"></a> +<span class="sourceLineNo">095</span> " - please use static accessor methods instead.");<a name="line.95"></a> +<span class="sourceLineNo">096</span> return Bytes.toBytesBinary(oldStyleVal);<a name="line.96"></a> +<span class="sourceLineNo">097</span> }<a name="line.97"></a> +<span class="sourceLineNo">098</span><a name="line.98"></a> +<span class="sourceLineNo">099</span> @Override<a name="line.99"></a> +<span class="sourceLineNo">100</span> public int getPartition(final ImmutableBytesWritable key, final VALUE value,<a name="line.100"></a> +<span class="sourceLineNo">101</span> final int reduces) {<a name="line.101"></a> +<span class="sourceLineNo">102</span> if (reduces == 1) return 0;<a name="line.102"></a> +<span class="sourceLineNo">103</span> if (this.lastReduces != reduces) {<a name="line.103"></a> +<span class="sourceLineNo">104</span> this.splits = Bytes.split(this.startkey, this.endkey, reduces - 1);<a name="line.104"></a> +<span class="sourceLineNo">105</span> for (int i = 0; i < splits.length; i++) {<a name="line.105"></a> +<span class="sourceLineNo">106</span> LOG.info(Bytes.toStringBinary(splits[i]));<a name="line.106"></a> +<span class="sourceLineNo">107</span> }<a name="line.107"></a> +<span class="sourceLineNo">108</span> this.lastReduces = reduces;<a name="line.108"></a> +<span class="sourceLineNo">109</span> }<a name="line.109"></a> +<span class="sourceLineNo">110</span> int pos = Bytes.binarySearch(this.splits, key.get(), key.getOffset(),<a name="line.110"></a> +<span class="sourceLineNo">111</span> key.getLength());<a name="line.111"></a> +<span class="sourceLineNo">112</span> // Below code is from hfile index search.<a name="line.112"></a> +<span class="sourceLineNo">113</span> if (pos < 0) {<a name="line.113"></a> +<span class="sourceLineNo">114</span> pos++;<a name="line.114"></a> +<span class="sourceLineNo">115</span> pos *= -1;<a name="line.115"></a> +<span class="sourceLineNo">116</span> if (pos == 0) {<a name="line.116"></a> +<span class="sourceLineNo">117</span> // falls before the beginning of the file.<a name="line.117"></a> +<span class="sourceLineNo">118</span> throw new RuntimeException("Key outside start/stop range: " +<a name="line.118"></a> +<span class="sourceLineNo">119</span> key.toString());<a name="line.119"></a> +<span class="sourceLineNo">120</span> }<a name="line.120"></a> +<span class="sourceLineNo">121</span> pos--;<a name="line.121"></a> +<span class="sourceLineNo">122</span> }<a name="line.122"></a> +<span class="sourceLineNo">123</span> return pos;<a name="line.123"></a> +<span class="sourceLineNo">124</span> }<a name="line.124"></a> +<span class="sourceLineNo">125</span><a name="line.125"></a> +<span class="sourceLineNo">126</span> @Override<a name="line.126"></a> +<span class="sourceLineNo">127</span> public Configuration getConf() {<a name="line.127"></a> +<span class="sourceLineNo">128</span> return this.c;<a name="line.128"></a> +<span class="sourceLineNo">129</span> }<a name="line.129"></a> +<span class="sourceLineNo">130</span><a name="line.130"></a> +<span class="sourceLineNo">131</span> @Override<a name="line.131"></a> +<span class="sourceLineNo">132</span> public void setConf(Configuration conf) {<a name="line.132"></a> +<span class="sourceLineNo">133</span> this.c = conf;<a name="line.133"></a> +<span class="sourceLineNo">134</span> this.startkey = getStartKey(conf);<a name="line.134"></a> +<span class="sourceLineNo">135</span> this.endkey = getEndKey(conf);<a name="line.135"></a> +<span class="sourceLineNo">136</span> if (startkey == null || endkey == null) {<a name="line.136"></a> +<span class="sourceLineNo">137</span> throw new RuntimeException(this.getClass() + " not configured");<a name="line.137"></a> +<span class="sourceLineNo">138</span> }<a name="line.138"></a> +<span class="sourceLineNo">139</span> LOG.info("startkey=" + Bytes.toStringBinary(startkey) +<a name="line.139"></a> +<span class="sourceLineNo">140</span> ", endkey=" + Bytes.toStringBinary(endkey));<a name="line.140"></a> +<span class="sourceLineNo">141</span> // Reset last reduces count on change of Start / End key<a name="line.141"></a> +<span class="sourceLineNo">142</span> this.lastReduces = -1;<a name="line.142"></a> +<span class="sourceLineNo">143</span> }<a name="line.143"></a> +<span class="sourceLineNo">144</span>}<a name="line.144"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html index c57c5df..bb026cc 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html @@ -31,37 +31,37 @@ <span class="sourceLineNo">023</span>import java.net.URL;<a name="line.23"></a> <span class="sourceLineNo">024</span>import java.net.URLDecoder;<a name="line.24"></a> <span class="sourceLineNo">025</span>import java.util.ArrayList;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.util.Collection;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import java.util.Enumeration;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import java.util.HashMap;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import java.util.HashSet;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import java.util.List;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import java.util.Map;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import java.util.Set;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import java.util.zip.ZipEntry;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import java.util.zip.ZipFile;<a name="line.34"></a> -<span class="sourceLineNo">035</span><a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.conf.Configuration;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.fs.FileSystem;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.fs.Path;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HConstants;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.TableName;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.47"></a> -<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Put;<a name="line.48"></a> -<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.49"></a> -<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.50"></a> -<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.51"></a> -<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;<a name="line.52"></a> -<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.security.User;<a name="line.53"></a> -<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.security.UserProvider;<a name="line.54"></a> -<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.security.token.TokenUtil;<a name="line.55"></a> -<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.56"></a> +<span class="sourceLineNo">026</span>import java.util.Base64;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.util.Collection;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.util.Enumeration;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import java.util.HashMap;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import java.util.HashSet;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import java.util.List;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import java.util.Map;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import java.util.Set;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import java.util.zip.ZipEntry;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import java.util.zip.ZipFile;<a name="line.35"></a> +<span class="sourceLineNo">036</span><a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.conf.Configuration;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.fs.FileSystem;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.apache.hadoop.fs.Path;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HConstants;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.TableName;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.slf4j.Logger;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.slf4j.LoggerFactory;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.48"></a> +<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Put;<a name="line.49"></a> +<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.50"></a> +<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.51"></a> +<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.52"></a> +<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;<a name="line.53"></a> +<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.security.User;<a name="line.54"></a> +<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.security.UserProvider;<a name="line.55"></a> +<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.security.token.TokenUtil;<a name="line.56"></a> <span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.57"></a> <span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.util.RegionSplitter;<a name="line.58"></a> <span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.zookeeper.ZKConfig;<a name="line.59"></a> @@ -605,7 +605,7 @@ <span class="sourceLineNo">597</span> */<a name="line.597"></a> <span class="sourceLineNo">598</span> public static String convertScanToString(Scan scan) throws IOException {<a name="line.598"></a> <span class="sourceLineNo">599</span> ClientProtos.Scan proto = ProtobufUtil.toScan(scan);<a name="line.599"></a> -<span class="sourceLineNo">600</span> return Base64.encodeBytes(proto.toByteArray());<a name="line.600"></a> +<span class="sourceLineNo">600</span> return Bytes.toString(Base64.getEncoder().encode(proto.toByteArray()));<a name="line.600"></a> <span class="sourceLineNo">601</span> }<a name="line.601"></a> <span class="sourceLineNo">602</span><a name="line.602"></a> <span class="sourceLineNo">603</span> /**<a name="line.603"></a> @@ -616,7 +616,7 @@ <span class="sourceLineNo">608</span> * @throws IOException When reading the scan instance fails.<a name="line.608"></a> <span class="sourceLineNo">609</span> */<a name="line.609"></a> <span class="sourceLineNo">610</span> public static Scan convertStringToScan(String base64) throws IOException {<a name="line.610"></a> -<span class="sourceLineNo">611</span> byte [] decoded = Base64.decode(base64);<a name="line.611"></a> +<span class="sourceLineNo">611</span> byte [] decoded = Base64.getDecoder().decode(base64);<a name="line.611"></a> <span class="sourceLineNo">612</span> return ProtobufUtil.toScan(ClientProtos.Scan.parseFrom(decoded));<a name="line.612"></a> <span class="sourceLineNo">613</span> }<a name="line.613"></a> <span class="sourceLineNo">614</span><a name="line.614"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TextSortReducer.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TextSortReducer.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TextSortReducer.html index 44251b2..5780819 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TextSortReducer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TextSortReducer.html @@ -27,23 +27,23 @@ <span class="sourceLineNo">019</span><a name="line.19"></a> <span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a> <span class="sourceLineNo">021</span>import java.util.ArrayList;<a name="line.21"></a> -<span class="sourceLineNo">022</span>import java.util.Iterator;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import java.util.List;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import java.util.Set;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import java.util.TreeSet;<a name="line.25"></a> -<span class="sourceLineNo">026</span><a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configuration;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.ArrayBackedTag;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.Cell;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.Tag;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.TagType;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.security.visibility.InvalidLabelException;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.38"></a> +<span class="sourceLineNo">022</span>import java.util.Base64;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import java.util.Iterator;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import java.util.Set;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import java.util.TreeSet;<a name="line.26"></a> +<span class="sourceLineNo">027</span><a name="line.27"></a> +<span class="sourceLineNo">028</span>import org.apache.hadoop.conf.Configuration;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.ArrayBackedTag;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.Cell;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.Tag;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.TagType;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.security.visibility.InvalidLabelException;<a name="line.38"></a> <span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.39"></a> <span class="sourceLineNo">040</span>import org.apache.hadoop.io.Text;<a name="line.40"></a> <span class="sourceLineNo">041</span>import org.apache.hadoop.mapreduce.Counter;<a name="line.41"></a> @@ -129,7 +129,7 @@ <span class="sourceLineNo">121</span> if (separator == null) {<a name="line.121"></a> <span class="sourceLineNo">122</span> separator = ImportTsv.DEFAULT_SEPARATOR;<a name="line.122"></a> <span class="sourceLineNo">123</span> } else {<a name="line.123"></a> -<span class="sourceLineNo">124</span> separator = new String(Base64.decode(separator));<a name="line.124"></a> +<span class="sourceLineNo">124</span> separator = Bytes.toString(Base64.getDecoder().decode(separator));<a name="line.124"></a> <span class="sourceLineNo">125</span> }<a name="line.125"></a> <span class="sourceLineNo">126</span><a name="line.126"></a> <span class="sourceLineNo">127</span> // Should never get 0 as we are setting this to a valid value in job configuration.<a name="line.127"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html index 6a3e33c..b57acc2 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html @@ -27,21 +27,21 @@ <span class="sourceLineNo">019</span><a name="line.19"></a> <span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a> <span class="sourceLineNo">021</span>import java.util.ArrayList;<a name="line.21"></a> -<span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a> -<span class="sourceLineNo">023</span><a name="line.23"></a> -<span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configuration;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.ArrayBackedTag;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.Cell;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.Tag;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.TagType;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.Put;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.BadTsvLineException;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.security.visibility.CellVisibility;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.security.visibility.InvalidLabelException;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.36"></a> +<span class="sourceLineNo">022</span>import java.util.Base64;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import java.util.List;<a name="line.23"></a> +<span class="sourceLineNo">024</span><a name="line.24"></a> +<span class="sourceLineNo">025</span>import org.apache.hadoop.conf.Configuration;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.ArrayBackedTag;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.Cell;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.Tag;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.TagType;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.Put;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.BadTsvLineException;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.security.visibility.CellVisibility;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.security.visibility.InvalidLabelException;<a name="line.36"></a> <span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.37"></a> <span class="sourceLineNo">038</span>import org.apache.hadoop.io.LongWritable;<a name="line.38"></a> <span class="sourceLineNo">039</span>import org.apache.hadoop.io.Text;<a name="line.39"></a> @@ -135,7 +135,7 @@ <span class="sourceLineNo">127</span> if (separator == null) {<a name="line.127"></a> <span class="sourceLineNo">128</span> separator = ImportTsv.DEFAULT_SEPARATOR;<a name="line.128"></a> <span class="sourceLineNo">129</span> } else {<a name="line.129"></a> -<span class="sourceLineNo">130</span> separator = new String(Base64.decode(separator));<a name="line.130"></a> +<span class="sourceLineNo">130</span> separator = new String(Base64.getDecoder().decode(separator));<a name="line.130"></a> <span class="sourceLineNo">131</span> }<a name="line.131"></a> <span class="sourceLineNo">132</span> // Should never get 0 as we are setting this to a valid value in job<a name="line.132"></a> <span class="sourceLineNo">133</span> // configuration.<a name="line.133"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html index a339bbf..8359449 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html @@ -25,17 +25,17 @@ <span class="sourceLineNo">017</span> */<a name="line.17"></a> <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.mapreduce;<a name="line.18"></a> <span class="sourceLineNo">019</span><a name="line.19"></a> -<span class="sourceLineNo">020</span>import org.apache.hadoop.io.LongWritable;<a name="line.20"></a> -<span class="sourceLineNo">021</span>import org.apache.hadoop.io.Text;<a name="line.21"></a> -<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.hadoop.mapreduce.Mapper;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.hadoop.mapreduce.Counter;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.conf.Configuration;<a name="line.28"></a> -<span class="sourceLineNo">029</span><a name="line.29"></a> -<span class="sourceLineNo">030</span>import java.io.IOException;<a name="line.30"></a> +<span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a> +<span class="sourceLineNo">021</span>import java.util.Base64;<a name="line.21"></a> +<span class="sourceLineNo">022</span><a name="line.22"></a> +<span class="sourceLineNo">023</span>import org.apache.hadoop.io.LongWritable;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import org.apache.hadoop.io.Text;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import org.apache.hadoop.mapreduce.Mapper;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import org.apache.hadoop.mapreduce.Counter;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a> <span class="sourceLineNo">031</span><a name="line.31"></a> <span class="sourceLineNo">032</span>/**<a name="line.32"></a> <span class="sourceLineNo">033</span> * Write table content out to map output files.<a name="line.33"></a> @@ -69,7 +69,7 @@ <span class="sourceLineNo">061</span><a name="line.61"></a> <span class="sourceLineNo">062</span> /**<a name="line.62"></a> <span class="sourceLineNo">063</span> * Handles initializing this class with objects specific to it (i.e., the parser).<a name="line.63"></a> -<span class="sourceLineNo">064</span> * Common initialization that might be leveraged by a subsclass is done in<a name="line.64"></a> +<span class="sourceLineNo">064</span> * Common initialization that might be leveraged by a subclass is done in<a name="line.64"></a> <span class="sourceLineNo">065</span> * <code>doSetup</code>. Hence a subclass may choose to override this method<a name="line.65"></a> <span class="sourceLineNo">066</span> * and call <code>doSetup</code> as well before handling it's own custom params.<a name="line.66"></a> <span class="sourceLineNo">067</span> *<a name="line.67"></a> @@ -100,7 +100,7 @@ <span class="sourceLineNo">092</span> if (separator == null) {<a name="line.92"></a> <span class="sourceLineNo">093</span> separator = ImportTsv.DEFAULT_SEPARATOR;<a name="line.93"></a> <span class="sourceLineNo">094</span> } else {<a name="line.94"></a> -<span class="sourceLineNo">095</span> separator = new String(Base64.decode(separator));<a name="line.95"></a> +<span class="sourceLineNo">095</span> separator = new String(Base64.getDecoder().decode(separator));<a name="line.95"></a> <span class="sourceLineNo">096</span> }<a name="line.96"></a> <span class="sourceLineNo">097</span><a name="line.97"></a> <span class="sourceLineNo">098</span> skipBadLines = context.getConfiguration().getBoolean(ImportTsv.SKIP_LINES_CONF_KEY, true);<a name="line.98"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html index 88f1e93..fcd2c2c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html @@ -354,7 +354,7 @@ <span class="sourceLineNo">346</span> if (inMemoryCompaction == null) {<a name="line.346"></a> <span class="sourceLineNo">347</span> inMemoryCompaction =<a name="line.347"></a> <span class="sourceLineNo">348</span> MemoryCompactionPolicy.valueOf(conf.get(CompactingMemStore.COMPACTING_MEMSTORE_TYPE_KEY,<a name="line.348"></a> -<span class="sourceLineNo">349</span> CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT));<a name="line.349"></a> +<span class="sourceLineNo">349</span> CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT).toUpperCase());<a name="line.349"></a> <span class="sourceLineNo">350</span> }<a name="line.350"></a> <span class="sourceLineNo">351</span> switch (inMemoryCompaction) {<a name="line.351"></a> <span class="sourceLineNo">352</span> case NONE:<a name="line.352"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html index 88f1e93..fcd2c2c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html @@ -354,7 +354,7 @@ <span class="sourceLineNo">346</span> if (inMemoryCompaction == null) {<a name="line.346"></a> <span class="sourceLineNo">347</span> inMemoryCompaction =<a name="line.347"></a> <span class="sourceLineNo">348</span> MemoryCompactionPolicy.valueOf(conf.get(CompactingMemStore.COMPACTING_MEMSTORE_TYPE_KEY,<a name="line.348"></a> -<span class="sourceLineNo">349</span> CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT));<a name="line.349"></a> +<span class="sourceLineNo">349</span> CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT).toUpperCase());<a name="line.349"></a> <span class="sourceLineNo">350</span> }<a name="line.350"></a> <span class="sourceLineNo">351</span> switch (inMemoryCompaction) {<a name="line.351"></a> <span class="sourceLineNo">352</span> case NONE:<a name="line.352"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerInstanceResource.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerInstanceResource.html b/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerInstanceResource.html index 81e6357..7b970fb 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerInstanceResource.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerInstanceResource.html @@ -28,27 +28,27 @@ <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.rest;<a name="line.20"></a> <span class="sourceLineNo">021</span><a name="line.21"></a> <span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a> -<span class="sourceLineNo">023</span><a name="line.23"></a> -<span class="sourceLineNo">024</span>import javax.ws.rs.DELETE;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import javax.ws.rs.GET;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import javax.ws.rs.Produces;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import javax.ws.rs.QueryParam;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import javax.ws.rs.core.CacheControl;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import javax.ws.rs.core.Context;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import javax.ws.rs.core.Response;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import javax.ws.rs.core.Response.ResponseBuilder;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import javax.ws.rs.core.UriInfo;<a name="line.32"></a> -<span class="sourceLineNo">033</span><a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.Cell;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.slf4j.Logger;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.slf4j.LoggerFactory;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.rest.model.CellModel;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.rest.model.CellSetModel;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.rest.model.RowModel;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.43"></a> +<span class="sourceLineNo">023</span>import java.util.Base64;<a name="line.23"></a> +<span class="sourceLineNo">024</span><a name="line.24"></a> +<span class="sourceLineNo">025</span>import javax.ws.rs.DELETE;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import javax.ws.rs.GET;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import javax.ws.rs.Produces;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import javax.ws.rs.QueryParam;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import javax.ws.rs.core.CacheControl;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import javax.ws.rs.core.Context;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import javax.ws.rs.core.Response;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import javax.ws.rs.core.Response.ResponseBuilder;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import javax.ws.rs.core.UriInfo;<a name="line.33"></a> +<span class="sourceLineNo">034</span><a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.Cell;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.slf4j.Logger;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.slf4j.LoggerFactory;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.rest.model.CellModel;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.rest.model.CellSetModel;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.rest.model.RowModel;<a name="line.43"></a> <span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a> <span class="sourceLineNo">045</span><a name="line.45"></a> <span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a> @@ -179,10 +179,10 @@ <span class="sourceLineNo">171</span> }<a name="line.171"></a> <span class="sourceLineNo">172</span> ResponseBuilder response = Response.ok(CellUtil.cloneValue(value));<a name="line.172"></a> <span class="sourceLineNo">173</span> response.cacheControl(cacheControl);<a name="line.173"></a> -<span class="sourceLineNo">174</span> response.header("X-Row", Base64.encodeBytes(CellUtil.cloneRow(value)));<a name="line.174"></a> -<span class="sourceLineNo">175</span> response.header("X-Column",<a name="line.175"></a> -<span class="sourceLineNo">176</span> Base64.encodeBytes(<a name="line.176"></a> -<span class="sourceLineNo">177</span> CellUtil.makeColumn(CellUtil.cloneFamily(value), CellUtil.cloneQualifier(value))));<a name="line.177"></a> +<span class="sourceLineNo">174</span> response.header("X-Row", Bytes.toString(Base64.getEncoder().encode(<a name="line.174"></a> +<span class="sourceLineNo">175</span> CellUtil.cloneRow(value))));<a name="line.175"></a> +<span class="sourceLineNo">176</span> response.header("X-Column", Bytes.toString(Base64.getEncoder().encode(<a name="line.176"></a> +<span class="sourceLineNo">177</span> CellUtil.makeColumn(CellUtil.cloneFamily(value), CellUtil.cloneQualifier(value)))));<a name="line.177"></a> <span class="sourceLineNo">178</span> response.header("X-Timestamp", value.getTimestamp());<a name="line.178"></a> <span class="sourceLineNo">179</span> servlet.getMetrics().incrementSucessfulGetRequests(1);<a name="line.179"></a> <span class="sourceLineNo">180</span> return response.build();<a name="line.180"></a>
