cassandra-commits mailing list archives

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java


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

Branch: refs/heads/trunk
Commit: 579222e9d5e37dacaeb5f82a58211cfe5b0a3855
Parents: fabdd43 7554eb5
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Aug 19 16:19:12 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Aug 19 16:19:12 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +-
 .../db/index/SecondaryIndexManager.java         | 28 +++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/579222e9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8aafd98,0ac1fb6..ca58708
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,16 +1,33 @@@
 -2.0.10
 +2.1.0
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * 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)
 +
 +
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
   * (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)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/579222e9/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index c184097,a54882d..07fd568
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -472,25 -452,21 +472,21 @@@ public class SecondaryIndexManage
          // Update entire row only once per row level index
          Set<Class<? extends SecondaryIndex>> cleanedRowLevelIndexes = null;
  
 -        for (Column column : indexedColumnsInRow)
 +        for (Cell cell : indexedColumnsInRow)
          {
-             // TODO: this is probably incorrect, we should pull all indexes
-             ColumnDefinition cDef = baseCfs.metadata.getColumnDefinition(cell.name());
-             SecondaryIndex index = indexesByColumn.get(cDef.name.bytes);
-             if (index == null)
-                 continue;
- 
-             if (index instanceof PerRowSecondaryIndex)
-             {
-                 if (cleanedRowLevelIndexes == null)
-                     cleanedRowLevelIndexes = new HashSet<>();
- 
-                 if (cleanedRowLevelIndexes.add(index.getClass()))
-                     ((PerRowSecondaryIndex)index).delete(key, opGroup);
-             }
-             else
 -            for (SecondaryIndex index : indexFor(column.name()))
++            for (SecondaryIndex index : indexFor(cell.name()))
              {
-                 ((PerColumnSecondaryIndex) index).delete(key.getKey(), cell, opGroup);
+                 if (index instanceof PerRowSecondaryIndex)
+                 {
+                     if (cleanedRowLevelIndexes == null)
+                         cleanedRowLevelIndexes = new HashSet<>();
+                     if (cleanedRowLevelIndexes.add(index.getClass()))
 -                        ((PerRowSecondaryIndex) index).delete(key);
++                        ((PerRowSecondaryIndex) index).delete(key, opGroup);
+                 }
+                 else
+                 {
 -                    ((PerColumnSecondaryIndex) index).delete(key.key, column);
++                    ((PerColumnSecondaryIndex) index).delete(key.getKey(), cell, opGroup);
+                 }
              }
          }
      }


Mime
View raw message