cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Tue, 19 Aug 2014 23:39:13 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/Constants.java


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

Branch: refs/heads/cassandra-2.1.0
Commit: ecf1baebbe783854c6f153449cf71038d2f032fb
Parents: 31d5193 62642fa
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Aug 20 02:31:45 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Aug 20 02:31:45 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                              | 1 +
 src/java/org/apache/cassandra/cql3/Constants.java        | 4 ++--
 src/java/org/apache/cassandra/cql3/UpdateParameters.java | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecf1baeb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1de5b33,7fb6de9..304d9bf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 -1.2.19
 +2.0.10
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
 + * Properly reject operations on list index with conditions (CASSANDRA-7499)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
 + * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
 + * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
 + * Give CRR a default input_cql Statement (CASSANDRA-7226)
 + * Better error message when adding a collection with the same name
 +   than a previously dropped one (CASSANDRA-6276)
 + * Fix validation when adding static columns (CASSANDRA-7730)
 + * (Thrift) fix range deletion of supercolumns (CASSANDRA-7733)
 + * Fix potential AssertionError in RangeTombstoneList (CASSANDRA-7700)
 + * Validate arguments of blobAs* functions (CASSANDRA-7707)
 + * Fix potential AssertionError with 2ndary indexes (CASSANDRA-6612)
 + * Avoid logging CompactionInterrupted at ERROR (CASSANDRA-7694)
 + * Minor leak in sstable2jon (CASSANDRA-7709)
 + * Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
 + * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * Update java driver (for hadoop) (CASSANDRA-7618)
 + * Fix truncate to always flush (CASSANDRA-7511)
 + * Remove shuffle and taketoken (CASSANDRA-7601)
 + * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
 + * Fix range merging when DES scores are zero (CASSANDRA-7535)
 + * Warn when SSL certificates have expired (CASSANDRA-7528)
 + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
 + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
 + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
 +   operations to incorrect become full QUORUM (CASSANDRA-7345)
 + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
 + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
 + * Make sure high level sstables get compacted (CASSANDRA-7414)
 + * Fix AssertionError when using empty clustering columns and static columns
 +   (CASSANDRA-7455)
 + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
 + * Add option to disable STCS in L0 (CASSANDRA-6621)
 + * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 + * Backport CASSNADRA-3569/CASSANDRA-6747 (CASSANDRA-7560)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 + * Fix sstableloader unable to connect encrypted node (CASSANDRA-7585)
 +Merged from 1.2:
+  * Validate empty cell names from counter updates (CASSANDRA-7798)
   * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
   * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
   * Clone token map outside of hot gossip loops (CASSANDRA-7758)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecf1baeb/src/java/org/apache/cassandra/cql3/Constants.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Constants.java
index 4ea6c2d,1c7feaf..5189517
--- a/src/java/org/apache/cassandra/cql3/Constants.java
+++ b/src/java/org/apache/cassandra/cql3/Constants.java
@@@ -322,9 -325,8 +322,9 @@@ public abstract class Constant
              if (bytes == null)
                  throw new InvalidRequestException("Invalid null value for counter increment");
              long increment = ByteBufferUtil.toLong(bytes);
 +            prefix = maybeUpdatePrefix(cf.metadata(), prefix);
              ByteBuffer cname = columnName == null ? prefix.build() : prefix.add(columnName.key).build();
-             cf.addCounter(cname, increment);
+             cf.addColumn(params.makeCounter(cname, increment));
          }
      }
  
@@@ -345,9 -347,8 +345,9 @@@
              if (increment == Long.MIN_VALUE)
                  throw new InvalidRequestException("The negation of " + increment + " overflows
supported counter precision (signed 8 bytes integer)");
  
 +            prefix = maybeUpdatePrefix(cf.metadata(), prefix);
              ByteBuffer cname = columnName == null ? prefix.build() : prefix.add(columnName.key).build();
-             cf.addCounter(cname, -increment);
+             cf.addColumn(params.makeCounter(cname, -increment));
          }
      }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecf1baeb/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 0034b16,3d87598..c543d6c
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@@ -54,13 -51,21 +54,19 @@@ public class UpdateParameter
  
      public Column makeColumn(ByteBuffer name, ByteBuffer value) throws InvalidRequestException
      {
 -        QueryProcessor.validateColumnName(name);
 -        return ttl > 0
 -             ? new ExpiringColumn(name, value, timestamp, ttl)
 -             : new Column(name, value, timestamp);
 +        QueryProcessor.validateCellName(name);
 +        return Column.create(name, value, timestamp, ttl, metadata);
      }
  
+     public Column makeCounter(ByteBuffer name, long delta) throws InvalidRequestException
+     {
 -        QueryProcessor.validateColumnName(name);
++        QueryProcessor.validateCellName(name);
+         return new CounterUpdateColumn(name, delta, System.currentTimeMillis());
+     }
+ 
      public Column makeTombstone(ByteBuffer name) throws InvalidRequestException
      {
 -        QueryProcessor.validateColumnName(name);
 +        QueryProcessor.validateCellName(name);
          return new DeletedColumn(name, localDeletionTime, timestamp);
      }
  


Mime
View raw message