You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/02/19 16:17:46 UTC
[1/2] cassandra git commit: Ninja Fix: remove wrongly commited test
Repository: cassandra
Updated Branches:
refs/heads/trunk b3eeadf92 -> acb2ab072
Ninja Fix: remove wrongly commited test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2838908
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2838908
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2838908
Branch: refs/heads/trunk
Commit: a28389087abf7e8df2964bf212ab27d07a26849a
Parents: a76a8ef
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Feb 19 16:14:16 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Feb 19 16:14:16 2016 +0100
----------------------------------------------------------------------
.../commitlog/CommitLogSegmentManagerTest.java | 63 --------------------
1 file changed, 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2838908/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java
deleted file mode 100644
index 59b380f..0000000
--- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.apache.cassandra.db.commitlog;
-
-import java.nio.ByteBuffer;
-import java.util.Random;
-
-import javax.naming.ConfigurationException;
-
-import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.config.Config.CommitLogSync;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.Mutation;
-import org.apache.cassandra.db.RowUpdateBuilder;
-import org.apache.cassandra.db.compaction.CompactionManager;
-import org.apache.cassandra.db.marshal.AsciiType;
-import org.apache.cassandra.db.marshal.BytesType;
-import org.apache.cassandra.schema.KeyspaceParams;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableMap;
-
-public class CommitLogSegmentManagerTest
-{
- private static final String KEYSPACE1 = "CommitLogTest";
- private static final String STANDARD1 = "Standard1";
- private static final String STANDARD2 = "Standard2";
-
- private final static byte[] entropy = new byte[1024 * 256];
- @BeforeClass
- public static void defineSchema() throws ConfigurationException
- {
- new Random().nextBytes(entropy);
- DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of()));
- DatabaseDescriptor.setCommitLogSegmentSize(1);
- DatabaseDescriptor.setCommitLogSync(CommitLogSync.periodic);
- DatabaseDescriptor.setCommitLogSyncPeriod(10 * 1000);
- SchemaLoader.prepareServer();
- SchemaLoader.createKeyspace(KEYSPACE1,
- KeyspaceParams.simple(1),
- SchemaLoader.standardCFMD(KEYSPACE1, STANDARD1, 0, AsciiType.instance, BytesType.instance),
- SchemaLoader.standardCFMD(KEYSPACE1, STANDARD2, 0, AsciiType.instance, BytesType.instance));
-
- CompactionManager.instance.disableAutoCompaction();
- }
-
- @Test
- public void testCompressedCommitLogBackpressure() throws Throwable
- {
- CommitLog.instance.resetUnsafe(true);
- ColumnFamilyStore cfs1 = Keyspace.open(KEYSPACE1).getColumnFamilyStore(STANDARD1);
-
- Mutation m = new RowUpdateBuilder(cfs1.metadata, 0, "k")
- .clustering("bytes")
- .add("val", ByteBuffer.wrap(entropy))
- .build();
-
- for (int i = 0; i < 20000; i++)
- CommitLog.instance.add(m);
- }
-}
[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk
Posted by bl...@apache.org.
Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acb2ab07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acb2ab07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acb2ab07
Branch: refs/heads/trunk
Commit: acb2ab0723752e6e21877413866e9e7872194ffd
Parents: b3eeadf a283890
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Feb 19 16:17:16 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Feb 19 16:17:27 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------