[1/2] git commit: remove dead code
Repository: cassandra
Updated Branches:
refs/heads/trunk 35648e8cb - 70bf377b0
remove dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d5d3032
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d5d3032
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d5d3032
Branch: refs/heads/trunk
Commit: 1d5d30327541e1f91cd6f4e8cd9fc5a39a146aa2
Parents: 8e5fdc2
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Thu Oct 23 22:54:07 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Thu Oct 23 22:54:07 2014 -0400
--
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d5d3032/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 1efde47..7ef592f 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -97,6 +97,7 @@ public class CqlRecordReader extends RecordReaderLong, Row
super();
}
+@Override
public void initialize(InputSplit split, TaskAttemptContext context)
throws IOException
{
this.split = (ColumnFamilySplit) split;
@@ -109,7 +110,6 @@ public class CqlRecordReader extends RecordReaderLong, Row
partitioner = ConfigHelper.getInputPartitioner(conf);
inputColumns = CqlConfigHelper.getInputcolumns(conf);
userDefinedWhereClauses = CqlConfigHelper.getInputWhereClauses(conf);
-OptionalInteger pageRowSizeOptional =
CqlConfigHelper.getInputPageRowSize(conf);
try
{
[1/2] git commit: remove dead code
Repository: cassandra
Updated Branches:
refs/heads/trunk e5314641a - f63fafbfa
remove dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ef88156
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ef88156
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ef88156
Branch: refs/heads/trunk
Commit: 9ef88156884419bd4bba6f10a24a60a2e7252c37
Parents: 8a2a0c3
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue Mar 25 00:31:26 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Mar 25 00:31:26 2014 -0400
--
.../apache/cassandra/dht/AbstractByteOrderedPartitioner.java | 2 +-
.../org/apache/cassandra/dht/OrderPreservingPartitioner.java | 2 +-
src/java/org/apache/cassandra/service/StorageService.java | 6 +++---
src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +-
test/unit/org/apache/cassandra/db/KeyCollisionTest.java| 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef88156/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
--
diff --git
a/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
b/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
index 5858a4a..0adab50 100644
--- a/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
@@ -198,7 +198,7 @@ public abstract class AbstractByteOrderedPartitioner
extends AbstractPartitioner
for (RangeToken r : sortedRanges)
{
// Looping over every KS:CF:Range, get the splits size and
add it to the count
-allTokens.put(r.right, allTokens.get(r.right) +
StorageService.instance.getSplits(ks, cfmd.cfName, r, 1, cfmd).size());
+allTokens.put(r.right, allTokens.get(r.right) +
StorageService.instance.getSplits(ks, cfmd.cfName, r, 1).size());
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef88156/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
--
diff --git a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
index d812d3e..ab80ef7 100644
--- a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
@@ -199,7 +199,7 @@ public class OrderPreservingPartitioner extends
AbstractPartitionerStringToken
for (RangeToken r : sortedRanges)
{
// Looping over every KS:CF:Range, get the splits size and
add it to the count
-allTokens.put(r.right, allTokens.get(r.right) +
StorageService.instance.getSplits(ks, cfmd.cfName, r,
cfmd.getMinIndexInterval(), cfmd).size());
+allTokens.put(r.right, allTokens.get(r.right) +
StorageService.instance.getSplits(ks, cfmd.cfName, r,
cfmd.getMinIndexInterval()).size());
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef88156/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java
b/src/java/org/apache/cassandra/service/StorageService.java
index 57fbaf0..bfcfcce 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2832,7 +2832,7 @@ public class StorageService extends
NotificationBroadcasterSupport implements IE
* @return list of Token ranges (_not_ keys!) together with estimated key
count,
* breaking up the data this node is responsible for into pieces of
roughly keysPerSplit
*/
-public ListPairRangeToken, Long getSplits(String keyspaceName,
String cfName, RangeToken range, int keysPerSplit, CFMetaData metadata)
+public ListPairRangeToken, Long getSplits(String keyspaceName,
String cfName, RangeToken range, int keysPerSplit)
{
Keyspace t = Keyspace.open(keyspaceName);
ColumnFamilyStore cfs = t.getColumnFamilyStore(cfName);
@@ -2846,10 +2846,10 @@ public class StorageService extends
NotificationBroadcasterSupport implements IE
final int splitCount = Math.max(1, Math.min(maxSplitCount,
(int)(totalRowCountEstimate / keysPerSplit)));
ListToken tokens = keysToTokens(range, keys);
-return getSplits(tokens,
[1/2] git commit: remove dead code
Updated Branches:
refs/heads/trunk 10b617364 - 4b4a8dd4f
remove dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f60fcc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f60fcc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f60fcc3
Branch: refs/heads/trunk
Commit: 5f60fcc39c9ac8958bd2d8565404515f919d8124
Parents: de6a74a
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Wed Feb 12 20:50:35 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Wed Feb 12 20:50:35 2014 -0500
--
src/java/org/apache/cassandra/service/ReadCallback.java | 3 ---
1 file changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f60fcc3/src/java/org/apache/cassandra/service/ReadCallback.java
--
diff --git a/src/java/org/apache/cassandra/service/ReadCallback.java
b/src/java/org/apache/cassandra/service/ReadCallback.java
index afff530..777ef90 100644
--- a/src/java/org/apache/cassandra/service/ReadCallback.java
+++ b/src/java/org/apache/cassandra/service/ReadCallback.java
@@ -96,9 +96,6 @@ public class ReadCallbackTMessage, TResolved implements
IAsyncCallbackTMessag
if (!await(command.getTimeout(), TimeUnit.MILLISECONDS))
{
// Same as for writes, see AbstractWriteResponseHandler
-int acks = received.get();
-if (resolver.isDataPresent() acks = blockfor)
-acks = blockfor - 1;
ReadTimeoutException ex = new
ReadTimeoutException(consistencyLevel, received.get(), blockfor,
resolver.isDataPresent());
if (logger.isDebugEnabled())
logger.debug(Read timeout: {}, ex.toString());
[1/2] git commit: remove dead code
Updated Branches:
refs/heads/trunk 88bef0cbf - c3670e4f8
remove dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e0ce7a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e0ce7a0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e0ce7a0
Branch: refs/heads/trunk
Commit: 6e0ce7a0507f58aab61343bdc6e8d955834cb321
Parents: ce9c8c2
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Thu Feb 6 23:40:32 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Thu Feb 6 23:40:32 2014 -0500
--
src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 3 ---
1 file changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e0ce7a0/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index 535dbb3..e9d55d4 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@ -49,7 +49,6 @@ public class DynamicEndpointSnitch extends
AbstractEndpointSnitch implements ILa
private boolean registered = false;
private final ConcurrentHashMapInetAddress, Double scores = new
ConcurrentHashMapInetAddress, Double();
-private final ConcurrentHashMapInetAddress, Long lastReceived = new
ConcurrentHashMapInetAddress, Long();
private final ConcurrentHashMapInetAddress, ExponentiallyDecayingSample
samples = new ConcurrentHashMapInetAddress, ExponentiallyDecayingSample();
public final IEndpointSnitch subsnitch;
@@ -201,8 +200,6 @@ public class DynamicEndpointSnitch extends
AbstractEndpointSnitch implements ILa
public void receiveTiming(InetAddress host, long latency) // this is cheap
{
-lastReceived.put(host, System.nanoTime());
-
ExponentiallyDecayingSample sample = samples.get(host);
if (sample == null)
{
[1/2] git commit: Remove dead code
Updated Branches:
refs/heads/trunk 2fd2d8978 - d9691e823
Remove dead code
patch by slebresne; reviewed by jbellis for CASSANDRA-6580
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e55e9ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e55e9ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e55e9ff
Branch: refs/heads/trunk
Commit: 0e55e9ff6695504c4698115d8856620b752cf713
Parents: 8b8c159
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Jan 14 15:34:53 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Jan 14 15:35:34 2014 +0100
--
src/java/org/apache/cassandra/db/AtomicSortedColumns.java | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e55e9ff/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
--
diff --git a/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
b/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
index b44d8bf..1c0bf1b 100644
--- a/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
@@ -330,12 +330,7 @@ public class AtomicSortedColumns extends ColumnFamily
Column reconciledColumn = column.reconcile(oldColumn,
allocator);
if (map.replace(name, oldColumn, reconciledColumn))
{
-// for memtable updates we only care about oldcolumn,
reconciledcolumn, but when compacting
-// we need to make sure we update indexes no matter the
order we merge
-if (reconciledColumn == column)
-indexer.update(oldColumn, reconciledColumn);
-else
-indexer.update(column, reconciledColumn);
+indexer.update(oldColumn, reconciledColumn);
return reconciledColumn.dataSize() - oldColumn.dataSize();
}
// We failed to replace column due to a concurrent update or a
concurrent removal. Keep trying.
[1/2] git commit: remove dead code (unused assignments)
remove dead code (unused assignments) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aef01d16 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aef01d16 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aef01d16 Branch: refs/heads/trunk Commit: aef01d1627a4ed303da76f751c7c8c98418e6d45 Parents: 86063aa Author: Dave Brosius dbros...@apache.org Authored: Fri Feb 15 23:35:30 2013 -0500 Committer: Dave Brosius dbros...@apache.org Committed: Fri Feb 15 23:35:30 2013 -0500 -- src/java/org/apache/cassandra/tools/NodeProbe.java |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aef01d16/src/java/org/apache/cassandra/tools/NodeProbe.java -- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 45f6e18..ed93359 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -814,8 +814,6 @@ class ColumnFamilyStoreMBeanIterator implements IteratorMap.EntryString, Colum return tableCmp; // get CF name and split it for index name -String q = e1.getValue().getColumnFamilyName(); -String h = e2.getValue().getColumnFamilyName(); String e1CF[] = e1.getValue().getColumnFamilyName().split(\\.); String e2CF[] = e1.getValue().getColumnFamilyName().split(\\.); assert e1CF.length = 2 e2CF.length = 2 : unexpected split count for column family name;
