Author: slebresne Date: Tue Oct 25 16:08:31 2011 New Revision: 1188757 URL: http://svn.apache.org/viewvc?rev=1188757&view=rev Log: push down assignments to scopes where they are needed patch by dbrosius; reviewed by slebresne for CASSANDRA-3396
Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/Gossiper.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageService.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableExport.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableImport.java Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java?rev=1188757&r1=1188756&r2=1188757&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java Tue Oct 25 16:08:31 2011 @@ -336,10 +336,9 @@ public class QueryProcessor if (!select.isMultiKey() && select.getKeys().size() > 1) throw new InvalidRequestException("You cannot use more than one KEY = in a SELECT"); - AbstractType<?> comparator = select.getComparator(keyspace); - if (select.getColumnRelations().size() > 0) { + AbstractType<?> comparator = select.getComparator(keyspace); Set<ByteBuffer> indexed = Table.open(keyspace).getColumnFamilyStore(select.getColumnFamily()).indexManager.getIndexedColumns(); for (Relation relation : select.getColumnRelations()) { Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java?rev=1188757&r1=1188756&r2=1188757&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java Tue Oct 25 16:08:31 2011 @@ -39,9 +39,11 @@ public class GossipDigestAck2VerbHandler public void doVerb(Message message, String id) { - InetAddress from = message.getFrom(); if (logger_.isTraceEnabled()) + { + InetAddress from = message.getFrom(); logger_.trace("Received a GossipDigestAck2Message from {}", from); + } byte[] bytes = message.getMessageBody(); DataInputStream dis = new DataInputStream( new FastByteArrayInputStream(bytes) ); Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/Gossiper.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1188757&r1=1188756&r2=1188757&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/Gossiper.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/gms/Gossiper.java Tue Oct 25 16:08:31 2011 @@ -693,7 +693,6 @@ public class Gossiper implements IFailur void notifyFailureDetector(InetAddress endpoint, EndpointState remoteEndpointState) { - IFailureDetector fd = FailureDetector.instance; EndpointState localEndpointState = endpointStateMap.get(endpoint); /* * If the local endpoint state exists then report to the FD only @@ -701,6 +700,7 @@ public class Gossiper implements IFailur */ if ( localEndpointState != null ) { + IFailureDetector fd = FailureDetector.instance; int localGeneration = localEndpointState.getHeartBeatState().getGeneration(); int remoteGeneration = remoteEndpointState.getHeartBeatState().getGeneration(); if ( remoteGeneration > localGeneration ) Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageService.java?rev=1188757&r1=1188756&r2=1188757&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageService.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageService.java Tue Oct 25 16:08:31 2011 @@ -999,7 +999,6 @@ public class StorageService implements I */ private void handleStateRemoving(InetAddress endpoint, String[] pieces) { - String state = pieces[0]; assert (pieces.length > 0); if (endpoint.equals(FBUtilities.getBroadcastAddress())) @@ -1017,6 +1016,7 @@ public class StorageService implements I } if (tokenMetadata_.isMember(endpoint)) { + String state = pieces[0]; Token removeToken = tokenMetadata_.getToken(endpoint); if (VersionedValue.REMOVED_TOKEN.equals(state)) Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableExport.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableExport.java?rev=1188757&r1=1188756&r2=1188757&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableExport.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableExport.java Tue Oct 25 16:08:31 2011 @@ -126,13 +126,17 @@ public class SSTableExport ByteBuffer name = ByteBufferUtil.clone(column.name()); ByteBuffer value = ByteBufferUtil.clone(column.value()); - AbstractType validator = cfMetaData.getValueValidator(name); serializedColumn.add(comparator.getString(name)); if (column instanceof DeletedColumn) + { serializedColumn.add(ByteBufferUtil.bytesToHex(value)); + } else + { + AbstractType validator = cfMetaData.getValueValidator(name); serializedColumn.add(validator.getString(value)); + } serializedColumn.add(column.timestamp()); if (column instanceof DeletedColumn) Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableImport.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableImport.java?rev=1188757&r1=1188756&r2=1188757&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableImport.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/tools/SSTableImport.java Tue Oct 25 16:08:31 2011 @@ -96,10 +96,9 @@ public class SSTableImport public JsonColumn(T json, CFMetaData meta, boolean isSubColumn) { - AbstractType comparator = (isSubColumn) ? meta.subcolumnComparator : meta.comparator; - if (json instanceof List) { + AbstractType comparator = (isSubColumn) ? meta.subcolumnComparator : meta.comparator; List fields = (List<?>) json; assert fields.size() >= 3 : "Column definition should have at least 3";