cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 19 Jun 2014 08:09:52 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java


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

Branch: refs/heads/trunk
Commit: 7d8ba3be55ff0800dc0f7fdcc3f4dded1ed02770
Parents: 4155033 3ff7a77
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Thu Jun 19 10:08:31 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Thu Jun 19 10:08:31 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/db/ColumnFamily.java   |  21 ++--
 .../db/compaction/LazilyCompactedRow.java       |  10 +-
 .../cassandra/io/sstable/SSTableWriter.java     |   3 +
 .../apache/cassandra/db/ColumnFamilyTest.java   |  12 ++
 .../db/compaction/CompactionsTest.java          | 117 ++++++++++++++++---
 6 files changed, 135 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d8ba3be/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d8ba3be/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d8ba3be/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d8ba3be/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
index a720375,c60b650..58473b4
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@@ -18,20 -18,9 +18,16 @@@
  */
  package org.apache.cassandra.db.compaction;
  
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertTrue;
- import static org.junit.Assert.assertNotNull;
- 
 -import java.io.*;
 +import java.io.File;
++import java.io.IOException;
  import java.nio.ByteBuffer;
 -import java.util.*;
 +import java.util.ArrayList;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.Iterator;
 +import java.util.Map;
 +import java.util.Set;
 +import java.util.UUID;
  import java.util.concurrent.ExecutionException;
  import java.util.concurrent.TimeUnit;
  
@@@ -59,14 -51,9 +52,16 @@@ import org.apache.cassandra.service.Sto
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.Pair;
 +import org.junit.Ignore;
 +import org.junit.Test;
 +import org.junit.runner.RunWith;
 +
 +import com.google.common.base.Function;
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Sets;
  
+ import static org.junit.Assert.*;
+ 
  @RunWith(OrderedJUnit4ClassRunner.class)
  public class CompactionsTest extends SchemaLoader
  {


Mime
View raw message