natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.0' into cassandra-1.1.0

This commit is contained in:
Sylvain Lebresne 2012-03-30 16:47:25 +02:00
parent d69d304c4e 3931ee709d
commit adc0931e81
7 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -49,6 +49,8 @@ Merged from 1.0:
* ensure that directory is selected for compaction for user-defined
tasks and upgradesstables (CASSANDRA-3985)
* fix NPE on invalid CQL delete command (CASSANDRA-3755)
* allow custom types in CLI's assume command (CASSANDRA-4081)
* Fix totalBytes count for parallel compactions (CASSANDRA-3758)
1.1-beta1

4
src/java/org/apache/cassandra/cli/Cli.g
View File

@ -301,8 +301,8 @@ truncateStatement
;
assumeStatement
: ASSUME columnFamily assumptionElement=Identifier 'AS' defaultType=Identifier
-> ^(NODE_ASSUME columnFamily $assumptionElement $defaultType)
: ASSUME columnFamily assumptionElement=Identifier 'AS' entityName
-> ^(NODE_ASSUME columnFamily $assumptionElement entityName)
;
consistencyLevelStatement

20
src/java/org/apache/cassandra/cli/CliClient.java
View File

@ -1474,17 +1474,25 @@ public class CliClient
AbstractType<?> comparator;
// Could be UTF8Type, IntegerType, LexicalUUIDType etc.
String defaultType = statement.getChild(2).getText();
String defaultType = CliUtils.unescapeSQLString(statement.getChild(2).getText());
try
{
comparator = Function.valueOf(defaultType.toUpperCase()).getValidator();
comparator = TypeParser.parse(defaultType);
}
catch (Exception e)
catch (ConfigurationException e)
{
String functions = Function.getFunctionNames();
sessionState.out.println("Type '" + defaultType + "' was not found. Available: " + functions);
return;
try
{
comparator = Function.valueOf(defaultType.toUpperCase()).getValidator();
}
catch (Exception ne)
{
String functions = Function.getFunctionNames();
sessionState.out.println("Type '" + defaultType + "' was not found. Available: " + functions
+ " Or any class which extends o.a.c.db.marshal.AbstractType.");
return;
}
}
// making string representation look property e.g. o.a.c.db.marshal.UTF8Type

13
src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
View File

@ -41,15 +41,24 @@ public abstract class AbstractCompactionIterable extends CompactionInfo.Holder i
protected final OperationType type;
protected final CompactionController controller;
protected long totalBytes;
protected final long totalBytes;
protected volatile long bytesRead;
protected final List<SSTableScanner> scanners;
protected final Throttle throttle;
public AbstractCompactionIterable(CompactionController controller, OperationType type)
public AbstractCompactionIterable(CompactionController controller, OperationType type, List<SSTableScanner> scanners)
{
this.controller = controller;
this.type = type;
this.scanners = scanners;
this.bytesRead = 0;
long bytes = 0;
for (SSTableScanner scanner : scanners)
bytes += scanner.getFileLength();
this.totalBytes = bytes;
this.throttle = new Throttle(toString(), new Throttle.ThroughputFunction()
{
/** @return Instantaneous throughput target in bytes per millisecond. */

7
src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
View File

@ -41,7 +41,6 @@ public class CompactionIterable extends AbstractCompactionIterable
private static Logger logger = LoggerFactory.getLogger(CompactionIterable.class);
private long row;
private final List<SSTableScanner> scanners;
private static final Comparator<IColumnIterator> comparator = new Comparator<IColumnIterator>()
{
@ -58,12 +57,8 @@ public class CompactionIterable extends AbstractCompactionIterable
protected CompactionIterable(OperationType type, List<SSTableScanner> scanners, CompactionController controller)
{
super(controller, type);
this.scanners = scanners;
super(controller, type, scanners);
row = 0;
totalBytes = bytesRead = 0;
for (SSTableScanner scanner : scanners)
totalBytes += scanner.getFileLength();
}
protected static List<SSTableScanner> getScanners(Iterable<SSTableReader> sstables) throws IOException

4
src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
View File

@ -59,7 +59,6 @@ public class ParallelCompactionIterable extends AbstractCompactionIterable
{
private static Logger logger = LoggerFactory.getLogger(ParallelCompactionIterable.class);
private final List<SSTableScanner> scanners;
private final int maxInMemorySize;
public ParallelCompactionIterable(OperationType type, Iterable<SSTableReader> sstables, CompactionController controller) throws IOException
@ -74,8 +73,7 @@ public class ParallelCompactionIterable extends AbstractCompactionIterable
protected ParallelCompactionIterable(OperationType type, List<SSTableScanner> scanners, CompactionController controller, int maxInMemorySize)
{
super(controller, type);
this.scanners = scanners;
super(controller, type, scanners);
this.maxInMemorySize = maxInMemorySize;
}

4
src/java/org/apache/cassandra/net/IncomingTcpConnection.java
View File

@ -46,7 +46,6 @@ public class IncomingTcpConnection extends Thread
{
assert socket != null;
this.socket = socket;
from = socket.getInetAddress(); // maximize chance of this not being nulled by disconnect
}
/**
@ -92,6 +91,7 @@ public class IncomingTcpConnection extends Thread
input = new DataInputStream(new BufferedInputStream(socket.getInputStream(), 4096));
// Receive the first message to set the version.
Message msg = receiveMessage(input, version);
from = msg.getFrom(); // why? see => CASSANDRA-4099
if (version > MessagingService.version_)
{
// save the endpoint so gossip will reconnect to it
@ -100,7 +100,7 @@ public class IncomingTcpConnection extends Thread
}
else if (msg != null)
{
Gossiper.instance.setVersion(msg.getFrom(), version);
Gossiper.instance.setVersion(from, version);
logger.debug("set version for {} to {}", from, version);
}