You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/03/18 22:09:50 UTC
svn commit: r1457999 - in /accumulo/trunk: ./ assemble/ core/
core/src/main/java/org/apache/accumulo/core/client/mock/
core/src/main/java/org/apache/accumulo/core/iterators/ examples/
fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/...
Author: kturner
Date: Mon Mar 18 21:09:50 2013
New Revision: 1457999
URL: http://svn.apache.org/r1457999
Log:
ACCUMULO-972 removed some TODOs that are no longer relevant
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1457819-1457895,1457897-1457993
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1457190-1457723,1457725-1457895,1457897-1457993
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1457190-1457723,1457725-1457895,1457897-1457993
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java?rev=1457999&r1=1457998&r2=1457999&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java Mon Mar 18 21:09:50 2013
@@ -126,14 +126,8 @@ public class MockInstanceOperations impl
return new ArrayList<ActiveCompaction>();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#ping(java.lang.String)
- */
@Override
public void ping(String tserver) throws AccumuloException {
- // TODO Auto-generated method stub
-
+
}
}
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java?rev=1457999&r1=1457998&r2=1457999&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java Mon Mar 18 21:09:50 2013
@@ -84,7 +84,6 @@ public class ColumnFamilyCounter impleme
@Override
public SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env) {
- // TODO Auto-generated method stub
return null;
}
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1457190-1457723,1457725-1457895,1457897-1457993
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1457190-1457723,1457725-1457895,1457897-1457993
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1457190-1457723,1457725-1457895,1457897-1457993
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1457819-1457895,1457897-1457993
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1457999&r1=1457998&r2=1457999&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java Mon Mar 18 21:09:50 2013
@@ -138,7 +138,6 @@ import org.apache.accumulo.server.master
import org.apache.accumulo.server.master.tableOps.TraceRepo;
import org.apache.accumulo.server.master.tserverOps.ShutdownTServer;
import org.apache.accumulo.server.monitor.Monitor;
-import org.apache.accumulo.server.monitor.util.Table;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
import org.apache.accumulo.server.security.SecurityConstants;
import org.apache.accumulo.server.security.SecurityOperation;
@@ -2007,7 +2006,6 @@ public class Master implements LiveTServ
if (connection == null)
throw new IOException("No connection to " + server);
TabletServerStatus status = connection.getTableMap();
- // TODO maybe remove from bad servers
result.put(server, status);
} finally {
t.setName(oldName);
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java?rev=1457999&r1=1457998&r2=1457999&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java Mon Mar 18 21:09:50 2013
@@ -38,9 +38,6 @@ class TServerLockWatcher implements Asyn
public void lostLock(LockLossReason reason) {}
@Override
- public void unableToMonitorLockNode(Throwable e) {
- // TODO Auto-generated method stub
-
- }
+ public void unableToMonitorLockNode(Throwable e) {}
}
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1457999&r1=1457998&r2=1457999&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java Mon Mar 18 21:09:50 2013
@@ -708,14 +708,6 @@ public class Tablet {
}
- // TODO I do not think the case below is needed anymore
- /*
- * if(!fs.exists(new Path(bulkDir, Constants.BULK_LOAD_IN_PROGRESS))){ DataFileValue zero = new DataFileValue(0, 0);
- * MetadataTable.replaceDatafiles(extent, abs2rel(paths.keySet()), new HashSet<String>(), "junk", null, zero, SecurityConstants.getSystemCredentials(),
- * tabletServer.getClientAddressString(), lastLocation, tabletServer.getLock(), false); throw new
- * IOException("Processing file does not exist, aborting bulk import "+extent+" "+bulkDir); }
- */
-
synchronized (Tablet.this) {
for (Entry<Path,DataFileValue> tpath : paths.entrySet()) {
if (datafileSizes.containsKey(tpath.getKey())) {
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1457190-1457723,1457725-1457895,1457897-1457993
Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java?rev=1457999&r1=1457998&r2=1457999&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java Mon Mar 18 21:09:50 2013
@@ -111,9 +111,6 @@ public class SparseColumnFamilyTest exte
}
@Override
- public void cleanup() throws Exception {
- // TODO Auto-generated method stub
-
- }
+ public void cleanup() throws Exception {}
}
Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java?rev=1457999&r1=1457998&r2=1457999&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java Mon Mar 18 21:09:50 2013
@@ -340,7 +340,6 @@ public class Module extends Node {
try {
timer.join();
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}