cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [1/2] git commit: merge from 1.1
Date Tue, 11 Sep 2012 11:18:00 GMT
Updated Branches:
  refs/heads/trunk c6ddbea43 -> b85c93e0a


merge from 1.1


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

Branch: refs/heads/trunk
Commit: b85c93e0a89ace02b4a73d49a75976d7fbce6115
Parents: c6ddbea 98708d8
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Tue Sep 11 14:16:22 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Tue Sep 11 14:16:22 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                      |    9 +---
 src/java/org/apache/cassandra/cli/CliClient.java |   36 +++++++++++-----
 2 files changed, 28 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b85c93e0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 98929cf,b6fe049..00971a5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,7 +1,69 @@@
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default (CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and CQL3) (CASSANDRA-4487)
 + * add Murmur3Partitioner and make it default for new installations (CASSANDRA-3772)
 + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497)
 + * Finer grained exceptions hierarchy and provides error code with exceptions (CASSANDRA-3979)
 + * Adds events push to binary protocol (CASSANDRA-4480)
 + * Rewrite nodetool help (CASSANDRA-2293)
 + * Make CQL3 the default for CQL (CASSANDRA-4640)
 + * update stress tool to be able to use CQL3 (CASSANDRA-4406)
 + * Accept all thrift update on CQL3 cf but don't expose their metadata (CASSANDRA-4377)
 +
 +
  1.1.6
-   * (cql3) fix potential NPE with both equal and unequal restriction (CASSANDRA-4532)
-   * (cql3) improves ORDER BY validation (CASSANDRA-4624)
-   * Fix potential deadlock during counter writes (CASSANDRA-4578)
-   * Fix cql error with ORDER BY when using IN (CASSANDRA-4612)
-   * Improve IAuthority interface by introducing fine-grained
-     access permissions and grant/revoke commands (CASSANDRA-4490)
+  * Improve IAuthority interface by introducing fine-grained
+    access permissions and grant/revoke commands (CASSANDRA-4490)
+  * fix assumption error in CLI when updating/describing keyspace (CASSANDRA-4322)
  
  
  1.1.5

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b85c93e0/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cli/CliClient.java
index 090bef5,d0fb543..0c3e133
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@@ -1063,8 -1066,9 +1063,8 @@@ public class CliClien
  
              String mySchemaVersion = thriftClient.system_update_keyspace(updatedKsDef);
              sessionState.out.println(mySchemaVersion);
 -            validateSchemaIsSettled(mySchemaVersion);
              keyspacesMap.remove(keyspaceName);
-             getKSMetaData(keySpace);
+             getKSMetaData(keyspaceName);
          }
          catch (InvalidRequestException e)
          {
@@@ -2955,12 -3007,12 +2969,12 @@@
              cfAssumes.put(property, value);
              assumptionsChanged = true;
          }
 -        
 +
          public void replayAssumptions(String keyspace)
          {
-             if (!CliMain.isConnected() || !hasKeySpace())
+             if (!CliMain.isConnected() || !hasKeySpace(false))
                  return;
 -            
 +
              Map<String, Map<String, String>> cfAssumes = assumptions.get(keyspace);
              if (cfAssumes != null)
              {


Mime
View raw message