cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 6afe13f6f -> 4864ccf61 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/4864ccf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4864ccf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4864ccf6 Branch: refs/heads/trunk Commit: 4864ccf61811f0469dfc77fc83c5313bb77213ee Parents: 6afe13f Author: Dave Brosius Authored: Sat Sep 30 19:08:04 2017 -0400 Committer: Dave Brosius Committed: Sat Sep 30 19:08:04 2017 -0400 -- src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4864ccf6/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java -- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java index 75ef8e9..078bb53 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java @@ -81,7 +81,6 @@ public class CommitLogReader private static boolean shouldSkip(File file) throws IOException, ConfigurationException { -CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(file.getName()); try(RandomAccessReader reader = RandomAccessReader.open(file)) { CommitLogDescriptor.readHeader(reader, DatabaseDescriptor.getEncryptionContext()); - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 74647a8cc -> da995b72e 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/da995b72 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da995b72 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da995b72 Branch: refs/heads/trunk Commit: da995b72e3577a058606afbbb82a873089c47a80 Parents: 74647a8 Author: Dave Brosius Authored: Wed Jul 13 01:04:03 2016 -0400 Committer: Dave Brosius Committed: Wed Jul 13 01:04:34 2016 -0400 -- .../apache/cassandra/db/filter/ClusteringIndexSliceFilter.java | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/da995b72/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java -- diff --git a/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java b/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java index ba30dcf..02a44d7 100644 --- a/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ClusteringIndexSliceFilter.java @@ -94,11 +94,6 @@ public class ClusteringIndexSliceFilter extends AbstractClusteringIndexFilter // the range extend) and it's harmless to leave them. class FilterNotIndexed extends Transformation { -public boolean isDoneForPartition() -{ -return tester.isDone(); -} - @Override public Row applyToRow(Row row) {
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk fe5ef557c -> f2251aa41 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/f2251aa4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2251aa4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2251aa4 Branch: refs/heads/trunk Commit: f2251aa41a766bf65363540608909238685a6b1a Parents: fe5ef55 Author: Dave Brosius Authored: Wed Jun 15 20:29:34 2016 -0400 Committer: Dave Brosius Committed: Wed Jun 15 20:29:34 2016 -0400 -- src/java/org/apache/cassandra/db/view/View.java | 8 1 file changed, 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2251aa4/src/java/org/apache/cassandra/db/view/View.java -- diff --git a/src/java/org/apache/cassandra/db/view/View.java b/src/java/org/apache/cassandra/db/view/View.java index 771c242..8babc99 100644 --- a/src/java/org/apache/cassandra/db/view/View.java +++ b/src/java/org/apache/cassandra/db/view/View.java @@ -17,9 +17,7 @@ */ package org.apache.cassandra.db.view; -import java.nio.ByteBuffer; import java.util.*; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -31,16 +29,11 @@ import org.apache.cassandra.cql3.statements.ParsedStatement; import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.db.*; import org.apache.cassandra.config.*; -import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.db.partitions.*; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.service.ClientState; -import org.apache.cassandra.service.pager.QueryPager; -import org.apache.cassandra.transport.Server; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.btree.BTreeSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -96,7 +89,6 @@ public class View { this.definition = definition; -CFMetaData viewCfm = definition.metadata; List nonPKDefPartOfViewPK = new ArrayList<>(); for (ColumnDefinition baseColumn : baseCfs.metadata.allColumns()) {
[1/5] cassandra git commit: Remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 966bea74b -> 829b9b78c 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/6a86d221 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a86d221 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a86d221 Branch: refs/heads/trunk Commit: 6a86d221a5b4dc11784a022917d0e4c6845e03aa Parents: 796b0f2 Author: Sylvain Lebresne Authored: Wed Sep 2 17:22:53 2015 +0200 Committer: Sylvain Lebresne Committed: Wed Sep 2 17:22:53 2015 +0200 -- src/java/org/apache/cassandra/db/ReadCommand.java | 9 - 1 file changed, 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a86d221/src/java/org/apache/cassandra/db/ReadCommand.java -- diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java index 0bc8cea..0ccd229 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -971,21 +971,12 @@ public abstract class ReadCommand implements ReadQuery LegacyLayout.LegacyBound startBound = LegacyLayout.decodeBound(metadata, ByteBufferUtil.readWithShortLength(in), true); ByteBufferUtil.readWithShortLength(in); // the composite "stop", which isn't actually needed -// pre-3.0 nodes will sometimes use a clustering prefix for the Command-level start and stop, but in all -// cases this should also be represented by the ClusteringIndexFilter, so we can ignore them -Clustering startClustering; -if (startBound == LegacyLayout.LegacyBound.BOTTOM || startBound.bound.size() < metadata.comparator.size()) -startClustering = Clustering.EMPTY; -else -startClustering = startBound.getAsClustering(metadata); - ColumnFilter selection = LegacyRangeSliceCommandSerializer.getColumnSelectionForSlice(filter, compositesToGroup, metadata); RowFilter rowFilter = LegacyRangeSliceCommandSerializer.deserializeRowFilter(in, metadata); int maxResults = in.readInt(); in.readBoolean(); // countCQL3Rows - boolean selectsStatics = (!selection.fetchedColumns().statics.isEmpty() || filter.selects(Clustering.STATIC_CLUSTERING)); boolean isDistinct = compositesToGroup == -2 || (perPartitionLimit == 1 && selectsStatics); DataLimits limits;
cassandra git commit: Remove dead code
Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 796b0f26a -> 6a86d221a 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/6a86d221 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a86d221 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a86d221 Branch: refs/heads/cassandra-3.0 Commit: 6a86d221a5b4dc11784a022917d0e4c6845e03aa Parents: 796b0f2 Author: Sylvain Lebresne Authored: Wed Sep 2 17:22:53 2015 +0200 Committer: Sylvain Lebresne Committed: Wed Sep 2 17:22:53 2015 +0200 -- src/java/org/apache/cassandra/db/ReadCommand.java | 9 - 1 file changed, 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a86d221/src/java/org/apache/cassandra/db/ReadCommand.java -- diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java index 0bc8cea..0ccd229 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -971,21 +971,12 @@ public abstract class ReadCommand implements ReadQuery LegacyLayout.LegacyBound startBound = LegacyLayout.decodeBound(metadata, ByteBufferUtil.readWithShortLength(in), true); ByteBufferUtil.readWithShortLength(in); // the composite "stop", which isn't actually needed -// pre-3.0 nodes will sometimes use a clustering prefix for the Command-level start and stop, but in all -// cases this should also be represented by the ClusteringIndexFilter, so we can ignore them -Clustering startClustering; -if (startBound == LegacyLayout.LegacyBound.BOTTOM || startBound.bound.size() < metadata.comparator.size()) -startClustering = Clustering.EMPTY; -else -startClustering = startBound.getAsClustering(metadata); - ColumnFilter selection = LegacyRangeSliceCommandSerializer.getColumnSelectionForSlice(filter, compositesToGroup, metadata); RowFilter rowFilter = LegacyRangeSliceCommandSerializer.deserializeRowFilter(in, metadata); int maxResults = in.readInt(); in.readBoolean(); // countCQL3Rows - boolean selectsStatics = (!selection.fetchedColumns().statics.isEmpty() || filter.selects(Clustering.STATIC_CLUSTERING)); boolean isDistinct = compositesToGroup == -2 || (perPartitionLimit == 1 && selectsStatics); DataLimits limits;
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk f55a4f451 -> 48c25ba2e 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/48c25ba2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48c25ba2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48c25ba2 Branch: refs/heads/trunk Commit: 48c25ba2e6595331191b8bdb7787bf8a593d8607 Parents: f55a4f4 Author: Dave Brosius Authored: Thu May 28 22:34:00 2015 -0400 Committer: Dave Brosius Committed: Thu May 28 22:34:00 2015 -0400 -- .../cassandra/cql3/statements/DropFunctionStatement.java | 8 1 file changed, 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48c25ba2/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java -- diff --git a/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java index edd8a65..3957d97 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java @@ -162,14 +162,6 @@ public final class DropFunctionStatement extends SchemaAlteringStatement return sb.toString(); } -private String typeKeyspace(CQL3Type.Raw rawType) -{ -String ks = rawType.keyspace(); -if (ks != null) -return ks; -return functionName.keyspace; -} - private Function findFunction() { Function old;
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 792446a5a -> 5023e620d 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/5023e620 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5023e620 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5023e620 Branch: refs/heads/trunk Commit: 5023e620db0c975150d40dbd4c4bc86200c3527d Parents: 792446a Author: Dave Brosius Authored: Thu Apr 23 22:55:35 2015 -0400 Committer: Dave Brosius Committed: Thu Apr 23 22:55:35 2015 -0400 -- .../apache/cassandra/serializers/ListSerializer.java | 14 -- .../apache/cassandra/serializers/MapSerializer.java | 15 --- .../apache/cassandra/serializers/SetSerializer.java | 13 - 3 files changed, 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5023e620/src/java/org/apache/cassandra/serializers/ListSerializer.java -- diff --git a/src/java/org/apache/cassandra/serializers/ListSerializer.java b/src/java/org/apache/cassandra/serializers/ListSerializer.java index 2bbb6d4..aeee2b9 100644 --- a/src/java/org/apache/cassandra/serializers/ListSerializer.java +++ b/src/java/org/apache/cassandra/serializers/ListSerializer.java @@ -112,20 +112,6 @@ public class ListSerializer extends CollectionSerializer> } /** - * Deserializes a serialized list and returns a list of unserialized (ByteBuffer) elements. - */ -public List deserializeToByteBufferCollection(ByteBuffer bytes, int version) -{ -ByteBuffer input = bytes.duplicate(); -int n = readCollectionSize(input, version); -List l = new ArrayList<>(n); -for (int i = 0; i < n; i++) -l.add(readValue(input, version)); - -return l; -} - -/** * Returns the element at the given index in a list. * @param serializedList a serialized list * @param index the index to get http://git-wip-us.apache.org/repos/asf/cassandra/blob/5023e620/src/java/org/apache/cassandra/serializers/MapSerializer.java -- diff --git a/src/java/org/apache/cassandra/serializers/MapSerializer.java b/src/java/org/apache/cassandra/serializers/MapSerializer.java index 87b620a..8350f66 100644 --- a/src/java/org/apache/cassandra/serializers/MapSerializer.java +++ b/src/java/org/apache/cassandra/serializers/MapSerializer.java @@ -116,21 +116,6 @@ public class MapSerializer extends CollectionSerializer> } /** - * Deserializes a serialized map and returns a map of unserialized (ByteBuffer) keys and values. - */ -public Map deserializeToByteBufferCollection(ByteBuffer bytes, int protocolVersion) -{ -ByteBuffer input = bytes.duplicate(); -int n = readCollectionSize(input, protocolVersion); -Map m = new LinkedHashMap<>(n); - -for (int i = 0; i < n; i++) -m.put(readValue(input, protocolVersion), readValue(input, protocolVersion)); - -return m; -} - -/** * Given a serialized map, gets the value associated with a given key. * @param serializedMap a serialized map * @param serializedKey a serialized key http://git-wip-us.apache.org/repos/asf/cassandra/blob/5023e620/src/java/org/apache/cassandra/serializers/SetSerializer.java -- diff --git a/src/java/org/apache/cassandra/serializers/SetSerializer.java b/src/java/org/apache/cassandra/serializers/SetSerializer.java index 970cfab..21f5075 100644 --- a/src/java/org/apache/cassandra/serializers/SetSerializer.java +++ b/src/java/org/apache/cassandra/serializers/SetSerializer.java @@ -98,19 +98,6 @@ public class SetSerializer extends CollectionSerializer> } } -/** - * Deserializes a serialized set and returns a set of unserialized (ByteBuffer) elements. - */ -public Set deserializeToByteBufferCollection(ByteBuffer bytes, int version) -{ -ByteBuffer input = bytes.duplicate(); -int n = readCollectionSize(input, version); -Set s = new LinkedHashSet<>(n); -for (int i = 0; i < n; i++) -s.add(readValue(input, version)); -return s; -} - public String toString(Set value) { StringBuilder sb = new StringBuilder();
cassandra git commit: remove dead code left over from removal of commitlog_periodic_queue_size setting see cassandra-8697
Repository: cassandra Updated Branches: refs/heads/trunk 5de72e548 -> 9bba842c1 remove dead code left over from removal of commitlog_periodic_queue_size setting see cassandra-8697 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bba842c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bba842c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bba842c Branch: refs/heads/trunk Commit: 9bba842c1c50bf944f449d2662a54284b4d5f74b Parents: 5de72e5 Author: Dave Brosius Authored: Fri Apr 17 02:03:00 2015 -0400 Committer: Dave Brosius Committed: Fri Apr 17 02:03:00 2015 -0400 -- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bba842c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index fd1faeb..76ef4c5 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -1274,11 +1274,6 @@ public class DatabaseDescriptor conf.commitlog_sync_period_in_ms = periodMillis; } -public static int getCommitLogPeriodicQueueSize() -{ -return conf.commitlog_periodic_queue_size; -} - public static Config.CommitLogSync getCommitLogSync() { return conf.commitlog_sync;
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk e4b158f6a -> 7f0a8542d 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/7f0a8542 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f0a8542 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f0a8542 Branch: refs/heads/trunk Commit: 7f0a8542d684d3bd9b597b5eab332355315c4942 Parents: e4b158f Author: Dave Brosius Authored: Tue Mar 31 23:53:31 2015 -0400 Committer: Dave Brosius Committed: Tue Mar 31 23:53:31 2015 -0400 -- src/java/org/apache/cassandra/thrift/CassandraServer.java | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f0a8542/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 e92e0c6..c6d2600 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -581,13 +581,6 @@ public class CassandraServer implements Cassandra.Iface } } -private static ByteBuffer getName(ColumnOrSuperColumn cosc) -{ -return cosc.isSetSuper_column() ? cosc.super_column.name : - (cosc.isSetColumn() ? cosc.column.name : - (cosc.isSetCounter_column() ? cosc.counter_column.name : cosc.counter_super_column.name)); -} - public Map multiget_count(List keys, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException {
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk c0fc8d823 -> 7ea642c89 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/7ea642c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ea642c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ea642c8 Branch: refs/heads/trunk Commit: 7ea642c89c124f0515754ceb8a163370e8d74578 Parents: c0fc8d8 Author: Dave Brosius Authored: Sun Mar 29 20:35:24 2015 -0400 Committer: Dave Brosius Committed: Sun Mar 29 20:35:24 2015 -0400 -- src/java/org/apache/cassandra/utils/IntervalTree.java | 9 - 1 file changed, 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ea642c8/src/java/org/apache/cassandra/utils/IntervalTree.java -- diff --git a/src/java/org/apache/cassandra/utils/IntervalTree.java b/src/java/org/apache/cassandra/utils/IntervalTree.java index 0c3c611..4522e27 100644 --- a/src/java/org/apache/cassandra/utils/IntervalTree.java +++ b/src/java/org/apache/cassandra/utils/IntervalTree.java @@ -47,19 +47,10 @@ public class IntervalTree, D, I extends Interval protected IntervalTree(Collection intervals) { -final IntervalTree it = this; this.head = intervals == null || intervals.isEmpty() ? null : new IntervalNode(intervals); this.count = intervals == null ? 0 : intervals.size(); } -public static , D, I extends Interval> IntervalTree build(Collection intervals, Comparator comparator) -{ -if (intervals == null || intervals.isEmpty()) -return emptyTree(); - -return new IntervalTree(intervals); -} - public static , D, I extends Interval> IntervalTree build(Collection intervals) { if (intervals == null || intervals.isEmpty())
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 5a09483df -> 45259f095 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/45259f09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45259f09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45259f09 Branch: refs/heads/trunk Commit: 45259f0958b5b8b43af0d399bb71c24bf9b53322 Parents: 5a09483 Author: Dave Brosius Authored: Tue Mar 17 22:17:21 2015 -0400 Committer: Dave Brosius Committed: Tue Mar 17 22:17:21 2015 -0400 -- .../org/apache/cassandra/db/DataTracker.java | 18 +- .../apache/cassandra/service/StorageService.java | 19 --- 2 files changed, 1 insertion(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45259f09/src/java/org/apache/cassandra/db/DataTracker.java -- diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java index 19f027c..ca96a38 100644 --- a/src/java/org/apache/cassandra/db/DataTracker.java +++ b/src/java/org/apache/cassandra/db/DataTracker.java @@ -205,7 +205,7 @@ public class DataTracker if (Iterables.any(sstables, Predicates.in(currentView.compacting))) return false; -Predicate live = new Predicate() +Predicate live = new Predicate() { public boolean apply(SSTableReader sstable) { @@ -774,22 +774,6 @@ public class DataTracker return new View(liveMemtables, flushingMemtables, sstablesMap, compactingNew, shadowed, intervalTree); } -private Set newSSTables(Collection oldSSTables, Iterable replacements) -{ -ImmutableSet oldSet = ImmutableSet.copyOf(oldSSTables); -int newSSTablesSize = sstables.size() - oldSSTables.size() + Iterables.size(replacements); -assert newSSTablesSize >= Iterables.size(replacements) : String.format("Incoherent new size %d replacing %s by %s in %s", newSSTablesSize, oldSSTables, replacements, this); -Set newSSTables = new HashSet<>(newSSTablesSize); - -for (SSTableReader sstable : sstables) -if (!oldSet.contains(sstable)) -newSSTables.add(sstable); - -Iterables.addAll(newSSTables, replacements); -assert newSSTables.size() == newSSTablesSize : String.format("Expecting new size of %d, got %d while replacing %s by %s in %s", newSSTablesSize, newSSTables.size(), oldSSTables, replacements, this); -return ImmutableSet.copyOf(newSSTables); -} - @Override public String toString() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/45259f09/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 19e0a5a..b1f352c 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -2600,7 +2600,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE * @param endToken end token of the range * @return collection of ranges that match ring layout in TokenMetadata */ -@SuppressWarnings("unchecked") @VisibleForTesting Collection> createRepairRangeFrom(String beginToken, String endToken) { @@ -3631,24 +3630,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE return finalOwnership; } - -private boolean hasSameReplication(List list) -{ -if (list.isEmpty()) -return false; - -for (int i = 0; i < list.size() -1; i++) -{ -KSMetaData ksm1 = Schema.instance.getKSMetaData(list.get(i)); -KSMetaData ksm2 = Schema.instance.getKSMetaData(list.get(i + 1)); -if (!ksm1.strategyClass.equals(ksm2.strategyClass) || - !Iterators.elementsEqual(ksm1.strategyOptions.entrySet().iterator(), - ksm2.strategyOptions.entrySet().iterator())) -return false; -} -return true; -} - public List getKeyspaces() { List keyspaceNamesList = new ArrayList<>(Schema.instance.getKeyspaces());
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 217721ae9 -> ca41972ea 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/ca41972e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca41972e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca41972e Branch: refs/heads/trunk Commit: ca41972ea011ee9e082c02afb1c37e1151b8cd2d Parents: 217721a Author: Dave Brosius Authored: Fri Feb 6 08:13:44 2015 -0500 Committer: Dave Brosius Committed: Fri Feb 6 08:13:44 2015 -0500 -- .../org/apache/cassandra/service/StorageServiceServerTest.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca41972e/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java -- diff --git a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java index d1a4d85..a20fa6c 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java @@ -476,8 +476,6 @@ public class StorageServiceServerTest metadata.updateNormalToken(new LongToken(3000L), InetAddress.getByName("127.0.0.3")); metadata.updateNormalToken(new LongToken(4000L), InetAddress.getByName("127.0.0.4")); -Map configOptions = new HashMap(); -configOptions.put("replication_factor", "3"); Collection> repairRangeFrom = StorageService.instance.createRepairRangeFrom("1500", "3700"); assert repairRangeFrom.size() == 3; assert repairRangeFrom.contains(new Range(new LongToken(1500L), new LongToken(2000L)));
cassandra git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 64e39a039 -> 02367e78b 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/02367e78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02367e78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02367e78 Branch: refs/heads/trunk Commit: 02367e78b573925a864ab8f94ba0a69950ca74f5 Parents: 64e39a0 Author: Dave Brosius Authored: Tue Jan 27 20:35:18 2015 -0500 Committer: Dave Brosius Committed: Tue Jan 27 20:36:45 2015 -0500 -- test/unit/org/apache/cassandra/Util.java | 37 --- 1 file changed, 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02367e78/test/unit/org/apache/cassandra/Util.java -- diff --git a/test/unit/org/apache/cassandra/Util.java b/test/unit/org/apache/cassandra/Util.java index cdb7ac6..24e334a 100644 --- a/test/unit/org/apache/cassandra/Util.java +++ b/test/unit/org/apache/cassandra/Util.java @@ -211,27 +211,6 @@ public class Util return cfStore.getColumnFamily(QueryFilter.getIdentityFilter(key, cfName, System.currentTimeMillis())); } -public static byte[] concatByteArrays(byte[] first, byte[]... remaining) -{ -int length = first.length; -for (byte[] array : remaining) -{ -length += array.length; -} - -byte[] result = new byte[length]; -System.arraycopy(first, 0, result, 0, first.length); -int offset = first.length; - -for (byte[] array : remaining) -{ -System.arraycopy(array, 0, result, offset, array.length); -offset += array.length; -} - -return result; -} - public static boolean equalsCounterId(CounterId n, ByteBuffer context, int offset) { return CounterId.wrap(context, context.position() + offset).equals(n); @@ -313,22 +292,6 @@ public class Util assert thrown : exception.getName() + " not received"; } -public static ByteBuffer serializeForSSTable(ColumnFamily cf) -{ -try -{ -DataOutputBuffer out = new DataOutputBuffer(); - DeletionTime.serializer.serialize(cf.deletionInfo().getTopLevelDeletion(), out); -out.writeInt(cf.getColumnCount()); -new ColumnIndex.Builder(cf, ByteBufferUtil.EMPTY_BYTE_BUFFER, out).build(cf); -return ByteBuffer.wrap(out.toByteArray()); -} -catch (IOException e) -{ -throw new RuntimeException(e); -} -} - public static QueryFilter namesQueryFilter(ColumnFamilyStore cfs, DecoratedKey key) { SortedSet s = new TreeSet(cfs.getComparator());
[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 Authored: Thu Oct 23 22:54:07 2014 -0400 Committer: Dave Brosius 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 RecordReader super(); } +@Override public void initialize(InputSplit split, TaskAttemptContext context) throws IOException { this.split = (ColumnFamilySplit) split; @@ -109,7 +110,6 @@ public class CqlRecordReader extends RecordReader partitioner = ConfigHelper.getInputPartitioner(conf); inputColumns = CqlConfigHelper.getInputcolumns(conf); userDefinedWhereClauses = CqlConfigHelper.getInputWhereClauses(conf); -Optional pageRowSizeOptional = CqlConfigHelper.getInputPageRowSize(conf); try {
git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 8e5fdc2f9 -> 1d5d30327 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/cassandra-2.1 Commit: 1d5d30327541e1f91cd6f4e8cd9fc5a39a146aa2 Parents: 8e5fdc2 Author: Dave Brosius Authored: Thu Oct 23 22:54:07 2014 -0400 Committer: Dave Brosius 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 RecordReader super(); } +@Override public void initialize(InputSplit split, TaskAttemptContext context) throws IOException { this.split = (ColumnFamilySplit) split; @@ -109,7 +110,6 @@ public class CqlRecordReader extends RecordReader partitioner = ConfigHelper.getInputPartitioner(conf); inputColumns = CqlConfigHelper.getInputcolumns(conf); userDefinedWhereClauses = CqlConfigHelper.getInputWhereClauses(conf); -Optional pageRowSizeOptional = CqlConfigHelper.getInputPageRowSize(conf); try {
git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 52d09eaa7 -> fb6c28514 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/fb6c2851 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb6c2851 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb6c2851 Branch: refs/heads/trunk Commit: fb6c28514c5aabf56d64042652c1c079ec1642c8 Parents: 52d09ea Author: Dave Brosius Authored: Sun Sep 14 22:29:49 2014 -0400 Committer: Dave Brosius Committed: Sun Sep 14 22:29:49 2014 -0400 -- src/java/org/apache/cassandra/service/StorageService.java | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb6c2851/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 0e1ab2a..88c9a83 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3631,9 +3631,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE TokenMetadata metadata = tokenMetadata.cloneOnlyTokenMap(); -if (keyspace == null) -keyspace = Schema.instance.getNonSystemKeyspaces().get(0); - Collection> endpointsGroupedByDc = new ArrayList<>(); // mapping of dc's to nodes, use sorted map so that we get dcs sorted SortedMap> sortedDcsToEndpoints = new TreeMap<>();
git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 5cc7a11ab -> bd889dc41 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/bd889dc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd889dc4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd889dc4 Branch: refs/heads/trunk Commit: bd889dc41f97dcbf6d2b223b73f934a64c261c5c Parents: 5cc7a11 Author: Dave Brosius Authored: Sat Sep 6 14:44:07 2014 -0400 Committer: Dave Brosius Committed: Sat Sep 6 14:44:07 2014 -0400 -- src/java/org/apache/cassandra/utils/UUIDGen.java | 6 -- 1 file changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd889dc4/src/java/org/apache/cassandra/utils/UUIDGen.java -- diff --git a/src/java/org/apache/cassandra/utils/UUIDGen.java b/src/java/org/apache/cassandra/utils/UUIDGen.java index 5c39c2c..33f14a4 100644 --- a/src/java/org/apache/cassandra/utils/UUIDGen.java +++ b/src/java/org/apache/cassandra/utils/UUIDGen.java @@ -243,12 +243,6 @@ public class UUIDGen return createTime(nanosSince); } -/** @param when time in milliseconds */ -private long createTimeUnsafe(long when) -{ -return createTimeUnsafe(when, 0); -} - private long createTimeUnsafe(long when, int nanos) { long nanosSince = ((when - START_EPOCH) * 1) + nanos;
git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk eeb150e9e -> 54e7f96e4 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/54e7f96e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54e7f96e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54e7f96e Branch: refs/heads/trunk Commit: 54e7f96e42b768cbac67bc5b381c904dfe481c7c Parents: eeb150e Author: Dave Brosius Authored: Mon Sep 1 13:04:34 2014 -0400 Committer: Dave Brosius Committed: Mon Sep 1 13:04:34 2014 -0400 -- src/java/org/apache/cassandra/cql3/Cql.g | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/54e7f96e/src/java/org/apache/cassandra/cql3/Cql.g -- diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g index 054f1a2..a564f1c 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -323,10 +323,9 @@ whereClause returns [List clause] orderByClause[Map orderings] @init{ -ColumnIdentifier orderBy = null; boolean reversed = false; } -: c=cident { orderBy = c; } (K_ASC | K_DESC { reversed = true; })? { orderings.put(c, reversed); } +: c=cident (K_ASC | K_DESC { reversed = true; })? { orderings.put(c, reversed); } ; /**
[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 Authored: Tue Mar 25 00:31:26 2014 -0400 Committer: Dave Brosius 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 (Range 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 AbstractPartitioner for (Range 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 List, Long>> getSplits(String keyspaceName, String cfName, Range range, int keysPerSplit, CFMetaData metadata) +public List, Long>> getSplits(String keyspaceName, String cfName, Range 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))); List tokens = keysToTokens(range, keys); -return getSplits(tokens, splitCount, metadata, cfs); +return getSplits(tokens, splitCount, cfs); } -private List, Long>> get
git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 8a2a0c3d4 -> 9ef881568 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/cassandra-2.1 Commit: 9ef88156884419bd4bba6f10a24a60a2e7252c37 Parents: 8a2a0c3 Author: Dave Brosius Authored: Tue Mar 25 00:31:26 2014 -0400 Committer: Dave Brosius 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 (Range 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 AbstractPartitioner for (Range 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 List, Long>> getSplits(String keyspaceName, String cfName, Range range, int keysPerSplit, CFMetaData metadata) +public List, Long>> getSplits(String keyspaceName, String cfName, Range 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))); List tokens = keysToTokens(range, keys); -return getSplits(tokens, splitCount, metadata, cfs); +return getSplits(tokens, splitCount, cfs); } -private
git commit: remove dead code
Repository: cassandra Updated Branches: refs/heads/trunk 283175ee6 -> 2639ac2ae 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/2639ac2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2639ac2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2639ac2a Branch: refs/heads/trunk Commit: 2639ac2ae94f8a2d773cf333a2631772df479325 Parents: 283175e Author: Dave Brosius Authored: Tue Mar 18 21:03:50 2014 -0400 Committer: Dave Brosius Committed: Tue Mar 18 21:03:50 2014 -0400 -- .../apache/cassandra/locator/OldNetworkTopologyStrategyTest.java | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2639ac2a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java -- diff --git a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java index 14cb54d..4ae21c0 100644 --- a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java @@ -43,7 +43,6 @@ import org.junit.Test; public class OldNetworkTopologyStrategyTest extends SchemaLoader { -private List endpointTokens; private List keyTokens; private TokenMetadata tmd; private Map> expectedResults; @@ -51,7 +50,6 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader @Before public void init() { -endpointTokens = new ArrayList(); keyTokens = new ArrayList(); tmd = new TokenMetadata(); expectedResults = new HashMap>(); @@ -145,7 +143,6 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader private void addEndpoint(String endpointTokenID, String keyTokenID, String endpointAddress) throws UnknownHostException { BigIntegerToken endpointToken = new BigIntegerToken(endpointTokenID); -endpointTokens.add(endpointToken); BigIntegerToken keyToken = new BigIntegerToken(keyTokenID); keyTokens.add(keyToken);
[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 Authored: Wed Feb 12 20:50:35 2014 -0500 Committer: Dave Brosius 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 ReadCallback implements IAsyncCallback= blockfor) -acks = blockfor - 1; ReadTimeoutException ex = new ReadTimeoutException(consistencyLevel, received.get(), blockfor, resolver.isDataPresent()); if (logger.isDebugEnabled()) logger.debug("Read timeout: {}", ex.toString());
git commit: remove dead code
Updated Branches: refs/heads/cassandra-2.0 de6a74a2d -> 5f60fcc39 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/cassandra-2.0 Commit: 5f60fcc39c9ac8958bd2d8565404515f919d8124 Parents: de6a74a Author: Dave Brosius Authored: Wed Feb 12 20:50:35 2014 -0500 Committer: Dave Brosius 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 ReadCallback implements IAsyncCallback= blockfor) -acks = blockfor - 1; ReadTimeoutException ex = new ReadTimeoutException(consistencyLevel, received.get(), blockfor, resolver.isDataPresent()); if (logger.isDebugEnabled()) logger.debug("Read timeout: {}", ex.toString());
git commit: remove dead code
Updated Branches: refs/heads/trunk 813da911b -> bcfaeaa9c 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/bcfaeaa9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcfaeaa9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcfaeaa9 Branch: refs/heads/trunk Commit: bcfaeaa9c88c056cc36b47ae2df49062316cac83 Parents: 813da91 Author: Dave Brosius Authored: Fri Feb 7 23:05:41 2014 -0500 Committer: Dave Brosius Committed: Fri Feb 7 23:05:41 2014 -0500 -- .../org/apache/cassandra/db/commitlog/CommitLogReplayer.java| 4 ++-- src/java/org/apache/cassandra/service/StorageProxy.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcfaeaa9/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java -- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java index 00c8bb4..df28b8e 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java @@ -147,7 +147,7 @@ public class CommitLogReplayer return end; } -private int getStartOffset(long segmentId, int version, File file) +private int getStartOffset(long segmentId, int version) { if (globalPosition.segment < segmentId) { @@ -236,7 +236,7 @@ public class CommitLogReplayer try { assert reader.length() <= Integer.MAX_VALUE; -int offset = getStartOffset(segmentId, version, file); +int offset = getStartOffset(segmentId, version); if (offset < 0) { logger.debug("skipping replay of fully-flushed {}", file); http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcfaeaa9/src/java/org/apache/cassandra/service/StorageProxy.java -- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 69d7123..8c31192 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -563,7 +563,7 @@ public class StorageProxy implements StorageProxyMBean syncWriteToBatchlog(mutations, batchlogEndpoints, batchUUID); // now actually perform the writes and wait for them to complete -syncWriteBatchedMutations(wrappers, localDataCenter, consistency_level); +syncWriteBatchedMutations(wrappers, localDataCenter); // remove the batchlog entries asynchronously asyncRemoveFromBatchlog(batchlogEndpoints, batchUUID); @@ -630,8 +630,7 @@ public class StorageProxy implements StorageProxyMBean } private static void syncWriteBatchedMutations(List wrappers, - String localDataCenter, - ConsistencyLevel consistencyLevel) + String localDataCenter) throws WriteTimeoutException, OverloadedException { for (WriteResponseHandlerWrapper wrapper : wrappers)
[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 Authored: Thu Feb 6 23:40:32 2014 -0500 Committer: Dave Brosius 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 ConcurrentHashMap scores = new ConcurrentHashMap(); -private final ConcurrentHashMap lastReceived = new ConcurrentHashMap(); private final ConcurrentHashMap samples = new ConcurrentHashMap(); 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) {
git commit: remove dead code
Updated Branches: refs/heads/cassandra-2.0 ce9c8c2cd -> 6e0ce7a05 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/cassandra-2.0 Commit: 6e0ce7a0507f58aab61343bdc6e8d955834cb321 Parents: ce9c8c2 Author: Dave Brosius Authored: Thu Feb 6 23:40:32 2014 -0500 Committer: Dave Brosius 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 ConcurrentHashMap scores = new ConcurrentHashMap(); -private final ConcurrentHashMap lastReceived = new ConcurrentHashMap(); private final ConcurrentHashMap samples = new ConcurrentHashMap(); 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 Authored: Tue Jan 14 15:34:53 2014 +0100 Committer: Sylvain Lebresne 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.
git commit: Remove dead code
Updated Branches: refs/heads/cassandra-2.0 8b8c159f4 -> 0e55e9ff6 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/cassandra-2.0 Commit: 0e55e9ff6695504c4698115d8856620b752cf713 Parents: 8b8c159 Author: Sylvain Lebresne Authored: Tue Jan 14 15:34:53 2014 +0100 Committer: Sylvain Lebresne 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.
git commit: remove dead code
Updated Branches: refs/heads/trunk 81f8c75d3 -> 2aeb30cf7 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/2aeb30cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2aeb30cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2aeb30cf Branch: refs/heads/trunk Commit: 2aeb30cf778de079f3a473c167c534085f95714d Parents: 81f8c75d Author: Dave Brosius Authored: Thu Dec 19 20:06:09 2013 -0500 Committer: Dave Brosius Committed: Thu Dec 19 20:06:09 2013 -0500 -- src/java/org/apache/cassandra/config/ColumnDefinition.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2aeb30cf/src/java/org/apache/cassandra/config/ColumnDefinition.java -- diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java b/src/java/org/apache/cassandra/config/ColumnDefinition.java index ef6f589..f16a0a6 100644 --- a/src/java/org/apache/cassandra/config/ColumnDefinition.java +++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java @@ -289,7 +289,6 @@ public class ColumnDefinition extends ColumnSpecification ColumnFamily cf = rm.addOrGet(CFMetaData.SchemaColumnsCf); int ldt = (int) (System.currentTimeMillis() / 1000); -ByteBuffer nameBytes = ByteBufferUtil.bytes(name.toString()); // Note: we do want to use name.toString(), not name.bytes directly for backward compatibility (For CQL3, this won't make a difference). Composite prefix = CFMetaData.SchemaColumnsCf.comparator.make(cfName, name.toString()); cf.addAtom(new RangeTombstone(prefix, prefix.end(), timestamp, ldt));
git commit: remove dead code
Updated Branches: refs/heads/trunk 435f1b72c -> d276d0a06 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/d276d0a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d276d0a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d276d0a0 Branch: refs/heads/trunk Commit: d276d0a0638ff6d80ce8749d2afc1eaa5cfbb14a Parents: 435f1b7 Author: Dave Brosius Authored: Wed Dec 18 23:27:47 2013 -0500 Committer: Dave Brosius Committed: Wed Dec 18 23:27:47 2013 -0500 -- test/unit/org/apache/cassandra/SchemaLoader.java | 11 --- .../unit/org/apache/cassandra/db/SerializationsTest.java | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d276d0a0/test/unit/org/apache/cassandra/SchemaLoader.java -- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 90dc629..df74108 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -34,7 +34,6 @@ import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.*; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.compaction.LeveledCompactionStrategy; -import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.Gossiper; @@ -51,12 +50,12 @@ public class SchemaLoader private static Logger logger = LoggerFactory.getLogger(SchemaLoader.class); @BeforeClass -public static void loadSchema() throws IOException, ConfigurationException +public static void loadSchema() throws ConfigurationException { loadSchema(false); } -public static void loadSchema(boolean withOldCfIds) throws IOException, ConfigurationException +public static void loadSchema(boolean withOldCfIds) throws ConfigurationException { // Cleanup first cleanupAndLeaveDirs(); @@ -115,8 +114,6 @@ public class SchemaLoader Map opts_rf3 = KSMetaData.optsWithRF(3); Map opts_rf5 = KSMetaData.optsWithRF(5); -ColumnFamilyType st = ColumnFamilyType.Standard; -ColumnFamilyType su = ColumnFamilyType.Super; AbstractType bytes = BytesType.instance; AbstractType composite = CompositeType.getInstance(Arrays.asList(new AbstractType[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance})); @@ -397,7 +394,7 @@ public class SchemaLoader DatabaseDescriptor.createAllDirectories(); } -protected void insertData(String keyspace, String columnFamily, int offset, int numberOfRows) throws IOException +protected void insertData(String keyspace, String columnFamily, int offset, int numberOfRows) { for (int i = offset; i < offset + numberOfRows; i++) { @@ -409,7 +406,7 @@ public class SchemaLoader } /* usually used to populate the cache */ -protected void readData(String keyspace, String columnFamily, int offset, int numberOfRows) throws IOException +protected void readData(String keyspace, String columnFamily, int offset, int numberOfRows) { ColumnFamilyStore store = Keyspace.open(keyspace).getColumnFamilyStore(columnFamily); for (int i = offset; i < offset + numberOfRows; i++) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d276d0a0/test/unit/org/apache/cassandra/db/SerializationsTest.java -- diff --git a/test/unit/org/apache/cassandra/db/SerializationsTest.java b/test/unit/org/apache/cassandra/db/SerializationsTest.java index e3a6077..983a8f7 100644 --- a/test/unit/org/apache/cassandra/db/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/db/SerializationsTest.java @@ -50,7 +50,7 @@ public class SerializationsTest extends AbstractSerializationsTester Statics statics = new Statics(); @BeforeClass -public static void loadSchema() throws IOException, ConfigurationException +public static void loadSchema() throws ConfigurationException { loadSchema(true); }
git commit: remove dead code
Updated Branches: refs/heads/trunk 9533b587f -> 5d167cf3d 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/5d167cf3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d167cf3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d167cf3 Branch: refs/heads/trunk Commit: 5d167cf3df23c728034e43a01e7f5e6561094df4 Parents: 9533b58 Author: Dave Brosius Authored: Sat Dec 14 18:37:13 2013 -0500 Committer: Dave Brosius Committed: Sat Dec 14 18:37:13 2013 -0500 -- .../org/apache/cassandra/db/compaction/LeveledManifest.java | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d167cf3/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java -- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index 2ec42e4..4dab156 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.db.compaction; -import java.io.DataOutputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.util.*; @@ -38,8 +36,6 @@ import org.apache.cassandra.db.RowPosition; import org.apache.cassandra.dht.Bounds; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.*; -import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; public class LeveledManifest @@ -185,7 +181,6 @@ public class LeveledManifest private synchronized void sendBackToL0(SSTableReader sstable) { remove(sstable); -String metaDataFile = sstable.descriptor.filenameFor(Component.STATS); try { sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 0);
[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 Authored: Fri Feb 15 23:35:30 2013 -0500 Committer: Dave Brosius 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 Iterator
git commit: remove dead code (unused assignments)
Updated Branches: refs/heads/cassandra-1.2 86063aa20 -> aef01d162 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/cassandra-1.2 Commit: aef01d1627a4ed303da76f751c7c8c98418e6d45 Parents: 86063aa Author: Dave Brosius Authored: Fri Feb 15 23:35:30 2013 -0500 Committer: Dave Brosius 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 Iterator
[3/3] git commit: remove dead code
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/c0a7c032 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0a7c032 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0a7c032 Branch: refs/heads/vnodes Commit: c0a7c032c86d266d6a1d28edcd3c116909cf7d31 Parents: 8821e8b Author: Eric Evans Authored: Wed Jul 18 10:31:56 2012 -0500 Committer: Eric Evans Committed: Wed Jul 18 10:31:56 2012 -0500 -- .../apache/cassandra/service/StorageService.java | 25 --- 1 files changed, 0 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0a7c032/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 99fbd84..b5d6d20 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -2882,31 +2882,6 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe // calculate ownership per dc for (Collection endpoints : endpointsGroupedByDc) { -// sort the endpoints by their tokens -List sortedEndpoints = Lists.newArrayListWithExpectedSize(endpoints.size()); -sortedEndpoints.addAll(endpoints); - -Collections.sort(sortedEndpoints, new Comparator() -{ -public int compare(InetAddress o1, InetAddress o2) -{ -byte[] b1 = o1.getAddress(); -byte[] b2 = o2.getAddress(); - -if(b1.length < b2.length) return -1; -if(b1.length > b2.length) return 1; - -for(int i = 0; i < b1.length; i++) -{ -int left = (int)b1[i] & 0xFF; -int right = (int)b2[i] & 0xFF; -if (left < right) return -1; -else if (left > right) return 1; -} -return 0; -} -}); - // calculate the ownership with replication and add the endpoint to the final ownership map for (InetAddress endpoint : endpoints) {
[5/8] git commit: Remove dead code
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/8ad7840b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ad7840b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ad7840b Branch: refs/heads/trunk Commit: 8ad7840b336f47cf4d6c33da3459121c98db2d48 Parents: 4dcd15f Author: Sylvain Lebresne Authored: Fri Feb 24 12:20:49 2012 +0100 Committer: Sylvain Lebresne Committed: Fri Feb 24 12:21:51 2012 +0100 -- .../org/apache/cassandra/concurrent/Context.java | 51 --- 1 files changed, 0 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ad7840b/src/java/org/apache/cassandra/concurrent/Context.java -- diff --git a/src/java/org/apache/cassandra/concurrent/Context.java b/src/java/org/apache/cassandra/concurrent/Context.java deleted file mode 100644 index d55f0ba..000 --- a/src/java/org/apache/cassandra/concurrent/Context.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.cassandra.concurrent; - -import java.util.HashMap; -import java.util.Map; - -/** - * Context object adding a collection of key/value pairs into ThreadLocalContext. - */ - -public class Context -{ -private Map ht_; - -public Context() -{ -ht_ = new HashMap(); -} - -public Object put(Object key, Object value) -{ -return ht_.put(key, value); -} - -public Object get(Object key) -{ -return ht_.get(key); -} - -public void remove(Object key) -{ -ht_.remove(key); -} -}
[2/4] git commit: Remove dead code
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/8ad7840b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ad7840b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ad7840b Branch: refs/heads/cassandra-1.1 Commit: 8ad7840b336f47cf4d6c33da3459121c98db2d48 Parents: 4dcd15f Author: Sylvain Lebresne Authored: Fri Feb 24 12:20:49 2012 +0100 Committer: Sylvain Lebresne Committed: Fri Feb 24 12:21:51 2012 +0100 -- .../org/apache/cassandra/concurrent/Context.java | 51 --- 1 files changed, 0 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ad7840b/src/java/org/apache/cassandra/concurrent/Context.java -- diff --git a/src/java/org/apache/cassandra/concurrent/Context.java b/src/java/org/apache/cassandra/concurrent/Context.java deleted file mode 100644 index d55f0ba..000 --- a/src/java/org/apache/cassandra/concurrent/Context.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.cassandra.concurrent; - -import java.util.HashMap; -import java.util.Map; - -/** - * Context object adding a collection of key/value pairs into ThreadLocalContext. - */ - -public class Context -{ -private Map ht_; - -public Context() -{ -ht_ = new HashMap(); -} - -public Object put(Object key, Object value) -{ -return ht_.put(key, value); -} - -public Object get(Object key) -{ -return ht_.get(key); -} - -public void remove(Object key) -{ -ht_.remove(key); -} -}
git commit: Remove dead code
Updated Branches: refs/heads/cassandra-1.0 4dcd15f48 -> 8ad7840b3 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/8ad7840b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ad7840b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ad7840b Branch: refs/heads/cassandra-1.0 Commit: 8ad7840b336f47cf4d6c33da3459121c98db2d48 Parents: 4dcd15f Author: Sylvain Lebresne Authored: Fri Feb 24 12:20:49 2012 +0100 Committer: Sylvain Lebresne Committed: Fri Feb 24 12:21:51 2012 +0100 -- .../org/apache/cassandra/concurrent/Context.java | 51 --- 1 files changed, 0 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ad7840b/src/java/org/apache/cassandra/concurrent/Context.java -- diff --git a/src/java/org/apache/cassandra/concurrent/Context.java b/src/java/org/apache/cassandra/concurrent/Context.java deleted file mode 100644 index d55f0ba..000 --- a/src/java/org/apache/cassandra/concurrent/Context.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.cassandra.concurrent; - -import java.util.HashMap; -import java.util.Map; - -/** - * Context object adding a collection of key/value pairs into ThreadLocalContext. - */ - -public class Context -{ -private Map ht_; - -public Context() -{ -ht_ = new HashMap(); -} - -public Object put(Object key, Object value) -{ -return ht_.put(key, value); -} - -public Object get(Object key) -{ -return ht_.get(key); -} - -public void remove(Object key) -{ -ht_.remove(key); -} -}