cassandra git commit: Fix merge error at 619954cd5cd2a4d41a95eef7c95fdca6333fb5d8

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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)

[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

[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

[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

[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)
 {

[2/3] git commit: Fix merge on test

[yukim]

Fix merge on test


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

Branch: refs/heads/trunk
Commit: b6c9c35c33771f2664687fcead22905e6c786e37
Parents: 391f1d3
Author: Yuki Morishita yu...@apache.org
Authored: Wed Oct 29 19:07:12 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Oct 29 19:07:12 2014 -0500

--
 test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6c9c35c/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java 
b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
index e3e81d8..c91ed27 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
@@ -23,7 +23,7 @@ import java.util.Collection;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 import static org.junit.Assert.assertEquals;
@@ -47,7 +47,7 @@ public class ColumnFamilyMetricTest extends SchemaLoader
 {
 ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j));
 Mutation rm = new Mutation(Keyspace1, key);
-rm.add(Standard2, cellname(0), 
ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
+rm.add(Standard1, cellname(0), 
ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
 rm.apply();
 }
 store.forceBlockingFlush();

git commit: fix merge issue

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 6770d0ff8 - 50c27cca4


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/50c27cca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50c27cca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50c27cca

Branch: refs/heads/trunk
Commit: 50c27cca4084e1e65ac51af6e7125cf2be918d76
Parents: 6770d0f
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue Sep 16 21:07:10 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Sep 16 21:07:10 2014 -0400

--
 src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50c27cca/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java 
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 7a110ac..4e46125 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -24,17 +24,16 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.Ints;
-
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.googlecode.concurrentlinkedhashmap.EntryWeigher;
 import com.googlecode.concurrentlinkedhashmap.EvictionListener;
+
 import org.antlr.runtime.*;
 import org.apache.cassandra.service.IMigrationListener;
 import org.apache.cassandra.service.MigrationManager;
 import org.github.jamm.MemoryMeter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.cassandra.cql3.statements.*;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.composites.*;
@@ -559,9 +558,11 @@ public class QueryProcessor implements QueryHandler
 public void onCreateKeyspace(String ksName) { }
 public void onCreateColumnFamily(String ksName, String cfName) { }
 public void onCreateUserType(String ksName, String typeName) { }
+public void onCreateFunction(String namespace, String functionName) { }
 public void onUpdateKeyspace(String ksName) { }
 public void onUpdateColumnFamily(String ksName, String cfName) { }
 public void onUpdateUserType(String ksName, String typeName) { }
+public void onUpdateFunction(String namespace, String functionName) { }
 
 public void onDropKeyspace(String ksName)
 {
@@ -574,5 +575,6 @@ public class QueryProcessor implements QueryHandler
 }
 
 public void onDropUserType(String ksName, String typeName) { }
+public void onDropFunction(String namespace, String functionName) { }
}
 }

[2/3] git commit: fix merge of 7519

[benedict]

fix merge of 7519


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

Branch: refs/heads/trunk
Commit: a44d641e8ff877be7f758221d125c7b94d6fd1e4
Parents: 77d0c17
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Sep 8 08:06:36 2014 +0700
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Sep 8 08:06:36 2014 +0700

--
 .../operations/SampledOpDistributionFactory.java | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a44d641e/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
 
b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
index efc90bc..9e1a5e8 100644
--- 
a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
+++ 
b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
@@ -24,6 +24,7 @@ package org.apache.cassandra.stress.operations;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.math3.distribution.EnumeratedDistribution;
 import org.apache.commons.math3.util.Pair;
@@ -36,9 +37,9 @@ import org.apache.cassandra.stress.util.Timer;
 public abstract class SampledOpDistributionFactoryT implements 
OpDistributionFactory
 {
 
-final ListPairT, Double ratios;
+final MapT, Double ratios;
 final DistributionFactory clustering;
-protected SampledOpDistributionFactory(ListPairT, Double ratios, 
DistributionFactory clustering)
+protected SampledOpDistributionFactory(MapT, Double ratios, 
DistributionFactory clustering)
 {
 this.ratios = ratios;
 this.clustering = clustering;
@@ -51,34 +52,34 @@ public abstract class SampledOpDistributionFactoryT 
implements OpDistributionF
 {
 PartitionGenerator generator = newGenerator();
 ListPairOperation, Double operations = new ArrayList();
-for (PairT, Double ratio : ratios)
-operations.add(new Pair(get(timer, generator, ratio.getFirst()), 
ratio.getSecond()));
+for (Map.EntryT, Double ratio : ratios.entrySet())
+operations.add(new Pair(get(timer, generator, ratio.getKey()), 
ratio.getValue()));
 return new SampledOpDistribution(new 
EnumeratedDistribution(operations), clustering.get());
 }
 
 public String desc()
 {
 ListT keys = new ArrayList();
-for (PairT, Double p : ratios)
-keys.add(p.getFirst());
+for (Map.EntryT, Double ratio : ratios.entrySet())
+keys.add(ratio.getKey());
 return keys.toString();
 }
 
 public IterableOpDistributionFactory each()
 {
 ListOpDistributionFactory out = new ArrayList();
-for (final PairT, Double ratio : ratios)
+for (final Map.EntryT, Double ratio : ratios.entrySet())
 {
 out.add(new OpDistributionFactory()
 {
 public OpDistribution get(Timer timer)
 {
-return new 
FixedOpDistribution(SampledOpDistributionFactory.this.get(timer, 
newGenerator(), ratio.getFirst()));
+return new 
FixedOpDistribution(SampledOpDistributionFactory.this.get(timer, 
newGenerator(), ratio.getKey()));
 }
 
 public String desc()
 {
-return ratio.getFirst().toString();
+return ratio.getKey().toString();
 }
 
 public IterableOpDistributionFactory each()

[1/3] git commit: fix merge of 7519

[benedict]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 77d0c1757 - a44d641e8
  refs/heads/trunk eec381e0d - f203f0f3f


fix merge of 7519


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

Branch: refs/heads/cassandra-2.1
Commit: a44d641e8ff877be7f758221d125c7b94d6fd1e4
Parents: 77d0c17
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Sep 8 08:06:36 2014 +0700
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Sep 8 08:06:36 2014 +0700

--
 .../operations/SampledOpDistributionFactory.java | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a44d641e/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
 
b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
index efc90bc..9e1a5e8 100644
--- 
a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
+++ 
b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
@@ -24,6 +24,7 @@ package org.apache.cassandra.stress.operations;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.math3.distribution.EnumeratedDistribution;
 import org.apache.commons.math3.util.Pair;
@@ -36,9 +37,9 @@ import org.apache.cassandra.stress.util.Timer;
 public abstract class SampledOpDistributionFactoryT implements 
OpDistributionFactory
 {
 
-final ListPairT, Double ratios;
+final MapT, Double ratios;
 final DistributionFactory clustering;
-protected SampledOpDistributionFactory(ListPairT, Double ratios, 
DistributionFactory clustering)
+protected SampledOpDistributionFactory(MapT, Double ratios, 
DistributionFactory clustering)
 {
 this.ratios = ratios;
 this.clustering = clustering;
@@ -51,34 +52,34 @@ public abstract class SampledOpDistributionFactoryT 
implements OpDistributionF
 {
 PartitionGenerator generator = newGenerator();
 ListPairOperation, Double operations = new ArrayList();
-for (PairT, Double ratio : ratios)
-operations.add(new Pair(get(timer, generator, ratio.getFirst()), 
ratio.getSecond()));
+for (Map.EntryT, Double ratio : ratios.entrySet())
+operations.add(new Pair(get(timer, generator, ratio.getKey()), 
ratio.getValue()));
 return new SampledOpDistribution(new 
EnumeratedDistribution(operations), clustering.get());
 }
 
 public String desc()
 {
 ListT keys = new ArrayList();
-for (PairT, Double p : ratios)
-keys.add(p.getFirst());
+for (Map.EntryT, Double ratio : ratios.entrySet())
+keys.add(ratio.getKey());
 return keys.toString();
 }
 
 public IterableOpDistributionFactory each()
 {
 ListOpDistributionFactory out = new ArrayList();
-for (final PairT, Double ratio : ratios)
+for (final Map.EntryT, Double ratio : ratios.entrySet())
 {
 out.add(new OpDistributionFactory()
 {
 public OpDistribution get(Timer timer)
 {
-return new 
FixedOpDistribution(SampledOpDistributionFactory.this.get(timer, 
newGenerator(), ratio.getFirst()));
+return new 
FixedOpDistribution(SampledOpDistributionFactory.this.get(timer, 
newGenerator(), ratio.getKey()));
 }
 
 public String desc()
 {
-return ratio.getFirst().toString();
+return ratio.getKey().toString();
 }
 
 public IterableOpDistributionFactory each()

git commit: fix merge

[brandonwilliams]

Repository: cassandra
Updated Branches:
  refs/heads/trunk fafcfc787 - da3fd5d7a


fix merge


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

Branch: refs/heads/trunk
Commit: da3fd5d7ac2bb0f64a32176c3722b857b71bc654
Parents: fafcfc7
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jul 30 22:07:10 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jul 30 22:08:40 2014 -0500

--
 .../apache/cassandra/locator/TokenMetadata.java |  21 +-
 .../service/PendingRangeCalculatorService.java  |  73 +--
 .../ScheduledRangeTransferExecutorService.java  | 135 
 .../apache/cassandra/service/RelocateTest.java  | 204 ---
 4 files changed, 4 insertions(+), 429 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/da3fd5d7/src/java/org/apache/cassandra/locator/TokenMetadata.java
--
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java 
b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index bb5455c..2a6a624 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -701,10 +701,10 @@ public class TokenMetadata
 {
 MultimapRangeToken, InetAddress newPendingRanges = 
HashMultimap.create();
 
-if (bootstrapTokens.isEmpty()  leavingEndpoints.isEmpty()  
movingEndpoints.isEmpty()  relocatingTokens.isEmpty())
+if (bootstrapTokens.isEmpty()  leavingEndpoints.isEmpty()  
movingEndpoints.isEmpty())
 {
 if (logger.isDebugEnabled())
-logger.debug(No bootstrapping, leaving or moving nodes, 
and no relocating tokens - empty pending ranges for {}, keyspaceName);
+logger.debug(No bootstrapping, leaving or moving nodes - 
empty pending ranges for {}, keyspaceName);
 
 pendingRanges.put(keyspaceName, newPendingRanges);
 return;
@@ -746,7 +746,7 @@ public class TokenMetadata
 }
 
 // At this stage newPendingRanges has been updated according to 
leaving and bootstrapping nodes.
-// We can now finish the calculation by checking moving and 
relocating nodes.
+// We can now finish the calculation by checking moving nodes.
 
 // For each of the moving nodes, we do the same thing we did for 
bootstrapping:
 // simply add and remove them one by one to allLeftMetadata and 
check in between what their ranges would be.
@@ -765,20 +765,6 @@ public class TokenMetadata
 allLeftMetadata.removeEndpoint(endpoint);
 }
 
-// Ranges being relocated.
-for (Map.EntryToken, InetAddress relocating : 
relocatingTokens.entrySet())
-{
-InetAddress endpoint = relocating.getValue(); // address of 
the moving node
-Token token = relocating.getKey();
-
-allLeftMetadata.updateNormalToken(token, endpoint);
-
-for (RangeToken range : 
strategy.getAddressRanges(allLeftMetadata).get(endpoint))
-newPendingRanges.put(range, endpoint);
-
-allLeftMetadata.removeEndpoint(endpoint);
-}
-
 pendingRanges.put(keyspaceName, newPendingRanges);
 
 if (logger.isDebugEnabled())
@@ -936,7 +922,6 @@ public class TokenMetadata
 leavingEndpoints.clear();
 pendingRanges.clear();
 movingEndpoints.clear();
-relocatingTokens.clear();
 sortedTokens.clear();
 topology.clear();
 invalidateCachedRings();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/da3fd5d7/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
--
diff --git 
a/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java 
b/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
index d3aa6b6..2276c4a 100644
--- a/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
+++ b/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
@@ -96,77 +96,6 @@ public class PendingRangeCalculatorService
 // public  static for testing purposes
 public static void calculatePendingRanges(AbstractReplicationStrategy 
strategy, String keyspaceName)
 {
-TokenMetadata tm = StorageService.instance.getTokenMetadata();
-MultimapRangeToken, InetAddress pendingRanges 

[5/7] git commit: fix merge

[marcuse]

fix merge


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

Branch: refs/heads/trunk
Commit: cde5666290a89fcfff0c6a4bf2a421caa615de36
Parents: c4d23e1
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jul 31 07:46:10 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jul 31 07:46:10 2014 +0200

--
 src/java/org/apache/cassandra/db/ColumnFamily.java   | 4 ++--
 .../org/apache/cassandra/db/compaction/LazilyCompactedRow.java   | 4 ++--
 src/java/org/apache/cassandra/io/sstable/SSTableWriter.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/db/ColumnFamily.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java 
b/src/java/org/apache/cassandra/db/ColumnFamily.java
index cf47508..cd96785 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@ -411,8 +411,8 @@ public abstract class ColumnFamily implements 
IterableCell, IRowCacheEntry
 {
 RangeTombstone rangeTombstone = it.next();
 tombstones.update(rangeTombstone.getLocalDeletionTime());
-minTimestampSeen = Math.min(minTimestampSeen, 
rangeTombstone.minTimestamp());
-maxTimestampSeen = Math.max(maxTimestampSeen, 
rangeTombstone.maxTimestamp());
+minTimestampSeen = Math.min(minTimestampSeen, 
rangeTombstone.timestamp());
+maxTimestampSeen = Math.max(maxTimestampSeen, 
rangeTombstone.timestamp());
 minColumnNamesSeen = 
ColumnNameHelper.minComponents(minColumnNamesSeen, rangeTombstone.min, 
metadata.comparator);
 maxColumnNamesSeen = 
ColumnNameHelper.maxComponents(maxColumnNamesSeen, rangeTombstone.max, 
metadata.comparator);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java 
b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index e922492..7d6f872 100644
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@ -245,8 +245,8 @@ public class LazilyCompactedRow extends AbstractCompactedRow
 else
 {
 tombstones.update(t.getLocalDeletionTime());
-minTimestampSeen = Math.min(minTimestampSeen, 
t.minTimestamp());
-maxTimestampSeen = Math.max(maxTimestampSeen, 
t.maxTimestamp());
+minTimestampSeen = Math.min(minTimestampSeen, 
t.timestamp());
+maxTimestampSeen = Math.max(maxTimestampSeen, 
t.timestamp());
 minColumnNameSeen = 
ColumnNameHelper.minComponents(minColumnNameSeen, t.min, 
controller.cfs.metadata.comparator);
 maxColumnNameSeen = 
ColumnNameHelper.maxComponents(maxColumnNameSeen, t.max, 
controller.cfs.metadata.comparator);
 return t;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 20df91b..bfb2445 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -266,8 +266,8 @@ public class SSTableWriter extends SSTable
 {
 RangeTombstone rangeTombstone = rangeTombstoneIterator.next();
 tombstones.update(rangeTombstone.getLocalDeletionTime());
-minTimestamp = Math.min(minTimestamp, 
rangeTombstone.minTimestamp());
-maxTimestamp = Math.max(maxTimestamp, 
rangeTombstone.maxTimestamp());
+minTimestamp = Math.min(minTimestamp, rangeTombstone.timestamp());
+maxTimestamp = Math.max(maxTimestamp, rangeTombstone.timestamp());
 
 minColumnNames = ColumnNameHelper.minComponents(minColumnNames, 
rangeTombstone.min, metadata.comparator);
 maxColumnNames = ColumnNameHelper.maxComponents(maxColumnNames, 
rangeTombstone.max, metadata.comparator);

[1/2] git commit: fix merge

[marcuse]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 3da7d9e25 - 40d7bdf80


fix merge


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

Branch: refs/heads/cassandra-2.1
Commit: cde5666290a89fcfff0c6a4bf2a421caa615de36
Parents: c4d23e1
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jul 31 07:46:10 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jul 31 07:46:10 2014 +0200

--
 src/java/org/apache/cassandra/db/ColumnFamily.java   | 4 ++--
 .../org/apache/cassandra/db/compaction/LazilyCompactedRow.java   | 4 ++--
 src/java/org/apache/cassandra/io/sstable/SSTableWriter.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/db/ColumnFamily.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java 
b/src/java/org/apache/cassandra/db/ColumnFamily.java
index cf47508..cd96785 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@ -411,8 +411,8 @@ public abstract class ColumnFamily implements 
IterableCell, IRowCacheEntry
 {
 RangeTombstone rangeTombstone = it.next();
 tombstones.update(rangeTombstone.getLocalDeletionTime());
-minTimestampSeen = Math.min(minTimestampSeen, 
rangeTombstone.minTimestamp());
-maxTimestampSeen = Math.max(maxTimestampSeen, 
rangeTombstone.maxTimestamp());
+minTimestampSeen = Math.min(minTimestampSeen, 
rangeTombstone.timestamp());
+maxTimestampSeen = Math.max(maxTimestampSeen, 
rangeTombstone.timestamp());
 minColumnNamesSeen = 
ColumnNameHelper.minComponents(minColumnNamesSeen, rangeTombstone.min, 
metadata.comparator);
 maxColumnNamesSeen = 
ColumnNameHelper.maxComponents(maxColumnNamesSeen, rangeTombstone.max, 
metadata.comparator);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java 
b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index e922492..7d6f872 100644
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@ -245,8 +245,8 @@ public class LazilyCompactedRow extends AbstractCompactedRow
 else
 {
 tombstones.update(t.getLocalDeletionTime());
-minTimestampSeen = Math.min(minTimestampSeen, 
t.minTimestamp());
-maxTimestampSeen = Math.max(maxTimestampSeen, 
t.maxTimestamp());
+minTimestampSeen = Math.min(minTimestampSeen, 
t.timestamp());
+maxTimestampSeen = Math.max(maxTimestampSeen, 
t.timestamp());
 minColumnNameSeen = 
ColumnNameHelper.minComponents(minColumnNameSeen, t.min, 
controller.cfs.metadata.comparator);
 maxColumnNameSeen = 
ColumnNameHelper.maxComponents(maxColumnNameSeen, t.max, 
controller.cfs.metadata.comparator);
 return t;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 20df91b..bfb2445 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -266,8 +266,8 @@ public class SSTableWriter extends SSTable
 {
 RangeTombstone rangeTombstone = rangeTombstoneIterator.next();
 tombstones.update(rangeTombstone.getLocalDeletionTime());
-minTimestamp = Math.min(minTimestamp, 
rangeTombstone.minTimestamp());
-maxTimestamp = Math.max(maxTimestamp, 
rangeTombstone.maxTimestamp());
+minTimestamp = Math.min(minTimestamp, rangeTombstone.timestamp());
+maxTimestamp = Math.max(maxTimestamp, rangeTombstone.timestamp());
 
 minColumnNames = ColumnNameHelper.minComponents(minColumnNames, 
rangeTombstone.min, metadata.comparator);
 maxColumnNames = ColumnNameHelper.maxComponents(maxColumnNames, 

git commit: fix merge

[marcuse]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 c4d23e168 - cde566629


fix merge


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

Branch: refs/heads/cassandra-2.1.0
Commit: cde5666290a89fcfff0c6a4bf2a421caa615de36
Parents: c4d23e1
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jul 31 07:46:10 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jul 31 07:46:10 2014 +0200

--
 src/java/org/apache/cassandra/db/ColumnFamily.java   | 4 ++--
 .../org/apache/cassandra/db/compaction/LazilyCompactedRow.java   | 4 ++--
 src/java/org/apache/cassandra/io/sstable/SSTableWriter.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/db/ColumnFamily.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java 
b/src/java/org/apache/cassandra/db/ColumnFamily.java
index cf47508..cd96785 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@ -411,8 +411,8 @@ public abstract class ColumnFamily implements 
IterableCell, IRowCacheEntry
 {
 RangeTombstone rangeTombstone = it.next();
 tombstones.update(rangeTombstone.getLocalDeletionTime());
-minTimestampSeen = Math.min(minTimestampSeen, 
rangeTombstone.minTimestamp());
-maxTimestampSeen = Math.max(maxTimestampSeen, 
rangeTombstone.maxTimestamp());
+minTimestampSeen = Math.min(minTimestampSeen, 
rangeTombstone.timestamp());
+maxTimestampSeen = Math.max(maxTimestampSeen, 
rangeTombstone.timestamp());
 minColumnNamesSeen = 
ColumnNameHelper.minComponents(minColumnNamesSeen, rangeTombstone.min, 
metadata.comparator);
 maxColumnNamesSeen = 
ColumnNameHelper.maxComponents(maxColumnNamesSeen, rangeTombstone.max, 
metadata.comparator);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java 
b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index e922492..7d6f872 100644
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@ -245,8 +245,8 @@ public class LazilyCompactedRow extends AbstractCompactedRow
 else
 {
 tombstones.update(t.getLocalDeletionTime());
-minTimestampSeen = Math.min(minTimestampSeen, 
t.minTimestamp());
-maxTimestampSeen = Math.max(maxTimestampSeen, 
t.maxTimestamp());
+minTimestampSeen = Math.min(minTimestampSeen, 
t.timestamp());
+maxTimestampSeen = Math.max(maxTimestampSeen, 
t.timestamp());
 minColumnNameSeen = 
ColumnNameHelper.minComponents(minColumnNameSeen, t.min, 
controller.cfs.metadata.comparator);
 maxColumnNameSeen = 
ColumnNameHelper.maxComponents(maxColumnNameSeen, t.max, 
controller.cfs.metadata.comparator);
 return t;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 20df91b..bfb2445 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -266,8 +266,8 @@ public class SSTableWriter extends SSTable
 {
 RangeTombstone rangeTombstone = rangeTombstoneIterator.next();
 tombstones.update(rangeTombstone.getLocalDeletionTime());
-minTimestamp = Math.min(minTimestamp, 
rangeTombstone.minTimestamp());
-maxTimestamp = Math.max(maxTimestamp, 
rangeTombstone.maxTimestamp());
+minTimestamp = Math.min(minTimestamp, rangeTombstone.timestamp());
+maxTimestamp = Math.max(maxTimestamp, rangeTombstone.timestamp());
 
 minColumnNames = ColumnNameHelper.minComponents(minColumnNames, 
rangeTombstone.min, metadata.comparator);
 maxColumnNames = ColumnNameHelper.maxComponents(maxColumnNames, 

[2/8] git commit: fix merge

[brandonwilliams]

fix merge


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

Branch: refs/heads/cassandra-2.1
Commit: cc276fb198cbc1cddd880736a5d99f49cfcc9592
Parents: be79ba5
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jun 13 11:17:51 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jun 13 11:17:51 2014 -0500

--
 src/java/org/apache/cassandra/db/Keyspace.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc276fb1/src/java/org/apache/cassandra/db/Keyspace.java
--
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java 
b/src/java/org/apache/cassandra/db/Keyspace.java
index 308d8ef..a6da637 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -27,7 +27,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
-import org.apache.cassandra.metrics.KeyspaceMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -79,7 +78,7 @@ public class Keyspace
 /* ColumnFamilyStore per column family */
 private final ConcurrentMapUUID, ColumnFamilyStore columnFamilyStores = 
new ConcurrentHashMapUUID, ColumnFamilyStore();
 private volatile AbstractReplicationStrategy replicationStrategy;
-public final KeyspaceMetrics metric;
+
 public static final FunctionString,Keyspace keyspaceTransformer = new 
FunctionString, Keyspace()
 {
 public Keyspace apply(String keyspaceName)
@@ -265,7 +264,6 @@ public class Keyspace
 metadata = Schema.instance.getKSMetaData(keyspaceName);
 assert metadata != null : Unknown keyspace  + keyspaceName;
 createReplicationStrategy(metadata);
-metric = new KeyspaceMetrics(this);
 
 for (CFMetaData cfm : new 
ArrayListCFMetaData(metadata.cfMetaData().values()))
 {

[6/8] git commit: fix merge

[brandonwilliams]

fix merge


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

Branch: refs/heads/trunk
Commit: 9baae7b80767b077403a75cd1c1e2589ae38b0ba
Parents: 12025b7
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jun 13 11:35:07 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jun 13 11:35:07 2014 -0500

--
 src/java/org/apache/cassandra/db/Keyspace.java  |  2 -
 .../cassandra/metrics/KeyspaceMetrics.java  | 94 +---
 2 files changed, 80 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9baae7b8/src/java/org/apache/cassandra/db/Keyspace.java
--
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java 
b/src/java/org/apache/cassandra/db/Keyspace.java
index 8762643..54054c5 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -64,8 +64,6 @@ public class Keyspace
 
 public final KeyspaceMetrics metric;
 
-public final KeyspaceMetrics metric;
-
 // It is possible to call Keyspace.open without a running daemon, so it 
makes sense to ensure
 // proper directories here as well as in CassandraDaemon.
 static

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9baae7b8/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
--
diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java 
b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
index 4a0980f..7ef8a75 100644
--- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
@@ -32,16 +32,24 @@ import org.apache.cassandra.db.Keyspace;
  */
 public class KeyspaceMetrics
 {
-/** Total amount of data stored in the memtable, including column related 
overhead. */
-public final GaugeLong memtableDataSize;
-/** Total amount of data stored in the memtables (2i and pending flush 
memtables included). */
-public final GaugeLong allMemtablesDataSize;
+/** Total amount of live data stored in the memtable, excluding any data 
structure overhead */
+public final GaugeLong memtableLiveDataSize;
+/** Total amount of data stored in the memtable that resides on-heap, 
including column related overhead and overwritten rows. */
+public final GaugeLong memtableOnHeapDataSize;
+/** Total amount of data stored in the memtable that resides off-heap, 
including column related overhead and overwritten rows. */
+public final GaugeLong memtableOffHeapDataSize;
+/** Total amount of live data stored in the memtables (2i and pending 
flush memtables included) that resides off-heap, excluding any data structure 
overhead */
+public final GaugeLong allMemtablesLiveDataSize;
+/** Total amount of data stored in the memtables (2i and pending flush 
memtables included) that resides on-heap. */
+public final GaugeLong allMemtablesOnHeapDataSize;
+/** Total amount of data stored in the memtables (2i and pending flush 
memtables included) that resides off-heap. */
+public final GaugeLong allMemtablesOffHeapDataSize;
 /** Total number of columns present in the memtable. */
 public final GaugeLong memtableColumnsCount;
 /** Number of times flush has resulted in the memtable being switched out. 
*/
 public final GaugeLong memtableSwitchCount;
 /** Estimated number of tasks pending for this column family */
-public final GaugeInteger pendingTasks;
+public final GaugeInteger pendingFlushes;
 /** Estimate of number of pending compactios for this CF */
 public final GaugeInteger pendingCompactions;
 /** Disk space used by SSTables belonging to this CF */
@@ -74,26 +82,74 @@ public class KeyspaceMetrics
 return total;
 }
 });
-memtableDataSize = 
Metrics.newGauge(factory.createMetricName(MemtableDataSize), new GaugeLong()
+memtableLiveDataSize = 
Metrics.newGauge(factory.createMetricName(MemtableLiveDataSize), new 
GaugeLong()
 {
 public Long value()
 {
 long total = 0;
 for (ColumnFamilyStore cf : ks.getColumnFamilyStores())
 {
-total += cf.metric.memtableDataSize.value();
+total += cf.metric.memtableLiveDataSize.value();
 }
 return total;
 }
 });
-allMemtablesDataSize = 

[7/8] git commit: fix merge

[brandonwilliams]

fix merge


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

Branch: refs/heads/cassandra-2.1
Commit: 9baae7b80767b077403a75cd1c1e2589ae38b0ba
Parents: 12025b7
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jun 13 11:35:07 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jun 13 11:35:07 2014 -0500

--
 src/java/org/apache/cassandra/db/Keyspace.java  |  2 -
 .../cassandra/metrics/KeyspaceMetrics.java  | 94 +---
 2 files changed, 80 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9baae7b8/src/java/org/apache/cassandra/db/Keyspace.java
--
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java 
b/src/java/org/apache/cassandra/db/Keyspace.java
index 8762643..54054c5 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -64,8 +64,6 @@ public class Keyspace
 
 public final KeyspaceMetrics metric;
 
-public final KeyspaceMetrics metric;
-
 // It is possible to call Keyspace.open without a running daemon, so it 
makes sense to ensure
 // proper directories here as well as in CassandraDaemon.
 static

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9baae7b8/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
--
diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java 
b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
index 4a0980f..7ef8a75 100644
--- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
@@ -32,16 +32,24 @@ import org.apache.cassandra.db.Keyspace;
  */
 public class KeyspaceMetrics
 {
-/** Total amount of data stored in the memtable, including column related 
overhead. */
-public final GaugeLong memtableDataSize;
-/** Total amount of data stored in the memtables (2i and pending flush 
memtables included). */
-public final GaugeLong allMemtablesDataSize;
+/** Total amount of live data stored in the memtable, excluding any data 
structure overhead */
+public final GaugeLong memtableLiveDataSize;
+/** Total amount of data stored in the memtable that resides on-heap, 
including column related overhead and overwritten rows. */
+public final GaugeLong memtableOnHeapDataSize;
+/** Total amount of data stored in the memtable that resides off-heap, 
including column related overhead and overwritten rows. */
+public final GaugeLong memtableOffHeapDataSize;
+/** Total amount of live data stored in the memtables (2i and pending 
flush memtables included) that resides off-heap, excluding any data structure 
overhead */
+public final GaugeLong allMemtablesLiveDataSize;
+/** Total amount of data stored in the memtables (2i and pending flush 
memtables included) that resides on-heap. */
+public final GaugeLong allMemtablesOnHeapDataSize;
+/** Total amount of data stored in the memtables (2i and pending flush 
memtables included) that resides off-heap. */
+public final GaugeLong allMemtablesOffHeapDataSize;
 /** Total number of columns present in the memtable. */
 public final GaugeLong memtableColumnsCount;
 /** Number of times flush has resulted in the memtable being switched out. 
*/
 public final GaugeLong memtableSwitchCount;
 /** Estimated number of tasks pending for this column family */
-public final GaugeInteger pendingTasks;
+public final GaugeInteger pendingFlushes;
 /** Estimate of number of pending compactios for this CF */
 public final GaugeInteger pendingCompactions;
 /** Disk space used by SSTables belonging to this CF */
@@ -74,26 +82,74 @@ public class KeyspaceMetrics
 return total;
 }
 });
-memtableDataSize = 
Metrics.newGauge(factory.createMetricName(MemtableDataSize), new GaugeLong()
+memtableLiveDataSize = 
Metrics.newGauge(factory.createMetricName(MemtableLiveDataSize), new 
GaugeLong()
 {
 public Long value()
 {
 long total = 0;
 for (ColumnFamilyStore cf : ks.getColumnFamilyStores())
 {
-total += cf.metric.memtableDataSize.value();
+total += cf.metric.memtableLiveDataSize.value();
 }
 return total;
 }
 });
-allMemtablesDataSize = 

[3/8] git commit: fix merge

[brandonwilliams]

fix merge


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

Branch: refs/heads/trunk
Commit: cc276fb198cbc1cddd880736a5d99f49cfcc9592
Parents: be79ba5
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jun 13 11:17:51 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jun 13 11:17:51 2014 -0500

--
 src/java/org/apache/cassandra/db/Keyspace.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc276fb1/src/java/org/apache/cassandra/db/Keyspace.java
--
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java 
b/src/java/org/apache/cassandra/db/Keyspace.java
index 308d8ef..a6da637 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -27,7 +27,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
-import org.apache.cassandra.metrics.KeyspaceMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -79,7 +78,7 @@ public class Keyspace
 /* ColumnFamilyStore per column family */
 private final ConcurrentMapUUID, ColumnFamilyStore columnFamilyStores = 
new ConcurrentHashMapUUID, ColumnFamilyStore();
 private volatile AbstractReplicationStrategy replicationStrategy;
-public final KeyspaceMetrics metric;
+
 public static final FunctionString,Keyspace keyspaceTransformer = new 
FunctionString, Keyspace()
 {
 public Keyspace apply(String keyspaceName)
@@ -265,7 +264,6 @@ public class Keyspace
 metadata = Schema.instance.getKSMetaData(keyspaceName);
 assert metadata != null : Unknown keyspace  + keyspaceName;
 createReplicationStrategy(metadata);
-metric = new KeyspaceMetrics(this);
 
 for (CFMetaData cfm : new 
ArrayListCFMetaData(metadata.cfMetaData().values()))
 {

[1/8] git commit: fix merge

[brandonwilliams]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 be79ba500 - cc276fb19
  refs/heads/cassandra-2.1 30d3623bc - 9baae7b80
  refs/heads/trunk 3aa030593 - 7765e0e41


fix merge


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

Branch: refs/heads/cassandra-2.0
Commit: cc276fb198cbc1cddd880736a5d99f49cfcc9592
Parents: be79ba5
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jun 13 11:17:51 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jun 13 11:17:51 2014 -0500

--
 src/java/org/apache/cassandra/db/Keyspace.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc276fb1/src/java/org/apache/cassandra/db/Keyspace.java
--
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java 
b/src/java/org/apache/cassandra/db/Keyspace.java
index 308d8ef..a6da637 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -27,7 +27,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
-import org.apache.cassandra.metrics.KeyspaceMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -79,7 +78,7 @@ public class Keyspace
 /* ColumnFamilyStore per column family */
 private final ConcurrentMapUUID, ColumnFamilyStore columnFamilyStores = 
new ConcurrentHashMapUUID, ColumnFamilyStore();
 private volatile AbstractReplicationStrategy replicationStrategy;
-public final KeyspaceMetrics metric;
+
 public static final FunctionString,Keyspace keyspaceTransformer = new 
FunctionString, Keyspace()
 {
 public Keyspace apply(String keyspaceName)
@@ -265,7 +264,6 @@ public class Keyspace
 metadata = Schema.instance.getKSMetaData(keyspaceName);
 assert metadata != null : Unknown keyspace  + keyspaceName;
 createReplicationStrategy(metadata);
-metric = new KeyspaceMetrics(this);
 
 for (CFMetaData cfm : new 
ArrayListCFMetaData(metadata.cfMetaData().values()))
 {

git commit: fix merge-created bad map key lookup type

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e0502ea29 - f64dc4527


fix merge-created bad map key lookup type


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

Branch: refs/heads/cassandra-2.1
Commit: f64dc45276282016ae4a5642555ea27ad6f6d1a6
Parents: e0502ea
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat May 24 01:44:37 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat May 24 01:44:37 2014 -0400

--
 src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f64dc452/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 765cbac..501ef45 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -1549,7 +1549,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 return stmt.columnRestrictions[def.position()];
 case REGULAR:
 case STATIC:
-return stmt.metadataRestrictions.get(def);
+return stmt.metadataRestrictions.get(def.name);
 default:
 throw new AssertionError();
 }

[1/2] git commit: fix merge-created bad map key lookup type

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/trunk deee02c53 - f5c54aac9


fix merge-created bad map key lookup type


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

Branch: refs/heads/trunk
Commit: f64dc45276282016ae4a5642555ea27ad6f6d1a6
Parents: e0502ea
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat May 24 01:44:37 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat May 24 01:44:37 2014 -0400

--
 src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f64dc452/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 765cbac..501ef45 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -1549,7 +1549,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 return stmt.columnRestrictions[def.position()];
 case REGULAR:
 case STATIC:
-return stmt.metadataRestrictions.get(def);
+return stmt.metadataRestrictions.get(def.name);
 default:
 throw new AssertionError();
 }

git commit: Fix merge

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 94f25ce15 - 82be86a56


Fix merge


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

Branch: refs/heads/cassandra-2.1
Commit: 82be86a5681a947333a675d7f3a72a202c0049ca
Parents: 94f25ce
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed May 21 11:42:32 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed May 21 11:42:32 2014 +0200

--
 .../cassandra/cql3/statements/SelectStatement.java| 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82be86a5/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index ca990a4..b212147 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -928,11 +928,11 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 if (slice.hasBound(b))
 {
 ByteBuffer value = validateIndexedValue(def, 
slice.bound(b, options));
-IndexOperator op = slice.getIndexOperator(b);
+IndexExpression.Operator op = 
slice.getIndexOperator(b);
 // If the underlying comparator for name is reversed, 
we need to reverse the IndexOperator: user operation
 // always refer to the forward sorting even if the 
clustering order is reversed, but the 2ndary code does
 // use the underlying comparator as is.
-if (name.type instanceof ReversedType)
+if (def.type instanceof ReversedType)
 op = reverse(op);
 expressions.add(new IndexExpression(def.name.bytes, 
op, value));
 }
@@ -1004,14 +1004,14 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 };
 }
 
-private static IndexOperator reverse(IndexOperator op)
+private static IndexExpression.Operator reverse(IndexExpression.Operator 
op)
 {
 switch (op)
 {
-case LT:  return IndexOperator.GT;
-case LTE: return IndexOperator.GTE;
-case GT:  return IndexOperator.LT;
-case GTE: return IndexOperator.LTE;
+case LT:  return IndexExpression.Operator.GT;
+case LTE: return IndexExpression.Operator.GTE;
+case GT:  return IndexExpression.Operator.LT;
+case GTE: return IndexExpression.Operator.LTE;
 default: return op;
 }
 }

[3/4] git commit: Fix merge

[slebresne]

Fix merge


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

Branch: refs/heads/trunk
Commit: 82be86a5681a947333a675d7f3a72a202c0049ca
Parents: 94f25ce
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed May 21 11:42:32 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed May 21 11:42:32 2014 +0200

--
 .../cassandra/cql3/statements/SelectStatement.java| 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82be86a5/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index ca990a4..b212147 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -928,11 +928,11 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 if (slice.hasBound(b))
 {
 ByteBuffer value = validateIndexedValue(def, 
slice.bound(b, options));
-IndexOperator op = slice.getIndexOperator(b);
+IndexExpression.Operator op = 
slice.getIndexOperator(b);
 // If the underlying comparator for name is reversed, 
we need to reverse the IndexOperator: user operation
 // always refer to the forward sorting even if the 
clustering order is reversed, but the 2ndary code does
 // use the underlying comparator as is.
-if (name.type instanceof ReversedType)
+if (def.type instanceof ReversedType)
 op = reverse(op);
 expressions.add(new IndexExpression(def.name.bytes, 
op, value));
 }
@@ -1004,14 +1004,14 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
 };
 }
 
-private static IndexOperator reverse(IndexOperator op)
+private static IndexExpression.Operator reverse(IndexExpression.Operator 
op)
 {
 switch (op)
 {
-case LT:  return IndexOperator.GT;
-case LTE: return IndexOperator.GTE;
-case GT:  return IndexOperator.LT;
-case GTE: return IndexOperator.LTE;
+case LT:  return IndexExpression.Operator.GT;
+case LTE: return IndexExpression.Operator.GTE;
+case GT:  return IndexExpression.Operator.LT;
+case GTE: return IndexExpression.Operator.LTE;
 default: return op;
 }
 }

[2/3] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/trunk
Commit: 47675ce7598ed07dc227fd2ebe3e169180f3b0a8
Parents: e0718bc
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Mar 14 15:41:56 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Mar 14 15:41:58 2014 -0500

--
 src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/47675ce7/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
--
diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java 
b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
index 325521b..f5a2603 100644
--- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.db.composites.CType;
 import org.apache.cassandra.db.composites.CellName;
 import org.apache.cassandra.db.composites.CellNameType;
 import org.apache.cassandra.db.composites.Composite;
+import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.io.util.FileDataInput;
@@ -222,11 +223,10 @@ public class SliceQueryFilter implements IDiskAtomFilter
 if (respectTombstoneThresholds()  columnCounter.ignored()  
DatabaseDescriptor.getTombstoneWarnThreshold())
 {
 StringBuilder sb = new StringBuilder();
-AbstractType? type = container.metadata().comparator;
+CellNameType type = container.metadata().comparator;
 for (ColumnSlice sl : slices)
 {
-if (sl == null)
-continue;
+assert sl != null;
 
 sb.append('[');
 sb.append(type.getString(sl.start));

[1/3] git commit: fix merge

[jbellis]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e0718bcdf - 47675ce75
  refs/heads/trunk 5011437b1 - 572731247


fix merge


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

Branch: refs/heads/cassandra-2.1
Commit: 47675ce7598ed07dc227fd2ebe3e169180f3b0a8
Parents: e0718bc
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Mar 14 15:41:56 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Mar 14 15:41:58 2014 -0500

--
 src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/47675ce7/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
--
diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java 
b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
index 325521b..f5a2603 100644
--- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.db.composites.CType;
 import org.apache.cassandra.db.composites.CellName;
 import org.apache.cassandra.db.composites.CellNameType;
 import org.apache.cassandra.db.composites.Composite;
+import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.io.util.FileDataInput;
@@ -222,11 +223,10 @@ public class SliceQueryFilter implements IDiskAtomFilter
 if (respectTombstoneThresholds()  columnCounter.ignored()  
DatabaseDescriptor.getTombstoneWarnThreshold())
 {
 StringBuilder sb = new StringBuilder();
-AbstractType? type = container.metadata().comparator;
+CellNameType type = container.metadata().comparator;
 for (ColumnSlice sl : slices)
 {
-if (sl == null)
-continue;
+assert sl != null;
 
 sb.append('[');
 sb.append(type.getString(sl.start));

git commit: Fix merge

[marcuse]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e4437bc18 - 043953127


Fix merge


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

Branch: refs/heads/cassandra-2.1
Commit: 04395312745805ed7e4fd201b88bcd3d46b3a601
Parents: e4437bc
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Mar 3 14:39:40 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Mar 3 14:39:40 2014 +0100

--
 .../cassandra/io/compress/CompressedRandomAccessReaderTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04395312/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
index c9ddfea..f8fcf76 100644
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
@@ -29,6 +29,7 @@ import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.io.sstable.CorruptSSTableException;
 import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
+import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
 import org.apache.cassandra.io.util.*;
 
 import static org.junit.Assert.assertEquals;
@@ -59,7 +60,7 @@ public class CompressedRandomAccessReaderTest
 try
 {
 
-SSTableMetadata.Collector sstableMetadataCollector = 
SSTableMetadata.createCollector(BytesType.instance).replayPosition(null);
+MetadataCollector sstableMetadataCollector = new 
MetadataCollector(new SimpleDenseCellNameType(BytesType.instance));
 CompressedSequentialWriter writer = new 
CompressedSequentialWriter(f, filename + .metadata, false, new 
CompressionParameters(SnappyCompressor.instance, 32, Collections.String, 
StringemptyMap()), sstableMetadataCollector);
 
 for (int i = 0; i  20; i++)

[1/2] git commit: Fix merge

[marcuse]

Repository: cassandra
Updated Branches:
  refs/heads/trunk e80564f39 - 2c8100af2


Fix merge


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

Branch: refs/heads/trunk
Commit: 04395312745805ed7e4fd201b88bcd3d46b3a601
Parents: e4437bc
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Mar 3 14:39:40 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Mar 3 14:39:40 2014 +0100

--
 .../cassandra/io/compress/CompressedRandomAccessReaderTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04395312/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
index c9ddfea..f8fcf76 100644
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
@@ -29,6 +29,7 @@ import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.io.sstable.CorruptSSTableException;
 import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
+import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
 import org.apache.cassandra.io.util.*;
 
 import static org.junit.Assert.assertEquals;
@@ -59,7 +60,7 @@ public class CompressedRandomAccessReaderTest
 try
 {
 
-SSTableMetadata.Collector sstableMetadataCollector = 
SSTableMetadata.createCollector(BytesType.instance).replayPosition(null);
+MetadataCollector sstableMetadataCollector = new 
MetadataCollector(new SimpleDenseCellNameType(BytesType.instance));
 CompressedSequentialWriter writer = new 
CompressedSequentialWriter(f, filename + .metadata, false, new 
CompressionParameters(SnappyCompressor.instance, 32, Collections.String, 
StringemptyMap()), sstableMetadataCollector);
 
 for (int i = 0; i  20; i++)

[4/4] git commit: Fix merge

[aleksey]

Fix merge


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

Branch: refs/heads/trunk
Commit: 34235ad7b5722a5a5ee9680ba3a2d563a67ecc6f
Parents: 85863e2
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Dec 22 20:10:59 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Dec 22 20:10:59 2013 +0300

--
 src/java/org/apache/cassandra/thrift/ThriftValidation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34235ad7/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java 
b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
index b597203..d491636 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@ -268,7 +268,7 @@ public class ThriftValidation
 if (range.count  0)
 throw new 
org.apache.cassandra.exceptions.InvalidRequestException(get_slice requires 
non-negative count);
 
-int maxNameLength = org.apache.cassandra.db.Column.MAX_NAME_LENGTH;
+int maxNameLength = Cell.MAX_NAME_LENGTH;
 if (range.start.remaining()  maxNameLength)
 throw new 
org.apache.cassandra.exceptions.InvalidRequestException(range start length 
cannot be larger than  + maxNameLength);
 if (range.finish.remaining()  maxNameLength)

[5/5] git commit: Fix merge

[slebresne]

Fix merge


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

Branch: refs/heads/trunk
Commit: 1a5ebd6a7d65af8393c9d5c67e7de8088bbb1d0f
Parents: 1273476
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Dec 18 11:23:44 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Dec 18 11:23:44 2013 +0100

--
 src/java/org/apache/cassandra/service/pager/SliceQueryPager.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a5ebd6a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
--
diff --git a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java 
b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
index 9d8d62c..fbc36e0 100644
--- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
@@ -17,6 +17,7 @@
  */
 package org.apache.cassandra.service.pager;
 
+import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.List;
 

[3/3] git commit: Fix merge

[slebresne]

Fix merge


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

Branch: refs/heads/cassandra-2.0
Commit: 1334f94e40ce5dbed7270808abb2330ea6d37c51
Parents: b2da839
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Dec 3 14:56:19 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Dec 3 14:56:19 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1334f94e/src/java/org/apache/cassandra/db/marshal/CollectionType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/CollectionType.java 
b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
index 9408980..07c86e0 100644
--- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
@@ -113,7 +113,7 @@ public abstract class CollectionTypeT extends 
AbstractTypeT
 return (ByteBuffer)result.flip();
 }
 
-protected ListPairByteBuffer, IColumn 
enforceLimit(ListPairByteBuffer, IColumn columns)
+protected ListPairByteBuffer, Column 
enforceLimit(ListPairByteBuffer, Column columns)
 {
 if (columns.size() = MAX_ELEMENTS)
 return columns;

[3/4] git commit: Fix merge

[slebresne]

Fix merge


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

Branch: refs/heads/trunk
Commit: 1334f94e40ce5dbed7270808abb2330ea6d37c51
Parents: b2da839
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Dec 3 14:56:19 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Dec 3 14:56:19 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1334f94e/src/java/org/apache/cassandra/db/marshal/CollectionType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/CollectionType.java 
b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
index 9408980..07c86e0 100644
--- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
@@ -113,7 +113,7 @@ public abstract class CollectionTypeT extends 
AbstractTypeT
 return (ByteBuffer)result.flip();
 }
 
-protected ListPairByteBuffer, IColumn 
enforceLimit(ListPairByteBuffer, IColumn columns)
+protected ListPairByteBuffer, Column 
enforceLimit(ListPairByteBuffer, Column columns)
 {
 if (columns.size() = MAX_ELEMENTS)
 return columns;

[1/3] git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/cassandra-2.0 ab4cc9c00 - f15681b67
  refs/heads/trunk a13c6dcbb - f15d6d591


fix merge


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

Branch: refs/heads/cassandra-2.0
Commit: f15681b6795d8a0b192100e37bec4080db2b7edb
Parents: ab4cc9c
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:39:21 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:39:21 2013 -0600

--
 src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f15681b6/src/java/org/apache/cassandra/locator/TokenMetadata.java
--
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java 
b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index 47e91c9..635c010 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -976,7 +976,7 @@ public class TokenMetadata
 return sb.toString();
 }
 
-public CollectionInetAddress pendingEndpointsFor(Token token, String 
table)
+public CollectionInetAddress pendingEndpointsFor(Token token, String 
keyspaceName)
 {
 MapRangeToken, CollectionInetAddress ranges = 
getPendingRanges(keyspaceName);
 if (ranges.isEmpty())

[2/3] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/trunk
Commit: f15681b6795d8a0b192100e37bec4080db2b7edb
Parents: ab4cc9c
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:39:21 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:39:21 2013 -0600

--
 src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f15681b6/src/java/org/apache/cassandra/locator/TokenMetadata.java
--
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java 
b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index 47e91c9..635c010 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -976,7 +976,7 @@ public class TokenMetadata
 return sb.toString();
 }
 
-public CollectionInetAddress pendingEndpointsFor(Token token, String 
table)
+public CollectionInetAddress pendingEndpointsFor(Token token, String 
keyspaceName)
 {
 MapRangeToken, CollectionInetAddress ranges = 
getPendingRanges(keyspaceName);
 if (ranges.isEmpty())

git commit: fix merge

[marcuse]

Updated Branches:
  refs/heads/trunk a9d64ef86 - 6bcf28edc


fix merge


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

Branch: refs/heads/trunk
Commit: 6bcf28edcb1d59253113102efd7ac25ffb35037f
Parents: a9d64ef
Author: Marcus Eriksson marc...@spotify.com
Authored: Fri Oct 18 15:28:21 2013 +0200
Committer: Marcus Eriksson marc...@spotify.com
Committed: Fri Oct 18 15:28:21 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bcf28ed/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 cd09083..22a9270 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -582,7 +582,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 // for bootstrap to get the load info it needs.
 // (we won't be part of the storage ring though until we add a 
counterId to our state, below.)
 // Seed the host ID-to-endpoint map with our own ID.
-getTokenMetadata().updateHostId(SystemTable.getLocalHostId(), 
FBUtilities.getBroadcastAddress());
+getTokenMetadata().updateHostId(SystemKeyspace.getLocalHostId(), 
FBUtilities.getBroadcastAddress());
 appStates.put(ApplicationState.NET_VERSION, 
valueFactory.networkVersion());
 appStates.put(ApplicationState.HOST_ID, 
valueFactory.hostId(SystemKeyspace.getLocalHostId()));
 appStates.put(ApplicationState.RPC_ADDRESS, 
valueFactory.rpcaddress(DatabaseDescriptor.getRpcAddress()));

[1/3] git commit: fix merge again

[brandonwilliams]

Updated Branches:
  refs/heads/cassandra-2.0 ff5db5635 - 99bef9dfe
  refs/heads/trunk 8e0aa710d - 50b08f2b2


fix merge again


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

Branch: refs/heads/cassandra-2.0
Commit: 99bef9dfe8bbf83526b5a3686a7eb1aaf7cb9b94
Parents: ff5db56
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 11:15:57 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 11:15:57 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/99bef9df/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 e6b11a4..4065c9e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -932,7 +932,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 {
 // Dont set any state for the node which is bootstrapping the 
existing token...
 tokenMetadata.updateNormalTokens(tokens, 
FBUtilities.getBroadcastAddress());
-SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
+
SystemKeyspace.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
 }
 if (!Gossiper.instance.seenAnySeed())
 throw new IllegalStateException(Unable to contact any seeds!);

[1/3] git commit: fix merge

[brandonwilliams]

Updated Branches:
  refs/heads/cassandra-2.0 cb585ef9e - 4dc5d690f
  refs/heads/trunk 8ec455d84 - a9d64ef86


fix merge


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

Branch: refs/heads/cassandra-2.0
Commit: 4dc5d690f1483ed8e112c0d7834af1e46b982b05
Parents: cb585ef
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 00:22:10 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 00:22:10 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dc5d690/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 4489f59..e4e03a2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -402,7 +402,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 {
 throw new RuntimeException(e);
 }
-SystemTable.setLocalHostId(hostId); // use the replacee's host Id as 
our own so we receive hints, etc
+SystemKeyspace.setLocalHostId(hostId); // use the replacee's host Id 
as our own so we receive hints, etc
 MessagingService.instance().shutdown();
 Gossiper.instance.resetEndpointStateMap(); // clean up since we have 
what we need
 return tokens;

[2/3] git commit: fix merge

[brandonwilliams]

fix merge


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

Branch: refs/heads/trunk
Commit: 4dc5d690f1483ed8e112c0d7834af1e46b982b05
Parents: cb585ef
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 00:22:10 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 00:22:10 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dc5d690/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 4489f59..e4e03a2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -402,7 +402,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 {
 throw new RuntimeException(e);
 }
-SystemTable.setLocalHostId(hostId); // use the replacee's host Id as 
our own so we receive hints, etc
+SystemKeyspace.setLocalHostId(hostId); // use the replacee's host Id 
as our own so we receive hints, etc
 MessagingService.instance().shutdown();
 Gossiper.instance.resetEndpointStateMap(); // clean up since we have 
what we need
 return tokens;

git commit: fix merge from #6132 patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6154

[jbellis]

Updated Branches:
  refs/heads/trunk a57981650 - 53f7c328a


fix merge from #6132
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6154


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

Branch: refs/heads/trunk
Commit: 53f7c328ae4aca0affaed4f0c73678011a4e152a
Parents: a579816
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Oct 7 16:47:41 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Oct 7 16:47:47 2013 -0500

--
 .../org/apache/cassandra/net/MessagingService.java   | 15 ++-
 .../org/apache/cassandra/service/StorageProxy.java   | 10 --
 2 files changed, 14 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/53f7c328/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java 
b/src/java/org/apache/cassandra/net/MessagingService.java
index 1776361..ff8a2c7 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -563,14 +563,16 @@ public final class MessagingService implements 
MessagingServiceMBean
 return idGen.incrementAndGet();
 }
 
-/*
- * @see #sendRR(Message message, InetAddress to, IAsyncCallback cb, long 
timeout)
- */
 public int sendRR(MessageOut message, InetAddress to, IAsyncCallback cb)
 {
 return sendRR(message, to, cb, message.getTimeout());
 }
 
+public int sendRR(MessageOut message, InetAddress to, IAsyncCallback cb, 
long timeout)
+{
+return sendRR(message, to, cb, timeout, null);
+}
+
 /**
  * Send a message to a given endpoint. This method specifies a callback
  * which is invoked with the actual response.
@@ -584,11 +586,14 @@ public final class MessagingService implements 
MessagingServiceMBean
  *suggest that a timeout occurred to the invoker of the 
send().
  *suggest that a timeout occurred to the invoker of the 
send().
  * @param timeout the timeout used for expiration
+ * @param consistencyLevel the consistency level, for mutations; must be 
null otherwise
  * @return an reference to message id used to match with the result
  */
-public int sendRR(MessageOut message, InetAddress to, IAsyncCallback cb, 
long timeout)
+public int sendRR(MessageOut message, InetAddress to, IAsyncCallback cb, 
long timeout, ConsistencyLevel consistencyLevel)
 {
-int id = addCallback(cb, message, to, timeout);
+int id = consistencyLevel == null
+   ? addCallback(cb, message, to, timeout)
+   : addCallback(cb, message, to, timeout, consistencyLevel);
 sendOneWay(message, id, to);
 return id;
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/53f7c328/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 157079f..102d8b5 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -681,7 +681,7 @@ public class StorageProxy implements StorageProxyMBean
 {
 MessageOutRowMutation message = rm.createMessage();
 for (InetAddress target : endpoints)
-MessagingService.instance().sendRR(message, target, handler);
+MessagingService.instance().sendRR(message, target, handler, 
message.getTimeout(), ConsistencyLevel.ONE);
 }
 }
 
@@ -866,7 +866,7 @@ public class StorageProxy implements StorageProxyMBean
 // (1.1 knows how to forward old-style String message IDs; 
updated to int in 2.0)
 if (localDataCenter.equals(dc))
 {
-MessagingService.instance().sendRR(message, 
destination, responseHandler);
+MessagingService.instance().sendRR(message, 
destination, responseHandler, message.getTimeout(), consistency_level);
 }
 else
 {
@@ -982,8 +982,7 @@ public class StorageProxy implements StorageProxyMBean
 }
 message = message.withParameter(RowMutation.FORWARD_TO, 
out.getData());
 // send the combined message + forward headers
-int id = MessagingService.instance().addCallback(handler, 

git commit: fix merge

[brandonwilliams]

Updated Branches:
  refs/heads/trunk 53f7c328a - b77fdcc3d


fix merge


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

Branch: refs/heads/trunk
Commit: b77fdcc3df540ce5f735844eec0cd4cc7909ec07
Parents: 53f7c32
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Oct 7 17:00:43 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Oct 7 17:00:52 2013 -0500

--
 .../org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b77fdcc3/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
--
diff --git 
a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java 
b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
index 0766adf..c881734 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
@@ -127,6 +127,7 @@ public abstract class AbstractCassandraStorage extends 
LoadFunc implements Store
 setTupleValue(pair, 0, cassandraToObj(comparator, col.name()));
 
 // value
+MapByteBuffer,AbstractType validators = getValidatorMap(cfDef);
 if (validators.get(col.name()) == null)
 {
 MapMarshallerType, AbstractType marshallers = 
getDefaultMarshallers(cfDef);

[2/4] git commit: fix merge conflict

[jbellis]

fix merge conflict


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

Branch: refs/heads/cassandra-2.0
Commit: 76cb10ca92d46ccf9bb3f81f0ad897c6fb9bbf53
Parents: 70239e1
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 2 16:10:47 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 2 16:10:47 2013 -0500

--
 src/java/org/apache/cassandra/tracing/Tracing.java | 9 -
 1 file changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cb10ca/src/java/org/apache/cassandra/tracing/Tracing.java
--
diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java 
b/src/java/org/apache/cassandra/tracing/Tracing.java
index aef3816..c000af9 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -170,16 +170,7 @@ public class Tracing
 CFMetaData cfMeta = CFMetaData.TraceSessionsCf;
 ColumnFamily cf = 
ArrayBackedSortedColumns.factory.create(cfMeta);
 addColumn(cf, buildName(cfMeta, bytes(duration)), 
elapsed);
- HEAD
-RowMutation mutation = new RowMutation(TRACE_KS, 
sessionIdBytes, cf);
-StorageProxy.mutate(Arrays.asList(mutation), 
ConsistencyLevel.ANY);
-||| merged common ancestors
-RowMutation mutation = new RowMutation(TRACE_KS, 
sessionIdBytes);
-mutation.add(cf);
-StorageProxy.mutate(Arrays.asList(mutation), 
ConsistencyLevel.ANY);
-===
 mutateWithCatch(new RowMutation(TRACE_KS, sessionIdBytes, 
cf));
- cassandra-1.2
 }
 });
 

[3/4] git commit: fix merge conflict

[jbellis]

fix merge conflict


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

Branch: refs/heads/trunk
Commit: 76cb10ca92d46ccf9bb3f81f0ad897c6fb9bbf53
Parents: 70239e1
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 2 16:10:47 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 2 16:10:47 2013 -0500

--
 src/java/org/apache/cassandra/tracing/Tracing.java | 9 -
 1 file changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cb10ca/src/java/org/apache/cassandra/tracing/Tracing.java
--
diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java 
b/src/java/org/apache/cassandra/tracing/Tracing.java
index aef3816..c000af9 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -170,16 +170,7 @@ public class Tracing
 CFMetaData cfMeta = CFMetaData.TraceSessionsCf;
 ColumnFamily cf = 
ArrayBackedSortedColumns.factory.create(cfMeta);
 addColumn(cf, buildName(cfMeta, bytes(duration)), 
elapsed);
- HEAD
-RowMutation mutation = new RowMutation(TRACE_KS, 
sessionIdBytes, cf);
-StorageProxy.mutate(Arrays.asList(mutation), 
ConsistencyLevel.ANY);
-||| merged common ancestors
-RowMutation mutation = new RowMutation(TRACE_KS, 
sessionIdBytes);
-mutation.add(cf);
-StorageProxy.mutate(Arrays.asList(mutation), 
ConsistencyLevel.ANY);
-===
 mutateWithCatch(new RowMutation(TRACE_KS, sessionIdBytes, 
cf));
- cassandra-1.2
 }
 });
 

git commit: Fix merge (s//= in CompositesSearcher)

[aleksey]

Updated Branches:
  refs/heads/cassandra-2.0 096f2bf92 - 1ff0d8e9f


Fix merge (s//= in CompositesSearcher)


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

Branch: refs/heads/cassandra-2.0
Commit: 1ff0d8e9f653b7575caa0f2c09e59ff51c79a8ad
Parents: 096f2bf
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Sep 10 18:23:03 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Sep 10 18:23:03 2013 +0300

--
 .../apache/cassandra/db/index/composites/CompositesSearcher.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ff0d8e9/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
--
diff --git 
a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java 
b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
index 011839e..0c2cfbc 100644
--- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
@@ -138,7 +138,7 @@ public class CompositesSearcher extends 
SecondaryIndexSearcher
 {
 // Did we get more columns that needed to respect the user 
limit?
 // (but we still need to return what has been fetched 
already)
-if (columnsCount  limit)
+if (columnsCount = limit)
 return makeReturn(currentKey, data);
 
 if (indexColumns == null || indexColumns.isEmpty())

[1/2] git commit: Fix merge (s//= in CompositesSearcher)

[aleksey]

Updated Branches:
  refs/heads/trunk 36610aaf7 - 382261218


Fix merge (s//= in CompositesSearcher)


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

Branch: refs/heads/trunk
Commit: 1ff0d8e9f653b7575caa0f2c09e59ff51c79a8ad
Parents: 096f2bf
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Sep 10 18:23:03 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Sep 10 18:23:03 2013 +0300

--
 .../apache/cassandra/db/index/composites/CompositesSearcher.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ff0d8e9/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
--
diff --git 
a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java 
b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
index 011839e..0c2cfbc 100644
--- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
@@ -138,7 +138,7 @@ public class CompositesSearcher extends 
SecondaryIndexSearcher
 {
 // Did we get more columns that needed to respect the user 
limit?
 // (but we still need to return what has been fetched 
already)
-if (columnsCount  limit)
+if (columnsCount = limit)
 return makeReturn(currentKey, data);
 
 if (indexColumns == null || indexColumns.isEmpty())

git commit: fix merge issues

[dbrosius]

Updated Branches:
  refs/heads/trunk 4439b4117 - 385ce13f5


fix merge issues


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

Branch: refs/heads/trunk
Commit: 385ce13f5ac3be91e40caa4f2cb34ec0ce654719
Parents: 4439b41
Author: Dave Brosius dbros...@apache.org
Authored: Sun Apr 28 12:23:10 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Sun Apr 28 12:23:10 2013 -0400

--
 .../cassandra/io/sstable/IndexSummaryBuilder.java  |   76 +++
 .../apache/cassandra/io/sstable/SSTableReader.java |4 +-
 .../apache/cassandra/io/sstable/SSTableWriter.java |4 +-
 3 files changed, 80 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/385ce13f/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
new file mode 100644
index 000..12be453
--- /dev/null
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+package org.apache.cassandra.io.sstable;
+
+import java.util.ArrayList;
+
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.Longs;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.DecoratedKey;
+import org.apache.cassandra.dht.IPartitioner;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
+public class IndexSummaryBuilder
+{
+private static final Logger logger = 
LoggerFactory.getLogger(IndexSummaryBuilder.class);
+
+private final ArrayListLong positions;
+private final ArrayListbyte[] keys;
+private long keysWritten = 0;
+
+public IndexSummaryBuilder(long expectedKeys, int indexInterval)
+{
+long expectedEntries = expectedKeys / indexInterval;
+if (expectedEntries  Integer.MAX_VALUE)
+{
+// that's a _lot_ of keys, and a very low interval
+int effectiveInterval = (int) Math.ceil((double) Integer.MAX_VALUE 
/ expectedKeys);
+expectedEntries = expectedKeys / effectiveInterval;
+assert expectedEntries = Integer.MAX_VALUE : expectedEntries;
+logger.warn(Index interval of {} is too low for {} expected keys; 
using interval of {} instead,
+indexInterval, expectedKeys, effectiveInterval);
+}
+positions = new ArrayListLong((int)expectedEntries);
+keys = new ArrayListbyte[]((int)expectedEntries);
+}
+
+public IndexSummaryBuilder maybeAddEntry(DecoratedKey decoratedKey, int 
indexInterval, long indexPosition)
+{
+if (keysWritten % indexInterval == 0)
+{
+keys.add(ByteBufferUtil.getArray(decoratedKey.key));
+positions.add(indexPosition);
+}
+keysWritten++;
+
+return this;
+}
+
+public IndexSummary build(IPartitioner partitioner, int indexInterval)
+{
+byte[][] keysArray = new byte[keys.size()][];
+for (int i = 0; i  keys.size(); i++)
+keysArray[i] = keys.get(i);
+
+return new IndexSummary(partitioner, keysArray, 
Longs.toArray(positions), indexInterval);
+}
+}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/385ce13f/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java 
b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index 2d6c1df..27589f5 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ 

[04/14] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/trunk
Commit: 344f5fa5af64b601751269fc570fbf4de930e9e2
Parents: d7a0982
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Apr 19 13:29:52 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Apr 19 13:29:52 2013 -0500

--
 .../org/apache/cassandra/db/RowIndexEntry.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/344f5fa5/src/java/org/apache/cassandra/db/RowIndexEntry.java
--
diff --git a/src/java/org/apache/cassandra/db/RowIndexEntry.java 
b/src/java/org/apache/cassandra/db/RowIndexEntry.java
index c6caa3a..d5046a8 100644
--- a/src/java/org/apache/cassandra/db/RowIndexEntry.java
+++ b/src/java/org/apache/cassandra/db/RowIndexEntry.java
@@ -206,7 +206,7 @@ public class RowIndexEntry implements IMeasurableMemory
 for (IndexHelper.IndexInfo idx : columnsIndex)
 internal += idx.memorySize();
 long listSize = 
ObjectSizes.getFieldSize(ObjectSizes.getArraySize(columnsIndex.size(), 
internal) + 4);
-return ObjectSizes.getFieldSize(deletionInfo.memorySize() + 
listSize);
+return ObjectSizes.getFieldSize(deletion.memorySize() + listSize);
 }
 }
 }

[05/14] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/trunk
Commit: 317ab72a8cc067bd16db63d9e6c19390e96075f9
Parents: 344f5fa
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Apr 19 13:31:11 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Apr 19 13:31:11 2013 -0500

--
 src/java/org/apache/cassandra/db/DeletionTime.java |2 +-
 .../org/apache/cassandra/cache/ObjectSizeTest.java |8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/317ab72a/src/java/org/apache/cassandra/db/DeletionTime.java
--
diff --git a/src/java/org/apache/cassandra/db/DeletionTime.java 
b/src/java/org/apache/cassandra/db/DeletionTime.java
index 5f39071..350d026 100644
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@ -35,7 +35,7 @@ public class DeletionTime implements ComparableDeletionTime
 
 public static final ISerializerDeletionTime serializer = new 
Serializer();
 
-DeletionTime(long markedForDeleteAt, int localDeletionTime)
+public DeletionTime(long markedForDeleteAt, int localDeletionTime)
 {
 this.markedForDeleteAt = markedForDeleteAt;
 this.localDeletionTime = localDeletionTime;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/317ab72a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
--
diff --git a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java 
b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
index 398b395..47aab6d 100644
--- a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
+++ b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
@@ -3,13 +3,13 @@ package org.apache.cassandra.cache;
 import java.nio.ByteBuffer;
 import java.util.UUID;
 
-import junit.framework.Assert;
+import org.junit.Test;
 
-import org.apache.cassandra.db.DeletionInfo;
+import junit.framework.Assert;
+import org.apache.cassandra.db.DeletionTime;
 import org.apache.cassandra.db.RowIndexEntry;
 import org.apache.cassandra.utils.ObjectSizes;
 import org.github.jamm.MemoryMeter;
-import org.junit.Test;
 
 public class ObjectSizeTest
 {
@@ -56,7 +56,7 @@ public class ObjectSizeTest
 @Test
 public void testKeyCacheValueWithDelInfo()
 {
-RowIndexEntry entry = RowIndexEntry.create(123, new DeletionInfo(123, 
123), null);
+RowIndexEntry entry = RowIndexEntry.create(123, new DeletionTime(123, 
123), null);
 long size = entry.memorySize();
 long size2 = meter.measureDeep(entry);
 Assert.assertEquals(size, size2);

git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/trunk 3a3f612f8 - 1af5865ed


fix merge


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

Branch: refs/heads/trunk
Commit: 1af5865edc448a1ae1117f2254285ebc79ae6a68
Parents: 3a3f612
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Apr 22 09:52:32 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Apr 22 09:52:32 2013 -0500

--
 .../apache/cassandra/service/StorageService.java   |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1af5865e/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 b0d62dc..ae82cd6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3835,7 +3835,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 ListDecoratedKey keys = new ArrayListDecoratedKey();
 for (Table keyspace : Table.nonSystem())
 {
-for (RangeToken range : 
getPrimaryRangesForEndpoint(keyspace.name, FBUtilities.getBroadcastAddress()))
+for (RangeToken range : 
getPrimaryRangesForEndpoint(keyspace.getName(), 
FBUtilities.getBroadcastAddress()))
 keys.addAll(keySamples(keyspace.getColumnFamilyStores(), 
range));
 }
 

git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/cassandra-1.2 d7a098250 - 344f5fa5a


fix merge


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

Branch: refs/heads/cassandra-1.2
Commit: 344f5fa5af64b601751269fc570fbf4de930e9e2
Parents: d7a0982
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Apr 19 13:29:52 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Apr 19 13:29:52 2013 -0500

--
 .../org/apache/cassandra/db/RowIndexEntry.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/344f5fa5/src/java/org/apache/cassandra/db/RowIndexEntry.java
--
diff --git a/src/java/org/apache/cassandra/db/RowIndexEntry.java 
b/src/java/org/apache/cassandra/db/RowIndexEntry.java
index c6caa3a..d5046a8 100644
--- a/src/java/org/apache/cassandra/db/RowIndexEntry.java
+++ b/src/java/org/apache/cassandra/db/RowIndexEntry.java
@@ -206,7 +206,7 @@ public class RowIndexEntry implements IMeasurableMemory
 for (IndexHelper.IndexInfo idx : columnsIndex)
 internal += idx.memorySize();
 long listSize = 
ObjectSizes.getFieldSize(ObjectSizes.getArraySize(columnsIndex.size(), 
internal) + 4);
-return ObjectSizes.getFieldSize(deletionInfo.memorySize() + 
listSize);
+return ObjectSizes.getFieldSize(deletion.memorySize() + listSize);
 }
 }
 }

git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/cassandra-1.2 344f5fa5a - 317ab72a8


fix merge


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

Branch: refs/heads/cassandra-1.2
Commit: 317ab72a8cc067bd16db63d9e6c19390e96075f9
Parents: 344f5fa
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Apr 19 13:31:11 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Apr 19 13:31:11 2013 -0500

--
 src/java/org/apache/cassandra/db/DeletionTime.java |2 +-
 .../org/apache/cassandra/cache/ObjectSizeTest.java |8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/317ab72a/src/java/org/apache/cassandra/db/DeletionTime.java
--
diff --git a/src/java/org/apache/cassandra/db/DeletionTime.java 
b/src/java/org/apache/cassandra/db/DeletionTime.java
index 5f39071..350d026 100644
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@ -35,7 +35,7 @@ public class DeletionTime implements ComparableDeletionTime
 
 public static final ISerializerDeletionTime serializer = new 
Serializer();
 
-DeletionTime(long markedForDeleteAt, int localDeletionTime)
+public DeletionTime(long markedForDeleteAt, int localDeletionTime)
 {
 this.markedForDeleteAt = markedForDeleteAt;
 this.localDeletionTime = localDeletionTime;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/317ab72a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
--
diff --git a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java 
b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
index 398b395..47aab6d 100644
--- a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
+++ b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
@@ -3,13 +3,13 @@ package org.apache.cassandra.cache;
 import java.nio.ByteBuffer;
 import java.util.UUID;
 
-import junit.framework.Assert;
+import org.junit.Test;
 
-import org.apache.cassandra.db.DeletionInfo;
+import junit.framework.Assert;
+import org.apache.cassandra.db.DeletionTime;
 import org.apache.cassandra.db.RowIndexEntry;
 import org.apache.cassandra.utils.ObjectSizes;
 import org.github.jamm.MemoryMeter;
-import org.junit.Test;
 
 public class ObjectSizeTest
 {
@@ -56,7 +56,7 @@ public class ObjectSizeTest
 @Test
 public void testKeyCacheValueWithDelInfo()
 {
-RowIndexEntry entry = RowIndexEntry.create(123, new DeletionInfo(123, 
123), null);
+RowIndexEntry entry = RowIndexEntry.create(123, new DeletionTime(123, 
123), null);
 long size = entry.memorySize();
 long size2 = meter.measureDeep(entry);
 Assert.assertEquals(size, size2);

git commit: fix merge failure

[yukim]

Updated Branches:
  refs/heads/trunk 0aaf67a74 - eba27a641


fix merge failure


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

Branch: refs/heads/trunk
Commit: eba27a641341878c08180c88814e33287ca8b05b
Parents: 0aaf67a
Author: Yuki Morishita yu...@apache.org
Authored: Thu Apr 11 11:23:08 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Apr 11 11:23:08 2013 -0500

--
 src/java/org/apache/cassandra/db/ColumnIndex.java  |1 -
 .../cassandra/streaming/StreamingTransferTest.java |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eba27a64/src/java/org/apache/cassandra/db/ColumnIndex.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnIndex.java 
b/src/java/org/apache/cassandra/db/ColumnIndex.java
index daaac63..b523814 100644
--- a/src/java/org/apache/cassandra/db/ColumnIndex.java
+++ b/src/java/org/apache/cassandra/db/ColumnIndex.java
@@ -58,7 +58,6 @@ public class ColumnIndex
 
 public Builder(ColumnFamily cf,
ByteBuffer key,
-   DataOutput output)
DataOutput output,
boolean fromStream)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eba27a64/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java 
b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
index 335f98c..e3d9b8a 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
@@ -146,8 +146,8 @@ public class StreamingTransferTest extends SchemaLoader
 String key = key1;
 RowMutation rm = new RowMutation(ks, ByteBufferUtil.bytes(key));
 // add columns of size slightly less than column_index_size to force 
insert column index
-rm.add(new QueryPath(cfname, null, ByteBufferUtil.bytes(1)), 
ByteBuffer.wrap(new byte[DatabaseDescriptor.getColumnIndexSize() - 64]), 2);
-rm.add(new QueryPath(cfname, null, ByteBufferUtil.bytes(6)), 
ByteBuffer.wrap(new byte[DatabaseDescriptor.getColumnIndexSize()]), 2);
+rm.add(cfname, ByteBufferUtil.bytes(1), ByteBuffer.wrap(new 
byte[DatabaseDescriptor.getColumnIndexSize() - 64]), 2);
+rm.add(cfname, ByteBufferUtil.bytes(6), ByteBuffer.wrap(new 
byte[DatabaseDescriptor.getColumnIndexSize()]), 2);
 ColumnFamily cf = rm.addOrGet(cfname);
 // add RangeTombstones
 cf.delete(new DeletionInfo(ByteBufferUtil.bytes(2), 
ByteBufferUtil.bytes(3), cf.getComparator(), 1, (int) 
(System.currentTimeMillis() / 1000)));

git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/trunk a751d04d7 - 162675983


fix merge


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

Branch: refs/heads/trunk
Commit: 162675983c0a41edd29220e6cbc061f04830142b
Parents: a751d04
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Apr 9 17:00:37 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Apr 9 17:00:37 2013 -0500

--
 .../cassandra/db/index/SecondaryIndexManager.java  |9 --
 .../db/index/PerRowSecondaryIndexTest.java |   24 +++---
 2 files changed, 18 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/16267598/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java 
b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 6859c81..f949823 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -608,9 +608,12 @@ public class SecondaryIndexManager
 {
 for (SecondaryIndex index : indexFor(column.name()))
 {
-((PerColumnSecondaryIndex) index).delete(key.key, oldColumn);
-if (!column.isMarkedForDelete())
-((PerColumnSecondaryIndex) index).insert(key.key, column);
+if (index instanceof PerColumnSecondaryIndex)
+{
+((PerColumnSecondaryIndex) index).delete(key.key, 
oldColumn);
+if (!column.isMarkedForDelete())
+((PerColumnSecondaryIndex) index).insert(key.key, 
column);
+}
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/16267598/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java 
b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
index a4f97fe..44bf6a1 100644
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@ -18,6 +18,14 @@
 package org.apache.cassandra.db.index;
 
 
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import org.apache.cassandra.SchemaLoader;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.*;
@@ -25,14 +33,6 @@ import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Set;
-
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -82,13 +82,13 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 // issue a column delete and test that the configured index instance 
was notified to update
 RowMutation rm;
 rm = new RowMutation(PerRowSecondaryIndex, 
ByteBufferUtil.bytes(k2));
-rm.delete(new QueryPath(Indexed1, null, 
ByteBufferUtil.bytes(indexed)), 1);
+rm.delete(Indexed1, ByteBufferUtil.bytes(indexed), 1);
 rm.apply();
 
 ColumnFamily indexedRow = TestIndex.LAST_INDEXED_ROW;
 assertNotNull(indexedRow);
 
-for (IColumn column : indexedRow.getSortedColumns())
+for (Column column : indexedRow.getSortedColumns())
 {
 assertTrue(column.isMarkedForDelete());
 }
@@ -101,12 +101,12 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 // issue a row level delete and test that the configured index 
instance was notified to update
 RowMutation rm;
 rm = new RowMutation(PerRowSecondaryIndex, 
ByteBufferUtil.bytes(k3));
-rm.delete(new QueryPath(Indexed1), 1);
+rm.delete(Indexed1, 1);
 rm.apply();
 
 ColumnFamily indexedRow = TestIndex.LAST_INDEXED_ROW;
 assertNotNull(indexedRow);
-for (IColumn column : indexedRow.getSortedColumns())
+for (Column column : indexedRow.getSortedColumns())
 {
 

git commit: Fix merge

[slebresne]

Updated Branches:
  refs/heads/trunk 7005a7808 - 0b20e139d


Fix merge


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

Branch: refs/heads/trunk
Commit: 0b20e139d64faa3147ba068c367df4bffb278c47
Parents: 7005a78
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Apr 2 11:44:39 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Apr 2 11:44:39 2013 +0200

--
 .../cassandra/cql3/statements/Selection.java   |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b20e139/src/java/org/apache/cassandra/cql3/statements/Selection.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/Selection.java 
b/src/java/org/apache/cassandra/cql3/statements/Selection.java
index 6a70130..2f5b948 100644
--- a/src/java/org/apache/cassandra/cql3/statements/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/statements/Selection.java
@@ -262,7 +262,7 @@ public abstract class Selection
 }
 }
 
-private boolean isDead(IColumn c)
+private boolean isDead(Column c)
 {
 return c == null || c.isMarkedForDelete();
 }

[6/6] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/cassandra-1.2
Commit: b4f369301a17b62b1806e51c72a76c8743b830f0
Parents: b537567
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Dec 6 16:21:48 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Dec 6 16:21:48 2012 -0600

--
 .../apache/cassandra/service/MigrationManager.java |   17 --
 1 files changed, 5 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4f36930/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java 
b/src/java/org/apache/cassandra/service/MigrationManager.java
index 4cffdfc..9b9fed1 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -17,22 +17,15 @@
  */
 package org.apache.cassandra.service;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.*;
- HEAD
-import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
-||| merged common ancestors
-import java.util.concurrent.Callable;
-===
- cassandra-1.1
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
@@ -41,13 +34,13 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.concurrent.Stage;
 import org.apache.cassandra.concurrent.StageManager;
 import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.exceptions.AlreadyExistsException;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.config.KSMetaData;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.exceptions.AlreadyExistsException;
+import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.gms.*;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.net.MessageOut;

[4/6] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/trunk
Commit: b4f369301a17b62b1806e51c72a76c8743b830f0
Parents: b537567
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Dec 6 16:21:48 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Dec 6 16:21:48 2012 -0600

--
 .../apache/cassandra/service/MigrationManager.java |   17 --
 1 files changed, 5 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4f36930/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java 
b/src/java/org/apache/cassandra/service/MigrationManager.java
index 4cffdfc..9b9fed1 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -17,22 +17,15 @@
  */
 package org.apache.cassandra.service;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.*;
- HEAD
-import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
-||| merged common ancestors
-import java.util.concurrent.Callable;
-===
- cassandra-1.1
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
@@ -41,13 +34,13 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.concurrent.Stage;
 import org.apache.cassandra.concurrent.StageManager;
 import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.exceptions.AlreadyExistsException;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.config.KSMetaData;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.exceptions.AlreadyExistsException;
+import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.gms.*;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.net.MessageOut;

[5/6] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/cassandra-1.2.0
Commit: b4f369301a17b62b1806e51c72a76c8743b830f0
Parents: b537567
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Dec 6 16:21:48 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Dec 6 16:21:48 2012 -0600

--
 .../apache/cassandra/service/MigrationManager.java |   17 --
 1 files changed, 5 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4f36930/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java 
b/src/java/org/apache/cassandra/service/MigrationManager.java
index 4cffdfc..9b9fed1 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -17,22 +17,15 @@
  */
 package org.apache.cassandra.service;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.*;
- HEAD
-import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
-||| merged common ancestors
-import java.util.concurrent.Callable;
-===
- cassandra-1.1
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
@@ -41,13 +34,13 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.concurrent.Stage;
 import org.apache.cassandra.concurrent.StageManager;
 import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.exceptions.AlreadyExistsException;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.config.KSMetaData;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.exceptions.AlreadyExistsException;
+import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.gms.*;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.net.MessageOut;

git commit: Fix merge wonkiness.

[brandonwilliams]

Updated Branches:
  refs/heads/trunk 94e37b4e4 - 989dd44c0


Fix merge wonkiness.


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

Branch: refs/heads/trunk
Commit: 989dd44c078bcfd4a1fbe825b104e3b9bce1435c
Parents: 94e37b4
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Dec 5 21:26:15 2012 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Dec 5 21:26:15 2012 -0600

--
 src/java/org/apache/cassandra/config/Config.java   |1 -
 .../apache/cassandra/thrift/CassandraDaemon.java   |  223 ---
 2 files changed, 0 insertions(+), 224 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/989dd44c/src/java/org/apache/cassandra/config/Config.java
--
diff --git a/src/java/org/apache/cassandra/config/Config.java 
b/src/java/org/apache/cassandra/config/Config.java
index 609633c..4dd1dff 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -106,7 +106,6 @@ public class Config
 public Integer in_memory_compaction_limit_in_mb = 64;
 public Integer concurrent_compactors = 
FBUtilities.getAvailableProcessors();
 public volatile Integer compaction_throughput_mb_per_sec = 16;
-public Integer compaction_throughput_mb_per_sec = 16;
 public Boolean multithreaded_compaction = false;
 
 public Integer max_streaming_retries = 3;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/989dd44c/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraDaemon.java 
b/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
deleted file mode 100644
index 572e3e0..000
--- a/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.cassandra.thrift;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.cassandra.service.AbstractCassandraDaemon;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.thrift.server.TNonblockingServer;
-import org.apache.thrift.server.TThreadPoolServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
-import org.apache.cassandra.concurrent.NamedThreadFactory;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TNonblockingServerTransport;
-import org.apache.thrift.transport.TServerTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TTransportFactory;
-
-/**
- * This class supports two methods for creating a Cassandra node daemon,
- * invoking the class's main method, and using the jsvc wrapper from
- * commons-daemon, (for more information on using this class with the
- * jsvc wrapper, see the
- * a href=http://commons.apache.org/daemon/jsvc.html;Commons Daemon/a
- * documentation).
- */
-
-public class CassandraDaemon extends 
org.apache.cassandra.service.AbstractCassandraDaemon
-{
-protected static CassandraDaemon instance;
-
-static
-{
-AbstractCassandraDaemon.initLog4j();
-}
-
-private static Logger logger = 
LoggerFactory.getLogger(CassandraDaemon.class);
-private final static String SYNC = sync;
-private final static String ASYNC = async;
-

[2/4] git commit: fix merge from 1.1

[jbellis]

fix merge from 1.1


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

Branch: refs/heads/trunk
Commit: 660016658f033875f4a442b5f9fdd5875f610cb9
Parents: 3e77082
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Nov 12 16:14:44 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Nov 12 16:14:44 2012 -0600

--
 .../org/apache/cassandra/service/StorageProxy.java |   18 ++-
 1 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66001665/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 33266c7..b747075 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -41,7 +41,9 @@ import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.filter.IDiskAtomFilter;
 import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.db.filter.SliceQueryFilter;
 import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.cassandra.dht.AbstractBounds;
 import org.apache.cassandra.dht.Bounds;
@@ -1091,8 +1093,11 @@ public class StorageProxy implements StorageProxyMBean
 // now scan until we have enough results
 try
 {
-final SlicePredicate emptyPredicate = getEmptySlicePredicate();
-SlicePredicate commandPredicate = command.predicate;
+final IDiskAtomFilter emptyPredicate = new 
SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER,
+
ByteBufferUtil.EMPTY_BYTE_BUFFER,
+false,
+-1);
+IDiskAtomFilter commandPredicate = command.predicate;
 
 int columnsCount = 0;
 rows = new ArrayListRow();
@@ -1174,11 +1179,12 @@ public class StorageProxy implements StorageProxyMBean
 return trim(command, rows);
 }
 
-private static SlicePredicate getEmptySlicePredicate()
+private static IDiskAtomFilter getEmptySlicePredicate()
 {
-final SliceRange emptySliceRange =
-new SliceRange(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ByteBufferUtil.EMPTY_BYTE_BUFFER, false, -1);
-return new SlicePredicate().setSlice_range(emptySliceRange);
+return new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER,
+ByteBufferUtil.EMPTY_BYTE_BUFFER,
+false,
+-1);
 }
 
 private static ListRow trim(RangeSliceCommand command, ListRow rows)

[3/4] git commit: fix merge from 1.1

[jbellis]

fix merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: 660016658f033875f4a442b5f9fdd5875f610cb9
Parents: 3e77082
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Nov 12 16:14:44 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Nov 12 16:14:44 2012 -0600

--
 .../org/apache/cassandra/service/StorageProxy.java |   18 ++-
 1 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66001665/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 33266c7..b747075 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -41,7 +41,9 @@ import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.filter.IDiskAtomFilter;
 import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.db.filter.SliceQueryFilter;
 import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.cassandra.dht.AbstractBounds;
 import org.apache.cassandra.dht.Bounds;
@@ -1091,8 +1093,11 @@ public class StorageProxy implements StorageProxyMBean
 // now scan until we have enough results
 try
 {
-final SlicePredicate emptyPredicate = getEmptySlicePredicate();
-SlicePredicate commandPredicate = command.predicate;
+final IDiskAtomFilter emptyPredicate = new 
SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER,
+
ByteBufferUtil.EMPTY_BYTE_BUFFER,
+false,
+-1);
+IDiskAtomFilter commandPredicate = command.predicate;
 
 int columnsCount = 0;
 rows = new ArrayListRow();
@@ -1174,11 +1179,12 @@ public class StorageProxy implements StorageProxyMBean
 return trim(command, rows);
 }
 
-private static SlicePredicate getEmptySlicePredicate()
+private static IDiskAtomFilter getEmptySlicePredicate()
 {
-final SliceRange emptySliceRange =
-new SliceRange(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ByteBufferUtil.EMPTY_BYTE_BUFFER, false, -1);
-return new SlicePredicate().setSlice_range(emptySliceRange);
+return new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER,
+ByteBufferUtil.EMPTY_BYTE_BUFFER,
+false,
+-1);
 }
 
 private static ListRow trim(RangeSliceCommand command, ListRow rows)

[4/4] git commit: fix merge from 1.1

[jbellis]

fix merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 660016658f033875f4a442b5f9fdd5875f610cb9
Parents: 3e77082
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Nov 12 16:14:44 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Nov 12 16:14:44 2012 -0600

--
 .../org/apache/cassandra/service/StorageProxy.java |   18 ++-
 1 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66001665/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 33266c7..b747075 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -41,7 +41,9 @@ import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.filter.IDiskAtomFilter;
 import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.db.filter.SliceQueryFilter;
 import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.cassandra.dht.AbstractBounds;
 import org.apache.cassandra.dht.Bounds;
@@ -1091,8 +1093,11 @@ public class StorageProxy implements StorageProxyMBean
 // now scan until we have enough results
 try
 {
-final SlicePredicate emptyPredicate = getEmptySlicePredicate();
-SlicePredicate commandPredicate = command.predicate;
+final IDiskAtomFilter emptyPredicate = new 
SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER,
+
ByteBufferUtil.EMPTY_BYTE_BUFFER,
+false,
+-1);
+IDiskAtomFilter commandPredicate = command.predicate;
 
 int columnsCount = 0;
 rows = new ArrayListRow();
@@ -1174,11 +1179,12 @@ public class StorageProxy implements StorageProxyMBean
 return trim(command, rows);
 }
 
-private static SlicePredicate getEmptySlicePredicate()
+private static IDiskAtomFilter getEmptySlicePredicate()
 {
-final SliceRange emptySliceRange =
-new SliceRange(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ByteBufferUtil.EMPTY_BYTE_BUFFER, false, -1);
-return new SlicePredicate().setSlice_range(emptySliceRange);
+return new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER,
+ByteBufferUtil.EMPTY_BYTE_BUFFER,
+false,
+-1);
 }
 
 private static ListRow trim(RangeSliceCommand command, ListRow rows)

git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/trunk 8cf1259b3 - 565c57684


fix merge


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

Branch: refs/heads/trunk
Commit: 565c57684bc7423491512b0a71e76680ec2400bf
Parents: 8cf1259
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 24 14:52:55 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 24 14:52:55 2012 -0500

--
 .../apache/cassandra/db/RowIteratorFactory.java|   10 +-
 1 files changed, 1 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/565c5768/src/java/org/apache/cassandra/db/RowIteratorFactory.java
--
diff --git a/src/java/org/apache/cassandra/db/RowIteratorFactory.java 
b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
index 229a08f..937c496 100644
--- a/src/java/org/apache/cassandra/db/RowIteratorFactory.java
+++ b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
@@ -19,17 +19,9 @@ package org.apache.cassandra.db;
 
 import java.util.*;
 
- HEAD
-
-import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
-||| merged common ancestors
-
-import org.apache.cassandra.db.columniterator.IColumnIterator;
-===
-import org.apache.cassandra.db.columniterator.IColumnIterator;
 import org.apache.cassandra.db.columniterator.IColumnIteratorFactory;
 import org.apache.cassandra.db.columniterator.LazyColumnIterator;
- cassandra-1.1
+import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.io.sstable.SSTableScanner;

git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/trunk db2c2999d - 1b8c47524


fix merge


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

Branch: refs/heads/trunk
Commit: 1b8c47524029b37e7f9309bc1d3169769e5fee62
Parents: db2c299
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Oct 18 17:15:23 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Oct 18 17:15:23 2012 -0500

--
 .../io/compress/CompressedRandomAccessReader.java  |   11 +--
 1 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b8c4752/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
index 62e5db9..da35e92 100644
--- 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
+++ 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
@@ -155,10 +155,17 @@ public class CompressedRandomAccessReader extends 
RandomAccessReader
 }
 
 @Override
-public void close() throws IOException
+public void close()
 {
 super.close();
-source.close();
+try
+{
+source.close();
+}
+catch (IOException e)
+{
+throw new FSReadError(e, getPath());
+}
 }
 
 @Override

git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/trunk f5c19e84a - 70754af41


fix merge


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

Branch: refs/heads/trunk
Commit: 70754af41e3e3d38f66b55cb7eaa4b79bccc794b
Parents: f5c19e8
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Aug 28 09:59:08 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Aug 28 09:59:08 2012 -0500

--
 .../apache/cassandra/db/HintedHandOffManager.java  |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/70754af4/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 97bbb43..e271c78 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -43,6 +43,7 @@ import org.apache.cassandra.db.marshal.Int32Type;
 import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Range;
+import org.apache.cassandra.dht.Token;
 import org.apache.cassandra.gms.ApplicationState;
 import org.apache.cassandra.gms.FailureDetector;
 import org.apache.cassandra.gms.Gossiper;

[22/50] [abbrv] git commit: fix merge from 1.1 to use UUID instead of Integer for CF identifier.

[yukim]

fix merge from 1.1 to use UUID instead of Integer for CF identifier.


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

Branch: refs/heads/cassandra-1.1
Commit: 655a76face34c18370d49c4fb0a1232395187ea1
Parents: 34cd691
Author: Pavel Yaskevich xe...@apache.org
Authored: Mon Jul 23 19:33:45 2012 +0300
Committer: Pavel Yaskevich xe...@apache.org
Committed: Mon Jul 23 19:33:45 2012 +0300

--
 .../org/apache/cassandra/config/CFMetaData.java|2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/655a76fa/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java 
b/src/java/org/apache/cassandra/config/CFMetaData.java
index a54b4ff..3cf41d7 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -886,7 +886,7 @@ public final class CFMetaData
 public void addDefaultIndexNames() throws ConfigurationException
 {
 // if this is ColumnFamily update we need to add previously defined 
index names to the existing columns first
-Integer cfId = Schema.instance.getId(ksName, cfName);
+UUID cfId = Schema.instance.getId(ksName, cfName);
 if (cfId != null)
 {
 CFMetaData cfm = Schema.instance.getCFMetaData(cfId);

git commit: fix merge from 1.1 to use UUID instead of Integer for CF identifier.

[xedin]

Updated Branches:
  refs/heads/trunk 34cd6912b - 655a76fac


fix merge from 1.1 to use UUID instead of Integer for CF identifier.


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

Branch: refs/heads/trunk
Commit: 655a76face34c18370d49c4fb0a1232395187ea1
Parents: 34cd691
Author: Pavel Yaskevich xe...@apache.org
Authored: Mon Jul 23 19:33:45 2012 +0300
Committer: Pavel Yaskevich xe...@apache.org
Committed: Mon Jul 23 19:33:45 2012 +0300

--
 .../org/apache/cassandra/config/CFMetaData.java|2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/655a76fa/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java 
b/src/java/org/apache/cassandra/config/CFMetaData.java
index a54b4ff..3cf41d7 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -886,7 +886,7 @@ public final class CFMetaData
 public void addDefaultIndexNames() throws ConfigurationException
 {
 // if this is ColumnFamily update we need to add previously defined 
index names to the existing columns first
-Integer cfId = Schema.instance.getId(ksName, cfName);
+UUID cfId = Schema.instance.getId(ksName, cfName);
 if (cfId != null)
 {
 CFMetaData cfm = Schema.instance.getCFMetaData(cfId);

[4/11] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/trunk
Commit: 6b29f91dc9e2c6c1dfe1b713d62dd49fed07c07e
Parents: 782b156
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri May 25 15:40:26 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri May 25 15:50:55 2012 -0500

--
 NEWS.txt |7 ---
 1 files changed, 0 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b29f91d/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index 400b29b..73ec79b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -8,13 +8,6 @@ upgrade, just in case you need to roll back to the previous 
version.
 (Cassandra version X + 1 will always be able to read data files created
 by version X, but the inverse is not necessarily the case.)
 
-1.0.10
-==
-
-Upgrading
--
-- Nothing specific to 1.0.10
-
 
 1.2
 ===

[9/11] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/trunk
Commit: 06b2467942ea4bbcde6341eeff5a66695f8ec2cd
Parents: a727717
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri May 25 15:40:26 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri May 25 15:50:46 2012 -0500

--
 NEWS.txt |7 ---
 1 files changed, 0 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06b24679/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index 3368d98..3a4f222 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -8,13 +8,6 @@ upgrade, just in case you need to roll back to the previous 
version.
 (Cassandra version X + 1 will always be able to read data files created
 by version X, but the inverse is not necessarily the case.)
 
-1.0.10
-==
-
-Upgrading
--
-- Nothing specific to 1.0.10
-
 
 1.1.1
 =

[10/11] git commit: fix merge

[jbellis]

fix merge


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

Branch: refs/heads/cassandra-1.1
Commit: 06b2467942ea4bbcde6341eeff5a66695f8ec2cd
Parents: a727717
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri May 25 15:40:26 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri May 25 15:50:46 2012 -0500

--
 NEWS.txt |7 ---
 1 files changed, 0 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06b24679/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index 3368d98..3a4f222 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -8,13 +8,6 @@ upgrade, just in case you need to roll back to the previous 
version.
 (Cassandra version X + 1 will always be able to read data files created
 by version X, but the inverse is not necessarily the case.)
 
-1.0.10
-==
-
-Upgrading
--
-- Nothing specific to 1.0.10
-
 
 1.1.1
 =

git commit: fix merge

[jbellis]

Updated Branches:
  refs/heads/trunk b3b510262 - b4e520c3b


fix merge


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

Branch: refs/heads/trunk
Commit: b4e520c3b668360d08f6f0c6dbc86fc0d7e29cc7
Parents: b3b5102
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu May 3 10:44:04 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu May 3 10:44:04 2012 -0500

--
 src/java/org/apache/cassandra/db/ColumnFamily.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4e520c3/src/java/org/apache/cassandra/db/ColumnFamily.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java 
b/src/java/org/apache/cassandra/db/ColumnFamily.java
index ec2266b..a88cf91 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@ -256,7 +256,7 @@ public class ColumnFamily extends AbstractColumnContainer 
implements IRowCacheEn
 
 int size(DBTypeSizes typeSizes)
 {
-int size = DBConstants.longSize + DBConstants.intSize; // tombstone 
tracking
+int size = DBTypeSizes.NATIVE.sizeof(1L) + 
DBTypeSizes.NATIVE.sizeof(1); // tombstone tracking
 for (IColumn column : columns)
 {
 size += column.size(typeSizes);

[1/2] git commit: fix merge error; recompile Cassandra.java with thrift 0.7.0

[eevans]

Updated Branches:
  refs/heads/trunk 7c92fc52e - bce44ff32


fix merge error; recompile Cassandra.java with thrift 0.7.0


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

Branch: refs/heads/trunk
Commit: bce44ff3297c36260a2adabea5f77c6b0b9dfe92
Parents: 7c92fc5
Author: Eric Evans eev...@apache.org
Authored: Wed Jan 18 10:54:33 2012 -0600
Committer: Eric Evans eev...@apache.org
Committed: Wed Jan 18 10:54:33 2012 -0600

--
 .../org/apache/cassandra/thrift/Cassandra.java | 9036 ---
 1 files changed, 4558 insertions(+), 4478 deletions(-)
--