[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5754ab2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5754ab2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5754ab2
Branch: refs/heads/cassandra-1.1
Commit: d5754ab223116f26749d0df0c942d43c819ff63b
Parents: de212e5 f8567d1
Author: Dave Brosius dbros...@apache.org
Authored: Thu May 2 10:12:19 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Thu May 2 10:12:19 2013 -0400
--
build.xml | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5754ab2/build.xml
--
diff --cc build.xml
index ab4dd71,43172c9..3d76d14
--- a/build.xml
+++ b/build.xml
@@@ -1010,9 -945,12 +1014,11 @@@
javac
debug=true
debuglevel=${debuglevel}
- destdir=${test.classes}
+ destdir=${test.classes}
+ source=${source.version}
+ target=${target.version}
classpath
path refid=cassandra.classpath/
-pathelement location=${build.classes.cql}/
/classpath
src path=${test.unit.src}/
src path=${test.long.src}/
[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccd436c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccd436c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccd436c0 Branch: refs/heads/trunk Commit: ccd436c0fe0c75db09dd7cd87a516f005f4e7289 Parents: 070c1d8 7ff8e3c Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Jul 27 10:14:34 2012 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Jul 27 10:14:34 2012 +0200 -- CHANGES.txt|2 ++ .../cassandra/db/compaction/CompactionManager.java |9 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccd436c0/CHANGES.txt -- diff --cc CHANGES.txt index bcf56b7,b3fa1a8..fd6991c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,155 -1,6 +1,157 @@@ -1.0.11 +1.1.3 + * (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) * allow dropping columns shadowed by not-yet-expired supercolumn or row tombstones in PrecompactedRow (CASSANDRA-4396) + * fix 1.0.x node join to mixed version cluster, other nodes = 1.1 (CASSANDRA-4195) + * Fix LCS splitting sstable base on uncompressed size (CASSANDRA-4419) + * Bootstraps that fail are detected upon restart and will retry safely without + needing to delete existing data first (CASSANDRA-4427) + * (cqlsh) add a COPY TO command to copy a CF to a CSV file (CASSANDRA-4434) ++ * Don't purge columns during upgradesstables (CASSANDRA-4462) ++ * Push the validation of secondary index values to the SecondaryIndexManager (CASSANDRA-4240) + + +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) + *
[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e760446 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e760446 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e760446 Branch: refs/heads/trunk Commit: 1e7604462d36f16dcdfe99da9eb518e25032510e Parents: 97620fe 787e0e6 Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Jul 12 11:08:11 2012 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Jul 12 11:08:11 2012 +0200 -- CHANGES.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e760446/CHANGES.txt -- diff --cc CHANGES.txt index 01a3af1,66a7b9e..1b6f4d1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,140 -1,6 +1,141 @@@ -1.0.11 +1.1.3 + * 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) +Merged from 1.0: * allow dropping columns shadowed by not-yet-expired supercolumn or row tombstones in PrecompactedRow (CASSANDRA-4396) + * fix 1.0.x node join to mixed version cluster, other nodes = 1.1 (CASSANDRA-4195) ++ * Fix LCS splitting sstable base on uncompressed size (CASSANDRA-4419) + + +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
[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Merge branch 'cassandra-1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9124ed6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9124ed6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9124ed6 Branch: refs/heads/cassandra-1.1 Commit: d9124ed68cc6683ba131399794ddae4330507953 Parents: 9f90a79 1ad1c12 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Feb 22 11:30:50 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Feb 22 11:30:50 2012 +0100 -- CHANGES.txt |1 + bin/cqlsh |6 +- 2 files changed, 6 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9124ed6/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9124ed6/bin/cqlsh --
[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Merge branch 'cassandra-1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c691e09f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c691e09f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c691e09f Branch: refs/heads/cassandra-1.1 Commit: c691e09f149bfc97992593bff1812769e25d6125 Parents: 40bb550 44ac7a0 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Feb 22 11:39:44 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Feb 22 11:39:44 2012 +0100 -- CHANGES.txt |3 ++- bin/cqlsh |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c691e09f/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c691e09f/bin/cqlsh --
[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Merge branch 'cassandra-1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68268954 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68268954 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68268954 Branch: refs/heads/cassandra-1.1 Commit: 68268954ac7ebe825cf61f28c8ccbd95dd0fed75 Parents: 87b786f 8413d83 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Feb 22 14:23:06 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Feb 22 14:23:06 2012 +0100 -- CHANGES.txt|1 + .../cassandra/db/RetriedSliceFromReadCommand.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java | 25 ++ 3 files changed, 20 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68268954/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Merge branch 'cassandra-1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee2a1354 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee2a1354 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee2a1354 Branch: refs/heads/trunk Commit: ee2a135469c4dc05d600bfb240afaa988d6984ce Parents: 1d435db 161e052 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Feb 14 11:47:06 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Feb 14 11:47:06 2012 +0100 -- src/java/org/apache/cassandra/tools/NodeCmd.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee2a1354/src/java/org/apache/cassandra/tools/NodeCmd.java --
