http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.RegionOp.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.RegionOp.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.RegionOp.html index fbb0a14..95f6ef8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.RegionOp.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.RegionOp.html @@ -461,90 +461,87 @@ <span class="sourceLineNo">453</span> }<a name="line.453"></a> <span class="sourceLineNo">454</span><a name="line.454"></a> <span class="sourceLineNo">455</span> private static User getActiveUser(final UserProvider userProvider, final Token userToken) throws IOException {<a name="line.455"></a> -<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser();<a name="line.456"></a> -<span class="sourceLineNo">457</span> if (user == null) {<a name="line.457"></a> -<span class="sourceLineNo">458</span> user = userProvider.getCurrent();<a name="line.458"></a> -<span class="sourceLineNo">459</span> }<a name="line.459"></a> -<span class="sourceLineNo">460</span> if (user == null && userToken != null) {<a name="line.460"></a> -<span class="sourceLineNo">461</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.461"></a> -<span class="sourceLineNo">462</span> } else if (user != null && userToken != null) {<a name="line.462"></a> -<span class="sourceLineNo">463</span> user.addToken(userToken);<a name="line.463"></a> -<span class="sourceLineNo">464</span> }<a name="line.464"></a> -<span class="sourceLineNo">465</span> return user;<a name="line.465"></a> -<span class="sourceLineNo">466</span> }<a name="line.466"></a> -<span class="sourceLineNo">467</span><a name="line.467"></a> -<span class="sourceLineNo">468</span> @Override<a name="line.468"></a> -<span class="sourceLineNo">469</span> public void close() throws IOException {<a name="line.469"></a> -<span class="sourceLineNo">470</span> privilegedWriter.close();<a name="line.470"></a> -<span class="sourceLineNo">471</span> }<a name="line.471"></a> -<span class="sourceLineNo">472</span> }<a name="line.472"></a> -<span class="sourceLineNo">473</span><a name="line.473"></a> -<span class="sourceLineNo">474</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.474"></a> -<span class="sourceLineNo">475</span> private final User user;<a name="line.475"></a> -<span class="sourceLineNo">476</span> private final SequenceFile.Writer out;<a name="line.476"></a> -<span class="sourceLineNo">477</span> private Object key;<a name="line.477"></a> -<span class="sourceLineNo">478</span> private Object value;<a name="line.478"></a> -<span class="sourceLineNo">479</span><a name="line.479"></a> -<span class="sourceLineNo">480</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.480"></a> -<span class="sourceLineNo">481</span> this.user = user;<a name="line.481"></a> -<span class="sourceLineNo">482</span> this.out = out;<a name="line.482"></a> -<span class="sourceLineNo">483</span> }<a name="line.483"></a> -<span class="sourceLineNo">484</span><a name="line.484"></a> -<span class="sourceLineNo">485</span> void append(final Object key, final Object value) throws IOException {<a name="line.485"></a> -<span class="sourceLineNo">486</span> if (user == null) {<a name="line.486"></a> -<span class="sourceLineNo">487</span> out.append(key, value);<a name="line.487"></a> -<span class="sourceLineNo">488</span> } else {<a name="line.488"></a> -<span class="sourceLineNo">489</span> this.key = key;<a name="line.489"></a> -<span class="sourceLineNo">490</span> this.value = value;<a name="line.490"></a> -<span class="sourceLineNo">491</span> try {<a name="line.491"></a> -<span class="sourceLineNo">492</span> user.runAs(this);<a name="line.492"></a> -<span class="sourceLineNo">493</span> } catch (InterruptedException ex) {<a name="line.493"></a> -<span class="sourceLineNo">494</span> throw new IOException(ex);<a name="line.494"></a> -<span class="sourceLineNo">495</span> }<a name="line.495"></a> -<span class="sourceLineNo">496</span> }<a name="line.496"></a> -<span class="sourceLineNo">497</span> }<a name="line.497"></a> -<span class="sourceLineNo">498</span><a name="line.498"></a> -<span class="sourceLineNo">499</span> @Override<a name="line.499"></a> -<span class="sourceLineNo">500</span> public Boolean run() throws Exception {<a name="line.500"></a> -<span class="sourceLineNo">501</span> out.append(key, value);<a name="line.501"></a> -<span class="sourceLineNo">502</span> return true;<a name="line.502"></a> -<span class="sourceLineNo">503</span> }<a name="line.503"></a> -<span class="sourceLineNo">504</span><a name="line.504"></a> -<span class="sourceLineNo">505</span> @Override<a name="line.505"></a> -<span class="sourceLineNo">506</span> public void close() throws IOException {<a name="line.506"></a> -<span class="sourceLineNo">507</span> out.close();<a name="line.507"></a> -<span class="sourceLineNo">508</span> }<a name="line.508"></a> -<span class="sourceLineNo">509</span> }<a name="line.509"></a> -<span class="sourceLineNo">510</span><a name="line.510"></a> -<span class="sourceLineNo">511</span> public static class Response {<a name="line.511"></a> +<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser().orElse(userProvider.getCurrent());<a name="line.456"></a> +<span class="sourceLineNo">457</span> if (user == null && userToken != null) {<a name="line.457"></a> +<span class="sourceLineNo">458</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.458"></a> +<span class="sourceLineNo">459</span> } else if (user != null && userToken != null) {<a name="line.459"></a> +<span class="sourceLineNo">460</span> user.addToken(userToken);<a name="line.460"></a> +<span class="sourceLineNo">461</span> }<a name="line.461"></a> +<span class="sourceLineNo">462</span> return user;<a name="line.462"></a> +<span class="sourceLineNo">463</span> }<a name="line.463"></a> +<span class="sourceLineNo">464</span><a name="line.464"></a> +<span class="sourceLineNo">465</span> @Override<a name="line.465"></a> +<span class="sourceLineNo">466</span> public void close() throws IOException {<a name="line.466"></a> +<span class="sourceLineNo">467</span> privilegedWriter.close();<a name="line.467"></a> +<span class="sourceLineNo">468</span> }<a name="line.468"></a> +<span class="sourceLineNo">469</span> }<a name="line.469"></a> +<span class="sourceLineNo">470</span><a name="line.470"></a> +<span class="sourceLineNo">471</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.471"></a> +<span class="sourceLineNo">472</span> private final User user;<a name="line.472"></a> +<span class="sourceLineNo">473</span> private final SequenceFile.Writer out;<a name="line.473"></a> +<span class="sourceLineNo">474</span> private Object key;<a name="line.474"></a> +<span class="sourceLineNo">475</span> private Object value;<a name="line.475"></a> +<span class="sourceLineNo">476</span><a name="line.476"></a> +<span class="sourceLineNo">477</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.477"></a> +<span class="sourceLineNo">478</span> this.user = user;<a name="line.478"></a> +<span class="sourceLineNo">479</span> this.out = out;<a name="line.479"></a> +<span class="sourceLineNo">480</span> }<a name="line.480"></a> +<span class="sourceLineNo">481</span><a name="line.481"></a> +<span class="sourceLineNo">482</span> void append(final Object key, final Object value) throws IOException {<a name="line.482"></a> +<span class="sourceLineNo">483</span> if (user == null) {<a name="line.483"></a> +<span class="sourceLineNo">484</span> out.append(key, value);<a name="line.484"></a> +<span class="sourceLineNo">485</span> } else {<a name="line.485"></a> +<span class="sourceLineNo">486</span> this.key = key;<a name="line.486"></a> +<span class="sourceLineNo">487</span> this.value = value;<a name="line.487"></a> +<span class="sourceLineNo">488</span> try {<a name="line.488"></a> +<span class="sourceLineNo">489</span> user.runAs(this);<a name="line.489"></a> +<span class="sourceLineNo">490</span> } catch (InterruptedException ex) {<a name="line.490"></a> +<span class="sourceLineNo">491</span> throw new IOException(ex);<a name="line.491"></a> +<span class="sourceLineNo">492</span> }<a name="line.492"></a> +<span class="sourceLineNo">493</span> }<a name="line.493"></a> +<span class="sourceLineNo">494</span> }<a name="line.494"></a> +<span class="sourceLineNo">495</span><a name="line.495"></a> +<span class="sourceLineNo">496</span> @Override<a name="line.496"></a> +<span class="sourceLineNo">497</span> public Boolean run() throws Exception {<a name="line.497"></a> +<span class="sourceLineNo">498</span> out.append(key, value);<a name="line.498"></a> +<span class="sourceLineNo">499</span> return true;<a name="line.499"></a> +<span class="sourceLineNo">500</span> }<a name="line.500"></a> +<span class="sourceLineNo">501</span><a name="line.501"></a> +<span class="sourceLineNo">502</span> @Override<a name="line.502"></a> +<span class="sourceLineNo">503</span> public void close() throws IOException {<a name="line.503"></a> +<span class="sourceLineNo">504</span> out.close();<a name="line.504"></a> +<span class="sourceLineNo">505</span> }<a name="line.505"></a> +<span class="sourceLineNo">506</span> }<a name="line.506"></a> +<span class="sourceLineNo">507</span><a name="line.507"></a> +<span class="sourceLineNo">508</span> public static class Response {<a name="line.508"></a> +<span class="sourceLineNo">509</span><a name="line.509"></a> +<span class="sourceLineNo">510</span> private final long rowCount;<a name="line.510"></a> +<span class="sourceLineNo">511</span> private final long cellCount;<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> private final long rowCount;<a name="line.513"></a> -<span class="sourceLineNo">514</span> private final long cellCount;<a name="line.514"></a> -<span class="sourceLineNo">515</span><a name="line.515"></a> -<span class="sourceLineNo">516</span> private Response(ExportProtos.ExportResponse r) {<a name="line.516"></a> -<span class="sourceLineNo">517</span> this.rowCount = r.getRowCount();<a name="line.517"></a> -<span class="sourceLineNo">518</span> this.cellCount = r.getCellCount();<a name="line.518"></a> -<span class="sourceLineNo">519</span> }<a name="line.519"></a> -<span class="sourceLineNo">520</span><a name="line.520"></a> -<span class="sourceLineNo">521</span> public long getRowCount() {<a name="line.521"></a> -<span class="sourceLineNo">522</span> return rowCount;<a name="line.522"></a> -<span class="sourceLineNo">523</span> }<a name="line.523"></a> -<span class="sourceLineNo">524</span><a name="line.524"></a> -<span class="sourceLineNo">525</span> public long getCellCount() {<a name="line.525"></a> -<span class="sourceLineNo">526</span> return cellCount;<a name="line.526"></a> -<span class="sourceLineNo">527</span> }<a name="line.527"></a> -<span class="sourceLineNo">528</span><a name="line.528"></a> -<span class="sourceLineNo">529</span> @Override<a name="line.529"></a> -<span class="sourceLineNo">530</span> public String toString() {<a name="line.530"></a> -<span class="sourceLineNo">531</span> StringBuilder builder = new StringBuilder(35);<a name="line.531"></a> -<span class="sourceLineNo">532</span> return builder.append("rowCount=")<a name="line.532"></a> -<span class="sourceLineNo">533</span> .append(rowCount)<a name="line.533"></a> -<span class="sourceLineNo">534</span> .append(", cellCount=")<a name="line.534"></a> -<span class="sourceLineNo">535</span> .append(cellCount)<a name="line.535"></a> -<span class="sourceLineNo">536</span> .toString();<a name="line.536"></a> -<span class="sourceLineNo">537</span> }<a name="line.537"></a> -<span class="sourceLineNo">538</span> }<a name="line.538"></a> -<span class="sourceLineNo">539</span>}<a name="line.539"></a> +<span class="sourceLineNo">513</span> private Response(ExportProtos.ExportResponse r) {<a name="line.513"></a> +<span class="sourceLineNo">514</span> this.rowCount = r.getRowCount();<a name="line.514"></a> +<span class="sourceLineNo">515</span> this.cellCount = r.getCellCount();<a name="line.515"></a> +<span class="sourceLineNo">516</span> }<a name="line.516"></a> +<span class="sourceLineNo">517</span><a name="line.517"></a> +<span class="sourceLineNo">518</span> public long getRowCount() {<a name="line.518"></a> +<span class="sourceLineNo">519</span> return rowCount;<a name="line.519"></a> +<span class="sourceLineNo">520</span> }<a name="line.520"></a> +<span class="sourceLineNo">521</span><a name="line.521"></a> +<span class="sourceLineNo">522</span> public long getCellCount() {<a name="line.522"></a> +<span class="sourceLineNo">523</span> return cellCount;<a name="line.523"></a> +<span class="sourceLineNo">524</span> }<a name="line.524"></a> +<span class="sourceLineNo">525</span><a name="line.525"></a> +<span class="sourceLineNo">526</span> @Override<a name="line.526"></a> +<span class="sourceLineNo">527</span> public String toString() {<a name="line.527"></a> +<span class="sourceLineNo">528</span> StringBuilder builder = new StringBuilder(35);<a name="line.528"></a> +<span class="sourceLineNo">529</span> return builder.append("rowCount=")<a name="line.529"></a> +<span class="sourceLineNo">530</span> .append(rowCount)<a name="line.530"></a> +<span class="sourceLineNo">531</span> .append(", cellCount=")<a name="line.531"></a> +<span class="sourceLineNo">532</span> .append(cellCount)<a name="line.532"></a> +<span class="sourceLineNo">533</span> .toString();<a name="line.533"></a> +<span class="sourceLineNo">534</span> }<a name="line.534"></a> +<span class="sourceLineNo">535</span> }<a name="line.535"></a> +<span class="sourceLineNo">536</span>}<a name="line.536"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.Response.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.Response.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.Response.html index fbb0a14..95f6ef8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.Response.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.Response.html @@ -461,90 +461,87 @@ <span class="sourceLineNo">453</span> }<a name="line.453"></a> <span class="sourceLineNo">454</span><a name="line.454"></a> <span class="sourceLineNo">455</span> private static User getActiveUser(final UserProvider userProvider, final Token userToken) throws IOException {<a name="line.455"></a> -<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser();<a name="line.456"></a> -<span class="sourceLineNo">457</span> if (user == null) {<a name="line.457"></a> -<span class="sourceLineNo">458</span> user = userProvider.getCurrent();<a name="line.458"></a> -<span class="sourceLineNo">459</span> }<a name="line.459"></a> -<span class="sourceLineNo">460</span> if (user == null && userToken != null) {<a name="line.460"></a> -<span class="sourceLineNo">461</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.461"></a> -<span class="sourceLineNo">462</span> } else if (user != null && userToken != null) {<a name="line.462"></a> -<span class="sourceLineNo">463</span> user.addToken(userToken);<a name="line.463"></a> -<span class="sourceLineNo">464</span> }<a name="line.464"></a> -<span class="sourceLineNo">465</span> return user;<a name="line.465"></a> -<span class="sourceLineNo">466</span> }<a name="line.466"></a> -<span class="sourceLineNo">467</span><a name="line.467"></a> -<span class="sourceLineNo">468</span> @Override<a name="line.468"></a> -<span class="sourceLineNo">469</span> public void close() throws IOException {<a name="line.469"></a> -<span class="sourceLineNo">470</span> privilegedWriter.close();<a name="line.470"></a> -<span class="sourceLineNo">471</span> }<a name="line.471"></a> -<span class="sourceLineNo">472</span> }<a name="line.472"></a> -<span class="sourceLineNo">473</span><a name="line.473"></a> -<span class="sourceLineNo">474</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.474"></a> -<span class="sourceLineNo">475</span> private final User user;<a name="line.475"></a> -<span class="sourceLineNo">476</span> private final SequenceFile.Writer out;<a name="line.476"></a> -<span class="sourceLineNo">477</span> private Object key;<a name="line.477"></a> -<span class="sourceLineNo">478</span> private Object value;<a name="line.478"></a> -<span class="sourceLineNo">479</span><a name="line.479"></a> -<span class="sourceLineNo">480</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.480"></a> -<span class="sourceLineNo">481</span> this.user = user;<a name="line.481"></a> -<span class="sourceLineNo">482</span> this.out = out;<a name="line.482"></a> -<span class="sourceLineNo">483</span> }<a name="line.483"></a> -<span class="sourceLineNo">484</span><a name="line.484"></a> -<span class="sourceLineNo">485</span> void append(final Object key, final Object value) throws IOException {<a name="line.485"></a> -<span class="sourceLineNo">486</span> if (user == null) {<a name="line.486"></a> -<span class="sourceLineNo">487</span> out.append(key, value);<a name="line.487"></a> -<span class="sourceLineNo">488</span> } else {<a name="line.488"></a> -<span class="sourceLineNo">489</span> this.key = key;<a name="line.489"></a> -<span class="sourceLineNo">490</span> this.value = value;<a name="line.490"></a> -<span class="sourceLineNo">491</span> try {<a name="line.491"></a> -<span class="sourceLineNo">492</span> user.runAs(this);<a name="line.492"></a> -<span class="sourceLineNo">493</span> } catch (InterruptedException ex) {<a name="line.493"></a> -<span class="sourceLineNo">494</span> throw new IOException(ex);<a name="line.494"></a> -<span class="sourceLineNo">495</span> }<a name="line.495"></a> -<span class="sourceLineNo">496</span> }<a name="line.496"></a> -<span class="sourceLineNo">497</span> }<a name="line.497"></a> -<span class="sourceLineNo">498</span><a name="line.498"></a> -<span class="sourceLineNo">499</span> @Override<a name="line.499"></a> -<span class="sourceLineNo">500</span> public Boolean run() throws Exception {<a name="line.500"></a> -<span class="sourceLineNo">501</span> out.append(key, value);<a name="line.501"></a> -<span class="sourceLineNo">502</span> return true;<a name="line.502"></a> -<span class="sourceLineNo">503</span> }<a name="line.503"></a> -<span class="sourceLineNo">504</span><a name="line.504"></a> -<span class="sourceLineNo">505</span> @Override<a name="line.505"></a> -<span class="sourceLineNo">506</span> public void close() throws IOException {<a name="line.506"></a> -<span class="sourceLineNo">507</span> out.close();<a name="line.507"></a> -<span class="sourceLineNo">508</span> }<a name="line.508"></a> -<span class="sourceLineNo">509</span> }<a name="line.509"></a> -<span class="sourceLineNo">510</span><a name="line.510"></a> -<span class="sourceLineNo">511</span> public static class Response {<a name="line.511"></a> +<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser().orElse(userProvider.getCurrent());<a name="line.456"></a> +<span class="sourceLineNo">457</span> if (user == null && userToken != null) {<a name="line.457"></a> +<span class="sourceLineNo">458</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.458"></a> +<span class="sourceLineNo">459</span> } else if (user != null && userToken != null) {<a name="line.459"></a> +<span class="sourceLineNo">460</span> user.addToken(userToken);<a name="line.460"></a> +<span class="sourceLineNo">461</span> }<a name="line.461"></a> +<span class="sourceLineNo">462</span> return user;<a name="line.462"></a> +<span class="sourceLineNo">463</span> }<a name="line.463"></a> +<span class="sourceLineNo">464</span><a name="line.464"></a> +<span class="sourceLineNo">465</span> @Override<a name="line.465"></a> +<span class="sourceLineNo">466</span> public void close() throws IOException {<a name="line.466"></a> +<span class="sourceLineNo">467</span> privilegedWriter.close();<a name="line.467"></a> +<span class="sourceLineNo">468</span> }<a name="line.468"></a> +<span class="sourceLineNo">469</span> }<a name="line.469"></a> +<span class="sourceLineNo">470</span><a name="line.470"></a> +<span class="sourceLineNo">471</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.471"></a> +<span class="sourceLineNo">472</span> private final User user;<a name="line.472"></a> +<span class="sourceLineNo">473</span> private final SequenceFile.Writer out;<a name="line.473"></a> +<span class="sourceLineNo">474</span> private Object key;<a name="line.474"></a> +<span class="sourceLineNo">475</span> private Object value;<a name="line.475"></a> +<span class="sourceLineNo">476</span><a name="line.476"></a> +<span class="sourceLineNo">477</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.477"></a> +<span class="sourceLineNo">478</span> this.user = user;<a name="line.478"></a> +<span class="sourceLineNo">479</span> this.out = out;<a name="line.479"></a> +<span class="sourceLineNo">480</span> }<a name="line.480"></a> +<span class="sourceLineNo">481</span><a name="line.481"></a> +<span class="sourceLineNo">482</span> void append(final Object key, final Object value) throws IOException {<a name="line.482"></a> +<span class="sourceLineNo">483</span> if (user == null) {<a name="line.483"></a> +<span class="sourceLineNo">484</span> out.append(key, value);<a name="line.484"></a> +<span class="sourceLineNo">485</span> } else {<a name="line.485"></a> +<span class="sourceLineNo">486</span> this.key = key;<a name="line.486"></a> +<span class="sourceLineNo">487</span> this.value = value;<a name="line.487"></a> +<span class="sourceLineNo">488</span> try {<a name="line.488"></a> +<span class="sourceLineNo">489</span> user.runAs(this);<a name="line.489"></a> +<span class="sourceLineNo">490</span> } catch (InterruptedException ex) {<a name="line.490"></a> +<span class="sourceLineNo">491</span> throw new IOException(ex);<a name="line.491"></a> +<span class="sourceLineNo">492</span> }<a name="line.492"></a> +<span class="sourceLineNo">493</span> }<a name="line.493"></a> +<span class="sourceLineNo">494</span> }<a name="line.494"></a> +<span class="sourceLineNo">495</span><a name="line.495"></a> +<span class="sourceLineNo">496</span> @Override<a name="line.496"></a> +<span class="sourceLineNo">497</span> public Boolean run() throws Exception {<a name="line.497"></a> +<span class="sourceLineNo">498</span> out.append(key, value);<a name="line.498"></a> +<span class="sourceLineNo">499</span> return true;<a name="line.499"></a> +<span class="sourceLineNo">500</span> }<a name="line.500"></a> +<span class="sourceLineNo">501</span><a name="line.501"></a> +<span class="sourceLineNo">502</span> @Override<a name="line.502"></a> +<span class="sourceLineNo">503</span> public void close() throws IOException {<a name="line.503"></a> +<span class="sourceLineNo">504</span> out.close();<a name="line.504"></a> +<span class="sourceLineNo">505</span> }<a name="line.505"></a> +<span class="sourceLineNo">506</span> }<a name="line.506"></a> +<span class="sourceLineNo">507</span><a name="line.507"></a> +<span class="sourceLineNo">508</span> public static class Response {<a name="line.508"></a> +<span class="sourceLineNo">509</span><a name="line.509"></a> +<span class="sourceLineNo">510</span> private final long rowCount;<a name="line.510"></a> +<span class="sourceLineNo">511</span> private final long cellCount;<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> private final long rowCount;<a name="line.513"></a> -<span class="sourceLineNo">514</span> private final long cellCount;<a name="line.514"></a> -<span class="sourceLineNo">515</span><a name="line.515"></a> -<span class="sourceLineNo">516</span> private Response(ExportProtos.ExportResponse r) {<a name="line.516"></a> -<span class="sourceLineNo">517</span> this.rowCount = r.getRowCount();<a name="line.517"></a> -<span class="sourceLineNo">518</span> this.cellCount = r.getCellCount();<a name="line.518"></a> -<span class="sourceLineNo">519</span> }<a name="line.519"></a> -<span class="sourceLineNo">520</span><a name="line.520"></a> -<span class="sourceLineNo">521</span> public long getRowCount() {<a name="line.521"></a> -<span class="sourceLineNo">522</span> return rowCount;<a name="line.522"></a> -<span class="sourceLineNo">523</span> }<a name="line.523"></a> -<span class="sourceLineNo">524</span><a name="line.524"></a> -<span class="sourceLineNo">525</span> public long getCellCount() {<a name="line.525"></a> -<span class="sourceLineNo">526</span> return cellCount;<a name="line.526"></a> -<span class="sourceLineNo">527</span> }<a name="line.527"></a> -<span class="sourceLineNo">528</span><a name="line.528"></a> -<span class="sourceLineNo">529</span> @Override<a name="line.529"></a> -<span class="sourceLineNo">530</span> public String toString() {<a name="line.530"></a> -<span class="sourceLineNo">531</span> StringBuilder builder = new StringBuilder(35);<a name="line.531"></a> -<span class="sourceLineNo">532</span> return builder.append("rowCount=")<a name="line.532"></a> -<span class="sourceLineNo">533</span> .append(rowCount)<a name="line.533"></a> -<span class="sourceLineNo">534</span> .append(", cellCount=")<a name="line.534"></a> -<span class="sourceLineNo">535</span> .append(cellCount)<a name="line.535"></a> -<span class="sourceLineNo">536</span> .toString();<a name="line.536"></a> -<span class="sourceLineNo">537</span> }<a name="line.537"></a> -<span class="sourceLineNo">538</span> }<a name="line.538"></a> -<span class="sourceLineNo">539</span>}<a name="line.539"></a> +<span class="sourceLineNo">513</span> private Response(ExportProtos.ExportResponse r) {<a name="line.513"></a> +<span class="sourceLineNo">514</span> this.rowCount = r.getRowCount();<a name="line.514"></a> +<span class="sourceLineNo">515</span> this.cellCount = r.getCellCount();<a name="line.515"></a> +<span class="sourceLineNo">516</span> }<a name="line.516"></a> +<span class="sourceLineNo">517</span><a name="line.517"></a> +<span class="sourceLineNo">518</span> public long getRowCount() {<a name="line.518"></a> +<span class="sourceLineNo">519</span> return rowCount;<a name="line.519"></a> +<span class="sourceLineNo">520</span> }<a name="line.520"></a> +<span class="sourceLineNo">521</span><a name="line.521"></a> +<span class="sourceLineNo">522</span> public long getCellCount() {<a name="line.522"></a> +<span class="sourceLineNo">523</span> return cellCount;<a name="line.523"></a> +<span class="sourceLineNo">524</span> }<a name="line.524"></a> +<span class="sourceLineNo">525</span><a name="line.525"></a> +<span class="sourceLineNo">526</span> @Override<a name="line.526"></a> +<span class="sourceLineNo">527</span> public String toString() {<a name="line.527"></a> +<span class="sourceLineNo">528</span> StringBuilder builder = new StringBuilder(35);<a name="line.528"></a> +<span class="sourceLineNo">529</span> return builder.append("rowCount=")<a name="line.529"></a> +<span class="sourceLineNo">530</span> .append(rowCount)<a name="line.530"></a> +<span class="sourceLineNo">531</span> .append(", cellCount=")<a name="line.531"></a> +<span class="sourceLineNo">532</span> .append(cellCount)<a name="line.532"></a> +<span class="sourceLineNo">533</span> .toString();<a name="line.533"></a> +<span class="sourceLineNo">534</span> }<a name="line.534"></a> +<span class="sourceLineNo">535</span> }<a name="line.535"></a> +<span class="sourceLineNo">536</span>}<a name="line.536"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.ScanCoprocessor.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.ScanCoprocessor.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.ScanCoprocessor.html index fbb0a14..95f6ef8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.ScanCoprocessor.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.ScanCoprocessor.html @@ -461,90 +461,87 @@ <span class="sourceLineNo">453</span> }<a name="line.453"></a> <span class="sourceLineNo">454</span><a name="line.454"></a> <span class="sourceLineNo">455</span> private static User getActiveUser(final UserProvider userProvider, final Token userToken) throws IOException {<a name="line.455"></a> -<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser();<a name="line.456"></a> -<span class="sourceLineNo">457</span> if (user == null) {<a name="line.457"></a> -<span class="sourceLineNo">458</span> user = userProvider.getCurrent();<a name="line.458"></a> -<span class="sourceLineNo">459</span> }<a name="line.459"></a> -<span class="sourceLineNo">460</span> if (user == null && userToken != null) {<a name="line.460"></a> -<span class="sourceLineNo">461</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.461"></a> -<span class="sourceLineNo">462</span> } else if (user != null && userToken != null) {<a name="line.462"></a> -<span class="sourceLineNo">463</span> user.addToken(userToken);<a name="line.463"></a> -<span class="sourceLineNo">464</span> }<a name="line.464"></a> -<span class="sourceLineNo">465</span> return user;<a name="line.465"></a> -<span class="sourceLineNo">466</span> }<a name="line.466"></a> -<span class="sourceLineNo">467</span><a name="line.467"></a> -<span class="sourceLineNo">468</span> @Override<a name="line.468"></a> -<span class="sourceLineNo">469</span> public void close() throws IOException {<a name="line.469"></a> -<span class="sourceLineNo">470</span> privilegedWriter.close();<a name="line.470"></a> -<span class="sourceLineNo">471</span> }<a name="line.471"></a> -<span class="sourceLineNo">472</span> }<a name="line.472"></a> -<span class="sourceLineNo">473</span><a name="line.473"></a> -<span class="sourceLineNo">474</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.474"></a> -<span class="sourceLineNo">475</span> private final User user;<a name="line.475"></a> -<span class="sourceLineNo">476</span> private final SequenceFile.Writer out;<a name="line.476"></a> -<span class="sourceLineNo">477</span> private Object key;<a name="line.477"></a> -<span class="sourceLineNo">478</span> private Object value;<a name="line.478"></a> -<span class="sourceLineNo">479</span><a name="line.479"></a> -<span class="sourceLineNo">480</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.480"></a> -<span class="sourceLineNo">481</span> this.user = user;<a name="line.481"></a> -<span class="sourceLineNo">482</span> this.out = out;<a name="line.482"></a> -<span class="sourceLineNo">483</span> }<a name="line.483"></a> -<span class="sourceLineNo">484</span><a name="line.484"></a> -<span class="sourceLineNo">485</span> void append(final Object key, final Object value) throws IOException {<a name="line.485"></a> -<span class="sourceLineNo">486</span> if (user == null) {<a name="line.486"></a> -<span class="sourceLineNo">487</span> out.append(key, value);<a name="line.487"></a> -<span class="sourceLineNo">488</span> } else {<a name="line.488"></a> -<span class="sourceLineNo">489</span> this.key = key;<a name="line.489"></a> -<span class="sourceLineNo">490</span> this.value = value;<a name="line.490"></a> -<span class="sourceLineNo">491</span> try {<a name="line.491"></a> -<span class="sourceLineNo">492</span> user.runAs(this);<a name="line.492"></a> -<span class="sourceLineNo">493</span> } catch (InterruptedException ex) {<a name="line.493"></a> -<span class="sourceLineNo">494</span> throw new IOException(ex);<a name="line.494"></a> -<span class="sourceLineNo">495</span> }<a name="line.495"></a> -<span class="sourceLineNo">496</span> }<a name="line.496"></a> -<span class="sourceLineNo">497</span> }<a name="line.497"></a> -<span class="sourceLineNo">498</span><a name="line.498"></a> -<span class="sourceLineNo">499</span> @Override<a name="line.499"></a> -<span class="sourceLineNo">500</span> public Boolean run() throws Exception {<a name="line.500"></a> -<span class="sourceLineNo">501</span> out.append(key, value);<a name="line.501"></a> -<span class="sourceLineNo">502</span> return true;<a name="line.502"></a> -<span class="sourceLineNo">503</span> }<a name="line.503"></a> -<span class="sourceLineNo">504</span><a name="line.504"></a> -<span class="sourceLineNo">505</span> @Override<a name="line.505"></a> -<span class="sourceLineNo">506</span> public void close() throws IOException {<a name="line.506"></a> -<span class="sourceLineNo">507</span> out.close();<a name="line.507"></a> -<span class="sourceLineNo">508</span> }<a name="line.508"></a> -<span class="sourceLineNo">509</span> }<a name="line.509"></a> -<span class="sourceLineNo">510</span><a name="line.510"></a> -<span class="sourceLineNo">511</span> public static class Response {<a name="line.511"></a> +<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser().orElse(userProvider.getCurrent());<a name="line.456"></a> +<span class="sourceLineNo">457</span> if (user == null && userToken != null) {<a name="line.457"></a> +<span class="sourceLineNo">458</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.458"></a> +<span class="sourceLineNo">459</span> } else if (user != null && userToken != null) {<a name="line.459"></a> +<span class="sourceLineNo">460</span> user.addToken(userToken);<a name="line.460"></a> +<span class="sourceLineNo">461</span> }<a name="line.461"></a> +<span class="sourceLineNo">462</span> return user;<a name="line.462"></a> +<span class="sourceLineNo">463</span> }<a name="line.463"></a> +<span class="sourceLineNo">464</span><a name="line.464"></a> +<span class="sourceLineNo">465</span> @Override<a name="line.465"></a> +<span class="sourceLineNo">466</span> public void close() throws IOException {<a name="line.466"></a> +<span class="sourceLineNo">467</span> privilegedWriter.close();<a name="line.467"></a> +<span class="sourceLineNo">468</span> }<a name="line.468"></a> +<span class="sourceLineNo">469</span> }<a name="line.469"></a> +<span class="sourceLineNo">470</span><a name="line.470"></a> +<span class="sourceLineNo">471</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.471"></a> +<span class="sourceLineNo">472</span> private final User user;<a name="line.472"></a> +<span class="sourceLineNo">473</span> private final SequenceFile.Writer out;<a name="line.473"></a> +<span class="sourceLineNo">474</span> private Object key;<a name="line.474"></a> +<span class="sourceLineNo">475</span> private Object value;<a name="line.475"></a> +<span class="sourceLineNo">476</span><a name="line.476"></a> +<span class="sourceLineNo">477</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.477"></a> +<span class="sourceLineNo">478</span> this.user = user;<a name="line.478"></a> +<span class="sourceLineNo">479</span> this.out = out;<a name="line.479"></a> +<span class="sourceLineNo">480</span> }<a name="line.480"></a> +<span class="sourceLineNo">481</span><a name="line.481"></a> +<span class="sourceLineNo">482</span> void append(final Object key, final Object value) throws IOException {<a name="line.482"></a> +<span class="sourceLineNo">483</span> if (user == null) {<a name="line.483"></a> +<span class="sourceLineNo">484</span> out.append(key, value);<a name="line.484"></a> +<span class="sourceLineNo">485</span> } else {<a name="line.485"></a> +<span class="sourceLineNo">486</span> this.key = key;<a name="line.486"></a> +<span class="sourceLineNo">487</span> this.value = value;<a name="line.487"></a> +<span class="sourceLineNo">488</span> try {<a name="line.488"></a> +<span class="sourceLineNo">489</span> user.runAs(this);<a name="line.489"></a> +<span class="sourceLineNo">490</span> } catch (InterruptedException ex) {<a name="line.490"></a> +<span class="sourceLineNo">491</span> throw new IOException(ex);<a name="line.491"></a> +<span class="sourceLineNo">492</span> }<a name="line.492"></a> +<span class="sourceLineNo">493</span> }<a name="line.493"></a> +<span class="sourceLineNo">494</span> }<a name="line.494"></a> +<span class="sourceLineNo">495</span><a name="line.495"></a> +<span class="sourceLineNo">496</span> @Override<a name="line.496"></a> +<span class="sourceLineNo">497</span> public Boolean run() throws Exception {<a name="line.497"></a> +<span class="sourceLineNo">498</span> out.append(key, value);<a name="line.498"></a> +<span class="sourceLineNo">499</span> return true;<a name="line.499"></a> +<span class="sourceLineNo">500</span> }<a name="line.500"></a> +<span class="sourceLineNo">501</span><a name="line.501"></a> +<span class="sourceLineNo">502</span> @Override<a name="line.502"></a> +<span class="sourceLineNo">503</span> public void close() throws IOException {<a name="line.503"></a> +<span class="sourceLineNo">504</span> out.close();<a name="line.504"></a> +<span class="sourceLineNo">505</span> }<a name="line.505"></a> +<span class="sourceLineNo">506</span> }<a name="line.506"></a> +<span class="sourceLineNo">507</span><a name="line.507"></a> +<span class="sourceLineNo">508</span> public static class Response {<a name="line.508"></a> +<span class="sourceLineNo">509</span><a name="line.509"></a> +<span class="sourceLineNo">510</span> private final long rowCount;<a name="line.510"></a> +<span class="sourceLineNo">511</span> private final long cellCount;<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> private final long rowCount;<a name="line.513"></a> -<span class="sourceLineNo">514</span> private final long cellCount;<a name="line.514"></a> -<span class="sourceLineNo">515</span><a name="line.515"></a> -<span class="sourceLineNo">516</span> private Response(ExportProtos.ExportResponse r) {<a name="line.516"></a> -<span class="sourceLineNo">517</span> this.rowCount = r.getRowCount();<a name="line.517"></a> -<span class="sourceLineNo">518</span> this.cellCount = r.getCellCount();<a name="line.518"></a> -<span class="sourceLineNo">519</span> }<a name="line.519"></a> -<span class="sourceLineNo">520</span><a name="line.520"></a> -<span class="sourceLineNo">521</span> public long getRowCount() {<a name="line.521"></a> -<span class="sourceLineNo">522</span> return rowCount;<a name="line.522"></a> -<span class="sourceLineNo">523</span> }<a name="line.523"></a> -<span class="sourceLineNo">524</span><a name="line.524"></a> -<span class="sourceLineNo">525</span> public long getCellCount() {<a name="line.525"></a> -<span class="sourceLineNo">526</span> return cellCount;<a name="line.526"></a> -<span class="sourceLineNo">527</span> }<a name="line.527"></a> -<span class="sourceLineNo">528</span><a name="line.528"></a> -<span class="sourceLineNo">529</span> @Override<a name="line.529"></a> -<span class="sourceLineNo">530</span> public String toString() {<a name="line.530"></a> -<span class="sourceLineNo">531</span> StringBuilder builder = new StringBuilder(35);<a name="line.531"></a> -<span class="sourceLineNo">532</span> return builder.append("rowCount=")<a name="line.532"></a> -<span class="sourceLineNo">533</span> .append(rowCount)<a name="line.533"></a> -<span class="sourceLineNo">534</span> .append(", cellCount=")<a name="line.534"></a> -<span class="sourceLineNo">535</span> .append(cellCount)<a name="line.535"></a> -<span class="sourceLineNo">536</span> .toString();<a name="line.536"></a> -<span class="sourceLineNo">537</span> }<a name="line.537"></a> -<span class="sourceLineNo">538</span> }<a name="line.538"></a> -<span class="sourceLineNo">539</span>}<a name="line.539"></a> +<span class="sourceLineNo">513</span> private Response(ExportProtos.ExportResponse r) {<a name="line.513"></a> +<span class="sourceLineNo">514</span> this.rowCount = r.getRowCount();<a name="line.514"></a> +<span class="sourceLineNo">515</span> this.cellCount = r.getCellCount();<a name="line.515"></a> +<span class="sourceLineNo">516</span> }<a name="line.516"></a> +<span class="sourceLineNo">517</span><a name="line.517"></a> +<span class="sourceLineNo">518</span> public long getRowCount() {<a name="line.518"></a> +<span class="sourceLineNo">519</span> return rowCount;<a name="line.519"></a> +<span class="sourceLineNo">520</span> }<a name="line.520"></a> +<span class="sourceLineNo">521</span><a name="line.521"></a> +<span class="sourceLineNo">522</span> public long getCellCount() {<a name="line.522"></a> +<span class="sourceLineNo">523</span> return cellCount;<a name="line.523"></a> +<span class="sourceLineNo">524</span> }<a name="line.524"></a> +<span class="sourceLineNo">525</span><a name="line.525"></a> +<span class="sourceLineNo">526</span> @Override<a name="line.526"></a> +<span class="sourceLineNo">527</span> public String toString() {<a name="line.527"></a> +<span class="sourceLineNo">528</span> StringBuilder builder = new StringBuilder(35);<a name="line.528"></a> +<span class="sourceLineNo">529</span> return builder.append("rowCount=")<a name="line.529"></a> +<span class="sourceLineNo">530</span> .append(rowCount)<a name="line.530"></a> +<span class="sourceLineNo">531</span> .append(", cellCount=")<a name="line.531"></a> +<span class="sourceLineNo">532</span> .append(cellCount)<a name="line.532"></a> +<span class="sourceLineNo">533</span> .toString();<a name="line.533"></a> +<span class="sourceLineNo">534</span> }<a name="line.534"></a> +<span class="sourceLineNo">535</span> }<a name="line.535"></a> +<span class="sourceLineNo">536</span>}<a name="line.536"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.SecureWriter.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.SecureWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.SecureWriter.html index fbb0a14..95f6ef8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.SecureWriter.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.SecureWriter.html @@ -461,90 +461,87 @@ <span class="sourceLineNo">453</span> }<a name="line.453"></a> <span class="sourceLineNo">454</span><a name="line.454"></a> <span class="sourceLineNo">455</span> private static User getActiveUser(final UserProvider userProvider, final Token userToken) throws IOException {<a name="line.455"></a> -<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser();<a name="line.456"></a> -<span class="sourceLineNo">457</span> if (user == null) {<a name="line.457"></a> -<span class="sourceLineNo">458</span> user = userProvider.getCurrent();<a name="line.458"></a> -<span class="sourceLineNo">459</span> }<a name="line.459"></a> -<span class="sourceLineNo">460</span> if (user == null && userToken != null) {<a name="line.460"></a> -<span class="sourceLineNo">461</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.461"></a> -<span class="sourceLineNo">462</span> } else if (user != null && userToken != null) {<a name="line.462"></a> -<span class="sourceLineNo">463</span> user.addToken(userToken);<a name="line.463"></a> -<span class="sourceLineNo">464</span> }<a name="line.464"></a> -<span class="sourceLineNo">465</span> return user;<a name="line.465"></a> -<span class="sourceLineNo">466</span> }<a name="line.466"></a> -<span class="sourceLineNo">467</span><a name="line.467"></a> -<span class="sourceLineNo">468</span> @Override<a name="line.468"></a> -<span class="sourceLineNo">469</span> public void close() throws IOException {<a name="line.469"></a> -<span class="sourceLineNo">470</span> privilegedWriter.close();<a name="line.470"></a> -<span class="sourceLineNo">471</span> }<a name="line.471"></a> -<span class="sourceLineNo">472</span> }<a name="line.472"></a> -<span class="sourceLineNo">473</span><a name="line.473"></a> -<span class="sourceLineNo">474</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.474"></a> -<span class="sourceLineNo">475</span> private final User user;<a name="line.475"></a> -<span class="sourceLineNo">476</span> private final SequenceFile.Writer out;<a name="line.476"></a> -<span class="sourceLineNo">477</span> private Object key;<a name="line.477"></a> -<span class="sourceLineNo">478</span> private Object value;<a name="line.478"></a> -<span class="sourceLineNo">479</span><a name="line.479"></a> -<span class="sourceLineNo">480</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.480"></a> -<span class="sourceLineNo">481</span> this.user = user;<a name="line.481"></a> -<span class="sourceLineNo">482</span> this.out = out;<a name="line.482"></a> -<span class="sourceLineNo">483</span> }<a name="line.483"></a> -<span class="sourceLineNo">484</span><a name="line.484"></a> -<span class="sourceLineNo">485</span> void append(final Object key, final Object value) throws IOException {<a name="line.485"></a> -<span class="sourceLineNo">486</span> if (user == null) {<a name="line.486"></a> -<span class="sourceLineNo">487</span> out.append(key, value);<a name="line.487"></a> -<span class="sourceLineNo">488</span> } else {<a name="line.488"></a> -<span class="sourceLineNo">489</span> this.key = key;<a name="line.489"></a> -<span class="sourceLineNo">490</span> this.value = value;<a name="line.490"></a> -<span class="sourceLineNo">491</span> try {<a name="line.491"></a> -<span class="sourceLineNo">492</span> user.runAs(this);<a name="line.492"></a> -<span class="sourceLineNo">493</span> } catch (InterruptedException ex) {<a name="line.493"></a> -<span class="sourceLineNo">494</span> throw new IOException(ex);<a name="line.494"></a> -<span class="sourceLineNo">495</span> }<a name="line.495"></a> -<span class="sourceLineNo">496</span> }<a name="line.496"></a> -<span class="sourceLineNo">497</span> }<a name="line.497"></a> -<span class="sourceLineNo">498</span><a name="line.498"></a> -<span class="sourceLineNo">499</span> @Override<a name="line.499"></a> -<span class="sourceLineNo">500</span> public Boolean run() throws Exception {<a name="line.500"></a> -<span class="sourceLineNo">501</span> out.append(key, value);<a name="line.501"></a> -<span class="sourceLineNo">502</span> return true;<a name="line.502"></a> -<span class="sourceLineNo">503</span> }<a name="line.503"></a> -<span class="sourceLineNo">504</span><a name="line.504"></a> -<span class="sourceLineNo">505</span> @Override<a name="line.505"></a> -<span class="sourceLineNo">506</span> public void close() throws IOException {<a name="line.506"></a> -<span class="sourceLineNo">507</span> out.close();<a name="line.507"></a> -<span class="sourceLineNo">508</span> }<a name="line.508"></a> -<span class="sourceLineNo">509</span> }<a name="line.509"></a> -<span class="sourceLineNo">510</span><a name="line.510"></a> -<span class="sourceLineNo">511</span> public static class Response {<a name="line.511"></a> +<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser().orElse(userProvider.getCurrent());<a name="line.456"></a> +<span class="sourceLineNo">457</span> if (user == null && userToken != null) {<a name="line.457"></a> +<span class="sourceLineNo">458</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.458"></a> +<span class="sourceLineNo">459</span> } else if (user != null && userToken != null) {<a name="line.459"></a> +<span class="sourceLineNo">460</span> user.addToken(userToken);<a name="line.460"></a> +<span class="sourceLineNo">461</span> }<a name="line.461"></a> +<span class="sourceLineNo">462</span> return user;<a name="line.462"></a> +<span class="sourceLineNo">463</span> }<a name="line.463"></a> +<span class="sourceLineNo">464</span><a name="line.464"></a> +<span class="sourceLineNo">465</span> @Override<a name="line.465"></a> +<span class="sourceLineNo">466</span> public void close() throws IOException {<a name="line.466"></a> +<span class="sourceLineNo">467</span> privilegedWriter.close();<a name="line.467"></a> +<span class="sourceLineNo">468</span> }<a name="line.468"></a> +<span class="sourceLineNo">469</span> }<a name="line.469"></a> +<span class="sourceLineNo">470</span><a name="line.470"></a> +<span class="sourceLineNo">471</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.471"></a> +<span class="sourceLineNo">472</span> private final User user;<a name="line.472"></a> +<span class="sourceLineNo">473</span> private final SequenceFile.Writer out;<a name="line.473"></a> +<span class="sourceLineNo">474</span> private Object key;<a name="line.474"></a> +<span class="sourceLineNo">475</span> private Object value;<a name="line.475"></a> +<span class="sourceLineNo">476</span><a name="line.476"></a> +<span class="sourceLineNo">477</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.477"></a> +<span class="sourceLineNo">478</span> this.user = user;<a name="line.478"></a> +<span class="sourceLineNo">479</span> this.out = out;<a name="line.479"></a> +<span class="sourceLineNo">480</span> }<a name="line.480"></a> +<span class="sourceLineNo">481</span><a name="line.481"></a> +<span class="sourceLineNo">482</span> void append(final Object key, final Object value) throws IOException {<a name="line.482"></a> +<span class="sourceLineNo">483</span> if (user == null) {<a name="line.483"></a> +<span class="sourceLineNo">484</span> out.append(key, value);<a name="line.484"></a> +<span class="sourceLineNo">485</span> } else {<a name="line.485"></a> +<span class="sourceLineNo">486</span> this.key = key;<a name="line.486"></a> +<span class="sourceLineNo">487</span> this.value = value;<a name="line.487"></a> +<span class="sourceLineNo">488</span> try {<a name="line.488"></a> +<span class="sourceLineNo">489</span> user.runAs(this);<a name="line.489"></a> +<span class="sourceLineNo">490</span> } catch (InterruptedException ex) {<a name="line.490"></a> +<span class="sourceLineNo">491</span> throw new IOException(ex);<a name="line.491"></a> +<span class="sourceLineNo">492</span> }<a name="line.492"></a> +<span class="sourceLineNo">493</span> }<a name="line.493"></a> +<span class="sourceLineNo">494</span> }<a name="line.494"></a> +<span class="sourceLineNo">495</span><a name="line.495"></a> +<span class="sourceLineNo">496</span> @Override<a name="line.496"></a> +<span class="sourceLineNo">497</span> public Boolean run() throws Exception {<a name="line.497"></a> +<span class="sourceLineNo">498</span> out.append(key, value);<a name="line.498"></a> +<span class="sourceLineNo">499</span> return true;<a name="line.499"></a> +<span class="sourceLineNo">500</span> }<a name="line.500"></a> +<span class="sourceLineNo">501</span><a name="line.501"></a> +<span class="sourceLineNo">502</span> @Override<a name="line.502"></a> +<span class="sourceLineNo">503</span> public void close() throws IOException {<a name="line.503"></a> +<span class="sourceLineNo">504</span> out.close();<a name="line.504"></a> +<span class="sourceLineNo">505</span> }<a name="line.505"></a> +<span class="sourceLineNo">506</span> }<a name="line.506"></a> +<span class="sourceLineNo">507</span><a name="line.507"></a> +<span class="sourceLineNo">508</span> public static class Response {<a name="line.508"></a> +<span class="sourceLineNo">509</span><a name="line.509"></a> +<span class="sourceLineNo">510</span> private final long rowCount;<a name="line.510"></a> +<span class="sourceLineNo">511</span> private final long cellCount;<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> private final long rowCount;<a name="line.513"></a> -<span class="sourceLineNo">514</span> private final long cellCount;<a name="line.514"></a> -<span class="sourceLineNo">515</span><a name="line.515"></a> -<span class="sourceLineNo">516</span> private Response(ExportProtos.ExportResponse r) {<a name="line.516"></a> -<span class="sourceLineNo">517</span> this.rowCount = r.getRowCount();<a name="line.517"></a> -<span class="sourceLineNo">518</span> this.cellCount = r.getCellCount();<a name="line.518"></a> -<span class="sourceLineNo">519</span> }<a name="line.519"></a> -<span class="sourceLineNo">520</span><a name="line.520"></a> -<span class="sourceLineNo">521</span> public long getRowCount() {<a name="line.521"></a> -<span class="sourceLineNo">522</span> return rowCount;<a name="line.522"></a> -<span class="sourceLineNo">523</span> }<a name="line.523"></a> -<span class="sourceLineNo">524</span><a name="line.524"></a> -<span class="sourceLineNo">525</span> public long getCellCount() {<a name="line.525"></a> -<span class="sourceLineNo">526</span> return cellCount;<a name="line.526"></a> -<span class="sourceLineNo">527</span> }<a name="line.527"></a> -<span class="sourceLineNo">528</span><a name="line.528"></a> -<span class="sourceLineNo">529</span> @Override<a name="line.529"></a> -<span class="sourceLineNo">530</span> public String toString() {<a name="line.530"></a> -<span class="sourceLineNo">531</span> StringBuilder builder = new StringBuilder(35);<a name="line.531"></a> -<span class="sourceLineNo">532</span> return builder.append("rowCount=")<a name="line.532"></a> -<span class="sourceLineNo">533</span> .append(rowCount)<a name="line.533"></a> -<span class="sourceLineNo">534</span> .append(", cellCount=")<a name="line.534"></a> -<span class="sourceLineNo">535</span> .append(cellCount)<a name="line.535"></a> -<span class="sourceLineNo">536</span> .toString();<a name="line.536"></a> -<span class="sourceLineNo">537</span> }<a name="line.537"></a> -<span class="sourceLineNo">538</span> }<a name="line.538"></a> -<span class="sourceLineNo">539</span>}<a name="line.539"></a> +<span class="sourceLineNo">513</span> private Response(ExportProtos.ExportResponse r) {<a name="line.513"></a> +<span class="sourceLineNo">514</span> this.rowCount = r.getRowCount();<a name="line.514"></a> +<span class="sourceLineNo">515</span> this.cellCount = r.getCellCount();<a name="line.515"></a> +<span class="sourceLineNo">516</span> }<a name="line.516"></a> +<span class="sourceLineNo">517</span><a name="line.517"></a> +<span class="sourceLineNo">518</span> public long getRowCount() {<a name="line.518"></a> +<span class="sourceLineNo">519</span> return rowCount;<a name="line.519"></a> +<span class="sourceLineNo">520</span> }<a name="line.520"></a> +<span class="sourceLineNo">521</span><a name="line.521"></a> +<span class="sourceLineNo">522</span> public long getCellCount() {<a name="line.522"></a> +<span class="sourceLineNo">523</span> return cellCount;<a name="line.523"></a> +<span class="sourceLineNo">524</span> }<a name="line.524"></a> +<span class="sourceLineNo">525</span><a name="line.525"></a> +<span class="sourceLineNo">526</span> @Override<a name="line.526"></a> +<span class="sourceLineNo">527</span> public String toString() {<a name="line.527"></a> +<span class="sourceLineNo">528</span> StringBuilder builder = new StringBuilder(35);<a name="line.528"></a> +<span class="sourceLineNo">529</span> return builder.append("rowCount=")<a name="line.529"></a> +<span class="sourceLineNo">530</span> .append(rowCount)<a name="line.530"></a> +<span class="sourceLineNo">531</span> .append(", cellCount=")<a name="line.531"></a> +<span class="sourceLineNo">532</span> .append(cellCount)<a name="line.532"></a> +<span class="sourceLineNo">533</span> .toString();<a name="line.533"></a> +<span class="sourceLineNo">534</span> }<a name="line.534"></a> +<span class="sourceLineNo">535</span> }<a name="line.535"></a> +<span class="sourceLineNo">536</span>}<a name="line.536"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.html index fbb0a14..95f6ef8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.html @@ -461,90 +461,87 @@ <span class="sourceLineNo">453</span> }<a name="line.453"></a> <span class="sourceLineNo">454</span><a name="line.454"></a> <span class="sourceLineNo">455</span> private static User getActiveUser(final UserProvider userProvider, final Token userToken) throws IOException {<a name="line.455"></a> -<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser();<a name="line.456"></a> -<span class="sourceLineNo">457</span> if (user == null) {<a name="line.457"></a> -<span class="sourceLineNo">458</span> user = userProvider.getCurrent();<a name="line.458"></a> -<span class="sourceLineNo">459</span> }<a name="line.459"></a> -<span class="sourceLineNo">460</span> if (user == null && userToken != null) {<a name="line.460"></a> -<span class="sourceLineNo">461</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.461"></a> -<span class="sourceLineNo">462</span> } else if (user != null && userToken != null) {<a name="line.462"></a> -<span class="sourceLineNo">463</span> user.addToken(userToken);<a name="line.463"></a> -<span class="sourceLineNo">464</span> }<a name="line.464"></a> -<span class="sourceLineNo">465</span> return user;<a name="line.465"></a> -<span class="sourceLineNo">466</span> }<a name="line.466"></a> -<span class="sourceLineNo">467</span><a name="line.467"></a> -<span class="sourceLineNo">468</span> @Override<a name="line.468"></a> -<span class="sourceLineNo">469</span> public void close() throws IOException {<a name="line.469"></a> -<span class="sourceLineNo">470</span> privilegedWriter.close();<a name="line.470"></a> -<span class="sourceLineNo">471</span> }<a name="line.471"></a> -<span class="sourceLineNo">472</span> }<a name="line.472"></a> -<span class="sourceLineNo">473</span><a name="line.473"></a> -<span class="sourceLineNo">474</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.474"></a> -<span class="sourceLineNo">475</span> private final User user;<a name="line.475"></a> -<span class="sourceLineNo">476</span> private final SequenceFile.Writer out;<a name="line.476"></a> -<span class="sourceLineNo">477</span> private Object key;<a name="line.477"></a> -<span class="sourceLineNo">478</span> private Object value;<a name="line.478"></a> -<span class="sourceLineNo">479</span><a name="line.479"></a> -<span class="sourceLineNo">480</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.480"></a> -<span class="sourceLineNo">481</span> this.user = user;<a name="line.481"></a> -<span class="sourceLineNo">482</span> this.out = out;<a name="line.482"></a> -<span class="sourceLineNo">483</span> }<a name="line.483"></a> -<span class="sourceLineNo">484</span><a name="line.484"></a> -<span class="sourceLineNo">485</span> void append(final Object key, final Object value) throws IOException {<a name="line.485"></a> -<span class="sourceLineNo">486</span> if (user == null) {<a name="line.486"></a> -<span class="sourceLineNo">487</span> out.append(key, value);<a name="line.487"></a> -<span class="sourceLineNo">488</span> } else {<a name="line.488"></a> -<span class="sourceLineNo">489</span> this.key = key;<a name="line.489"></a> -<span class="sourceLineNo">490</span> this.value = value;<a name="line.490"></a> -<span class="sourceLineNo">491</span> try {<a name="line.491"></a> -<span class="sourceLineNo">492</span> user.runAs(this);<a name="line.492"></a> -<span class="sourceLineNo">493</span> } catch (InterruptedException ex) {<a name="line.493"></a> -<span class="sourceLineNo">494</span> throw new IOException(ex);<a name="line.494"></a> -<span class="sourceLineNo">495</span> }<a name="line.495"></a> -<span class="sourceLineNo">496</span> }<a name="line.496"></a> -<span class="sourceLineNo">497</span> }<a name="line.497"></a> -<span class="sourceLineNo">498</span><a name="line.498"></a> -<span class="sourceLineNo">499</span> @Override<a name="line.499"></a> -<span class="sourceLineNo">500</span> public Boolean run() throws Exception {<a name="line.500"></a> -<span class="sourceLineNo">501</span> out.append(key, value);<a name="line.501"></a> -<span class="sourceLineNo">502</span> return true;<a name="line.502"></a> -<span class="sourceLineNo">503</span> }<a name="line.503"></a> -<span class="sourceLineNo">504</span><a name="line.504"></a> -<span class="sourceLineNo">505</span> @Override<a name="line.505"></a> -<span class="sourceLineNo">506</span> public void close() throws IOException {<a name="line.506"></a> -<span class="sourceLineNo">507</span> out.close();<a name="line.507"></a> -<span class="sourceLineNo">508</span> }<a name="line.508"></a> -<span class="sourceLineNo">509</span> }<a name="line.509"></a> -<span class="sourceLineNo">510</span><a name="line.510"></a> -<span class="sourceLineNo">511</span> public static class Response {<a name="line.511"></a> +<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser().orElse(userProvider.getCurrent());<a name="line.456"></a> +<span class="sourceLineNo">457</span> if (user == null && userToken != null) {<a name="line.457"></a> +<span class="sourceLineNo">458</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.458"></a> +<span class="sourceLineNo">459</span> } else if (user != null && userToken != null) {<a name="line.459"></a> +<span class="sourceLineNo">460</span> user.addToken(userToken);<a name="line.460"></a> +<span class="sourceLineNo">461</span> }<a name="line.461"></a> +<span class="sourceLineNo">462</span> return user;<a name="line.462"></a> +<span class="sourceLineNo">463</span> }<a name="line.463"></a> +<span class="sourceLineNo">464</span><a name="line.464"></a> +<span class="sourceLineNo">465</span> @Override<a name="line.465"></a> +<span class="sourceLineNo">466</span> public void close() throws IOException {<a name="line.466"></a> +<span class="sourceLineNo">467</span> privilegedWriter.close();<a name="line.467"></a> +<span class="sourceLineNo">468</span> }<a name="line.468"></a> +<span class="sourceLineNo">469</span> }<a name="line.469"></a> +<span class="sourceLineNo">470</span><a name="line.470"></a> +<span class="sourceLineNo">471</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.471"></a> +<span class="sourceLineNo">472</span> private final User user;<a name="line.472"></a> +<span class="sourceLineNo">473</span> private final SequenceFile.Writer out;<a name="line.473"></a> +<span class="sourceLineNo">474</span> private Object key;<a name="line.474"></a> +<span class="sourceLineNo">475</span> private Object value;<a name="line.475"></a> +<span class="sourceLineNo">476</span><a name="line.476"></a> +<span class="sourceLineNo">477</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.477"></a> +<span class="sourceLineNo">478</span> this.user = user;<a name="line.478"></a> +<span class="sourceLineNo">479</span> this.out = out;<a name="line.479"></a> +<span class="sourceLineNo">480</span> }<a name="line.480"></a> +<span class="sourceLineNo">481</span><a name="line.481"></a> +<span class="sourceLineNo">482</span> void append(final Object key, final Object value) throws IOException {<a name="line.482"></a> +<span class="sourceLineNo">483</span> if (user == null) {<a name="line.483"></a> +<span class="sourceLineNo">484</span> out.append(key, value);<a name="line.484"></a> +<span class="sourceLineNo">485</span> } else {<a name="line.485"></a> +<span class="sourceLineNo">486</span> this.key = key;<a name="line.486"></a> +<span class="sourceLineNo">487</span> this.value = value;<a name="line.487"></a> +<span class="sourceLineNo">488</span> try {<a name="line.488"></a> +<span class="sourceLineNo">489</span> user.runAs(this);<a name="line.489"></a> +<span class="sourceLineNo">490</span> } catch (InterruptedException ex) {<a name="line.490"></a> +<span class="sourceLineNo">491</span> throw new IOException(ex);<a name="line.491"></a> +<span class="sourceLineNo">492</span> }<a name="line.492"></a> +<span class="sourceLineNo">493</span> }<a name="line.493"></a> +<span class="sourceLineNo">494</span> }<a name="line.494"></a> +<span class="sourceLineNo">495</span><a name="line.495"></a> +<span class="sourceLineNo">496</span> @Override<a name="line.496"></a> +<span class="sourceLineNo">497</span> public Boolean run() throws Exception {<a name="line.497"></a> +<span class="sourceLineNo">498</span> out.append(key, value);<a name="line.498"></a> +<span class="sourceLineNo">499</span> return true;<a name="line.499"></a> +<span class="sourceLineNo">500</span> }<a name="line.500"></a> +<span class="sourceLineNo">501</span><a name="line.501"></a> +<span class="sourceLineNo">502</span> @Override<a name="line.502"></a> +<span class="sourceLineNo">503</span> public void close() throws IOException {<a name="line.503"></a> +<span class="sourceLineNo">504</span> out.close();<a name="line.504"></a> +<span class="sourceLineNo">505</span> }<a name="line.505"></a> +<span class="sourceLineNo">506</span> }<a name="line.506"></a> +<span class="sourceLineNo">507</span><a name="line.507"></a> +<span class="sourceLineNo">508</span> public static class Response {<a name="line.508"></a> +<span class="sourceLineNo">509</span><a name="line.509"></a> +<span class="sourceLineNo">510</span> private final long rowCount;<a name="line.510"></a> +<span class="sourceLineNo">511</span> private final long cellCount;<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> private final long rowCount;<a name="line.513"></a> -<span class="sourceLineNo">514</span> private final long cellCount;<a name="line.514"></a> -<span class="sourceLineNo">515</span><a name="line.515"></a> -<span class="sourceLineNo">516</span> private Response(ExportProtos.ExportResponse r) {<a name="line.516"></a> -<span class="sourceLineNo">517</span> this.rowCount = r.getRowCount();<a name="line.517"></a> -<span class="sourceLineNo">518</span> this.cellCount = r.getCellCount();<a name="line.518"></a> -<span class="sourceLineNo">519</span> }<a name="line.519"></a> -<span class="sourceLineNo">520</span><a name="line.520"></a> -<span class="sourceLineNo">521</span> public long getRowCount() {<a name="line.521"></a> -<span class="sourceLineNo">522</span> return rowCount;<a name="line.522"></a> -<span class="sourceLineNo">523</span> }<a name="line.523"></a> -<span class="sourceLineNo">524</span><a name="line.524"></a> -<span class="sourceLineNo">525</span> public long getCellCount() {<a name="line.525"></a> -<span class="sourceLineNo">526</span> return cellCount;<a name="line.526"></a> -<span class="sourceLineNo">527</span> }<a name="line.527"></a> -<span class="sourceLineNo">528</span><a name="line.528"></a> -<span class="sourceLineNo">529</span> @Override<a name="line.529"></a> -<span class="sourceLineNo">530</span> public String toString() {<a name="line.530"></a> -<span class="sourceLineNo">531</span> StringBuilder builder = new StringBuilder(35);<a name="line.531"></a> -<span class="sourceLineNo">532</span> return builder.append("rowCount=")<a name="line.532"></a> -<span class="sourceLineNo">533</span> .append(rowCount)<a name="line.533"></a> -<span class="sourceLineNo">534</span> .append(", cellCount=")<a name="line.534"></a> -<span class="sourceLineNo">535</span> .append(cellCount)<a name="line.535"></a> -<span class="sourceLineNo">536</span> .toString();<a name="line.536"></a> -<span class="sourceLineNo">537</span> }<a name="line.537"></a> -<span class="sourceLineNo">538</span> }<a name="line.538"></a> -<span class="sourceLineNo">539</span>}<a name="line.539"></a> +<span class="sourceLineNo">513</span> private Response(ExportProtos.ExportResponse r) {<a name="line.513"></a> +<span class="sourceLineNo">514</span> this.rowCount = r.getRowCount();<a name="line.514"></a> +<span class="sourceLineNo">515</span> this.cellCount = r.getCellCount();<a name="line.515"></a> +<span class="sourceLineNo">516</span> }<a name="line.516"></a> +<span class="sourceLineNo">517</span><a name="line.517"></a> +<span class="sourceLineNo">518</span> public long getRowCount() {<a name="line.518"></a> +<span class="sourceLineNo">519</span> return rowCount;<a name="line.519"></a> +<span class="sourceLineNo">520</span> }<a name="line.520"></a> +<span class="sourceLineNo">521</span><a name="line.521"></a> +<span class="sourceLineNo">522</span> public long getCellCount() {<a name="line.522"></a> +<span class="sourceLineNo">523</span> return cellCount;<a name="line.523"></a> +<span class="sourceLineNo">524</span> }<a name="line.524"></a> +<span class="sourceLineNo">525</span><a name="line.525"></a> +<span class="sourceLineNo">526</span> @Override<a name="line.526"></a> +<span class="sourceLineNo">527</span> public String toString() {<a name="line.527"></a> +<span class="sourceLineNo">528</span> StringBuilder builder = new StringBuilder(35);<a name="line.528"></a> +<span class="sourceLineNo">529</span> return builder.append("rowCount=")<a name="line.529"></a> +<span class="sourceLineNo">530</span> .append(rowCount)<a name="line.530"></a> +<span class="sourceLineNo">531</span> .append(", cellCount=")<a name="line.531"></a> +<span class="sourceLineNo">532</span> .append(cellCount)<a name="line.532"></a> +<span class="sourceLineNo">533</span> .toString();<a name="line.533"></a> +<span class="sourceLineNo">534</span> }<a name="line.534"></a> +<span class="sourceLineNo">535</span> }<a name="line.535"></a> +<span class="sourceLineNo">536</span>}<a name="line.536"></a>