Author: ctubbsii
Date: Fri Jan 25 03:31:59 2013
New Revision: 1438309
URL: http://svn.apache.org/viewvc?rev=1438309&view=rev
Log:
ACCUMULO-973 Add deprecation annotations for those that were missing them.
Javadoc deprecation tags are okay for documentation, but insufficient for
programmatically determining deprecated APIs (or for compiler warnings); This
is a 'play nice with other developers' enhancement.
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
Fri Jan 25 03:31:59 2013
@@ -46,6 +46,7 @@ public class Connector {
* when a user's credentials are invalid
* @see Instance#getConnector(String user, byte[] password)
*/
+ @Deprecated
public Connector(Instance instance, String user, byte[] password) throws
AccumuloException, AccumuloSecurityException {
impl = instance.getConnector(user, password);
}
@@ -54,6 +55,7 @@ public class Connector {
* @see Instance#getConnector(String user, byte[] password)
* @deprecated Not for client use
*/
+ @Deprecated
public Connector() {
impl = null;
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
Fri Jan 25 03:31:59 2013
@@ -235,6 +235,7 @@ public class ZooKeeperInstance implement
/**
* @deprecated Use {@link
#lookupInstanceName(org.apache.accumulo.fate.zookeeper.ZooCache, UUID)} instead
*/
+ @Deprecated
public static String
lookupInstanceName(org.apache.accumulo.core.zookeeper.ZooCache zooCache, UUID
instanceId) {
return lookupInstanceName((ZooCache) zooCache, instanceId);
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
Fri Jan 25 03:31:59 2013
@@ -46,6 +46,7 @@ public interface SecurityOperations {
* if the user does not have permission to create a user
* @deprecated Use {@link #createUser(String,byte[])} instead
*/
+ @Deprecated
public void createUser(String user, byte[] password, Authorizations
authorizations) throws AccumuloException, AccumuloSecurityException;
/**
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
Fri Jan 25 03:31:59 2013
@@ -107,6 +107,7 @@ public class SecurityOperationsImpl impl
* if the user does not have permission to create a user
* @deprecated Use {@link #createUser(String,byte[])} instead
*/
+ @Deprecated
public void createUser(final String user, final byte[] password, final
Authorizations authorizations) throws AccumuloException,
AccumuloSecurityException {
ArgumentChecker.notNull(user, password, authorizations);
execute(new ClientExec<ClientService.Client>() {
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
Fri Jan 25 03:31:59 2013
@@ -311,6 +311,7 @@ public interface TableOperations {
*
* @deprecated As of release 1.4, replaced by {@link #flush(String, Text,
Text, boolean)}
*/
+ @Deprecated
public void flush(String tableName) throws AccumuloException,
AccumuloSecurityException;
/**
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
Fri Jan 25 03:31:59 2013
@@ -665,6 +665,7 @@ public class TableOperationsImpl extends
/**
* @deprecated since 1.4 {@link #flush(String, Text, Text, boolean)}
*/
+ @Deprecated
public void flush(String tableName) throws AccumuloException,
AccumuloSecurityException {
try {
flush(tableName, null, null, false);
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
Fri Jan 25 03:31:59 2013
@@ -39,6 +39,7 @@ public class MockSecurityOperations impl
/**
* @deprecated Use {@link #createUser(String,byte[])} instead
*/
+ @Deprecated
@Override
public void createUser(String user, byte[] password, Authorizations
authorizations) throws AccumuloException, AccumuloSecurityException {
this.acu.users.put(user, new MockUser(user, password, authorizations));
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
Fri Jan 25 03:31:59 2013
@@ -137,6 +137,7 @@ public abstract class AccumuloConfigurat
*
* @deprecated not for client use
*/
+ @Deprecated
public static synchronized AccumuloConfiguration getSiteConfiguration() {
return SiteConfiguration.getInstance(getDefaultConfiguration());
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
Fri Jan 25 03:31:59 2013
@@ -38,6 +38,7 @@ import org.apache.log4j.Logger;
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.Combiner}
*/
+@Deprecated
public class AggregatingIterator implements SortedKeyValueIterator<Key,Value>,
OptionDescriber {
private SortedKeyValueIterator<Key,Value> iterator;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
Fri Jan 25 03:31:59 2013
@@ -23,6 +23,7 @@ import org.apache.accumulo.core.iterator
*
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.IndexedDocIterator}
*/
+@Deprecated
public class FamilyIntersectingIterator extends IndexedDocIterator {
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
Fri Jan 25 03:31:59 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
*
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.GrepIterator}
*/
+@Deprecated
public class GrepIterator extends
org.apache.accumulo.core.iterators.user.GrepIterator {
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
Fri Jan 25 03:31:59 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
*
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.IntersectingIterator}
*/
+@Deprecated
public class IntersectingIterator extends
org.apache.accumulo.core.iterators.user.IntersectingIterator {
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
Fri Jan 25 03:31:59 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
*
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.LargeRowFilter}
*/
+@Deprecated
public class LargeRowFilter extends
org.apache.accumulo.core.iterators.user.LargeRowFilter {
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
Fri Jan 25 03:31:59 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
*
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.RowDeletingIterator}
*/
+@Deprecated
public class RowDeletingIterator extends
org.apache.accumulo.core.iterators.user.RowDeletingIterator {
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
Fri Jan 25 03:31:59 2013
@@ -24,6 +24,7 @@ import org.apache.accumulo.core.data.Val
*
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.VersioningIterator}
*/
+@Deprecated
public class VersioningIterator extends
org.apache.accumulo.core.iterators.user.VersioningIterator {
public VersioningIterator() {}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
Fri Jan 25 03:31:59 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
*
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.WholeRowIterator}
*/
+@Deprecated
public class WholeRowIterator extends
org.apache.accumulo.core.iterators.user.WholeRowIterator {
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
Fri Jan 25 03:31:59 2013
@@ -21,6 +21,7 @@ import org.apache.accumulo.core.data.Val
/**
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.Combiner}
*/
+@Deprecated
public interface Aggregator {
void reset();
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
Fri Jan 25 03:31:59 2013
@@ -25,6 +25,7 @@ import org.apache.log4j.Logger;
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.SummingCombiner} with
* {@link
org.apache.accumulo.core.iterators.LongCombiner.Type#FIXEDLEN}
*/
+@Deprecated
public class LongSummation implements Aggregator {
private static final Logger log = Logger.getLogger(LongSummation.class);
long sum = 0;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
Fri Jan 25 03:31:59 2013
@@ -29,6 +29,7 @@ import org.apache.hadoop.io.WritableUtil
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.SummingArrayCombiner} with
* {@link
org.apache.accumulo.core.iterators.user.SummingArrayCombiner.Type#VARLEN}
*/
+@Deprecated
public class NumArraySummation implements Aggregator {
long[] sum = new long[0];
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
Fri Jan 25 03:31:59 2013
@@ -29,6 +29,7 @@ import org.apache.hadoop.io.WritableUtil
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.SummingCombiner} with
* {@link
org.apache.accumulo.core.iterators.LongCombiner.Type#VARLEN}
*/
+@Deprecated
public class NumSummation implements Aggregator {
long sum = 0l;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
Fri Jan 25 03:31:59 2013
@@ -22,6 +22,7 @@ import org.apache.accumulo.core.data.Val
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.MaxCombiner} with
* {@link
org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
*/
+@Deprecated
public class StringMax implements Aggregator {
long max = Long.MIN_VALUE;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
Fri Jan 25 03:31:59 2013
@@ -22,6 +22,7 @@ import org.apache.accumulo.core.data.Val
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.MinCombiner} with
* {@link
org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
*/
+@Deprecated
public class StringMin implements Aggregator {
long min = Long.MAX_VALUE;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
Fri Jan 25 03:31:59 2013
@@ -22,6 +22,7 @@ import org.apache.accumulo.core.data.Val
* @deprecated since 1.4, replaced by {@link
org.apache.accumulo.core.iterators.user.SummingCombiner} with
* {@link
org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
*/
+@Deprecated
public class StringSummation implements Aggregator {
long sum = 0;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java
Fri Jan 25 03:31:59 2013
@@ -22,6 +22,7 @@ import org.apache.hadoop.io.Text;
/**
* @deprecated since 1.4
*/
+@Deprecated
public class AggregatorConfiguration extends PerColumnIteratorConfig {
public AggregatorConfiguration(Text columnFamily, String aggClassName) {
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
Fri Jan 25 03:31:59 2013
@@ -25,6 +25,7 @@ import org.apache.accumulo.core.iterator
/**
* @deprecated since 1.4
*/
+@Deprecated
public class AggregatorSet extends ColumnToClassMapping<Aggregator> {
public AggregatorSet(Map<String,String> opts) throws InstantiationException,
IllegalAccessException, ClassNotFoundException {
super(opts, Aggregator.class);
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java
Fri Jan 25 03:31:59 2013
@@ -24,6 +24,7 @@ import org.apache.hadoop.io.Text;
* @see org.apache.accumulo.core.client.IteratorSetting.Column
* @see
org.apache.accumulo.core.iterators.Combiner#setColumns(org.apache.accumulo.core.client.IteratorSetting,
java.util.List)
*/
+@Deprecated
public class PerColumnIteratorConfig {
private String parameter;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java
Fri Jan 25 03:31:59 2013
@@ -75,6 +75,7 @@ public class ColumnFQ implements Compara
/**
* @deprecated since 1.5, use {@link #fetch(ScannerBase)} instead
*/
+ @Deprecated
public static void fetch(ScannerBase sb, ColumnFQ cfq) {
sb.fetchColumn(cfq.colf, cfq.colq);
}
@@ -82,6 +83,7 @@ public class ColumnFQ implements Compara
/**
* @deprecated since 1.5, use {@link #put(Mutation, Value)} instead
*/
+ @Deprecated
public static void put(Mutation m, ColumnFQ cfq, Value v) {
m.put(cfq.colf, cfq.colq, v);
}
@@ -89,6 +91,7 @@ public class ColumnFQ implements Compara
/**
* @deprecated since 1.5, use {@link #putDelete(Mutation)} instead
*/
+ @Deprecated
public static void putDelete(Mutation m, ColumnFQ cfq) {
m.putDelete(cfq.colf, cfq.colq);
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Fri Jan 25 03:31:59 2013
@@ -355,6 +355,7 @@ public class Shell extends ShellOptions
/**
* @deprecated Not for client use
*/
+ @Deprecated
private static Instance getDefaultInstance(AccumuloConfiguration conf) {
String keepers = conf.get(Property.INSTANCE_ZK_HOST);
Path instanceDir = new Path(conf.get(Property.INSTANCE_DFS_DIR),
"instance_id");
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
Fri Jan 25 03:31:59 2013
@@ -24,6 +24,7 @@ import org.apache.zookeeper.Watcher;
*
* @deprecated since 1.5, replaced by {@link
org.apache.accumulo.fate.zookeeper.ZooCache}
*/
+@Deprecated
public class ZooCache extends org.apache.accumulo.fate.zookeeper.ZooCache {
public ZooCache(String zooKeepers, int sessionTimeout) {
super(zooKeepers, sessionTimeout);
Modified:
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
(original)
+++
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
Fri Jan 25 03:31:59 2013
@@ -38,6 +38,7 @@ import org.apache.hadoop.io.Text;
/**
* @deprecated since 1.4
*/
+@Deprecated
public class AggregatingIteratorTest extends TestCase {
private static final Collection<ByteSequence> EMPTY_COL_FAMS = new
ArrayList<ByteSequence>();
Modified:
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
(original)
+++
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
Fri Jan 25 03:31:59 2013
@@ -23,6 +23,7 @@ import org.apache.accumulo.core.data.Val
/**
* @deprecated since 1.4
*/
+@Deprecated
public class NumSummationTest extends TestCase {
public byte[] init(int n) {
byte[] b = new byte[n];
Modified:
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
(original)
+++
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
Fri Jan 25 03:31:59 2013
@@ -24,6 +24,7 @@ import org.apache.hadoop.io.Text;
/**
* @deprecated since 1.4
*/
+@Deprecated
public class AggregatorConfigurationTest extends TestCase {
public void testBinary() {
Text colf = new Text();
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java?rev=1438309&r1=1438308&r2=1438309&view=diff
==============================================================================
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
Fri Jan 25 03:31:59 2013
@@ -56,6 +56,7 @@ public class TableConfiguration extends
/**
* @deprecated not for client use
*/
+ @Deprecated
private static ZooCache getTablePropCache() {
Instance inst = HdfsZooInstance.getInstance();
if (tablePropCache == null)
