cassandra git commit: Fix merge error at 619954cd5cd2a4d41a95eef7c95fdca6333fb5d8

2017-05-10 Thread adelapena 
Repository: cassandra
Updated Branches:
  refs/heads/trunk 619954cd5 -> 113ba2a53


Fix merge error at 619954cd5cd2a4d41a95eef7c95fdca6333fb5d8


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

Branch: refs/heads/trunk
Commit: 113ba2a533d98f2adb8e2a6bf022891abc382b34
Parents: 619954c
Author: adelapena 
Authored: Wed May 10 11:30:05 2017 +0100
Committer: adelapena 
Committed: Wed May 10 11:30:05 2017 +0100

--
 test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/113ba2a5/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
--
diff --git a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java 
b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
index 8c72a68..7f2f22b 100644
--- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
@@ -1924,7 +1924,7 @@ public class SASIIndexTest
 try
 {
 // unsupported partition key column
-SASIIndex.validateOptions(Collections.singletonMap("target", 
"id"), store.metadata);
+SASIIndex.validateOptions(Collections.singletonMap("target", 
"id"), store.metadata());
 Assert.fail();
 }
 catch (ConfigurationException e)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[3/6] cassandra git commit: fix merge left-over

2017-01-06 Thread snazy 
fix merge left-over


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

Branch: refs/heads/trunk
Commit: 858cb25a007accf007f76f81a3a20e1e4af5d0f9
Parents: 0e9e0a4
Author: Robert Stupp 
Authored: Sat Jan 7 01:17:18 2017 +0100
Committer: Robert Stupp 
Committed: Sat Jan 7 01:17:18 2017 +0100

--
 .../cql3/validation/entities/UFTest.java| 228 ---
 1 file changed, 228 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/858cb25a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java 
b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
index 6faaf8a..af9ec1a 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.cql3.validation.entities;
 
-import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -28,8 +27,6 @@ import org.junit.Test;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.exceptions.InvalidQueryException;
-import org.apache.cassandra.config.Config;
-import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.cql3.CQLTester;
 import org.apache.cassandra.cql3.QueryProcessor;
@@ -37,13 +34,10 @@ import org.apache.cassandra.cql3.UntypedResultSet;
 import org.apache.cassandra.cql3.functions.FunctionName;
 import org.apache.cassandra.cql3.functions.JavaBasedUDFunction;
 import org.apache.cassandra.cql3.functions.UDFunction;
-import org.apache.cassandra.cql3.functions.UDHelper;
 import org.apache.cassandra.db.marshal.CollectionType;
-import org.apache.cassandra.exceptions.FunctionExecutionException;
 import org.apache.cassandra.exceptions.InvalidRequestException;
 import org.apache.cassandra.schema.KeyspaceMetadata;
 import org.apache.cassandra.service.ClientState;
-import org.apache.cassandra.service.ClientWarn;
 import org.apache.cassandra.transport.*;
 import org.apache.cassandra.transport.ProtocolVersion;
 import org.apache.cassandra.transport.messages.ResultMessage;
@@ -878,228 +872,6 @@ public class UFTest extends CQLTester
 }
 
 @Test
-public void testSecurityPermissions() throws Throwable
-{
-createTable("CREATE TABLE %s (key int primary key, dval double)");
-execute("INSERT INTO %s (key, dval) VALUES (?, ?)", 1, 1d);
-
-// Java UDFs
-
-try
-{
-String fName = createFunction(KEYSPACE_PER_TEST, "double",
-  "CREATE OR REPLACE FUNCTION %s(val 
double) " +
-  "RETURNS NULL ON NULL INPUT " +
-  "RETURNS double " +
-  "LANGUAGE JAVA\n" +
-  "AS 
'System.getProperty(\"foo.bar.baz\"); return 0d;';");
-execute("SELECT " + fName + "(dval) FROM %s WHERE key=1");
-Assert.fail();
-}
-catch (FunctionExecutionException e)
-{
-assertAccessControlException("System.getProperty(\"foo.bar.baz\"); 
return 0d;", e);
-}
-
-String[][] typesAndSources =
-{
-{"","try { Class.forName(\"" + 
UDHelper.class.getName() + "\"); } catch (Exception e) { throw new 
RuntimeException(e); } return 0d;"},
-{"sun.misc.Unsafe", "sun.misc.Unsafe.getUnsafe(); return 0d;"},
-{"","try { Class.forName(\"sun.misc.Unsafe\"); 
} catch (Exception e) { throw new RuntimeException(e); } return 0d;"},
-{"java.nio.file.FileSystems", "try {" +
-" 
java.nio.file.FileSystems.getDefault(); return 0d;" +
-"} catch (Exception t) {" +
-" throw new RuntimeException(t);" +
-'}'},
-{"java.nio.channels.FileChannel", "try {" +
-" 
java.nio.channels.FileChannel.open(java.nio.file.FileSystems.getDefault().getPath(\"/etc/passwd\")).close();
 return 0d;" +
-"} catch (Exception t) {" +
-" throw new RuntimeException(t);" +
-

[2/6] cassandra git commit: fix merge left-over

2017-01-06 Thread snazy 
fix merge left-over


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

Branch: refs/heads/cassandra-3.X
Commit: 858cb25a007accf007f76f81a3a20e1e4af5d0f9
Parents: 0e9e0a4
Author: Robert Stupp 
Authored: Sat Jan 7 01:17:18 2017 +0100
Committer: Robert Stupp 
Committed: Sat Jan 7 01:17:18 2017 +0100

--
 .../cql3/validation/entities/UFTest.java| 228 ---
 1 file changed, 228 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/858cb25a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java 
b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
index 6faaf8a..af9ec1a 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.cql3.validation.entities;
 
-import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -28,8 +27,6 @@ import org.junit.Test;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.exceptions.InvalidQueryException;
-import org.apache.cassandra.config.Config;
-import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.cql3.CQLTester;
 import org.apache.cassandra.cql3.QueryProcessor;
@@ -37,13 +34,10 @@ import org.apache.cassandra.cql3.UntypedResultSet;
 import org.apache.cassandra.cql3.functions.FunctionName;
 import org.apache.cassandra.cql3.functions.JavaBasedUDFunction;
 import org.apache.cassandra.cql3.functions.UDFunction;
-import org.apache.cassandra.cql3.functions.UDHelper;
 import org.apache.cassandra.db.marshal.CollectionType;
-import org.apache.cassandra.exceptions.FunctionExecutionException;
 import org.apache.cassandra.exceptions.InvalidRequestException;
 import org.apache.cassandra.schema.KeyspaceMetadata;
 import org.apache.cassandra.service.ClientState;
-import org.apache.cassandra.service.ClientWarn;
 import org.apache.cassandra.transport.*;
 import org.apache.cassandra.transport.ProtocolVersion;
 import org.apache.cassandra.transport.messages.ResultMessage;
@@ -878,228 +872,6 @@ public class UFTest extends CQLTester
 }
 
 @Test
-public void testSecurityPermissions() throws Throwable
-{
-createTable("CREATE TABLE %s (key int primary key, dval double)");
-execute("INSERT INTO %s (key, dval) VALUES (?, ?)", 1, 1d);
-
-// Java UDFs
-
-try
-{
-String fName = createFunction(KEYSPACE_PER_TEST, "double",
-  "CREATE OR REPLACE FUNCTION %s(val 
double) " +
-  "RETURNS NULL ON NULL INPUT " +
-  "RETURNS double " +
-  "LANGUAGE JAVA\n" +
-  "AS 
'System.getProperty(\"foo.bar.baz\"); return 0d;';");
-execute("SELECT " + fName + "(dval) FROM %s WHERE key=1");
-Assert.fail();
-}
-catch (FunctionExecutionException e)
-{
-assertAccessControlException("System.getProperty(\"foo.bar.baz\"); 
return 0d;", e);
-}
-
-String[][] typesAndSources =
-{
-{"","try { Class.forName(\"" + 
UDHelper.class.getName() + "\"); } catch (Exception e) { throw new 
RuntimeException(e); } return 0d;"},
-{"sun.misc.Unsafe", "sun.misc.Unsafe.getUnsafe(); return 0d;"},
-{"","try { Class.forName(\"sun.misc.Unsafe\"); 
} catch (Exception e) { throw new RuntimeException(e); } return 0d;"},
-{"java.nio.file.FileSystems", "try {" +
-" 
java.nio.file.FileSystems.getDefault(); return 0d;" +
-"} catch (Exception t) {" +
-" throw new RuntimeException(t);" +
-'}'},
-{"java.nio.channels.FileChannel", "try {" +
-" 
java.nio.channels.FileChannel.open(java.nio.file.FileSystems.getDefault().getPath(\"/etc/passwd\")).close();
 return 0d;" +
-"} catch (Exception t) {" +
-" throw new RuntimeException(t);" +
-

[1/6] cassandra git commit: fix merge left-over

2017-01-06 Thread snazy 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 0e9e0a4a8 -> 858cb25a0
  refs/heads/cassandra-3.X c5c7f82db -> dfd8dcf72
  refs/heads/trunk 5ce08a728 -> 18f28c517


fix merge left-over


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

Branch: refs/heads/cassandra-3.11
Commit: 858cb25a007accf007f76f81a3a20e1e4af5d0f9
Parents: 0e9e0a4
Author: Robert Stupp 
Authored: Sat Jan 7 01:17:18 2017 +0100
Committer: Robert Stupp 
Committed: Sat Jan 7 01:17:18 2017 +0100

--
 .../cql3/validation/entities/UFTest.java| 228 ---
 1 file changed, 228 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/858cb25a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java 
b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
index 6faaf8a..af9ec1a 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.cql3.validation.entities;
 
-import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -28,8 +27,6 @@ import org.junit.Test;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.exceptions.InvalidQueryException;
-import org.apache.cassandra.config.Config;
-import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.cql3.CQLTester;
 import org.apache.cassandra.cql3.QueryProcessor;
@@ -37,13 +34,10 @@ import org.apache.cassandra.cql3.UntypedResultSet;
 import org.apache.cassandra.cql3.functions.FunctionName;
 import org.apache.cassandra.cql3.functions.JavaBasedUDFunction;
 import org.apache.cassandra.cql3.functions.UDFunction;
-import org.apache.cassandra.cql3.functions.UDHelper;
 import org.apache.cassandra.db.marshal.CollectionType;
-import org.apache.cassandra.exceptions.FunctionExecutionException;
 import org.apache.cassandra.exceptions.InvalidRequestException;
 import org.apache.cassandra.schema.KeyspaceMetadata;
 import org.apache.cassandra.service.ClientState;
-import org.apache.cassandra.service.ClientWarn;
 import org.apache.cassandra.transport.*;
 import org.apache.cassandra.transport.ProtocolVersion;
 import org.apache.cassandra.transport.messages.ResultMessage;
@@ -878,228 +872,6 @@ public class UFTest extends CQLTester
 }
 
 @Test
-public void testSecurityPermissions() throws Throwable
-{
-createTable("CREATE TABLE %s (key int primary key, dval double)");
-execute("INSERT INTO %s (key, dval) VALUES (?, ?)", 1, 1d);
-
-// Java UDFs
-
-try
-{
-String fName = createFunction(KEYSPACE_PER_TEST, "double",
-  "CREATE OR REPLACE FUNCTION %s(val 
double) " +
-  "RETURNS NULL ON NULL INPUT " +
-  "RETURNS double " +
-  "LANGUAGE JAVA\n" +
-  "AS 
'System.getProperty(\"foo.bar.baz\"); return 0d;';");
-execute("SELECT " + fName + "(dval) FROM %s WHERE key=1");
-Assert.fail();
-}
-catch (FunctionExecutionException e)
-{
-assertAccessControlException("System.getProperty(\"foo.bar.baz\"); 
return 0d;", e);
-}
-
-String[][] typesAndSources =
-{
-{"","try { Class.forName(\"" + 
UDHelper.class.getName() + "\"); } catch (Exception e) { throw new 
RuntimeException(e); } return 0d;"},
-{"sun.misc.Unsafe", "sun.misc.Unsafe.getUnsafe(); return 0d;"},
-{"","try { Class.forName(\"sun.misc.Unsafe\"); 
} catch (Exception e) { throw new RuntimeException(e); } return 0d;"},
-{"java.nio.file.FileSystems", "try {" +
-" 
java.nio.file.FileSystems.getDefault(); return 0d;" +
-"} catch (Exception t) {" +
-" throw new RuntimeException(t);" +
-'}'},
-{"java.nio.channels.FileChannel", "try {" +
-"

cassandra git commit: fix merge issue

2016-01-15 Thread jake 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.3 597729d9d -> dba2e16c9


fix merge issue


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

Branch: refs/heads/cassandra-3.3
Commit: dba2e16c95951216d401358180b309eec34eb7e5
Parents: 597729d
Author: T Jake Luciani 
Authored: Fri Jan 15 10:14:07 2016 -0500
Committer: T Jake Luciani 
Committed: Fri Jan 15 10:14:07 2016 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dba2e16c/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 7466556..0ce25cb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -98,9 +98,11 @@ import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.CounterMutationVerbHandler;
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.DefinitionsUpdateVerbHandler;
+import org.apache.cassandra.db.Directories;
 import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.db.MigrationRequestVerbHandler;
 import org.apache.cassandra.db.MutationVerbHandler;
+import org.apache.cassandra.db.PartitionPosition;
 import org.apache.cassandra.db.RangeSliceVerbHandler;
 import org.apache.cassandra.db.ReadCommandVerbHandler;
 import org.apache.cassandra.db.ReadRepairVerbHandler;

[1/2] cassandra git commit: fix merge issue

2016-01-15 Thread jake 
Repository: cassandra
Updated Branches:
  refs/heads/trunk 0c82f977a -> 6148f5214


fix merge issue


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

Branch: refs/heads/trunk
Commit: dba2e16c95951216d401358180b309eec34eb7e5
Parents: 597729d
Author: T Jake Luciani 
Authored: Fri Jan 15 10:14:07 2016 -0500
Committer: T Jake Luciani 
Committed: Fri Jan 15 10:14:07 2016 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dba2e16c/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 7466556..0ce25cb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -98,9 +98,11 @@ import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.CounterMutationVerbHandler;
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.DefinitionsUpdateVerbHandler;
+import org.apache.cassandra.db.Directories;
 import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.db.MigrationRequestVerbHandler;
 import org.apache.cassandra.db.MutationVerbHandler;
+import org.apache.cassandra.db.PartitionPosition;
 import org.apache.cassandra.db.RangeSliceVerbHandler;
 import org.apache.cassandra.db.ReadCommandVerbHandler;
 import org.apache.cassandra.db.ReadRepairVerbHandler;

[1/3] cassandra git commit: Fix merge

2015-07-07 Thread benedict 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 ebe18bb2f - 0f5dd225d
  refs/heads/trunk a8bb75a7e - 9423109de


Fix merge


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

Branch: refs/heads/cassandra-2.2
Commit: 0f5dd225de6ae995ddbc6d8d099260ed6eabd501
Parents: ebe18bb
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Jul 7 16:48:45 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Jul 7 17:01:33 2015 +0100

--
 .../cassandra/db/compaction/CompactionManager.java   | 15 +++
 .../io/sstable/format/big/BigTableReader.java|  3 +++
 .../apache/cassandra/tools/StandaloneScrubber.java   |  5 +
 test/unit/org/apache/cassandra/db/ScrubTest.java |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f5dd225/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 4c94fa0..150b926 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -332,7 +332,14 @@ public class CompactionManager implements 
CompactionManagerMBean
 }
 }
 
-public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData) throws InterruptedException, 
ExecutionException
+public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData)
+throws InterruptedException, ExecutionException
+{
+return performScrub(cfs, skipCorrupted, checkData, false);
+}
+
+public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData, final boolean offline)
+throws InterruptedException, ExecutionException
 {
 return parallelAllSSTableOperation(cfs, new OneSSTableOperation()
 {
@@ -345,7 +352,7 @@ public class CompactionManager implements 
CompactionManagerMBean
 @Override
 public void execute(LifecycleTransaction input) throws IOException
 {
-scrubOne(cfs, input, skipCorrupted, checkData);
+scrubOne(cfs, input, skipCorrupted, checkData, offline);
 }
 }, OperationType.SCRUB);
 }
@@ -691,11 +698,11 @@ public class CompactionManager implements 
CompactionManagerMBean
 }
 }
 
-private void scrubOne(ColumnFamilyStore cfs, LifecycleTransaction 
modifier, boolean skipCorrupted, boolean checkData) throws IOException
+private void scrubOne(ColumnFamilyStore cfs, LifecycleTransaction 
modifier, boolean skipCorrupted, boolean checkData, boolean offline) throws 
IOException
 {
 CompactionInfo.Holder scrubInfo = null;
 
-try (Scrubber scrubber = new Scrubber(cfs, modifier, skipCorrupted, 
false, checkData))
+try (Scrubber scrubber = new Scrubber(cfs, modifier, skipCorrupted, 
offline, checkData))
 {
 scrubInfo = scrubber.getScrubInfo();
 metrics.beginCompaction(scrubInfo);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f5dd225/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
--
diff --git 
a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java 
b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
index 3f375e7..f427389 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
@@ -167,6 +167,9 @@ public class BigTableReader extends SSTableReader
 
 int effectiveInterval = 
indexSummary.getEffectiveIndexIntervalAfterIndex(sampledIndex);
 
+if (ifile == null)
+return null;
+
 // scan the on-disk index, starting at the nearest sampled position.
 // The check against IndexInterval is to be exit the loop in the EQ 
case when the key looked for is not present
 // (bloom filter false positive). But note that for non-EQ cases, we 
might need to check the first key of the

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f5dd225/src/java/org/apache/cassandra/tools/StandaloneScrubber.java

[2/3] cassandra git commit: Fix merge

2015-07-07 Thread benedict 
Fix merge


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

Branch: refs/heads/trunk
Commit: 0f5dd225de6ae995ddbc6d8d099260ed6eabd501
Parents: ebe18bb
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Jul 7 16:48:45 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Jul 7 17:01:33 2015 +0100

--
 .../cassandra/db/compaction/CompactionManager.java   | 15 +++
 .../io/sstable/format/big/BigTableReader.java|  3 +++
 .../apache/cassandra/tools/StandaloneScrubber.java   |  5 +
 test/unit/org/apache/cassandra/db/ScrubTest.java |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f5dd225/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 4c94fa0..150b926 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -332,7 +332,14 @@ public class CompactionManager implements 
CompactionManagerMBean
 }
 }
 
-public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData) throws InterruptedException, 
ExecutionException
+public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData)
+throws InterruptedException, ExecutionException
+{
+return performScrub(cfs, skipCorrupted, checkData, false);
+}
+
+public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData, final boolean offline)
+throws InterruptedException, ExecutionException
 {
 return parallelAllSSTableOperation(cfs, new OneSSTableOperation()
 {
@@ -345,7 +352,7 @@ public class CompactionManager implements 
CompactionManagerMBean
 @Override
 public void execute(LifecycleTransaction input) throws IOException
 {
-scrubOne(cfs, input, skipCorrupted, checkData);
+scrubOne(cfs, input, skipCorrupted, checkData, offline);
 }
 }, OperationType.SCRUB);
 }
@@ -691,11 +698,11 @@ public class CompactionManager implements 
CompactionManagerMBean
 }
 }
 
-private void scrubOne(ColumnFamilyStore cfs, LifecycleTransaction 
modifier, boolean skipCorrupted, boolean checkData) throws IOException
+private void scrubOne(ColumnFamilyStore cfs, LifecycleTransaction 
modifier, boolean skipCorrupted, boolean checkData, boolean offline) throws 
IOException
 {
 CompactionInfo.Holder scrubInfo = null;
 
-try (Scrubber scrubber = new Scrubber(cfs, modifier, skipCorrupted, 
false, checkData))
+try (Scrubber scrubber = new Scrubber(cfs, modifier, skipCorrupted, 
offline, checkData))
 {
 scrubInfo = scrubber.getScrubInfo();
 metrics.beginCompaction(scrubInfo);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f5dd225/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
--
diff --git 
a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java 
b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
index 3f375e7..f427389 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
@@ -167,6 +167,9 @@ public class BigTableReader extends SSTableReader
 
 int effectiveInterval = 
indexSummary.getEffectiveIndexIntervalAfterIndex(sampledIndex);
 
+if (ifile == null)
+return null;
+
 // scan the on-disk index, starting at the nearest sampled position.
 // The check against IndexInterval is to be exit the loop in the EQ 
case when the key looked for is not present
 // (bloom filter false positive). But note that for non-EQ cases, we 
might need to check the first key of the

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f5dd225/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
--
diff --git a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java

cassandra git commit: fix merge issue with ColumnInfo name change

2015-05-05 Thread dbrosius 
Repository: cassandra
Updated Branches:
  refs/heads/trunk f698cc228 - 8f4c43db0


fix merge issue with ColumnInfo name change


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

Branch: refs/heads/trunk
Commit: 8f4c43db021c75a8d790f0fa2f93282952fffb71
Parents: f698cc2
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue May 5 22:01:15 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue May 5 22:01:15 2015 -0400

--
 src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f4c43db/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java 
b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index 91cdd02..0b833b7 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -499,8 +499,8 @@ public class CqlNativeStorage extends LoadFunc implements 
StoreFuncInterface, Lo
 for (ColumnInfo cdef : cfInfo.getColumns())
 {
 ResourceFieldSchema valSchema = new ResourceFieldSchema();
-AbstractType validator = validators.get(cdef.getName());
-valSchema.setName(new String(cdef.getName()));
+AbstractType? validator = 
validators.get(ByteBufferUtil.bytes(cdef.getName()));
+valSchema.setName(cdef.getName());
 valSchema.setType(StorageHelper.getPigType(validator));
 allSchemaFields.add(valSchema);
 }
@@ -901,7 +901,7 @@ public class CqlNativeStorage extends LoadFunc implements 
StoreFuncInterface, Lo
 String[] partitionKeys = new 
String[tableMetadata.getPartitionKey().size()];
 for (int i = 0; i  tableMetadata.getPartitionKey().size(); i++)
 {
-partitionKeys[i] = new 
String(tableMetadata.getPartitionKey().get(i).getName());
+partitionKeys[i] = 
tableMetadata.getPartitionKey().get(i).getName();
 }
 return partitionKeys;
 }

[1/2] cassandra git commit: Fix merge from CASSANDRA-8359

2015-04-01 Thread marcuse 
Repository: cassandra
Updated Branches:
  refs/heads/trunk b09e39295 - 1b0a59e2a


Fix merge from CASSANDRA-8359


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

Branch: refs/heads/trunk
Commit: 0ba5f2721b8d6b57592532654d8533acb9964807
Parents: 52191eb
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Apr 1 13:14:40 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Apr 1 13:14:40 2015 +0200

--
 .../cassandra/db/compaction/DateTieredCompactionStrategy.java  | 2 +-
 .../cassandra/db/compaction/DateTieredCompactionStrategyTest.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ba5f272/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java 
b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index 7841c93..d955ebf 100644
--- 
a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++ 
b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@ -74,7 +74,7 @@ public class DateTieredCompactionStrategy extends 
AbstractCompactionStrategy
 if (!isEnabled() || cfs.getSSTables().isEmpty())
 return Collections.emptyList();
 
-SetSSTableReader uncompacting = cfs.getUncompactingSSTables();
+SetSSTableReader uncompacting = Sets.intersection(sstables, 
cfs.getUncompactingSSTables());
 
 // Find fully expired SSTables. Those will be included no matter what.
 SetSSTableReader expired = 
CompactionController.getFullyExpiredSSTables(cfs, uncompacting, 
cfs.getOverlappingSSTables(uncompacting), gcBefore);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ba5f272/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index becddeb..743a337 100644
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@ -306,6 +306,8 @@ public class DateTieredCompactionStrategyTest extends 
SchemaLoader
 
options.put(DateTieredCompactionStrategyOptions.TIMESTAMP_RESOLUTION_KEY, 
MILLISECONDS);
 options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, 
Double.toString((1d / (24 * 60 * 60;
 DateTieredCompactionStrategy dtcs = new 
DateTieredCompactionStrategy(cfs, options);
+for (SSTableReader sstable : cfs.getSSTables())
+dtcs.addSSTable(sstable);
 dtcs.startup();
 assertNull(dtcs.getNextBackgroundTask((int) 
(System.currentTimeMillis() / 1000)));
 Thread.sleep(7000);

cassandra git commit: Fix merge from CASSANDRA-8359

2015-04-01 Thread marcuse 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 52191ebe3 - 0ba5f2721


Fix merge from CASSANDRA-8359


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

Branch: refs/heads/cassandra-2.1
Commit: 0ba5f2721b8d6b57592532654d8533acb9964807
Parents: 52191eb
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Apr 1 13:14:40 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Apr 1 13:14:40 2015 +0200

--
 .../cassandra/db/compaction/DateTieredCompactionStrategy.java  | 2 +-
 .../cassandra/db/compaction/DateTieredCompactionStrategyTest.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ba5f272/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java 
b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index 7841c93..d955ebf 100644
--- 
a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++ 
b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@ -74,7 +74,7 @@ public class DateTieredCompactionStrategy extends 
AbstractCompactionStrategy
 if (!isEnabled() || cfs.getSSTables().isEmpty())
 return Collections.emptyList();
 
-SetSSTableReader uncompacting = cfs.getUncompactingSSTables();
+SetSSTableReader uncompacting = Sets.intersection(sstables, 
cfs.getUncompactingSSTables());
 
 // Find fully expired SSTables. Those will be included no matter what.
 SetSSTableReader expired = 
CompactionController.getFullyExpiredSSTables(cfs, uncompacting, 
cfs.getOverlappingSSTables(uncompacting), gcBefore);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ba5f272/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index becddeb..743a337 100644
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@ -306,6 +306,8 @@ public class DateTieredCompactionStrategyTest extends 
SchemaLoader
 
options.put(DateTieredCompactionStrategyOptions.TIMESTAMP_RESOLUTION_KEY, 
MILLISECONDS);
 options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, 
Double.toString((1d / (24 * 60 * 60;
 DateTieredCompactionStrategy dtcs = new 
DateTieredCompactionStrategy(cfs, options);
+for (SSTableReader sstable : cfs.getSSTables())
+dtcs.addSSTable(sstable);
 dtcs.startup();
 assertNull(dtcs.getNextBackgroundTask((int) 
(System.currentTimeMillis() / 1000)));
 Thread.sleep(7000);

cassandra git commit: fix merge(s)

2015-03-04 Thread benedict 
Repository: cassandra
Updated Branches:
  refs/heads/trunk e473ce066 - 034e0179b


fix merge(s)


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

Branch: refs/heads/trunk
Commit: 034e0179b8da63e74e871030387948dd861beba6
Parents: e473ce0
Author: Benedict Elliott Smith bened...@apache.org
Authored: Wed Mar 4 15:30:39 2015 +
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Wed Mar 4 15:30:39 2015 +

--
 src/java/org/apache/cassandra/cache/OHCProvider.java  |  2 +-
 .../org/apache/cassandra/io/sstable/IndexSummary.java |  2 +-
 .../apache/cassandra/io/sstable/IndexSummaryBuilder.java  | 10 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/034e0179/src/java/org/apache/cassandra/cache/OHCProvider.java
--
diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java 
b/src/java/org/apache/cassandra/cache/OHCProvider.java
index 365ca41..720121c 100644
--- a/src/java/org/apache/cassandra/cache/OHCProvider.java
+++ b/src/java/org/apache/cassandra/cache/OHCProvider.java
@@ -266,7 +266,7 @@ public class OHCProvider implements 
CacheProviderRowCacheKey, IRowCacheEntry
 throw new UnsupportedOperationException(IMPLEMENT ME);
 }
 
-public void write(Memory memory) throws IOException
+public void write(Memory memory, long offset, long length) throws 
IOException
 {
 throw new UnsupportedOperationException(IMPLEMENT ME);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/034e0179/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java 
b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
index bad50b4..7e4619e 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
@@ -218,7 +218,7 @@ public class IndexSummary extends WrappedSharedCloseable
 return entries;
 }
 
-long getOffHeapSize()
+public long getOffHeapSize()
 {
 return offsetCount * 4 + entriesLength;
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/034e0179/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java 
b/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
index 54e8dd2..892e240 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
@@ -69,11 +69,11 @@ public class IndexSummaryBuilder implements AutoCloseable
  */
 public static class ReadableBoundary
 {
-final DecoratedKey lastKey;
-final long indexLength;
-final long dataLength;
-final int summaryCount;
-final long entriesLength;
+public final DecoratedKey lastKey;
+public final long indexLength;
+public final long dataLength;
+public final int summaryCount;
+public final long entriesLength;
 public ReadableBoundary(DecoratedKey lastKey, long indexLength, long 
dataLength, int summaryCount, long entriesLength)
 {
 this.lastKey = lastKey;

cassandra git commit: fix merge

2015-03-04 Thread benedict 
Repository: cassandra
Updated Branches:
  refs/heads/trunk a4221b721 - 7376f42fc


fix merge


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

Branch: refs/heads/trunk
Commit: 7376f42fc183bde6a03f1d94e04556d90ef6e525
Parents: a4221b7
Author: Benedict Elliott Smith bened...@apache.org
Authored: Wed Mar 4 17:08:16 2015 +
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Wed Mar 4 17:08:16 2015 +

--
 test/unit/org/apache/cassandra/SchemaLoader.java  |  3 ---
 .../cassandra/io/sstable/IndexSummaryManagerTest.java | 14 ++
 2 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7376f42f/test/unit/org/apache/cassandra/SchemaLoader.java
--
diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java 
b/test/unit/org/apache/cassandra/SchemaLoader.java
index dfef545..3a2725e 100644
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -178,9 +178,6 @@ public class SchemaLoader
standardCFMD(ks1, 
StandardLowIndexInterval).minIndexInterval(8)

 .maxIndexInterval(256)

 .caching(CachingOptions.NONE),
-   standardCFMD(ks1, 
StandardRace).minIndexInterval(8)
-
.maxIndexInterval(256)
-
.caching(CachingOptions.NONE),
standardCFMD(ks1, 
UUIDKeys).keyValidator(UUIDType.instance),
CFMetaData.denseCFMetaData(ks1, 
MixedTypes, 
LongType.instance).keyValidator(UUIDType.instance).defaultValidator(BooleanType.instance),
CFMetaData.denseCFMetaData(ks1, 
MixedTypesComposite, 
composite).keyValidator(composite).defaultValidator(BooleanType.instance),

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7376f42f/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java 
b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
index ecbbd76..87486ca 100644
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(OrderedJUnit4ClassRunner.class)
-public class IndexSummaryManagerTest extends SchemaLoader
+public class IndexSummaryManagerTest
 {
 private static final Logger logger = 
LoggerFactory.getLogger(IndexSummaryManagerTest.class);
 
@@ -69,6 +69,7 @@ public class IndexSummaryManagerTest extends SchemaLoader
 private static final String KEYSPACE1 = IndexSummaryManagerTest;
 // index interval of 8, no key caching
 private static final String CF_STANDARDLOWiINTERVAL = 
StandardLowIndexInterval;
+private static final String CF_STANDARDRACE = StandardRace;
 
 @BeforeClass
 public static void defineSchema() throws ConfigurationException
@@ -80,7 +81,12 @@ public class IndexSummaryManagerTest extends SchemaLoader
 SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLOWiINTERVAL)
 .minIndexInterval(8)
 .maxIndexInterval(256)
-.caching(CachingOptions.NONE));
+.caching(CachingOptions.NONE),
+SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDRACE)
+.minIndexInterval(8)
+.maxIndexInterval(256)
+.caching(CachingOptions.NONE)
+);
 }
 
 @Before
@@ -527,8 +533,8 @@ public class IndexSummaryManagerTest extends SchemaLoader
 @Test
 public void testCompactionRace() throws InterruptedException, 
ExecutionException
 {
-String ksname = Keyspace1;
-String

[2/3] cassandra git commit: fix merge

2015-02-13 Thread benedict 
fix merge


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

Branch: refs/heads/trunk
Commit: 2a167ea21ea1db1903ccdf01172eb55c39b4f506
Parents: 15c92c3
Author: Benedict Elliott Smith bened...@apache.org
Authored: Fri Feb 13 10:47:00 2015 +
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Fri Feb 13 10:47:00 2015 +

--
 .../apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java   | 2 +-
 src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a167ea2/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
index 38ba76a..af720c0 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
@@ -227,7 +227,7 @@ public class SSTableSimpleUnsortedWriter extends 
AbstractSSTableSimpleWriter
 throw new AssertionError(Empty partition);
 first = false;
 }
-writer.close(true);
+writer.close();
 }
 }
 catch (Throwable e)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a167ea2/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
index 5849465..87c8e33 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
@@ -71,7 +71,7 @@ public class SSTableSimpleWriter extends 
AbstractSSTableSimpleWriter
 {
 if (currentKey != null)
 writeRow(currentKey, columnFamily);
-writer.close(true);
+writer.close();
 }
 catch (FSError e)
 {

[1/3] cassandra git commit: fix merge

2015-02-13 Thread benedict 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 15c92c386 - 2a167ea21
  refs/heads/trunk 51293ed08 - bd04feb65


fix merge


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

Branch: refs/heads/cassandra-2.1
Commit: 2a167ea21ea1db1903ccdf01172eb55c39b4f506
Parents: 15c92c3
Author: Benedict Elliott Smith bened...@apache.org
Authored: Fri Feb 13 10:47:00 2015 +
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Fri Feb 13 10:47:00 2015 +

--
 .../apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java   | 2 +-
 src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a167ea2/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
index 38ba76a..af720c0 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
@@ -227,7 +227,7 @@ public class SSTableSimpleUnsortedWriter extends 
AbstractSSTableSimpleWriter
 throw new AssertionError(Empty partition);
 first = false;
 }
-writer.close(true);
+writer.close();
 }
 }
 catch (Throwable e)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a167ea2/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
index 5849465..87c8e33 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
@@ -71,7 +71,7 @@ public class SSTableSimpleWriter extends 
AbstractSSTableSimpleWriter
 {
 if (currentKey != null)
 writeRow(currentKey, columnFamily);
-writer.close(true);
+writer.close();
 }
 catch (FSError e)
 {