You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2017/01/04 12:39:25 UTC

[01/15] cassandra git commit: AutoSavingCache does not store required keys making RowCacheTests Flaky

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 e4f732536 -> 8a112ca8a
  refs/heads/cassandra-3.0 d2344683d -> 5983ce262
  refs/heads/cassandra-3.11 e043d7d0b -> 48ca31409
  refs/heads/cassandra-3.X 342e28f69 -> 578e137f0
  refs/heads/trunk d0e3ade8e -> 5f6921a22


AutoSavingCache does not store required keys making RowCacheTests Flaky

patch by Jay Zhuang; reviewed by Robert Stupp for CASSANDRA-12453


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

Branch: refs/heads/cassandra-2.2
Commit: 8a112ca8ae58df5b85d67f901ca6093917859941
Parents: e4f7325
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Wed Jan 4 13:32:23 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:23 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a112ca8/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java
index 0c0396c..332714fb 100644
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@ -62,6 +62,7 @@ public class RowCacheTest
     @BeforeClass
     public static void defineSchema() throws ConfigurationException
     {
+        System.setProperty("org.caffinitas.ohc.segmentCount", "16");
         SchemaLoader.prepareServer();
         SchemaLoader.createKeyspace(KEYSPACE_CACHED,
                 SimpleStrategy.class,


[09/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 5983ce262f991bb6e86acd97f6b360f62cf6d357
Parents: d234468 8a112ca
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:47 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:47 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5983ce26/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/RowCacheTest.java
index cff574a,332714fb..06aed47
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@@ -64,14 -62,16 +64,15 @@@ public class RowCacheTes
      @BeforeClass
      public static void defineSchema() throws ConfigurationException
      {
+         System.setProperty("org.caffinitas.ohc.segmentCount", "16");
          SchemaLoader.prepareServer();
          SchemaLoader.createKeyspace(KEYSPACE_CACHED,
 -                SimpleStrategy.class,
 -                KSMetaData.optsWithRF(1),
 -                SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL),
 -                SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT)
 -                            .defaultValidator(IntegerType.instance)
 -                            .caching(new CachingOptions(new CachingOptions.KeyCache(CachingOptions.KeyCache.Type.ALL),
 -                                     new CachingOptions.RowCache(CachingOptions.RowCache.Type.HEAD, 100))));
 +                                    KeyspaceParams.simple(1),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDNOCLUSTER, 1, AsciiType.instance, AsciiType.instance, null)
 +                                                .caching(new CachingParams(true, 100)),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingParams.CACHE_EVERYTHING),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT, 1, IntegerType.instance)
 +                                                .caching(new CachingParams(true, 100)));
      }
  
      @AfterClass


[02/15] cassandra git commit: AutoSavingCache does not store required keys making RowCacheTests Flaky

Posted by sn...@apache.org.
AutoSavingCache does not store required keys making RowCacheTests Flaky

patch by Jay Zhuang; reviewed by Robert Stupp for CASSANDRA-12453


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

Branch: refs/heads/cassandra-3.0
Commit: 8a112ca8ae58df5b85d67f901ca6093917859941
Parents: e4f7325
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Wed Jan 4 13:32:23 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:23 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a112ca8/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java
index 0c0396c..332714fb 100644
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@ -62,6 +62,7 @@ public class RowCacheTest
     @BeforeClass
     public static void defineSchema() throws ConfigurationException
     {
+        System.setProperty("org.caffinitas.ohc.segmentCount", "16");
         SchemaLoader.prepareServer();
         SchemaLoader.createKeyspace(KEYSPACE_CACHED,
                 SimpleStrategy.class,


[15/15] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

Posted by sn...@apache.org.
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 5f6921a221dc8c656bce991c6d5dd7a34969e71b
Parents: d0e3ade 578e137
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:33:05 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:33:05 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------



[11/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.X
Commit: 48ca31409dc2728272c44b47a5b6ce60144f422e
Parents: e043d7d 5983ce2
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:53 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:53 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/48ca3140/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------


[10/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 48ca31409dc2728272c44b47a5b6ce60144f422e
Parents: e043d7d 5983ce2
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:53 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:53 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/48ca3140/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------


[03/15] cassandra git commit: AutoSavingCache does not store required keys making RowCacheTests Flaky

Posted by sn...@apache.org.
AutoSavingCache does not store required keys making RowCacheTests Flaky

patch by Jay Zhuang; reviewed by Robert Stupp for CASSANDRA-12453


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

Branch: refs/heads/trunk
Commit: 8a112ca8ae58df5b85d67f901ca6093917859941
Parents: e4f7325
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Wed Jan 4 13:32:23 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:23 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a112ca8/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java
index 0c0396c..332714fb 100644
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@ -62,6 +62,7 @@ public class RowCacheTest
     @BeforeClass
     public static void defineSchema() throws ConfigurationException
     {
+        System.setProperty("org.caffinitas.ohc.segmentCount", "16");
         SchemaLoader.prepareServer();
         SchemaLoader.createKeyspace(KEYSPACE_CACHED,
                 SimpleStrategy.class,


[12/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 48ca31409dc2728272c44b47a5b6ce60144f422e
Parents: e043d7d 5983ce2
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:53 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:53 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/48ca3140/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------


[07/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 5983ce262f991bb6e86acd97f6b360f62cf6d357
Parents: d234468 8a112ca
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:47 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:47 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5983ce26/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/RowCacheTest.java
index cff574a,332714fb..06aed47
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@@ -64,14 -62,16 +64,15 @@@ public class RowCacheTes
      @BeforeClass
      public static void defineSchema() throws ConfigurationException
      {
+         System.setProperty("org.caffinitas.ohc.segmentCount", "16");
          SchemaLoader.prepareServer();
          SchemaLoader.createKeyspace(KEYSPACE_CACHED,
 -                SimpleStrategy.class,
 -                KSMetaData.optsWithRF(1),
 -                SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL),
 -                SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT)
 -                            .defaultValidator(IntegerType.instance)
 -                            .caching(new CachingOptions(new CachingOptions.KeyCache(CachingOptions.KeyCache.Type.ALL),
 -                                     new CachingOptions.RowCache(CachingOptions.RowCache.Type.HEAD, 100))));
 +                                    KeyspaceParams.simple(1),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDNOCLUSTER, 1, AsciiType.instance, AsciiType.instance, null)
 +                                                .caching(new CachingParams(true, 100)),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingParams.CACHE_EVERYTHING),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT, 1, IntegerType.instance)
 +                                                .caching(new CachingParams(true, 100)));
      }
  
      @AfterClass


[04/15] cassandra git commit: AutoSavingCache does not store required keys making RowCacheTests Flaky

Posted by sn...@apache.org.
AutoSavingCache does not store required keys making RowCacheTests Flaky

patch by Jay Zhuang; reviewed by Robert Stupp for CASSANDRA-12453


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

Branch: refs/heads/cassandra-3.11
Commit: 8a112ca8ae58df5b85d67f901ca6093917859941
Parents: e4f7325
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Wed Jan 4 13:32:23 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:23 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a112ca8/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java
index 0c0396c..332714fb 100644
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@ -62,6 +62,7 @@ public class RowCacheTest
     @BeforeClass
     public static void defineSchema() throws ConfigurationException
     {
+        System.setProperty("org.caffinitas.ohc.segmentCount", "16");
         SchemaLoader.prepareServer();
         SchemaLoader.createKeyspace(KEYSPACE_CACHED,
                 SimpleStrategy.class,


[13/15] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

Posted by sn...@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/578e137f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/578e137f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/578e137f

Branch: refs/heads/cassandra-3.X
Commit: 578e137f0c343b5e580d92c38d58782edd6b87b7
Parents: 342e28f 48ca314
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:59 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:59 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------



[14/15] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

Posted by sn...@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/578e137f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/578e137f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/578e137f

Branch: refs/heads/trunk
Commit: 578e137f0c343b5e580d92c38d58782edd6b87b7
Parents: 342e28f 48ca314
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:59 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:59 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------



[06/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5983ce262f991bb6e86acd97f6b360f62cf6d357
Parents: d234468 8a112ca
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:47 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:47 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5983ce26/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/RowCacheTest.java
index cff574a,332714fb..06aed47
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@@ -64,14 -62,16 +64,15 @@@ public class RowCacheTes
      @BeforeClass
      public static void defineSchema() throws ConfigurationException
      {
+         System.setProperty("org.caffinitas.ohc.segmentCount", "16");
          SchemaLoader.prepareServer();
          SchemaLoader.createKeyspace(KEYSPACE_CACHED,
 -                SimpleStrategy.class,
 -                KSMetaData.optsWithRF(1),
 -                SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL),
 -                SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT)
 -                            .defaultValidator(IntegerType.instance)
 -                            .caching(new CachingOptions(new CachingOptions.KeyCache(CachingOptions.KeyCache.Type.ALL),
 -                                     new CachingOptions.RowCache(CachingOptions.RowCache.Type.HEAD, 100))));
 +                                    KeyspaceParams.simple(1),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDNOCLUSTER, 1, AsciiType.instance, AsciiType.instance, null)
 +                                                .caching(new CachingParams(true, 100)),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingParams.CACHE_EVERYTHING),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT, 1, IntegerType.instance)
 +                                                .caching(new CachingParams(true, 100)));
      }
  
      @AfterClass


[08/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 5983ce262f991bb6e86acd97f6b360f62cf6d357
Parents: d234468 8a112ca
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Jan 4 13:32:47 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:47 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5983ce26/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/RowCacheTest.java
index cff574a,332714fb..06aed47
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@@ -64,14 -62,16 +64,15 @@@ public class RowCacheTes
      @BeforeClass
      public static void defineSchema() throws ConfigurationException
      {
+         System.setProperty("org.caffinitas.ohc.segmentCount", "16");
          SchemaLoader.prepareServer();
          SchemaLoader.createKeyspace(KEYSPACE_CACHED,
 -                SimpleStrategy.class,
 -                KSMetaData.optsWithRF(1),
 -                SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL),
 -                SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT)
 -                            .defaultValidator(IntegerType.instance)
 -                            .caching(new CachingOptions(new CachingOptions.KeyCache(CachingOptions.KeyCache.Type.ALL),
 -                                     new CachingOptions.RowCache(CachingOptions.RowCache.Type.HEAD, 100))));
 +                                    KeyspaceParams.simple(1),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDNOCLUSTER, 1, AsciiType.instance, AsciiType.instance, null)
 +                                                .caching(new CachingParams(true, 100)),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingParams.CACHE_EVERYTHING),
 +                                    SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT, 1, IntegerType.instance)
 +                                                .caching(new CachingParams(true, 100)));
      }
  
      @AfterClass


[05/15] cassandra git commit: AutoSavingCache does not store required keys making RowCacheTests Flaky

Posted by sn...@apache.org.
AutoSavingCache does not store required keys making RowCacheTests Flaky

patch by Jay Zhuang; reviewed by Robert Stupp for CASSANDRA-12453


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

Branch: refs/heads/cassandra-3.X
Commit: 8a112ca8ae58df5b85d67f901ca6093917859941
Parents: e4f7325
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Wed Jan 4 13:32:23 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Jan 4 13:32:23 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a112ca8/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java
index 0c0396c..332714fb 100644
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@ -62,6 +62,7 @@ public class RowCacheTest
     @BeforeClass
     public static void defineSchema() throws ConfigurationException
     {
+        System.setProperty("org.caffinitas.ohc.segmentCount", "16");
         SchemaLoader.prepareServer();
         SchemaLoader.createKeyspace(KEYSPACE_CACHED,
                 SimpleStrategy.class,