You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/02/02 08:37:47 UTC

[1/7] git commit: Fix potential loss of 2ndary index entry during compaction

Updated Branches:
  refs/heads/trunk 02fb21893 -> aa29b6af6


Fix potential loss of 2ndary index entry during compaction

patch by slebresne; reviewed by beobal for CASSANDRA-6517


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

Branch: refs/heads/trunk
Commit: 0191b359fc18ebb1efa940257729d141c26112d3
Parents: d76ad2e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 31 16:47:01 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 31 16:47:01 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../db/compaction/PrecompactedRow.java          |  2 +-
 .../apache/cassandra/db/RangeTombstoneTest.java | 59 ++++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0191b359/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 57fbe28..13b4c5b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,7 @@
  * sstables from stalled repair sessions can resurrect deleted data (CASSANDRA-6503)
  * Switch stress to use ITransportFactory (CASSANDRA-6641)
  * Fix IllegalArgumentException during prepare (CASSANDRA-6592)
+ * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517)
 Merged from 1.2:
  * fsync compression metadata (CASSANDRA-6531)
  * Validate CF existence on execution for prepared statement (CASSANDRA-6535)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0191b359/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
index d45bffa..db72847 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -126,7 +126,7 @@ public class PrecompactedRow extends AbstractCompactedRow
                 // notify the index that the column has been overwritten if the value being reduced has been
                 // superceded by another directly, or indirectly by a range tombstone
                 if ((!column.isMarkedForDelete(System.currentTimeMillis()) && !container.getColumn(column.name()).equals(column))
-                    || returnCF.deletionInfo().isDeleted(column.name(), CompactionManager.NO_GC))
+                    || returnCF.deletionInfo().isDeleted(column))
                 {
                     indexer.remove(column);
                 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0191b359/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index 731b364..d66f6db 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -31,6 +31,7 @@ import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.thrift.IndexType;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
@@ -303,6 +304,64 @@ public class RangeTombstoneTest extends SchemaLoader
         assertEquals(index.deletes.get(0), index.inserts.get(0));
     }
 
+    @Test
+    public void testOverwritesToDeletedColumns() throws Exception
+    {
+        Keyspace table = Keyspace.open(KSNAME);
+        ColumnFamilyStore cfs = table.getColumnFamilyStore(CFNAME);
+        ByteBuffer key = ByteBufferUtil.bytes("k6");
+        ByteBuffer indexedColumnName = ByteBufferUtil.bytes(1);
+
+        cfs.truncateBlocking();
+        cfs.disableAutoCompaction();
+        cfs.setCompactionStrategyClass(SizeTieredCompactionStrategy.class.getCanonicalName());
+        if (cfs.indexManager.getIndexForColumn(indexedColumnName) == null)
+        {
+            ColumnDefinition cd = new ColumnDefinition(indexedColumnName,
+                    cfs.getComparator(),
+                    IndexType.CUSTOM,
+                    ImmutableMap.of(SecondaryIndex.CUSTOM_INDEX_OPTION_NAME, TestIndex.class.getName()),
+                    "test_index",
+                    0,
+                    null);
+            cfs.indexManager.addIndexedColumn(cd);
+        }
+
+        TestIndex index = ((TestIndex)cfs.indexManager.getIndexForColumn(indexedColumnName));
+        index.resetCounts();
+
+        RowMutation rm = new RowMutation(KSNAME, key);
+        add(rm, 1, 0);
+        rm.apply();
+
+        // add a RT which hides the column we just inserted
+        rm = new RowMutation(KSNAME, key);
+        ColumnFamily cf = rm.addOrGet(CFNAME);
+        delete(cf, 0, 1, 1);
+        rm.apply();
+
+        // now re-insert that column
+        rm = new RowMutation(KSNAME, key);
+        add(rm, 1, 2);
+        rm.apply();
+
+        cfs.forceBlockingFlush();
+
+        // We should have 2 updates to the indexed "1" column
+        assertEquals(2, index.inserts.size());
+
+        CompactionManager.instance.performMaximal(cfs);
+
+        // verify that the "1" indexed column removed from the index twice:
+        // the first time by processing the RT, the second time by the
+        // re-indexing caused by the second insertion. This second write
+        // deletes from the 2i because the original column was still in the
+        // main cf's memtable (shadowed by the RT). One thing we're checking
+        // for here is that there wasn't an additional, bogus delete issued
+        // to the 2i (CASSANDRA-6517)
+        assertEquals(2, index.deletes.size());
+    }
+
     private void runCompactionWithRangeTombstoneAndCheckSecondaryIndex() throws Exception
     {
         Keyspace table = Keyspace.open(KSNAME);


[3/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 23e86ee15c88068385ca9bb4b14b4501fc0ef231
Parents: 0191b35 9a024b8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 12:20:41 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 12:20:41 2014 -0600

----------------------------------------------------------------------
 build.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23e86ee1/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 65d6b8c,667dbe2..a1498b8
--- a/build.xml
+++ b/build.xml
@@@ -1075,10 -1110,9 +1075,10 @@@
    </target>
  
    <target name="test" depends="build-test" description="Execute unit tests">
-     <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+     <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
        <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
 +      <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
      </testmacro>
@@@ -1085,10 -1122,9 +1088,10 @@@
    </target>
      
    <target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
-     <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+       <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
        <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
 +      <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
        <jvmarg value="-Dcassandra.test.compression=true"/>
        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>


[4/7] git commit: exclude pig from test target

Posted by al...@apache.org.
exclude pig from test target


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

Branch: refs/heads/trunk
Commit: 3f9875c7f5f1456dd4671a757ce7e27c1dcad9b5
Parents: 9a024b8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 14:08:07 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 14:08:07 2014 -0600

----------------------------------------------------------------------
 build.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f9875c7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 667dbe2..150e2fe 100644
--- a/build.xml
+++ b/build.xml
@@ -1047,6 +1047,7 @@
     <attribute name="forkmode" default="perTest"/>
     <element name="optjvmargs" implicit="true" optional="true" />
     <attribute name="filter" default="**/${test.name}.java"/>
+    <attribute name="exclude" default="" />
     <sequential>
       <echo message="running @{suitename} tests"/>
       <mkdir dir="${build.test.dir}/cassandra"/>
@@ -1072,7 +1073,7 @@
           </fileset>
         </classpath>
         <batchtest todir="${build.test.dir}/output">
-          <fileset dir="@{inputdir}" includes="@{filter}" />
+            <fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/>
         </batchtest>
       </junit>
       <fail message="Some @{suitename} test(s) failed.">
@@ -1109,29 +1110,23 @@
     </junit>
   </target>
 
-  <target name="test" depends="build-test" description="Execute unit tests">
-    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
+  <target name="test" depends="build-test" description="Execute unit tests" >
+    <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
     </testmacro>
-    <fileset dir="${test.unit.src}">
-        <exclude name="**/pig/*.java" />
-    </fileset>
   </target>
     
   <target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
-      <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
+      <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
       <jvmarg value="-Dcassandra.test.compression=true"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
     </testmacro>
-    <fileset dir="${test.unit.src}">
-        <exclude name="**/pig/*.java" />
-    </fileset>
   </target>
 
   <target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations">


[2/7] git commit: unify test timeouts, exclude pig

Posted by al...@apache.org.
unify test timeouts, exclude pig


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

Branch: refs/heads/trunk
Commit: 9a024b8018fb88dc7212a88878933ce077595dbd
Parents: 5f6c5ce
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 12:20:18 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 12:20:18 2014 -0600

----------------------------------------------------------------------
 build.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a024b80/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2a6c524..667dbe2 100644
--- a/build.xml
+++ b/build.xml
@@ -1110,46 +1110,52 @@
   </target>
 
   <target name="test" depends="build-test" description="Execute unit tests">
-    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
     </testmacro>
+    <fileset dir="${test.unit.src}">
+        <exclude name="**/pig/*.java" />
+    </fileset>
   </target>
     
   <target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
-    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+      <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
       <jvmarg value="-Dcassandra.test.compression=true"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
     </testmacro>
+    <fileset dir="${test.unit.src}">
+        <exclude name="**/pig/*.java" />
+    </fileset>
   </target>
 
   <target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations">
     <testmacro suitename="unit" inputdir="${test.unit.src}" 
-               timeout="60000" filter="**/SerializationsTest.java">
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.test-serialization-writes=True"/>
     </testmacro>
   </target>
   
   <target name="msg-ser-test" depends="build-test" description="Tests message serializations">
-    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000"
+      <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}"
                filter="**/SerializationsTest.java"/>
   </target>
   
   <target name="msg-ser-test-7" depends="build-test" description="Generates message serializations">
     <testmacro suitename="unit" inputdir="${test.unit.src}" 
-               timeout="60000" filter="**/SerializationsTest.java">
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.version=0.7"/>
     </testmacro>
   </target>
 
   <target name="msg-ser-test-10" depends="build-test" description="Tests message serializations on 1.0 messages">
     <testmacro suitename="unit" inputdir="${test.unit.src}" 
-               timeout="60000" filter="**/SerializationsTest.java">
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.version=1.0"/>
     </testmacro>
   </target>


[6/7] git commit: Fix CounterContext.ContextState.copyTo() method

Posted by al...@apache.org.
Fix CounterContext.ContextState.copyTo() method


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

Branch: refs/heads/trunk
Commit: b71372146135fdcee6353ec8254ebfd87c42f907
Parents: 8ecc6f1
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Feb 2 02:30:50 2014 -0500
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Feb 2 02:30:50 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/context/CounterContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7137214/src/java/org/apache/cassandra/db/context/CounterContext.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java
index 1fa4d60..48d2bd0 100644
--- a/src/java/org/apache/cassandra/db/context/CounterContext.java
+++ b/src/java/org/apache/cassandra/db/context/CounterContext.java
@@ -763,7 +763,7 @@ public class CounterContext implements IContext
             if (currentIsGlobal)
                 other.context.putShort(other.context.position() + other.headerOffset, (short) (other.getElementIndex() + Short.MIN_VALUE));
             else if (currentIsLocal)
-                context.putShort(other.context.position() + other.headerOffset, (short) other.getElementIndex());
+                other.context.putShort(other.context.position() + other.headerOffset, (short) other.getElementIndex());
 
             other.currentIsGlobal = currentIsGlobal;
             other.currentIsLocal = currentIsLocal;


[5/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 8ecc6f1118e49bdfd350321df9ace36b32e734b0
Parents: 23e86ee 3f9875c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 14:08:15 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 14:08:15 2014 -0600

----------------------------------------------------------------------
 build.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ecc6f11/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index a1498b8,150e2fe..6804a1b
--- a/build.xml
+++ b/build.xml
@@@ -1074,24 -1110,19 +1075,21 @@@
      </junit>
    </target>
  
-   <target name="test" depends="build-test" description="Execute unit tests">
-     <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
+   <target name="test" depends="build-test" description="Execute unit tests" >
+     <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
        <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
 +      <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
      </testmacro>
    </target>
      
    <target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
-       <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
+       <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
        <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
 +      <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
        <jvmarg value="-Dcassandra.test.compression=true"/>
        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>


[7/7] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
	src/java/org/apache/cassandra/db/context/CounterContext.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java


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

Branch: refs/heads/trunk
Commit: aa29b6af6af4923d80b68ab19efc05beeef7c45b
Parents: 02fb218 b713721
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Feb 2 02:37:14 2014 -0500
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Feb 2 02:37:14 2014 -0500

----------------------------------------------------------------------
 build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa29b6af/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 032cc71,6804a1b..0583012
--- a/build.xml
+++ b/build.xml
@@@ -1108,8 -1075,8 +1109,8 @@@
      </junit>
    </target>
  
 -  <target name="test" depends="build-test" description="Execute unit tests" >
 +  <target name="test" depends="build-test" description="Execute unit tests">
-     <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
+     <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
        <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
        <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>