cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/8] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1.0
Date Fri, 30 Mar 2012 14:55:57 GMT
Merge branch 'cassandra-1.0' into cassandra-1.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adc0931e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adc0931e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adc0931e

Branch: refs/heads/trunk
Commit: adc0931e8154c12536b8aafa0c90b5a4e8a708b0
Parents: d69d304 3931ee7
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Mar 30 16:47:25 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Mar 30 16:47:25 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 src/java/org/apache/cassandra/cli/Cli.g            |    4 +-
 src/java/org/apache/cassandra/cli/CliClient.java   |   20 ++++++++++----
 .../db/compaction/AbstractCompactionIterable.java  |   13 ++++++++-
 .../db/compaction/CompactionIterable.java          |    7 +----
 .../db/compaction/ParallelCompactionIterable.java  |    4 +--
 .../cassandra/net/IncomingTcpConnection.java       |    4 +-
 7 files changed, 33 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc0931e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9c62679,438bc91..00848f6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -49,96 -14,10 +49,98 @@@ 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
 + * (cqlsh)
 +   + add SOURCE and CAPTURE commands, and --file option (CASSANDRA-3479)
 +   + add ALTER COLUMNFAMILY WITH (CASSANDRA-3523)
 +   + bundle Python dependencies with Cassandra (CASSANDRA-3507)
 +   + added to Debian package (CASSANDRA-3458)
 +   + display byte data instead of erroring out on decode failure 
 +     (CASSANDRA-3874)
 + * add nodetool rebuild_index (CASSANDRA-3583)
 + * add nodetool rangekeysample (CASSANDRA-2917)
 + * Fix streaming too much data during move operations (CASSANDRA-3639)
 + * Nodetool and CLI connect to localhost by default (CASSANDRA-3568)
 + * Reduce memory used by primary index sample (CASSANDRA-3743)
 + * (Hadoop) separate input/output configurations (CASSANDRA-3197, 3765)
 + * avoid returning internal Cassandra classes over JMX (CASSANDRA-2805)
 + * add row-level isolation via SnapTree (CASSANDRA-2893)
 + * Optimize key count estimation when opening sstable on startup
 +   (CASSANDRA-2988)
 + * multi-dc replication optimization supporting CL > ONE (CASSANDRA-3577)
 + * add command to stop compactions (CASSANDRA-1740, 3566, 3582)
 + * multithreaded streaming (CASSANDRA-3494)
 + * removed in-tree redhat spec (CASSANDRA-3567)
 + * "defragment" rows for name-based queries under STCS, again (CASSANDRA-2503)
 + * Recycle commitlog segments for improved performance 
 +   (CASSANDRA-3411, 3543, 3557, 3615)
 + * update size-tiered compaction to prioritize small tiers (CASSANDRA-2407)
 + * add message expiration logic to OutboundTcpConnection (CASSANDRA-3005)
 + * off-heap cache to use sun.misc.Unsafe instead of JNA (CASSANDRA-3271)
 + * EACH_QUORUM is only supported for writes (CASSANDRA-3272)
 + * replace compactionlock use in schema migration by checking CFS.isValid
 +   (CASSANDRA-3116)
 + * recognize that "SELECT first ... *" isn't really "SELECT *" (CASSANDRA-3445)
 + * Use faster bytes comparison (CASSANDRA-3434)
 + * Bulk loader is no longer a fat client, (HADOOP) bulk load output format
 +   (CASSANDRA-3045)
 + * (Hadoop) add support for KeyRange.filter
 + * remove assumption that keys and token are in bijection
 +   (CASSANDRA-1034, 3574, 3604)
 + * always remove endpoints from delevery queue in HH (CASSANDRA-3546)
 + * fix race between cf flush and its 2ndary indexes flush (CASSANDRA-3547)
 + * fix potential race in AES when a repair fails (CASSANDRA-3548)
 + * Remove columns shadowed by a deleted container even when we cannot purge
 +   (CASSANDRA-3538)
 + * Improve memtable slice iteration performance (CASSANDRA-3545)
 + * more efficient allocation of small bloom filters (CASSANDRA-3618)
 + * Use separate writer thread in SSTableSimpleUnsortedWriter (CASSANDRA-3619)
 + * fsync the directory after new sstable or commitlog segment are created (CASSANDRA-3250)
 + * fix minor issues reported by FindBugs (CASSANDRA-3658)
 + * global key/row caches (CASSANDRA-3143, 3849)
 + * optimize memtable iteration during range scan (CASSANDRA-3638)
 + * introduce 'crc_check_chance' in CompressionParameters to support
 +   a checksum percentage checking chance similarly to read-repair (CASSANDRA-3611)
 + * a way to deactivate global key/row cache on per-CF basis (CASSANDRA-3667)
 + * fix LeveledCompactionStrategy broken because of generation pre-allocation
 +   in LeveledManifest (CASSANDRA-3691)
 + * finer-grained control over data directories (CASSANDRA-2749)
 + * Fix ClassCastException during hinted handoff (CASSANDRA-3694)
 + * Upgrade Thrift to 0.7 (CASSANDRA-3213)
 + * Make stress.java insert operation to use microseconds (CASSANDRA-3725)
 + * Allows (internally) doing a range query with a limit of columns instead of
 +   rows (CASSANDRA-3742)
 + * Allow rangeSlice queries to be start/end inclusive/exclusive (CASSANDRA-3749)
 + * Fix BulkLoader to support new SSTable layout and add stream
 +   throttling to prevent an NPE when there is no yaml config (CASSANDRA-3752)
 + * Allow concurrent schema migrations (CASSANDRA-1391, 3832)
 + * Add SnapshotCommand to trigger snapshot on remote node (CASSANDRA-3721)
 + * Make CFMetaData conversions to/from thrift/native schema inverses
 +   (CASSANDRA_3559)
 + * Add initial code for CQL 3.0-beta (CASSANDRA-3781, 3753)
 + * Add wide row support for ColumnFamilyInputFormat (CASSANDRA-3264)
 + * Allow extending CompositeType comparator (CASSANDRA-3657)
 + * Avoids over-paging during get_count (CASSANDRA-3798)
 + * Add new command to rebuild a node without (repair) merkle tree calculations
 +   (CASSANDRA-3483, 3922)
 + * respect not only row cache capacity but caching mode when
 +   trying to read data (CASSANDRA-3812)
 + * fix system tests (CASSANDRA-3827)
 + * CQL support for altering row key type in ALTER TABLE (CASSANDRA-3781)
 + * turn compression on by default (CASSANDRA-3871)
 + * make hexToBytes refuse invalid input (CASSANDRA-2851)
 + * Make secondary indexes CF inherit compression and compaction from their
 +   parent CF (CASSANDRA-3877)
 + * Finish cleanup up tombstone purge code (CASSANDRA-3872)
 + * Avoid NPE on aboarted stream-out sessions (CASSANDRA-3904)
 + * BulkRecordWriter throws NPE for counter columns (CASSANDRA-3906)
 + * Support compression using BulkWriter (CASSANDRA-3907)
 +
 +
  1.0.8
   * fix race between cleanup and flush on secondary index CFSes (CASSANDRA-3712)
   * avoid including non-queried nodes in rangeslice read repair

http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc0931e/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cli/CliClient.java
index ba772a9,dfbcb68..4e97e82
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@@ -1471,10 -1488,10 +1471,10 @@@ public class CliClien
          // VALIDATOR | COMPARATOR | KEYS | SUB_COMPARATOR
          String assumptionElement = statement.getChild(1).getText().toUpperCase();
          // used to store in this.cfKeysComparator
 -        AbstractType comparator;
 +        AbstractType<?> comparator;
  
          // Could be UTF8Type, IntegerType, LexicalUUIDType etc.
-         String defaultType = statement.getChild(2).getText();
+         String defaultType = CliUtils.unescapeSQLString(statement.getChild(2).getText());
  
          try
          {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc0931e/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc0931e/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc0931e/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc0931e/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index edae876,47ab39a..f329636
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@@ -100,10 -102,10 +100,10 @@@ public class IncomingTcpConnection exte
              }
              else if (msg != null)
              {
-                 Gossiper.instance.setVersion(msg.getFrom(), version);
+                 Gossiper.instance.setVersion(from, version);
                  logger.debug("set version for {} to {}", from, version);
              }
 -            
 +
              // loop to get the next message.
              while (true)
              {


Mime
View raw message