# HG changeset patch # User Mario Torre # Date 1418317865 -3600 # Node ID 0fb2d400ebf4aac18279fd7634d61fd035892229 # Parent aa80de0bd1b00fe30b8be488a6480f0a62b75fe3 Remove some dead code review-thread: http://icedtea.classpath.org/pipermail/thermostat/2014-December/012240.html reviewed-by: jerboaa diff -r aa80de0bd1b0 -r 0fb2d400ebf4 thread/collector/src/main/java/com/redhat/thermostat/thread/dao/ThreadDao.java --- a/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/ThreadDao.java Thu Dec 11 12:22:42 2014 +0100 +++ b/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/ThreadDao.java Thu Dec 11 18:11:05 2014 +0100 @@ -133,25 +133,6 @@ */ void addThreadState(ThreadState thread); - /** - */ - void saveContentionSample(ThreadContentionSample contentionSample); - - /** - */ - ThreadContentionSample getLatestContentionSample(VmRef ref, SessionID session); - - - /** - * Return the oldest session registered in the database. - */ - ThreadSession getFirstSession(VmRef ref); - - /** - * Return the newest session registered in the database. - */ - ThreadSession getLastSession(VmRef ref); - void getThreadStates(VmRef ref, SessionID session, ResultHandler handler, Range range, int limit, Sort order); diff -r aa80de0bd1b0 -r 0fb2d400ebf4 thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/ThreadDaoImpl.java --- a/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/ThreadDaoImpl.java Thu Dec 11 12:22:42 2014 +0100 +++ b/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/ThreadDaoImpl.java Thu Dec 11 18:11:05 2014 +0100 @@ -211,20 +211,6 @@ } @Override - public ThreadSession getFirstSession(VmRef ref) { - Range range = new Range<>(Long.MIN_VALUE, Long.MAX_VALUE); - List results = getSessions(ref, range, 1, Sort.ASCENDING); - return results.isEmpty() ? null : results.get(0); - } - - @Override - public ThreadSession getLastSession(VmRef ref) { - Range range = new Range<>(Long.MIN_VALUE, Long.MAX_VALUE); - List results = getSessions(ref, range, 1, Sort.DESCENDING); - return results.isEmpty() ? null : results.get(0); - } - - @Override public List getSessions(VmRef ref, Range range, int limit, Sort order) { @@ -324,74 +310,6 @@ } } - @Override - public void saveContentionSample(ThreadContentionSample contentionSample) { - -// StatementDescriptor desc = -// new StatementDescriptor<>(THREAD_CONTENTION_SAMPLE, -// ADD_CONTENTION_SAMPLE); -// PreparedStatement prepared; -// ThreadHeader header = contentionSample.getHeader(); -// if (header == null || header.getReferenceID() == null) { -// throw new IllegalArgumentException("header or header.getReferenceID() can't be null"); -// } -// -// try { -// prepared = storage.prepareStatement(desc); -// -// prepared.setString(0, header.getAgentId()); -// prepared.setString(1, header.getVmId()); -// -// prepared.setLong(2, contentionSample.getBlockedCount()); -// prepared.setLong(3, contentionSample.getBlockedTime()); -// prepared.setLong(4, contentionSample.getWaitedCount()); -// prepared.setLong(5, contentionSample.getWaitedTime()); -// -// prepared.setString(6, header.getReferenceID()); -// -// prepared.setLong(7, contentionSample.getTimeStamp()); -// -// prepared.execute(); -// -// } catch (DescriptorParsingException e) { -// logger.log(Level.SEVERE, "Preparing stmt '" + desc + "' failed!", e); -// } catch (StatementExecutionException e) { -// logger.log(Level.SEVERE, "Executing stmt '" + desc + "' failed!", e); -// } - } - - @Override - public ThreadContentionSample getLatestContentionSample(VmRef ref, SessionID session) { - - ThreadContentionSample sample = null; - -// StatementDescriptor desc = -// new StatementDescriptor<>(THREAD_CONTENTION_SAMPLE, -// GET_LATEST_CONTENTION_SAMPLE); -// PreparedStatement prepared; -// -// if (thread == null || thread.getReferenceID() == null) { -// throw new IllegalArgumentException("header or header.getReferenceID() can't be null"); -// } -// -// try { -// prepared = storage.prepareStatement(desc); -// -// prepared.setString(0, thread.getReferenceID()); -// Cursor cursor = prepared.executeQuery(); -// if (cursor.hasNext()) { -// sample = cursor.next(); -// sample.setHeader(thread); -// } -// -// } catch (DescriptorParsingException e) { -// logger.log(Level.SEVERE, "Preparing stmt '" + desc + "' failed!", e); -// } catch (StatementExecutionException e) { -// logger.log(Level.SEVERE, "Executing stmt '" + desc + "' failed!", e); -// } - - return sample; - } /**************************************************************************/ @@ -420,25 +338,6 @@ return stmt; } - private List getAllResults(PreparedStatement stmt) { - Cursor cursor; - try { - cursor = stmt.executeQuery(); - } catch (StatementExecutionException e) { - // should not happen, but if it *does* happen, at least log it - logger.log(Level.SEVERE, "Executing query '" + stmt + "' failed!", e); - return Collections.emptyList(); - } - - List result = new ArrayList<>(); - while (cursor.hasNext()) { - T info = cursor.next(); - result.add(info); - } - - return result; - } - private T getFirstResult(PreparedStatement stmt) { Cursor cursor; try {