cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [4/5] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Date Mon, 15 Apr 2013 06:02:28 GMT
Merge branch 'cassandra-1.1' into cassandra-1.2


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

Branch: refs/heads/trunk
Commit: 1f21bbe18bed5496b9dbc3922240b94863e27bcd
Parents: 25014a1 868e7eb
Author: Dave Brosius <dbrosius@apache.org>
Authored: Mon Apr 15 01:59:06 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Mon Apr 15 01:59:06 2013 -0400

----------------------------------------------------------------------
 CHANGES.txt                                        |    5 +++++
 .../cassandra/db/compaction/OperationType.java     |    2 +-
 .../cassandra/hadoop/pig/CassandraStorage.java     |    8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f21bbe1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2124b15,b225cdf..b17d8e1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -85,87 -10,11 +85,92 @@@ Merged from 1.1
   * cqlsh: Add inet type support on Windows (ipv4-only) (CASSANDRA-4801)
   * Fix race when initializing ColumnFamilyStore (CASSANDRA-5350)
   * Add UseTLAB JVM flag (CASSANDRA-5361)
 +
 +
 +1.2.2
 + * fix potential for multiple concurrent compactions of the same sstables
 +   (CASSANDRA-5256)
 + * avoid no-op caching of byte[] on commitlog append (CASSANDRA-5199)
 + * fix symlinks under data dir not working (CASSANDRA-5185)
 + * fix bug in compact storage metadata handling (CASSANDRA-5189)
 + * Validate login for USE queries (CASSANDRA-5207)
 + * cli: remove default username and password (CASSANDRA-5208)
 + * configure populate_io_cache_on_flush per-CF (CASSANDRA-4694)
 + * allow configuration of internode socket buffer (CASSANDRA-3378)
 + * Make sstable directory picking blacklist-aware again (CASSANDRA-5193)
 + * Correctly expire gossip states for edge cases (CASSANDRA-5216)
 + * Improve handling of directory creation failures (CASSANDRA-5196)
 + * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464)
 + * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * CQL3 refactor to allow conversion function (CASSANDRA-5226)
 + * Fix drop of sstables in some circumstance (CASSANDRA-5232)
 + * Implement caching of authorization results (CASSANDRA-4295)
 + * Add support for LZ4 compression (CASSANDRA-5038)
 + * Fix missing columns in wide rows queries (CASSANDRA-5225)
 + * Simplify auth setup and make system_auth ks alterable (CASSANDRA-5112)
 + * Stop compactions from hanging during bootstrap (CASSANDRA-5244)
 + * fix compressed streaming sending extra chunk (CASSANDRA-5105)
 + * Add CQL3-based implementations of IAuthenticator and IAuthorizer
 +   (CASSANDRA-4898)
 + * Fix timestamp-based tomstone removal logic (CASSANDRA-5248)
 + * cli: Add JMX authentication support (CASSANDRA-5080)
 + * Fix forceFlush behavior (CASSANDRA-5241)
 + * cqlsh: Add username autocompletion (CASSANDRA-5231)
 + * Fix CQL3 composite partition key error (CASSANDRA-5240)
 + * Allow IN clause on last clustering key (CASSANDRA-5230)
 +
 +
 +1.2.1
 + * stream undelivered hints on decommission (CASSANDRA-5128)
 + * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133)
 + * drain should flush system CFs too (CASSANDRA-4446)
 + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
 + * re-allow wrapping ranges for start_token/end_token range pairing (CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} (CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work (CASSANDRA-5097)
 + * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
 + * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
 + * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
 + * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
 + * Validate correctly selects on composite partition key (CASSANDRA-5122)
 + * Fix exception when adding collection (CASSANDRA-5117)
 + * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
 + * Refuse unrecognized replication and compaction strategy options (CASSANDRA-4795)
 + * Pick the correct value validator in sstable2json for cql3 tables (CASSANDRA-5134)
 + * Validate login for describe_keyspace, describe_keyspaces and set_keyspace
 +   (CASSANDRA-5144)
 + * Fix inserting empty maps (CASSANDRA-5141)
 + * Don't remove tokens from System table for node we know (CASSANDRA-5121)
 + * fix streaming progress report for compresed files (CASSANDRA-5130)
 + * Coverage analysis for low-CL queries (CASSANDRA-4858)
 + * Stop interpreting dates as valid timeUUID value (CASSANDRA-4936)
 + * Adds E notation for floating point numbers (CASSANDRA-4927)
 + * Detect (and warn) unintentional use of the cql2 thrift methods when cql3 was
 +   intended (CASSANDRA-5172)
+  * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
+  * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
+  * Fix cf name extraction from manifest in Directories.migrateFile() (CASSANDRA-5242)
+  * Support pluggable internode authentication (CASSANDRA-5401)
+  * Replace mistaken usage of commons-logging with slf4j (CASSANDRA-5464)
  
  
  1.1.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f21bbe1/src/java/org/apache/cassandra/db/compaction/OperationType.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/OperationType.java
index e46e92d,218808b..2416ed1
--- a/src/java/org/apache/cassandra/db/compaction/OperationType.java
+++ b/src/java/org/apache/cassandra/db/compaction/OperationType.java
@@@ -27,9 -31,7 +27,9 @@@ public enum OperationTyp
      SCRUB("Scrub"),
      UPGRADE_SSTABLES("Upgrade sstables"),
      INDEX_BUILD("Secondary index build"),
 +    /** Compaction for tombstone removal */
 +    TOMBSTONE_COMPACTION("Tombstone Compaction"),
-     UNKNOWN("Unkown compaction type");
+     UNKNOWN("Unknown compaction type");
  
      private final String type;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f21bbe1/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index dcac110,55ccbb9..110f61d
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -22,12 -21,8 +22,10 @@@ import java.math.BigInteger
  import java.nio.ByteBuffer;
  import java.util.*;
  
++
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.exceptions.SyntaxException;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
  import org.apache.cassandra.auth.IAuthenticator;
 -import org.apache.cassandra.config.ConfigurationException;
  import org.apache.cassandra.db.Column;
  import org.apache.cassandra.db.IColumn;
  import org.apache.cassandra.db.marshal.*;


Mime
View raw message