You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/02/14 18:42:30 UTC
[1/2] git commit: Fix SecondaryIndexManager#deleteFromIndexes()
Updated Branches:
refs/heads/cassandra-2.0 44f9c8689 -> 15fd82cb9
Fix SecondaryIndexManager#deleteFromIndexes()
patch by Sergio Bossa; reviewed by Sam Tunnicliffe for CASSANDRA-6711
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7937ee38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7937ee38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7937ee38
Branch: refs/heads/cassandra-2.0
Commit: 7937ee38f5f3ea0ee821441672cbb777814fa4fd
Parents: c9ade9d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Feb 14 20:37:06 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Feb 14 20:37:06 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7937ee38/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 492cc2d..964e10c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* Don't exchange schema between nodes with different versions (CASSANDRA-6695)
* Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
* IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
+ * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
1.2.15
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7937ee38/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 9cbbe8f..c4e4129 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -464,7 +464,8 @@ public class SecondaryIndexManager
for (IColumn column : indexedColumnsInRow)
{
- SecondaryIndex index = indexesByColumn.get(column.name());
+ ColumnDefinition cDef = baseCfs.metadata.getColumnDefinitionFromColumnName(column.name());
+ SecondaryIndex index = indexesByColumn.get(cDef.name);
if (index == null)
continue;
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15fd82cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15fd82cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15fd82cb
Branch: refs/heads/cassandra-2.0
Commit: 15fd82cb912edac6c6301d7175797ae2ea7976e6
Parents: 44f9c86 7937ee3
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Feb 14 20:40:10 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Feb 14 20:40:10 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15fd82cb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57eefac,964e10c..571b8dd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -22,33 -8,24 +22,34 @@@ Merged from 1.2
* Don't exchange schema between nodes with different versions (CASSANDRA-6695)
* Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
* IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
+ * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
-
-1.2.15
- * Move handling of migration event source to solve bootstrap race (CASSANDRA-6648)
- * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
-
-
-1.2.14
- * Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592)
- * add cassandra.default_messaging_version property to allow easier
- upgrading from 1.1 (CASSANDRA-6619)
- * Allow executing CREATE statements multiple times (CASSANDRA-6471)
- * Don't send confusing info with timeouts (CASSANDRA-6491)
- * Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
- * Don't drop local mutations without a hint (CASSANDRA-6510)
- * Don't allow null max_hint_window_in_ms (CASSANDRA-6419)
- * Validate SliceRange start and finish lengths (CASSANDRA-6521)
+2.0.5
+ * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
+ * Add ks.cf names to tombstone logging (CASSANDRA-6597)
+ * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495)
+ * Wait for gossip to settle before accepting client connections (CASSANDRA-4288)
+ * Delete unfinished compaction incrementally (CASSANDRA-6086)
+ * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480)
+ * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485)
+ * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584)
+ * Don't special case received counts in CAS timeout exceptions (CASSANDRA-6595)
+ * Add support for 2.1 global counter shards (CASSANDRA-6505)
+ * Fix NPE when streaming connection is not yet established (CASSANDRA-6210)
+ * Avoid rare duplicate read repair triggering (CASSANDRA-6606)
+ * Fix paging discardFirst (CASSANDRA-6555)
+ * Fix ArrayIndexOutOfBoundsException in 2ndary index query (CASSANDRA-6470)
+ * Release sstables upon rebuilding 2i (CASSANDRA-6635)
+ * Add AbstractCompactionStrategy.startup() method (CASSANDRA-6637)
+ * SSTableScanner may skip rows during cleanup (CASSANDRA-6638)
+ * sstables from stalled repair sessions can resurrect deleted data (CASSANDRA-6503)
+ * Switch stress to use ITransportFactory (CASSANDRA-6641)
+ * Fix IllegalArgumentException during prepare (CASSANDRA-6592)
+ * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517)
+ * Fix direct Memory on architectures that do not support unaligned long access
+ (CASSANDRA-6628)
+ * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
+Merged from 1.2:
* fsync compression metadata (CASSANDRA-6531)
* Validate CF existence on execution for prepared statement (CASSANDRA-6535)
* Add ability to throttle batchlog replay (CASSANDRA-6550)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15fd82cb/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 1838c03,c4e4129..7bfed33
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -436,9 -462,10 +436,10 @@@ public class SecondaryIndexManage
// Update entire row only once per row level index
Set<Class<? extends SecondaryIndex>> cleanedRowLevelIndexes = null;
- for (IColumn column : indexedColumnsInRow)
+ for (Column column : indexedColumnsInRow)
{
- SecondaryIndex index = indexesByColumn.get(column.name());
+ ColumnDefinition cDef = baseCfs.metadata.getColumnDefinitionFromColumnName(column.name());
+ SecondaryIndex index = indexesByColumn.get(cDef.name);
if (index == null)
continue;