You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/01/28 23:40:07 UTC
[1/6] cassandra git commit: ninja remove MeteredFlusherTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 b077cda83 -> d47d2b1e2
refs/heads/cassandra-2.1 ffd0ae4bf -> bda32583f
refs/heads/trunk ca1b06500 -> 4537b3277
ninja remove MeteredFlusherTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d47d2b1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d47d2b1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d47d2b1e
Branch: refs/heads/cassandra-2.0
Commit: d47d2b1e2b66e239b8cf81e8c254dd3fbdf32052
Parents: b077cda
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:37:49 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:37:49 2015 +0000
----------------------------------------------------------------------
.../apache/cassandra/db/MeteredFlusherTest.java | 72 --------------------
1 file changed, 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d47d2b1e/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java b/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
deleted file mode 100644
index 5e25744..0000000
--- a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.cassandra.db;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.junit.Test;
-
-import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.service.MigrationManager;
-import org.apache.cassandra.utils.ByteBufferUtil;
-
-public class MeteredFlusherTest extends SchemaLoader
-{
- @Test
- public void testManyMemtables() throws IOException, ConfigurationException
- {
- Keyspace keyspace = Keyspace.open("Keyspace1");
- for (int i = 0; i < 100; i++)
- {
- CFMetaData metadata = new CFMetaData(keyspace.getName(), "_CF" + i, ColumnFamilyType.Standard, UTF8Type.instance, null);
- MigrationManager.announceNewColumnFamily(metadata);
- }
-
- ByteBuffer name = ByteBufferUtil.bytes("c");
- for (int j = 0; j < 200; j++)
- {
- for (int i = 0; i < 100; i++)
- {
- RowMutation rm = new RowMutation("Keyspace1", ByteBufferUtil.bytes("key" + j));
- ColumnFamily cf = TreeMapBackedSortedColumns.factory.create("Keyspace1", "_CF" + i);
- // don't cheat by allocating this outside of the loop; that defeats the purpose of deliberately using lots of memory
- ByteBuffer value = ByteBuffer.allocate(100000);
- cf.addColumn(new Column(name, value));
- rm.add(cf);
- rm.applyUnsafe();
- }
- }
-
- int flushes = 0;
- for (ColumnFamilyStore cfs : ColumnFamilyStore.all())
- {
- if (cfs.name.startsWith("_CF"))
- flushes += cfs.getMemtableSwitchCount();
- }
- assert flushes > 0;
- }
-}
-
[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by be...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
test/long/org/apache/cassandra/db/LongFlushMemtableTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bda32583
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bda32583
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bda32583
Branch: refs/heads/trunk
Commit: bda32583f239f65d3249f309bc190414cfa2e903
Parents: ffd0ae4 d47d2b1
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:39:30 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:39:30 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4537b327
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4537b327
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4537b327
Branch: refs/heads/trunk
Commit: 4537b32772ed1b5116214a23f7f3b7c7f06613a1
Parents: ca1b065 bda3258
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:39:39 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:39:39 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] cassandra git commit: ninja remove MeteredFlusherTest
Posted by be...@apache.org.
ninja remove MeteredFlusherTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d47d2b1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d47d2b1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d47d2b1e
Branch: refs/heads/cassandra-2.1
Commit: d47d2b1e2b66e239b8cf81e8c254dd3fbdf32052
Parents: b077cda
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:37:49 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:37:49 2015 +0000
----------------------------------------------------------------------
.../apache/cassandra/db/MeteredFlusherTest.java | 72 --------------------
1 file changed, 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d47d2b1e/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java b/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
deleted file mode 100644
index 5e25744..0000000
--- a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.cassandra.db;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.junit.Test;
-
-import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.service.MigrationManager;
-import org.apache.cassandra.utils.ByteBufferUtil;
-
-public class MeteredFlusherTest extends SchemaLoader
-{
- @Test
- public void testManyMemtables() throws IOException, ConfigurationException
- {
- Keyspace keyspace = Keyspace.open("Keyspace1");
- for (int i = 0; i < 100; i++)
- {
- CFMetaData metadata = new CFMetaData(keyspace.getName(), "_CF" + i, ColumnFamilyType.Standard, UTF8Type.instance, null);
- MigrationManager.announceNewColumnFamily(metadata);
- }
-
- ByteBuffer name = ByteBufferUtil.bytes("c");
- for (int j = 0; j < 200; j++)
- {
- for (int i = 0; i < 100; i++)
- {
- RowMutation rm = new RowMutation("Keyspace1", ByteBufferUtil.bytes("key" + j));
- ColumnFamily cf = TreeMapBackedSortedColumns.factory.create("Keyspace1", "_CF" + i);
- // don't cheat by allocating this outside of the loop; that defeats the purpose of deliberately using lots of memory
- ByteBuffer value = ByteBuffer.allocate(100000);
- cf.addColumn(new Column(name, value));
- rm.add(cf);
- rm.applyUnsafe();
- }
- }
-
- int flushes = 0;
- for (ColumnFamilyStore cfs : ColumnFamilyStore.all())
- {
- if (cfs.name.startsWith("_CF"))
- flushes += cfs.getMemtableSwitchCount();
- }
- assert flushes > 0;
- }
-}
-
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by be...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
test/long/org/apache/cassandra/db/LongFlushMemtableTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bda32583
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bda32583
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bda32583
Branch: refs/heads/cassandra-2.1
Commit: bda32583f239f65d3249f309bc190414cfa2e903
Parents: ffd0ae4 d47d2b1
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:39:30 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:39:30 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] cassandra git commit: ninja remove MeteredFlusherTest
Posted by be...@apache.org.
ninja remove MeteredFlusherTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d47d2b1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d47d2b1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d47d2b1e
Branch: refs/heads/trunk
Commit: d47d2b1e2b66e239b8cf81e8c254dd3fbdf32052
Parents: b077cda
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:37:49 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:37:49 2015 +0000
----------------------------------------------------------------------
.../apache/cassandra/db/MeteredFlusherTest.java | 72 --------------------
1 file changed, 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d47d2b1e/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java b/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
deleted file mode 100644
index 5e25744..0000000
--- a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.cassandra.db;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.junit.Test;
-
-import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.service.MigrationManager;
-import org.apache.cassandra.utils.ByteBufferUtil;
-
-public class MeteredFlusherTest extends SchemaLoader
-{
- @Test
- public void testManyMemtables() throws IOException, ConfigurationException
- {
- Keyspace keyspace = Keyspace.open("Keyspace1");
- for (int i = 0; i < 100; i++)
- {
- CFMetaData metadata = new CFMetaData(keyspace.getName(), "_CF" + i, ColumnFamilyType.Standard, UTF8Type.instance, null);
- MigrationManager.announceNewColumnFamily(metadata);
- }
-
- ByteBuffer name = ByteBufferUtil.bytes("c");
- for (int j = 0; j < 200; j++)
- {
- for (int i = 0; i < 100; i++)
- {
- RowMutation rm = new RowMutation("Keyspace1", ByteBufferUtil.bytes("key" + j));
- ColumnFamily cf = TreeMapBackedSortedColumns.factory.create("Keyspace1", "_CF" + i);
- // don't cheat by allocating this outside of the loop; that defeats the purpose of deliberately using lots of memory
- ByteBuffer value = ByteBuffer.allocate(100000);
- cf.addColumn(new Column(name, value));
- rm.add(cf);
- rm.applyUnsafe();
- }
- }
-
- int flushes = 0;
- for (ColumnFamilyStore cfs : ColumnFamilyStore.all())
- {
- if (cfs.name.startsWith("_CF"))
- flushes += cfs.getMemtableSwitchCount();
- }
- assert flushes > 0;
- }
-}
-