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

merge from 1.0 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1211982 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2011-12-08 17:00:37 +00:00
parent c898b070a1 115889638e
commit aec633d479
7 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGES.txt
View File

@ -36,22 +36,28 @@
* fix default value validation usage in CLI SET command (CASSANDRA-3553)
* Optimize componentsFor method for compaction and startup time
(CASSANDRA-3532)
* (CQL) Proper ColumnFamily metadata validation on CREATE COLUMNFAMILY (CASSANDRA-3565)
* validate compression parameters on add/update of the ColumnFamily (CASSANDRA-3573)
* fix compression "chunk_length_kb" option to set correct kb value for thrift/avro
(CASSANDRA-3558)
* (CQL) Proper ColumnFamily metadata validation on CREATE COLUMNFAMILY
(CASSANDRA-3565)
* fix compression "chunk_length_kb" option to set correct kb value for
thrift/avro (CASSANDRA-3558)
* fix missing response during range slice repair (CASSANDRA-3551)
* 'describe ring' moved from CLI to nodetool and available through JMX (CASSANDRA-3220)
* add back partitioner to sstable metadata (CASSANDRA-3540)
Merged from 0.8:
* use cannonical host for local node in nodetool info (CASSANDRA-3556)
* detect misuses of CounterColumnType (CASSANDRA-3422)
* turn off string interning in json2sstable, take 2 (CASSANDRA-2189)
* validate compression parameters on add/update of the ColumnFamily
(CASSANDRA-3573)
* Check for 0.0.0.0 is incorrect in CFIF (CASSANDRA-3584)
* Increase vm.max_map_count in debian packaging (CASSANDRA-3563)
1.0.5
* revert CASSANDRA-3407 (see CASSANDRA-3540)
* fix assertion error while forwarding writes to local nodes (CASSANDRA-3539)
1.0.4
* fix self-hinting of timed out read repair updates and make hinted handoff
less prone to OOMing a coordinator (CASSANDRA-3440)
@ -892,7 +898,6 @@ Merged from 0.8:
modification operations (CASSANDRA-2222)
* fix for reversed slice queries on large rows (CASSANDRA-2212)
* fat clients were writing local data (CASSANDRA-2223)
* turn off string interning in json2sstable (CASSANDRA-2189)
* set DEFAULT_MEMTABLE_LIFETIME_IN_MINS to 24h
* improve detection and cleanup of partially-written sstables
(CASSANDRA-2206)

4
bin/cqlsh
View File

@ -1125,7 +1125,7 @@ class Shell(cmd.Cmd):
"""
def help_delete_using(self):
"""
print """
DELETE: the USING clause
DELETE ... USING CONSISTENCY <consistencylevel>;
@ -1142,7 +1142,7 @@ class Shell(cmd.Cmd):
"""
def help_delete_columns(self):
"""
print """
DELETE: specifying columns
DELETE col1, 'col2 name', 3 FROM ...

1
debian/cassandra.install vendored
View File

@ -3,6 +3,7 @@ conf/cassandra.yaml etc/cassandra
conf/cassandra-env.sh etc/cassandra
debian/cassandra.in.sh usr/share/cassandra
debian/cassandra.conf etc/security/limits.d
debian/cassandra-sysctl.conf etc/sysctl.d
bin/cassandra usr/sbin
bin/cassandra-cli usr/bin
bin/nodetool usr/bin

1
debian/cassandra.postinst vendored
View File

@ -38,6 +38,7 @@ case "$1" in
chown -R cassandra: /var/lib/cassandra
chown -R cassandra: /var/log/cassandra
fi
sysctl -p /etc/sysctl.d/cassandra.conf
;;
abort-upgrade|abort-remove|abort-deconfigure)

2
debian/rules vendored
View File

@ -44,6 +44,8 @@ install: build
dh_link usr/share/cassandra/apache-cassandra-$(VERSION).jar \
usr/share/cassandra/apache-cassandra.jar
cd debian/cassandra/etc/sysctl.d && mv cassandra-sysctl.conf cassandra.conf
# Build architecture-independent files here.
binary-indep: build install
dh_testdir

4
src/java/org/apache/cassandra/thrift/ThriftValidation.java
View File

@ -747,7 +747,9 @@ public class ThriftValidation
for (String ksName : Schema.instance.getTables())
{
if (ksName.equalsIgnoreCase(newKsName))
throw new InvalidRequestException("Keyspace names must be case-insensitively unique");
throw new InvalidRequestException(String.format("Keyspace names must be case-insensitively unique (\"%s\" conflicts with \"%s\")",
newKsName,
ksName));
}
}
}

4
src/java/org/apache/cassandra/tools/SSTableImport.java
View File

@ -62,7 +62,7 @@ public class SSTableImport
private static Integer keyCountToImport = null;
private static boolean isSorted = false;
private static JsonFactory factory = new MappingJsonFactory();
private static JsonFactory factory = new MappingJsonFactory().configure(JsonParser.Feature.INTERN_FIELD_NAMES, false);
static
{
@ -418,7 +418,7 @@ public class SSTableImport
*/
private static JsonParser getParser(String fileName) throws IOException
{
return factory.createJsonParser(new File(fileName)).configure(JsonParser.Feature.INTERN_FIELD_NAMES, false);
return factory.createJsonParser(new File(fileName));
}
/**