You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/06/02 02:49:30 UTC
git commit: Remove unused CassandraServer methods
Updated Branches:
refs/heads/trunk 37f0c8c91 -> 12537ca72
Remove unused CassandraServer methods
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12537ca7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12537ca7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12537ca7
Branch: refs/heads/trunk
Commit: 12537ca7289db7aed7c7b6135a3cc1bd9ff56800
Parents: 37f0c8c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Jun 2 03:49:09 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Jun 2 03:49:09 2013 +0300
----------------------------------------------------------------------
.../apache/cassandra/thrift/CassandraServer.java | 49 ---------------
1 files changed, 0 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12537ca7/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 878c42b..2daa910 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -74,8 +74,6 @@ public class CassandraServer implements Cassandra.Iface
private final static int COUNT_PAGE_SIZE = 1024;
private final static List<ColumnOrSuperColumn> EMPTY_COLUMNS = Collections.emptyList();
- private final static List<Column> EMPTY_SUBCOLUMNS = Collections.emptyList();
- private final static List<CounterColumn> EMPTY_COUNTER_SUBCOLUMNS = Collections.emptyList();
/*
* RequestScheduler to perform the scheduling of incoming requests
@@ -123,53 +121,6 @@ public class CassandraServer implements Cassandra.Iface
return columnFamilyKeyMap;
}
- public List<Column> thriftifySubColumns(Collection<org.apache.cassandra.db.Column> columns)
- {
- if (columns == null || columns.isEmpty())
- {
- return EMPTY_SUBCOLUMNS;
- }
-
- ArrayList<Column> thriftColumns = new ArrayList<Column>(columns.size());
- for (org.apache.cassandra.db.Column column : columns)
- {
- if (column.isMarkedForDelete())
- {
- continue;
- }
- Column thrift_column = new Column(column.name()).setValue(column.value()).setTimestamp(column.timestamp());
- if (column instanceof ExpiringColumn)
- {
- thrift_column.setTtl(((ExpiringColumn) column).getTimeToLive());
- }
- thriftColumns.add(thrift_column);
- }
-
- return thriftColumns;
- }
-
- public List<CounterColumn> thriftifyCounterSubColumns(Collection<org.apache.cassandra.db.Column> columns)
- {
- if (columns == null || columns.isEmpty())
- {
- return EMPTY_COUNTER_SUBCOLUMNS;
- }
-
- ArrayList<CounterColumn> thriftColumns = new ArrayList<CounterColumn>(columns.size());
- for (org.apache.cassandra.db.Column column : columns)
- {
- if (column.isMarkedForDelete())
- {
- continue;
- }
- assert column instanceof org.apache.cassandra.db.CounterColumn;
- CounterColumn thrift_column = new CounterColumn(column.name(), CounterContext.instance().total(column.value()));
- thriftColumns.add(thrift_column);
- }
-
- return thriftColumns;
- }
-
public List<ColumnOrSuperColumn> thriftifyColumns(Collection<org.apache.cassandra.db.Column> columns, boolean reverseOrder)
{
ArrayList<ColumnOrSuperColumn> thriftColumns = new ArrayList<ColumnOrSuperColumn>(columns.size());