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 Mon, 28 Oct 2013 13:28:49 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/thrift/CassandraServer.java


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

Branch: refs/heads/trunk
Commit: fcd657cde77c6a8dd2a2accba614e4055be0ab92
Parents: 46f7186 47896c8
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Oct 28 16:27:28 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Oct 28 16:27:28 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             |  2 ++
 .../org/apache/cassandra/thrift/CassandraServer.java    | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd657cd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0ba6584,8d47047..0d60fae
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,14 +1,48 @@@
 -1.2.12
 - * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
 - * Fix altering column types (CASSANDRA-6185)
 - * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
 - * add windows bat files for shell commands (CASSANDRA-6145)
 - * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181)
 - * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214)
 +2.0.3
 + * Fix modifying column_metadata from thrift (CASSANDRA-6182)
 + * cqlsh: fix LIST USERS output (CASSANDRA-6242)
 + * Add IRequestSink interface (CASSANDRA-6248)
 + * Update memtable size while flushing (CASSANDRA-6249)
 + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252)
 + * Require Permission.SELECT for CAS updates (CASSANDRA-6247)
++Merged from 1.2:
+  * Require logging in for Thrift CQL2/3 statement preparation (CASSANDRA-6254)
  
  
 -1.2.11
 +2.0.2
 + * Update FailureDetector to use nanontime (CASSANDRA-4925)
 + * Fix FileCacheService regressions (CASSANDRA-6149)
 + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
 + * Fix race conditions in bulk loader (CASSANDRA-6129)
 + * Add configurable metrics reporting (CASSANDRA-4430)
 + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
 + * Delete can potentially be skipped in batch (CASSANDRA-6115)
 + * Allow alter keyspace on system_traces (CASSANDRA-6016)
 + * Disallow empty column names in cql (CASSANDRA-6136)
 + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383)
 + * Save compaction history to system keyspace (CASSANDRA-5078)
 + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166)
 + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
 + * Add reloadtriggers command to nodetool (CASSANDRA-4949)
 + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
 + * Fix sstable loader (CASSANDRA-6205)
 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
 + * Fix NPE while loading paxos state (CASSANDRA-6211)
 + * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228)
 +Merged from 1.2:
 + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
   * Add a warning for small LCS sstable size (CASSANDRA-6191)
   * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191)
   * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd657cd/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index a8ee93c,9063be1..d52eb76
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -1958,12 -1730,13 +1958,14 @@@ public class CassandraServer implement
              logger.debug("prepare_cql_query");
  
          validateCQLVersion(2);
 +        maybeLogCQL2Warning();
  
 -        String queryString = uncompress(query,compression);
++        String queryString = uncompress(query, compression);
+         ThriftClientState cState = state();
+ 
          try
          {
-             ThriftClientState cState = state();
-             String queryString = uncompress(query, compression);
+             cState.validateLogin();
              return QueryProcessor.prepare(queryString, cState);
          }
          catch (RequestValidationException e)
@@@ -1980,10 -1753,12 +1982,12 @@@
  
          validateCQLVersion(3);
  
 -        String queryString = uncompress(query,compression);
++        String queryString = uncompress(query, compression);
+         ThriftClientState cState = state();
+ 
          try
          {
-             ThriftClientState cState = state();
-             String queryString = uncompress(query,compression);
+             cState.validateLogin();
              return org.apache.cassandra.cql3.QueryProcessor.prepare(queryString, cState,
true).toThriftPreparedResult();
          }
          catch (RequestValidationException e)


Mime
View raw message