merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f94c839d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f94c839d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f94c839d Branch: refs/heads/cassandra-1.1 Commit: f94c839dcf92b1e681fbaf20923df42a1bfbe04e Parents: e1b1059 08c6546 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Sep 4 14:54:30 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Sep 4 14:54:30 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f94c839d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6c504e8,8a0ce59..5e72de3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,172 -1,14 +1,173 @@@ -1.0.12 +1.1.5 + * fix FD leak in slice queries (CASSANDRA-4571) + * avoid recursion in leveled compaction (CASSANDRA-4587) + * increase stack size under Java7 to 180K + * Log(info) schema changes (CASSANDRA-4547) + * Change nodetool setcachecapcity to manipulate global caches (CASSANDRA-4563) + * (cql3) fix setting compaction strategy (CASSANDRA-4597) +Merged from 1.0: + * increase Xss to 160k to accomodate latest 1.6 JVMs (CASSANDRA-4602) * fix toString of hint destination tokens (CASSANDRA-4568) + + +1.1.4 + * fix offline scrub to catch >= out of order rows (CASSANDRA-4411) + * fix cassandra-env.sh on RHEL and other non-dash-based systems + (CASSANDRA-4494) +Merged from 1.0: * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534) - * (Hadoop) fix iterating through a resultset consisting entirely - of tombstoned rows (CASSANDRA-4466) -1.0.11 +1.1.3 + * munmap commitlog segments before rename (CASSANDRA-4337) + * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning + multi-MB results as an attribute (CASSANDRA-4452) + * flush based on data size, not throughput; overwritten columns no + longer artificially inflate liveRatio (CASSANDRA-4399) + * update default commitlog segment size to 32MB and total commitlog + size to 32/1024 MB for 32/64 bit JVMs, respectively (CASSANDRA-4422) + * avoid using global partitioner to estimate ranges in index sstables + (CASSANDRA-4403) + * restore pre-CASSANDRA-3862 approach to removing expired tombstones + from row cache during compaction (CASSANDRA-4364) + * (stress) support for CQL prepared statements (CASSANDRA-3633) + * Correctly catch exception when Snappy cannot be loaded (CASSANDRA-4400) + * (cql3) Support ORDER BY when IN condition is given in WHERE clause (CASSANDRA-4327) + * (cql3) delete "component_index" column on DROP TABLE call (CASSANDRA-4420) + * change nanoTime() to currentTimeInMillis() in schema related code (CASSANDRA-4432) + * add a token generation tool (CASSANDRA-3709) + * Fix LCS bug with sstable containing only 1 row (CASSANDRA-4411) + * fix "Can't Modify Index Name" problem on CF update (CASSANDRA-4439) + * Fix assertion error in getOverlappingSSTables during repair (CASSANDRA-4456) + * fix nodetool's setcompactionthreshold command (CASSANDRA-4455) + * Ensure compacted files are never used, to avoid counter overcount (CASSANDRA-4436) +Merged from 1.0: + * Push the validation of secondary index values to the SecondaryIndexManager (CASSANDRA-4240) + * (Hadoop) fix iterating through a resultset consisting entirely + of tombstoned rows (CASSANDRA-4466) * allow dropping columns shadowed by not-yet-expired supercolumn or row tombstones in PrecompactedRow (CASSANDRA-4396) + + +1.1.2 + * Fix cleanup not deleting index entries (CASSANDRA-4379) + * Use correct partitioner when saving + loading caches (CASSANDRA-4331) + * Check schema before trying to export sstable (CASSANDRA-2760) + * Raise a meaningful exception instead of NPE when PFS encounters + an unconfigured node + no default (CASSANDRA-4349) + * fix bug in sstable blacklisting with LCS (CASSANDRA-4343) + * LCS no longer promotes tiny sstables out of L0 (CASSANDRA-4341) + * skip tombstones during hint replay (CASSANDRA-4320) + * fix NPE in compactionstats (CASSANDRA-4318) + * enforce 1m min keycache for auto (CASSANDRA-4306) + * Have DeletedColumn.isMFD always return true (CASSANDRA-4307) + * (cql3) exeption message for ORDER BY constraints said primary filter can be + an IN clause, which is misleading (CASSANDRA-4319) + * (cql3) Reject (not yet supported) creation of 2ndardy indexes on tables with + composite primary keys (CASSANDRA-4328) + * Set JVM stack size to 160k for java 7 (CASSANDRA-4275) + * cqlsh: add COPY command to load data from CSV flat files (CASSANDRA-4012) + * CFMetaData.fromThrift to throw ConfigurationException upon error (CASSANDRA-4353) + * Use CF comparator to sort indexed columns in SecondaryIndexManager + (CASSANDRA-4365) + * add strategy_options to the KSMetaData.toString() output (CASSANDRA-4248) + * (cql3) fix range queries containing unqueried results (CASSANDRA-4372) + * (cql3) allow updating column_alias types (CASSANDRA-4041) + * (cql3) Fix deletion bug (CASSANDRA-4193) + * Fix computation of overlapping sstable for leveled compaction (CASSANDRA-4321) + * Improve scrub and allow to run it offline (CASSANDRA-4321) + * Fix assertionError in StorageService.bulkLoad (CASSANDRA-4368) + * (cqlsh) add option to authenticate to a keyspace at startup (CASSANDRA-4108) + * (cqlsh) fix ASSUME functionality (CASSANDRA-4352) + * Fix ColumnFamilyRecordReader to not return progress > 100% (CASSANDRA-3942) +Merged from 1.0: + * Set gc_grace on index CF to 0 (CASSANDRA-4314) + + +1.1.1 + * allow larger cache capacities than 2GB (CASSANDRA-4150) + * add getsstables command to nodetool (CASSANDRA-4199) + * apply parent CF compaction settings to secondary index CFs (CASSANDRA-4280) + * preserve commitlog size cap when recycling segments at startup + (CASSANDRA-4201) + * (Hadoop) fix split generation regression (CASSANDRA-4259) + * ignore min/max compactions settings in LCS, while preserving + behavior that min=max=0 disables autocompaction (CASSANDRA-4233) + * log number of rows read from saved cache (CASSANDRA-4249) + * calculate exact size required for cleanup operations (CASSANDRA-1404) + * avoid blocking additional writes during flush when the commitlog + gets behind temporarily (CASSANDRA-1991) + * enable caching on index CFs based on data CF cache setting (CASSANDRA-4197) + * warn on invalid replication strategy creation options (CASSANDRA-4046) + * remove [Freeable]Memory finalizers (CASSANDRA-4222) + * include tombstone size in ColumnFamily.size, which can prevent OOM + during sudden mass delete operations by yielding a nonzero liveRatio + (CASSANDRA-3741) + * Open 1 sstableScanner per level for leveled compaction (CASSANDRA-4142) + * Optimize reads when row deletion timestamps allow us to restrict + the set of sstables we check (CASSANDRA-4116) + * add support for commitlog archiving and point-in-time recovery + (CASSANDRA-3690) + * avoid generating redundant compaction tasks during streaming + (CASSANDRA-4174) + * add -cf option to nodetool snapshot, and takeColumnFamilySnapshot to + StorageService mbean (CASSANDRA-556) + * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079) + * optimize truncate when autosnapshot is disabled (CASSANDRA-4153) + * update caches to use byte[] keys to reduce memory overhead (CASSANDRA-3966) + * add column limit to cli (CASSANDRA-3012, 4098) + * clean up and optimize DataOutputBuffer, used by CQL compression and + CompositeType (CASSANDRA-4072) + * optimize commitlog checksumming (CASSANDRA-3610) + * identify and blacklist corrupted SSTables from future compactions + (CASSANDRA-2261) + * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037) + * Expose API to repair a user provided range (CASSANDRA-3912) + * Add way to force the cassandra-cli to refresh its schema (CASSANDRA-4052) + * Avoid having replicate on write tasks stacking up at CL.ONE (CASSANDRA-2889) + * (cql3) Backwards compatibility for composite comparators in non-cql3-aware + clients (CASSANDRA-4093) + * (cql3) Fix order by for reversed queries (CASSANDRA-4160) + * (cql3) Add ReversedType support (CASSANDRA-4004) + * (cql3) Add timeuuid type (CASSANDRA-4194) + * (cql3) Minor fixes (CASSANDRA-4185) + * (cql3) Fix prepared statement in BATCH (CASSANDRA-4202) + * (cql3) Reduce the list of reserved keywords (CASSANDRA-4186) + * (cql3) Move max/min compaction thresholds to compaction strategy options + (CASSANDRA-4187) + * Fix exception during move when localhost is the only source (CASSANDRA-4200) + * (cql3) Allow paging through non-ordered partitioner results (CASSANDRA-3771) + * (cql3) Fix drop index (CASSANDRA-4192) + * (cql3) Don't return range ghosts anymore (CASSANDRA-3982) + * fix re-creating Keyspaces/ColumnFamilies with the same name as dropped + ones (CASSANDRA-4219) + * fix SecondaryIndex LeveledManifest save upon snapshot (CASSANDRA-4230) + * fix missing arrayOffset in FBUtilities.hash (CASSANDRA-4250) + * (cql3) Add name of parameters in CqlResultSet (CASSANDRA-4242) + * (cql3) Correctly validate order by queries (CASSANDRA-4246) + * rename stress to cassandra-stress for saner packaging (CASSANDRA-4256) + * Fix exception on colum metadata with non-string comparator (CASSANDRA-4269) + * Check for unknown/invalid compression options (CASSANDRA-4266) + * (cql3) Adds simple access to column timestamp and ttl (CASSANDRA-4217) + * (cql3) Fix range queries with secondary indexes (CASSANDRA-4257) + * Better error messages from improper input in cli (CASSANDRA-3865) + * Try to stop all compaction upon Keyspace or ColumnFamily drop (CASSANDRA-4221) + * (cql3) Allow keyspace properties to contain hyphens (CASSANDRA-4278) + * (cql3) Correctly validate keyspace access in create table (CASSANDRA-4296) + * Avoid deadlock in migration stage (CASSANDRA-3882) + * Take supercolumn names and deletion info into account in memtable throughput + (CASSANDRA-4264) + * Add back backward compatibility for old style replication factor (CASSANDRA-4294) + * Preserve compatibility with pre-1.1 index queries (CASSANDRA-4262) +Merged from 1.0: + * Fix super columns bug where cache is not updated (CASSANDRA-4190) + * fix maxTimestamp to include row tombstones (CASSANDRA-4116) + * (CLI) properly handle quotes in create/update keyspace commands (CASSANDRA-4129) + * Avoids possible deadlock during bootstrap (CASSANDRA-4159) + * fix stress tool that hangs forever on timeout or error (CASSANDRA-4128) + * stress tool to return appropriate exit code on failure (CASSANDRA-4188) + * fix compaction NPE when out of disk space and assertions disabled + (CASSANDRA-3985) * synchronize LCS getEstimatedTasks to avoid CME (CASSANDRA-4255) * ensure unique streaming session id's (CASSANDRA-4223) * kick off background compaction when min/max thresholds change http://git-wip-us.apache.org/repos/asf/cassandra/blob/f94c839d/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --cc conf/cassandra-env.sh index c2a1078,5400fd9..6fa37ed --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -184,14 -150,8 +184,14 @@@ if [ "`uname`" = "Linux" ] ; the # thread-per-client. (Best practice is for client connections to # be pooled anyway.) Only do so on Linux where it is known to be # supported. - JVM_OPTS="$JVM_OPTS -Xss160k" + if startswith "$JVM_VERSION" '1.7.' + then + JVM_OPTS="$JVM_OPTS -Xss180k" + else - JVM_OPTS="$JVM_OPTS -Xss128k" ++ JVM_OPTS="$JVM_OPTS -Xss160k" + fi fi +echo "xss = $JVM_OPTS" # GC tuning options JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC"
