cassandra git commit: remove dead assignment
Repository: cassandra Updated Branches: refs/heads/trunk 834031cc0 -> 71bfab64b remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71bfab64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71bfab64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71bfab64 Branch: refs/heads/trunk Commit: 71bfab64ba4b7fbc923accb7a99a418e6043ea6b Parents: 834031c Author: Dave Brosius Authored: Fri Jul 14 20:37:56 2017 -0400 Committer: Dave Brosius Committed: Fri Jul 14 20:37:56 2017 -0400 -- src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bfab64/src/java/org/apache/cassandra/index/SecondaryIndexManager.java -- diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java index c2ed134..e253f3b 100644 --- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java @@ -202,7 +202,6 @@ public class SecondaryIndexManager implements IndexRegistry, INotificationConsum private synchronized Future createIndex(IndexMetadata indexDef) { final Index index = createInstance(indexDef); -String indexName = index.getIndexMetadata().name; index.register(this); // now mark as building prior to initializing - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
cassandra git commit: remove dead assignment
Repository: cassandra Updated Branches: refs/heads/trunk 68b915644 -> b2b2b0caf remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2b2b0ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2b2b0ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2b2b0ca Branch: refs/heads/trunk Commit: b2b2b0caf9eec9afded6dedd81a7ec3996605be0 Parents: 68b9156 Author: Dave Brosius Authored: Sun May 1 22:35:50 2016 -0400 Committer: Dave Brosius Committed: Sun May 1 22:35:50 2016 -0400 -- src/java/org/apache/cassandra/tools/JsonTransformer.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2b2b0ca/src/java/org/apache/cassandra/tools/JsonTransformer.java -- diff --git a/src/java/org/apache/cassandra/tools/JsonTransformer.java b/src/java/org/apache/cassandra/tools/JsonTransformer.java index 8e81121..9cf83ac 100644 --- a/src/java/org/apache/cassandra/tools/JsonTransformer.java +++ b/src/java/org/apache/cassandra/tools/JsonTransformer.java @@ -361,7 +361,6 @@ public final class JsonTransformer objectIndenter.setCompact(true); json.writeStartObject(); json.writeFieldName("name"); -AbstractType type = cd.column().type; json.writeString(cd.column().name.toCQLString()); serializeDeletion(complexData.complexDeletion()); objectIndenter.setCompact(true);
git commit: remove dead assignment
Updated Branches: refs/heads/trunk 6f217f7fe -> 6b3b62f98 remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b3b62f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b3b62f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b3b62f9 Branch: refs/heads/trunk Commit: 6b3b62f98e5243b0bf9ecf65cda78989619ae792 Parents: 6f217f7 Author: Dave Brosius Authored: Tue Jul 30 01:11:10 2013 -0400 Committer: Dave Brosius Committed: Tue Jul 30 01:11:10 2013 -0400 -- .../org/apache/cassandra/db/columniterator/IndexedSliceReader.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b3b62f9/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java -- diff --git a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java index a3fbb7f..27d307a 100644 --- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java +++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java @@ -30,7 +30,6 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ColumnSlice; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.sstable.CorruptSSTableException; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.IndexHelper; import org.apache.cassandra.io.sstable.IndexHelper.IndexInfo; import org.apache.cassandra.io.sstable.SSTableReader; @@ -78,7 +77,6 @@ class IndexedSliceReader extends AbstractIterator implements OnDiskA try { -Descriptor.Version version = sstable.descriptor.version; this.indexes = indexEntry.columnsIndex(); emptyColumnFamily = EmptyColumns.factory.create(sstable.metadata); if (indexes.isEmpty())
git commit: remove dead assignment
Updated Branches: refs/heads/trunk 1c686b217 -> 0396ff478 remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0396ff47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0396ff47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0396ff47 Branch: refs/heads/trunk Commit: 0396ff4785ff98956c4aa161cece9fb3d2c8a9fe Parents: 1c686b2 Author: Dave Brosius Authored: Mon Jul 22 01:55:34 2013 -0400 Committer: Dave Brosius Committed: Mon Jul 22 20:27:11 2013 -0400 -- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0396ff47/src/java/org/apache/cassandra/io/sstable/SSTableReader.java -- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java index 95db9f9..9f10061 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java @@ -46,7 +46,6 @@ import org.apache.cassandra.db.RowPosition; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.commitlog.ReplayPosition; import org.apache.cassandra.db.compaction.ICompactionScanner; -import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.dht.*; import org.apache.cassandra.io.compress.CompressedRandomAccessReader; @@ -207,7 +206,6 @@ public class SSTableReader extends SSTable assert components.contains(Component.DATA) : "Data component is missing for sstable" + descriptor; assert components.contains(Component.PRIMARY_INDEX) : "Primary index component is missing for sstable " + descriptor; -long start = System.nanoTime(); logger.info("Opening {} ({} bytes)", descriptor, new File(descriptor.filenameFor(COMPONENT_DATA)).length()); SSTableMetadata sstableMetadata = SSTableMetadata.serializer.deserialize(descriptor).left;
git commit: remove dead assignment
Updated Branches: refs/heads/trunk f6fd5bab7 -> dc51727a1 remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc51727a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc51727a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc51727a Branch: refs/heads/trunk Commit: dc51727a15f0a5936fc70083356ca2a48d4d39ef Parents: f6fd5ba Author: Dave Brosius Authored: Fri Jul 19 00:00:47 2013 -0400 Committer: Dave Brosius Committed: Fri Jul 19 00:00:47 2013 -0400 -- src/java/org/apache/cassandra/io/sstable/SSTableScanner.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc51727a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java -- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java index d0daad8..7e85a9f 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java @@ -127,7 +127,6 @@ public class SSTableScanner implements ICompactionScanner private long computeStopAt() { -AbstractBounds keyRange = dataRange.keyRange(); if (dataRange.stopKey().isMinimum(sstable.partitioner)) return dfile.length();
git commit: remove dead assignment
Updated Branches: refs/heads/trunk 5e70405eb -> c048f97cb remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c048f97c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c048f97c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c048f97c Branch: refs/heads/trunk Commit: c048f97cb02c136d98ba6f711a904881e99e6f5c Parents: 5e70405 Author: Dave Brosius Authored: Fri Jul 12 20:04:30 2013 -0400 Committer: Dave Brosius Committed: Fri Jul 12 20:04:30 2013 -0400 -- src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c048f97c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java -- diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 0796252..35e7060 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -996,7 +996,6 @@ public class SelectStatement implements CQLStatement CFDefinition cfDef = cfm.getCfDef(); ColumnSpecification[] names = new ColumnSpecification[getBoundsTerms()]; -IPartitioner partitioner = StorageService.getPartitioner(); // Select clause if (parameters.isCount && !selectClause.isEmpty())
git commit: remove dead assignment
Updated Branches: refs/heads/trunk f41684fde -> 0f52874ab remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f52874a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f52874a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f52874a Branch: refs/heads/trunk Commit: 0f52874ab5fa857e8f8ead1a52fbb5f0ff27027f Parents: f41684f Author: Dave Brosius Authored: Tue Aug 21 22:59:37 2012 -0400 Committer: Dave Brosius Committed: Tue Aug 21 22:59:37 2012 -0400 -- .../db/index/composites/CompositesIndex.java | 10 +- 1 files changed, 1 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f52874a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java -- diff --git a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java index e53a3bf..f9db99f 100644 --- a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java +++ b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java @@ -17,14 +17,9 @@ */ package org.apache.cassandra.db.index.composites; -import java.io.IOException; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; import java.util.Set; -import java.util.concurrent.ExecutionException; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.*; @@ -32,9 +27,6 @@ import org.apache.cassandra.db.index.AbstractSimplePerColumnSecondaryIndex; import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.index.SecondaryIndexSearcher; import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.dht.*; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.ByteBufferUtil; /** * Implements a secondary index for a column family using a second column family @@ -50,7 +42,7 @@ public class CompositesIndex extends AbstractSimplePerColumnSecondaryIndex public void init(ColumnDefinition columnDef) { assert baseCfs.getComparator() instanceof CompositeType; -CompositeType baseComparator = (CompositeType) baseCfs.getComparator(); + try { prefixSize = Integer.parseInt(columnDef.getIndexOptions().get(PREFIX_SIZE_OPTION));
[33/50] [abbrv] git commit: remove dead assignment
remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7af91424 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7af91424 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7af91424 Branch: refs/heads/cassandra-1.1 Commit: 7af91424d9b2929a72138c3f8ee75e09256aa5ef Parents: 201fe94 Author: Dave Brosius Authored: Wed Jul 18 21:18:21 2012 -0400 Committer: Dave Brosius Committed: Wed Jul 18 21:18:21 2012 -0400 -- src/java/org/apache/cassandra/db/SystemTable.java | 12 +--- 1 files changed, 5 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7af91424/src/java/org/apache/cassandra/db/SystemTable.java -- diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java index 9634515..48d9151 100644 --- a/src/java/org/apache/cassandra/db/SystemTable.java +++ b/src/java/org/apache/cassandra/db/SystemTable.java @@ -159,7 +159,7 @@ public class SystemTable { String req = "INSERT INTO system.%s (token_bytes, peer) VALUES ('%s', '%s')"; String tokenBytes = ByteBufferUtil.bytesToHex(p.getTokenFactory().toByteArray(token)); -processInternal(String.format(req, PEERS_CF, tokenBytes, ep.getHostAddress())); +processInternal(String.format(req, PEERS_CF, tokenBytes, ep.getHostAddress())); } forceBlockingFlush(PEERS_CF); } @@ -175,7 +175,7 @@ public class SystemTable { String req = "DELETE FROM system.%s WHERE token_bytes = '%s'"; String tokenBytes = ByteBufferUtil.bytesToHex(p.getTokenFactory().toByteArray(token)); -processInternal(String.format(req, PEERS_CF, tokenBytes)); +processInternal(String.format(req, PEERS_CF, tokenBytes)); } forceBlockingFlush(PEERS_CF); } @@ -185,8 +185,6 @@ public class SystemTable */ public static synchronized void updateTokens(Collection tokens) { -IPartitioner p = StorageService.getPartitioner(); - String req = "INSERT INTO system.%s (key, token_bytes) VALUES ('%s', '%s')"; String tokenBytes = ByteBufferUtil.bytesToHex(serializeTokens(tokens)); processInternal(String.format(req, LOCAL_CF, LOCAL_KEY, tokenBytes)); @@ -214,15 +212,15 @@ public class SystemTable newToks.put(toks); toks = newToks; } - + toks.putShort((short)tokenBytes.remaining()); toks.put(tokenBytes); } - + toks.flip(); return toks; } - + private static Collection deserializeTokens(ByteBuffer tokenBytes) { List tokens = new ArrayList();
git commit: remove dead assignment
Updated Branches: refs/heads/trunk 201fe9441 -> 7af91424d remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7af91424 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7af91424 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7af91424 Branch: refs/heads/trunk Commit: 7af91424d9b2929a72138c3f8ee75e09256aa5ef Parents: 201fe94 Author: Dave Brosius Authored: Wed Jul 18 21:18:21 2012 -0400 Committer: Dave Brosius Committed: Wed Jul 18 21:18:21 2012 -0400 -- src/java/org/apache/cassandra/db/SystemTable.java | 12 +--- 1 files changed, 5 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7af91424/src/java/org/apache/cassandra/db/SystemTable.java -- diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java index 9634515..48d9151 100644 --- a/src/java/org/apache/cassandra/db/SystemTable.java +++ b/src/java/org/apache/cassandra/db/SystemTable.java @@ -159,7 +159,7 @@ public class SystemTable { String req = "INSERT INTO system.%s (token_bytes, peer) VALUES ('%s', '%s')"; String tokenBytes = ByteBufferUtil.bytesToHex(p.getTokenFactory().toByteArray(token)); -processInternal(String.format(req, PEERS_CF, tokenBytes, ep.getHostAddress())); +processInternal(String.format(req, PEERS_CF, tokenBytes, ep.getHostAddress())); } forceBlockingFlush(PEERS_CF); } @@ -175,7 +175,7 @@ public class SystemTable { String req = "DELETE FROM system.%s WHERE token_bytes = '%s'"; String tokenBytes = ByteBufferUtil.bytesToHex(p.getTokenFactory().toByteArray(token)); -processInternal(String.format(req, PEERS_CF, tokenBytes)); +processInternal(String.format(req, PEERS_CF, tokenBytes)); } forceBlockingFlush(PEERS_CF); } @@ -185,8 +185,6 @@ public class SystemTable */ public static synchronized void updateTokens(Collection tokens) { -IPartitioner p = StorageService.getPartitioner(); - String req = "INSERT INTO system.%s (key, token_bytes) VALUES ('%s', '%s')"; String tokenBytes = ByteBufferUtil.bytesToHex(serializeTokens(tokens)); processInternal(String.format(req, LOCAL_CF, LOCAL_KEY, tokenBytes)); @@ -214,15 +212,15 @@ public class SystemTable newToks.put(toks); toks = newToks; } - + toks.putShort((short)tokenBytes.remaining()); toks.put(tokenBytes); } - + toks.flip(); return toks; } - + private static Collection deserializeTokens(ByteBuffer tokenBytes) { List tokens = new ArrayList();