You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/04/22 19:39:54 UTC
[1/3] accumulo git commit: ACCUMULO-3488 Reference non-deprecated
method in javadoc
Repository: accumulo
Updated Branches:
refs/heads/1.7 ac08cc4d2 -> d26fc146b
refs/heads/master fd9bb3a79 -> 9abf6a318
ACCUMULO-3488 Reference non-deprecated method in javadoc
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d26fc146
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d26fc146
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d26fc146
Branch: refs/heads/1.7
Commit: d26fc146b828a38626cc282f011526f4d390d50b
Parents: ac08cc4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Apr 22 13:21:18 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Apr 22 13:21:18 2015 -0400
----------------------------------------------------------------------
.../core/client/MutationsRejectedException.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d26fc146/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
index d046991..e8f675b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
@@ -46,9 +46,9 @@ public class MutationsRejectedException extends AccumuloException {
private Collection<String> es;
private int unknownErrors;
- private static <K, V, L> Map<L, V> transformKeys(Map<K, V> map, Function<K, L> keyFunction) {
- HashMap<L, V> ret = new HashMap<L,V>();
- for(Entry<K, V> entry : map.entrySet()){
+ private static <K,V,L> Map<L,V> transformKeys(Map<K,V> map, Function<K,L> keyFunction) {
+ HashMap<L,V> ret = new HashMap<L,V>();
+ for (Entry<K,V> entry : map.entrySet()) {
ret.put(keyFunction.apply(entry.getKey()), entry.getValue());
}
@@ -65,7 +65,7 @@ public class MutationsRejectedException extends AccumuloException {
* @param unknownErrors
* number of unknown errors
*
- * @deprecated since 1.6.0, see {@link #MutationsRejectedException(Instance, List, HashMap, Collection, int, Throwable)}
+ * @deprecated since 1.6.0, see {@link #MutationsRejectedException(Instance, List, Map, Collection, int, Throwable)}
*/
@Deprecated
public MutationsRejectedException(List<ConstraintViolationSummary> cvsList, HashMap<org.apache.accumulo.core.data.KeyExtent,Set<SecurityErrorCode>> hashMap,
@@ -91,8 +91,8 @@ public class MutationsRejectedException extends AccumuloException {
* @deprecated since 1.7.0 see {@link #MutationsRejectedException(Instance, List, Map, Collection, int, Throwable)}
*/
@Deprecated
- public MutationsRejectedException(Instance instance, List<ConstraintViolationSummary> cvsList, HashMap<org.apache.accumulo.core.data.KeyExtent,Set<SecurityErrorCode>> hashMap,
- Collection<String> serverSideErrors, int unknownErrors, Throwable cause) {
+ public MutationsRejectedException(Instance instance, List<ConstraintViolationSummary> cvsList,
+ HashMap<org.apache.accumulo.core.data.KeyExtent,Set<SecurityErrorCode>> hashMap, Collection<String> serverSideErrors, int unknownErrors, Throwable cause) {
super("# constraint violations : " + cvsList.size() + " security codes: " + format(transformKeys(hashMap, TabletIdImpl.KE_2_TID_OLD), instance)
+ " # server errors " + serverSideErrors.size() + " # exceptions " + unknownErrors, cause);
this.cvsl = cvsList;
@@ -169,7 +169,7 @@ public class MutationsRejectedException extends AccumuloException {
/**
* @return the internal mapping of TabletID to SecurityErrorCodes
*/
- public Map<TabletId,Set<SecurityErrorCode>> getSecurityErrorCodes(){
+ public Map<TabletId,Set<SecurityErrorCode>> getSecurityErrorCodes() {
return af;
}
[3/3] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9abf6a31
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9abf6a31
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9abf6a31
Branch: refs/heads/master
Commit: 9abf6a31810a5bf5823032e5823879c210b191d2
Parents: fd9bb3a d26fc14
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Apr 22 13:23:44 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Apr 22 13:23:44 2015 -0400
----------------------------------------------------------------------
.../core/client/MutationsRejectedException.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/3] accumulo git commit: ACCUMULO-3488 Reference non-deprecated
method in javadoc
Posted by ct...@apache.org.
ACCUMULO-3488 Reference non-deprecated method in javadoc
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d26fc146
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d26fc146
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d26fc146
Branch: refs/heads/master
Commit: d26fc146b828a38626cc282f011526f4d390d50b
Parents: ac08cc4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Apr 22 13:21:18 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Apr 22 13:21:18 2015 -0400
----------------------------------------------------------------------
.../core/client/MutationsRejectedException.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d26fc146/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
index d046991..e8f675b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
@@ -46,9 +46,9 @@ public class MutationsRejectedException extends AccumuloException {
private Collection<String> es;
private int unknownErrors;
- private static <K, V, L> Map<L, V> transformKeys(Map<K, V> map, Function<K, L> keyFunction) {
- HashMap<L, V> ret = new HashMap<L,V>();
- for(Entry<K, V> entry : map.entrySet()){
+ private static <K,V,L> Map<L,V> transformKeys(Map<K,V> map, Function<K,L> keyFunction) {
+ HashMap<L,V> ret = new HashMap<L,V>();
+ for (Entry<K,V> entry : map.entrySet()) {
ret.put(keyFunction.apply(entry.getKey()), entry.getValue());
}
@@ -65,7 +65,7 @@ public class MutationsRejectedException extends AccumuloException {
* @param unknownErrors
* number of unknown errors
*
- * @deprecated since 1.6.0, see {@link #MutationsRejectedException(Instance, List, HashMap, Collection, int, Throwable)}
+ * @deprecated since 1.6.0, see {@link #MutationsRejectedException(Instance, List, Map, Collection, int, Throwable)}
*/
@Deprecated
public MutationsRejectedException(List<ConstraintViolationSummary> cvsList, HashMap<org.apache.accumulo.core.data.KeyExtent,Set<SecurityErrorCode>> hashMap,
@@ -91,8 +91,8 @@ public class MutationsRejectedException extends AccumuloException {
* @deprecated since 1.7.0 see {@link #MutationsRejectedException(Instance, List, Map, Collection, int, Throwable)}
*/
@Deprecated
- public MutationsRejectedException(Instance instance, List<ConstraintViolationSummary> cvsList, HashMap<org.apache.accumulo.core.data.KeyExtent,Set<SecurityErrorCode>> hashMap,
- Collection<String> serverSideErrors, int unknownErrors, Throwable cause) {
+ public MutationsRejectedException(Instance instance, List<ConstraintViolationSummary> cvsList,
+ HashMap<org.apache.accumulo.core.data.KeyExtent,Set<SecurityErrorCode>> hashMap, Collection<String> serverSideErrors, int unknownErrors, Throwable cause) {
super("# constraint violations : " + cvsList.size() + " security codes: " + format(transformKeys(hashMap, TabletIdImpl.KE_2_TID_OLD), instance)
+ " # server errors " + serverSideErrors.size() + " # exceptions " + unknownErrors, cause);
this.cvsl = cvsList;
@@ -169,7 +169,7 @@ public class MutationsRejectedException extends AccumuloException {
/**
* @return the internal mapping of TabletID to SecurityErrorCodes
*/
- public Map<TabletId,Set<SecurityErrorCode>> getSecurityErrorCodes(){
+ public Map<TabletId,Set<SecurityErrorCode>> getSecurityErrorCodes() {
return af;
}