cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [1/4] git commit: merge from 1.0
Date Tue, 10 Jan 2012 17:41:12 GMT
Updated Branches:
  refs/heads/trunk bcc87a9ee -> 6c2bd5152


merge from 1.0


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

Branch: refs/heads/trunk
Commit: 6c2bd5152fed7cb536ed11ab48f92d18b3fa5f69
Parents: bcc87a9 044eb1e
Author: Pavel Yaskevich <povel.y@gmail.com>
Authored: Tue Jan 10 20:41:52 2012 +0200
Committer: Pavel Yaskevich <povel.y@gmail.com>
Committed: Tue Jan 10 20:41:52 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        |    4 ++++
 src/java/org/apache/cassandra/cli/CliClient.java   |   12 ++++++++----
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   13 +++++++------
 .../org/apache/cassandra/db/ExpiringColumn.java    |   12 ++++++++++++
 .../db/compaction/ParallelCompactionIterable.java  |    5 +++++
 .../apache/cassandra/db/filter/QueryFilter.java    |    2 +-
 .../org/apache/cassandra/utils/MergeIterator.java  |    7 +++++++
 7 files changed, 44 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c2bd515/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c2bd515/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cli/CliClient.java
index b09561b,c83ba97..94b98cb
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@@ -1248,9 -1268,6 +1248,9 @@@ public class CliClien
              case BLOOM_FILTER_FP_CHANCE:
                  cfDef.setBloom_filter_fp_chance(Double.parseDouble(mValue));
                  break;
 +            case CACHING:
-                 cfDef.setCaching(mValue);
++                cfDef.setCaching(CliUtils.unescapeSQLString(mValue));
 +                break;
              default:
                  //must match one of the above or we'd throw an exception at the valueOf
statement above.
                  assert(false);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c2bd515/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c2bd515/src/java/org/apache/cassandra/db/ExpiringColumn.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c2bd515/src/java/org/apache/cassandra/db/filter/QueryFilter.java
----------------------------------------------------------------------


Mime
View raw message