You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/12/23 01:20:41 UTC
[1/2] cassandra git commit: fix typo: wrong if guard variable
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X f6b4ab417 -> 0d4fdadbf
fix typo: wrong if guard variable
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eaced9a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaced9a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaced9a5
Branch: refs/heads/cassandra-3.X
Commit: eaced9a541d09d55973b6f88d720e16ac948a559
Parents: b987678
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu Dec 22 20:19:53 2016 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu Dec 22 20:19:53 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eaced9a5/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 0cb0334..6adefbd 100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@ -426,7 +426,7 @@ public class SecondaryIndexManager implements IndexRegistry
{
Class<? extends Index> indexClass = FBUtilities.classForName(className, "Index");
Constructor<? extends Index> ctor = indexClass.getConstructor(ColumnFamilyStore.class, IndexMetadata.class);
- newIndex = (Index)ctor.newInstance(baseCfs, indexDef);
+ newIndex = ctor.newInstance(baseCfs, indexDef);
}
catch (Exception e)
{
@@ -615,7 +615,7 @@ public class SecondaryIndexManager implements IndexRegistry
return DEFAULT_PAGE_SIZE;
int columnsPerRow = baseCfs.metadata.partitionColumns().regulars.size();
- if (meanCellsPerPartition <= 0)
+ if (columnsPerRow <= 0)
return DEFAULT_PAGE_SIZE;
int meanRowsPerPartition = meanCellsPerPartition / columnsPerRow;
[2/2] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by db...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d4fdadb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d4fdadb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d4fdadb
Branch: refs/heads/cassandra-3.X
Commit: 0d4fdadbfeaa1255b9382c0fd72adde5b36627c0
Parents: f6b4ab4 eaced9a
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu Dec 22 20:20:32 2016 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu Dec 22 20:20:32 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------