You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2018/01/11 14:30:19 UTC
[2/3] cassandra git commit: Enable CDC unittest
Enable CDC unittest
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-14141
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51335267
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51335267
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51335267
Branch: refs/heads/trunk
Commit: 5133526733f7ff24062acb5aa57fcfff050ac424
Parents: fe0ee85
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Wed Dec 27 17:00:04 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Jan 11 06:27:04 2018 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 +++++
test/unit/org/apache/cassandra/cql3/CDCStatementTest.java | 6 +++---
.../cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java | 6 +++---
4 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51335267/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b89ad99..a748e28 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.2
+ * Enable CDC unittest (CASSANDRA-14141)
* Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139)
* Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
* Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51335267/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 51fbb59..8b92c5a 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -2417,6 +2417,11 @@ public class DatabaseDescriptor
return conf.cdc_enabled;
}
+ public static void setCDCEnabled(boolean cdc_enabled)
+ {
+ conf.cdc_enabled = cdc_enabled;
+ }
+
public static String getCDCLogLocation()
{
return conf.cdc_raw_directory;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51335267/test/unit/org/apache/cassandra/cql3/CDCStatementTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CDCStatementTest.java b/test/unit/org/apache/cassandra/cql3/CDCStatementTest.java
index 0b18eec..fb24aa9 100644
--- a/test/unit/org/apache/cassandra/cql3/CDCStatementTest.java
+++ b/test/unit/org/apache/cassandra/cql3/CDCStatementTest.java
@@ -19,7 +19,6 @@
package org.apache.cassandra.cql3;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -28,9 +27,10 @@ import org.apache.cassandra.config.DatabaseDescriptor;
public class CDCStatementTest extends CQLTester
{
@BeforeClass
- public static void checkConfig()
+ public static void setUpClass()
{
- Assume.assumeTrue(DatabaseDescriptor.isCDCEnabled());
+ DatabaseDescriptor.setCDCEnabled(true);
+ CQLTester.setUpClass();
}
@Test
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51335267/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
index 68ce57d..92a4bf8 100644
--- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
+++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
@@ -24,7 +24,6 @@ import java.nio.ByteBuffer;
import java.util.Random;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -43,9 +42,10 @@ public class CommitLogSegmentManagerCDCTest extends CQLTester
private static Random random = new Random();
@BeforeClass
- public static void checkConfig()
+ public static void setUpClass()
{
- Assume.assumeTrue(DatabaseDescriptor.isCDCEnabled());
+ DatabaseDescriptor.setCDCEnabled(true);
+ CQLTester.setUpClass();
}
@Before
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org