subject:"git commit\: Fix build"

[2/6] cassandra git commit: Fix build

2018-07-05 Thread slebresne

Fix build


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

Branch: refs/heads/cassandra-3.11
Commit: a4b8d1e9bc67eb0eff159b5b35902cab19e3fc11
Parents: 93012e4
Author: Sylvain Lebresne 
Authored: Thu Jul 5 09:24:17 2018 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 5 09:24:17 2018 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4b8d1e9/test/unit/org/apache/cassandra/db/CounterCellTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CounterCellTest.java 
b/test/unit/org/apache/cassandra/db/CounterCellTest.java
index 8859fc6..b4c7b2a 100644
--- a/test/unit/org/apache/cassandra/db/CounterCellTest.java
+++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java
@@ -32,7 +32,6 @@ import org.apache.cassandra.config.ColumnDefinition;
 import org.apache.cassandra.db.rows.BTreeRow;
 import org.apache.cassandra.db.rows.BufferCell;
 import org.apache.cassandra.db.rows.Cell;
-import org.apache.cassandra.db.rows.CellPath;
 import org.apache.cassandra.db.rows.Cells;
 import org.apache.cassandra.db.context.CounterContext;
 import org.apache.cassandra.db.rows.Row;
@@ -292,10 +291,10 @@ public class CounterCellTest
 ColumnFamilyStore cfs = 
Keyspace.open(KEYSPACE1).getColumnFamilyStore(COUNTER1);
 
 ColumnDefinition emptyColDef = 
cfs.metadata.getColumnDefinition(ByteBufferUtil.bytes("val2"));
-BufferCell emptyCell = BufferCell.live(emptyColDef, 0, 
ByteBuffer.allocate(0));
+BufferCell emptyCell = BufferCell.live(cfs.metadata, emptyColDef, 0, 
ByteBuffer.allocate(0));
 
 Row.Builder builder = BTreeRow.unsortedBuilder(0);
-
builder.newRow(Clustering.make(AsciiSerializer.instance.serialize("test")));
+builder.newRow(new 
Clustering(AsciiSerializer.instance.serialize("test")));
 builder.addCell(emptyCell);
 Row row = builder.build();
 


-
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 build

2018-07-05 Thread slebresne

Fix build


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

Branch: refs/heads/trunk
Commit: a4b8d1e9bc67eb0eff159b5b35902cab19e3fc11
Parents: 93012e4
Author: Sylvain Lebresne 
Authored: Thu Jul 5 09:24:17 2018 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 5 09:24:17 2018 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4b8d1e9/test/unit/org/apache/cassandra/db/CounterCellTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CounterCellTest.java 
b/test/unit/org/apache/cassandra/db/CounterCellTest.java
index 8859fc6..b4c7b2a 100644
--- a/test/unit/org/apache/cassandra/db/CounterCellTest.java
+++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java
@@ -32,7 +32,6 @@ import org.apache.cassandra.config.ColumnDefinition;
 import org.apache.cassandra.db.rows.BTreeRow;
 import org.apache.cassandra.db.rows.BufferCell;
 import org.apache.cassandra.db.rows.Cell;
-import org.apache.cassandra.db.rows.CellPath;
 import org.apache.cassandra.db.rows.Cells;
 import org.apache.cassandra.db.context.CounterContext;
 import org.apache.cassandra.db.rows.Row;
@@ -292,10 +291,10 @@ public class CounterCellTest
 ColumnFamilyStore cfs = 
Keyspace.open(KEYSPACE1).getColumnFamilyStore(COUNTER1);
 
 ColumnDefinition emptyColDef = 
cfs.metadata.getColumnDefinition(ByteBufferUtil.bytes("val2"));
-BufferCell emptyCell = BufferCell.live(emptyColDef, 0, 
ByteBuffer.allocate(0));
+BufferCell emptyCell = BufferCell.live(cfs.metadata, emptyColDef, 0, 
ByteBuffer.allocate(0));
 
 Row.Builder builder = BTreeRow.unsortedBuilder(0);
-
builder.newRow(Clustering.make(AsciiSerializer.instance.serialize("test")));
+builder.newRow(new 
Clustering(AsciiSerializer.instance.serialize("test")));
 builder.addCell(emptyCell);
 Row row = builder.build();
 


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

[1/6] cassandra git commit: Fix build

2018-07-05 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 93012e43e -> a4b8d1e9b
  refs/heads/cassandra-3.11 49e63c273 -> 942fe3fb3
  refs/heads/trunk 243c371f4 -> 9e3b88646


Fix build


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

Branch: refs/heads/cassandra-3.0
Commit: a4b8d1e9bc67eb0eff159b5b35902cab19e3fc11
Parents: 93012e4
Author: Sylvain Lebresne 
Authored: Thu Jul 5 09:24:17 2018 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 5 09:24:17 2018 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4b8d1e9/test/unit/org/apache/cassandra/db/CounterCellTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CounterCellTest.java 
b/test/unit/org/apache/cassandra/db/CounterCellTest.java
index 8859fc6..b4c7b2a 100644
--- a/test/unit/org/apache/cassandra/db/CounterCellTest.java
+++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java
@@ -32,7 +32,6 @@ import org.apache.cassandra.config.ColumnDefinition;
 import org.apache.cassandra.db.rows.BTreeRow;
 import org.apache.cassandra.db.rows.BufferCell;
 import org.apache.cassandra.db.rows.Cell;
-import org.apache.cassandra.db.rows.CellPath;
 import org.apache.cassandra.db.rows.Cells;
 import org.apache.cassandra.db.context.CounterContext;
 import org.apache.cassandra.db.rows.Row;
@@ -292,10 +291,10 @@ public class CounterCellTest
 ColumnFamilyStore cfs = 
Keyspace.open(KEYSPACE1).getColumnFamilyStore(COUNTER1);
 
 ColumnDefinition emptyColDef = 
cfs.metadata.getColumnDefinition(ByteBufferUtil.bytes("val2"));
-BufferCell emptyCell = BufferCell.live(emptyColDef, 0, 
ByteBuffer.allocate(0));
+BufferCell emptyCell = BufferCell.live(cfs.metadata, emptyColDef, 0, 
ByteBuffer.allocate(0));
 
 Row.Builder builder = BTreeRow.unsortedBuilder(0);
-
builder.newRow(Clustering.make(AsciiSerializer.instance.serialize("test")));
+builder.newRow(new 
Clustering(AsciiSerializer.instance.serialize("test")));
 builder.addCell(emptyCell);
 Row row = builder.build();
 


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

cassandra-builds git commit: Fix build command order

2017-02-22 Thread mshuler

Repository: cassandra-builds
Updated Branches:
  refs/heads/master 15f616f65 -> 3477de5ed


Fix build command order


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

Branch: refs/heads/master
Commit: 3477de5ed89126cdf893b37a614e5684324198e4
Parents: 15f616f
Author: Michael Shuler 
Authored: Wed Feb 22 10:42:35 2017 -0600
Committer: Michael Shuler 
Committed: Wed Feb 22 10:42:35 2017 -0600

--
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/3477de5e/README.md
--
diff --git a/README.md b/README.md
index 056316e..89f95f2 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ Collection of scripts that can be used to create Cassandra 
Linux packages and to
```docker build -f docker/centos7-image.docker docker/```
 2. Run build script through docker (specify branch, e.g. cassandra-3.0 and 
version, e.g. 3.0.11):
* Debian:
-```docker run -v `pwd`/dist:/dist `docker images -f 
label=org.cassandra.buildenv=centos -q` /home/build/build-rpms.sh  
```
-   * RPM:
 ```docker run -v `pwd`/dist:/dist `docker images -f 
label=org.cassandra.buildenv=jessie -q` /home/build/build-debs.sh ```
+   * RPM:
+```docker run -v `pwd`/dist:/dist `docker images -f 
label=org.cassandra.buildenv=centos -q` /home/build/build-rpms.sh  
```
 
 You should find newly created Debian and RPM packages in the `dist` directory.

[2/3] cassandra git commit: Fix build

2016-02-01 Thread carl

Fix build


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

Branch: refs/heads/trunk
Commit: 30d3b29ab2b4aea486323a966d6169cfdc2e2113
Parents: 2e965f0
Author: Carl Yeksigian 
Authored: Mon Feb 1 17:44:05 2016 -0500
Committer: Carl Yeksigian 
Committed: Mon Feb 1 17:44:05 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30d3b29a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 3a9f5e6..55bdf07 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -105,7 +105,7 @@ public class CommitLogReplayer
 {
 Runnable runnable = new WrappedRunnable()
 {
-public void runMayThrow() throws IOException
+public void runMayThrow() throws ExecutionException
 {
 if 
(Schema.instance.getKSMetaData(mutation.getKeyspaceName()) == null)
 return;

[1/3] cassandra git commit: Fix build

2016-02-01 Thread carl

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.3 2e965f0e4 -> 30d3b29ab
  refs/heads/trunk 6e7d739d1 -> b24076d11


Fix build


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

Branch: refs/heads/cassandra-3.3
Commit: 30d3b29ab2b4aea486323a966d6169cfdc2e2113
Parents: 2e965f0
Author: Carl Yeksigian 
Authored: Mon Feb 1 17:44:05 2016 -0500
Committer: Carl Yeksigian 
Committed: Mon Feb 1 17:44:05 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30d3b29a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 3a9f5e6..55bdf07 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -105,7 +105,7 @@ public class CommitLogReplayer
 {
 Runnable runnable = new WrappedRunnable()
 {
-public void runMayThrow() throws IOException
+public void runMayThrow() throws ExecutionException
 {
 if 
(Schema.instance.getKSMetaData(mutation.getKeyspaceName()) == null)
 return;

[2/3] cassandra git commit: Fix build

2016-01-12 Thread slebresne

Fix build


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

Branch: refs/heads/trunk
Commit: d2c41b1b3c6e7ffddbccca3c8e7fba1f11fb46e1
Parents: 2318f76
Author: Sylvain Lebresne 
Authored: Tue Jan 12 18:21:54 2016 +0100
Committer: Sylvain Lebresne 
Committed: Tue Jan 12 18:21:54 2016 +0100

--
 src/java/org/apache/cassandra/cql3/Lists.java | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2c41b1b/src/java/org/apache/cassandra/cql3/Lists.java
--
diff --git a/src/java/org/apache/cassandra/cql3/Lists.java 
b/src/java/org/apache/cassandra/cql3/Lists.java
index 17c1575..55208ea 100644
--- a/src/java/org/apache/cassandra/cql3/Lists.java
+++ b/src/java/org/apache/cassandra/cql3/Lists.java
@@ -356,15 +356,11 @@ public abstract class Lists
 if (idx < 0 || idx >= existingSize)
 throw new InvalidRequestException(String.format("List index %d 
out of bound, list has size %d", idx, existingSize));
 
+CellPath elementPath = 
existingRow.getComplexColumnData(column).getCellByIndex(idx).path();
 if (value == null)
-{
 params.addTombstone(column, elementPath);
-}
 else if (value != ByteBufferUtil.UNSET_BYTE_BUFFER)
-{
-CellPath elementPath = 
existingRow.getComplexColumnData(column).getCellByIndex(idx).path();
 params.addCell(column, elementPath, value);
-}
 }
 }

[1/3] cassandra git commit: Fix build

2016-01-12 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.3 2318f76c8 -> d2c41b1b3
  refs/heads/trunk 837d0d045 -> 1ae3115b1


Fix build


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

Branch: refs/heads/cassandra-3.3
Commit: d2c41b1b3c6e7ffddbccca3c8e7fba1f11fb46e1
Parents: 2318f76
Author: Sylvain Lebresne 
Authored: Tue Jan 12 18:21:54 2016 +0100
Committer: Sylvain Lebresne 
Committed: Tue Jan 12 18:21:54 2016 +0100

--
 src/java/org/apache/cassandra/cql3/Lists.java | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2c41b1b/src/java/org/apache/cassandra/cql3/Lists.java
--
diff --git a/src/java/org/apache/cassandra/cql3/Lists.java 
b/src/java/org/apache/cassandra/cql3/Lists.java
index 17c1575..55208ea 100644
--- a/src/java/org/apache/cassandra/cql3/Lists.java
+++ b/src/java/org/apache/cassandra/cql3/Lists.java
@@ -356,15 +356,11 @@ public abstract class Lists
 if (idx < 0 || idx >= existingSize)
 throw new InvalidRequestException(String.format("List index %d 
out of bound, list has size %d", idx, existingSize));
 
+CellPath elementPath = 
existingRow.getComplexColumnData(column).getCellByIndex(idx).path();
 if (value == null)
-{
 params.addTombstone(column, elementPath);
-}
 else if (value != ByteBufferUtil.UNSET_BYTE_BUFFER)
-{
-CellPath elementPath = 
existingRow.getComplexColumnData(column).getCellByIndex(idx).path();
 params.addCell(column, elementPath, value);
-}
 }
 }

cassandra git commit: Fix build, change to ASCII char

2015-10-27 Thread snazy

Repository: cassandra
Updated Branches:
  refs/heads/trunk 15f17adf8 -> c0f2dc5d3


Fix build, change to ASCII char

Patch by Jaebin Lee; reviewed by Robert Stupp for CASSANDRA-10597


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

Branch: refs/heads/trunk
Commit: c0f2dc5d3dcf3913801577b42175f13b159338b4
Parents: 15f17ad
Author: Jaebin Lee 
Authored: Tue Oct 27 12:29:35 2015 +0100
Committer: Robert Stupp 
Committed: Tue Oct 27 12:29:35 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f2dc5d/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
--
diff --git a/test/unit/org/apache/cassandra/security/CipherFactoryTest.java 
b/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
index bb6f7ce..53bccc7 100644
--- a/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
+++ b/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
@@ -19,7 +19,7 @@ public class CipherFactoryTest
 // http://www.gutenberg.org/files/4300/4300-h/4300-h.htm
 static final String ULYSSEUS = "Stately, plump Buck Mulligan came from the 
stairhead, bearing a bowl of lather on which a mirror and a razor lay crossed. 
" +
"A yellow dressinggown, ungirdled, was 
sustained gently behind him on the mild morning air. He held the bowl aloft and 
intoned: " +
-   "âIntroibo ad altare Dei.";
+   "-Introibo ad altare Dei.";
 TransparentDataEncryptionOptions encryptionOptions;
 CipherFactory cipherFactory;
 SecureRandom secureRandom;

cassandra git commit: Fix build

2015-09-16 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 0afe4beeb -> af0678dd4


Fix build


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

Branch: refs/heads/cassandra-3.0
Commit: af0678dd48389a05b0fffb89d21b4e2f9d91f9d6
Parents: 0afe4be
Author: Sylvain Lebresne 
Authored: Wed Sep 16 09:44:16 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Sep 16 09:44:16 2015 +0200

--
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 23 +++-
 1 file changed, 17 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af0678dd/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 7699f29..3f74c33 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@ -19,19 +19,30 @@ package org.apache.cassandra.hadoop.cql3;
 
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.*
+import java.util.concurrent.*;
+
+import com.datastax.driver.core.Host;
+import com.datastax.driver.core.Metadata;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.TokenRange;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapred.InputSplit;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.RecordReader;
+import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.datastax.driver.core.*;
 import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.dht.*;
+import org.apache.cassandra.thrift.KeyRange;
 import org.apache.cassandra.hadoop.*;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapred.*;
-import org.apache.hadoop.mapreduce.*;
 
-import com.datastax.driver.core.Row;
 
 /**
  * Hadoop InputFormat allowing map/reduce against Cassandra rows within one 
ColumnFamily.

[1/6] cassandra git commit: Fix build

2015-09-16 Thread blerer

Repository: cassandra
Updated Branches:
  refs/heads/trunk 1ecb7a4f9 -> 61ce1b9a7


Fix build


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

Branch: refs/heads/trunk
Commit: af0678dd48389a05b0fffb89d21b4e2f9d91f9d6
Parents: 0afe4be
Author: Sylvain Lebresne 
Authored: Wed Sep 16 09:44:16 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Sep 16 09:44:16 2015 +0200

--
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 23 +++-
 1 file changed, 17 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af0678dd/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 7699f29..3f74c33 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@ -19,19 +19,30 @@ package org.apache.cassandra.hadoop.cql3;
 
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.*
+import java.util.concurrent.*;
+
+import com.datastax.driver.core.Host;
+import com.datastax.driver.core.Metadata;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.TokenRange;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapred.InputSplit;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.RecordReader;
+import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.datastax.driver.core.*;
 import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.dht.*;
+import org.apache.cassandra.thrift.KeyRange;
 import org.apache.cassandra.hadoop.*;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapred.*;
-import org.apache.hadoop.mapreduce.*;
 
-import com.datastax.driver.core.Row;
 
 /**
  * Hadoop InputFormat allowing map/reduce against Cassandra rows within one 
ColumnFamily.

cassandra git commit: fix build

2015-08-03 Thread marcuse

Repository: cassandra
Updated Branches:
  refs/heads/trunk 1415d7e9e - cc95bae85


fix build


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

Branch: refs/heads/trunk
Commit: cc95bae85a872153efd3af551e9ca1459689f7ec
Parents: 1415d7e
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Aug 3 21:53:20 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Aug 3 21:53:20 2015 +0200

--
 .../org/apache/cassandra/db/compaction/CompactionsCQLTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc95bae8/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java 
b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
index 76e3b88..a06d4a5 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
@@ -30,7 +30,7 @@ public class CompactionsCQLTest extends CQLTester
 public void testTriggerMinorCompaction() throws Throwable
 {
 createTable(CREATE TABLE %s (id text PRIMARY KEY););
-
assertTrue(Keyspace.open(KEYSPACE).getColumnFamilyStore(currentTable()).getCompactionStrategy().isEnabled());
+
assertTrue(Keyspace.open(KEYSPACE).getColumnFamilyStore(currentTable()).getCompactionStrategyManager().isEnabled());
 execute(insert into %s (id) values ('1'));
 flush();
 execute(insert into %s (id) values ('1'));

cassandra git commit: Fix build, bump version

2015-07-29 Thread jake

Repository: cassandra
Updated Branches:
  refs/heads/trunk 3bdcaa336 - b93f05d7d


Fix build, bump version


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

Branch: refs/heads/trunk
Commit: b93f05d7d1490c6146576a35f5a572d9d0e72399
Parents: 3bdcaa3
Author: T Jake Luciani j...@apache.org
Authored: Wed Jul 29 16:53:43 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Wed Jul 29 16:53:43 2015 -0400

--
 build.xml| 2 +-
 src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f05d7/build.xml
--
diff --git a/build.xml b/build.xml
index 5cd8f20..dc44f07 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 property name=debuglevel value=source,lines,vars/
 
 !-- default version and SCM information --
-property name=base.version value=3.0.0/
+property name=base.version value=3.0.0-alpha/
 property name=scm.connection 
value=scm:git://git.apache.org/cassandra.git/
 property name=scm.developerConnection 
value=scm:git://git.apache.org/cassandra.git/
 property name=scm.url 
value=http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f05d7/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java 
b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 2150f4a..8dc25d4 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -1340,7 +1340,7 @@ public final class SchemaKeyspace
 String name = row.getString(view_name);
 ListString partitionColumnNames = row.getList(target_columns, 
UTF8Type.instance);
 
-String cfName = row.getString(columnfamily_name);
+String cfName = row.getString(table_name);
 ListString clusteringColumnNames = row.getList(clustering_columns, 
UTF8Type.instance);
 
 ListColumnIdentifier partitionColumns = new ArrayList();

cassandra git commit: fix build

2015-07-28 Thread benedict

Repository: cassandra
Updated Branches:
  refs/heads/trunk a7f41345a - 3879bfd1e


fix build


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

Branch: refs/heads/trunk
Commit: 3879bfd1ebe41c3e503928cb74fc58b56f62183e
Parents: a7f4134
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Jul 28 16:00:05 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Jul 28 16:00:05 2015 +0100

--
 src/java/org/apache/cassandra/db/lifecycle/View.java| 10 ++
 src/java/org/apache/cassandra/utils/concurrent/Ref.java |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3879bfd1/src/java/org/apache/cassandra/db/lifecycle/View.java
--
diff --git a/src/java/org/apache/cassandra/db/lifecycle/View.java 
b/src/java/org/apache/cassandra/db/lifecycle/View.java
index 324dbc1..75590fa 100644
--- a/src/java/org/apache/cassandra/db/lifecycle/View.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/View.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.db.lifecycle;
 
 import java.util.*;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Predicate;
@@ -41,6 +42,7 @@ import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.transform;
 import static java.util.Collections.singleton;
 import static org.apache.cassandra.db.lifecycle.Helpers.emptySet;
+import static org.apache.cassandra.db.lifecycle.Helpers.filterOut;
 import static org.apache.cassandra.db.lifecycle.Helpers.replace;
 
 /**
@@ -124,6 +126,14 @@ public class View
 return select(sstableSet, filter(sstables, filter));
 }
 
+// any sstable known by this tracker in any form; we have a special method 
here since it's only used for testing/debug
+// (strong leak detection), and it does not follow the normal pattern
+@VisibleForTesting
+public IterableSSTableReader allKnownSSTables()
+{
+return Iterables.concat(sstables, filterOut(compacting, sstables));
+}
+
 private IterableSSTableReader select(SSTableSet sstableSet, 
IterableSSTableReader sstables)
 {
 switch (sstableSet)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3879bfd1/src/java/org/apache/cassandra/utils/concurrent/Ref.java
--
diff --git a/src/java/org/apache/cassandra/utils/concurrent/Ref.java 
b/src/java/org/apache/cassandra/utils/concurrent/Ref.java
index 522caca..92c1a0c 100644
--- a/src/java/org/apache/cassandra/utils/concurrent/Ref.java
+++ b/src/java/org/apache/cassandra/utils/concurrent/Ref.java
@@ -498,7 +498,7 @@ public final class RefT implements RefCountedT
 for (ColumnFamilyStore cfs : ks.getColumnFamilyStores())
 {
 View view = cfs.getTracker().getView();
-for (SSTableReader reader : 
Iterables.concat(view.sstables, view.compacting))
+for (SSTableReader reader : view.allKnownSSTables())
 reader.addTo(expected);
 }
 }

cassandra git commit: Fix build

2014-12-19 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/trunk 2f072f4d8 - 382834d4e


Fix build


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

Branch: refs/heads/trunk
Commit: 382834d4e49dbd305bb299ce911592838a5e1e3e
Parents: 2f072f4
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Dec 19 13:43:00 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Dec 19 13:43:00 2014 +0100

--
 src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/382834d4/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java 
b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
index 1ae3293..ec590f3 100644
--- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
@@ -77,12 +77,6 @@ import org.apache.cassandra.utils.Pair;
  */
 public class CQLSSTableWriter implements Closeable
 {
-static
-{
-// The CQLSSTableWriter must always be used in client mode.
-Config.setClientMode(true);
-}
-
 private final AbstractSSTableSimpleWriter writer;
 private final UpdateStatement insert;
 private final ListColumnSpecification boundNames;

git commit: Fix build

2014-11-05 Thread jake

Repository: cassandra
Updated Branches:
  refs/heads/trunk eccf25a17 - aa6233aa1


Fix build


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

Branch: refs/heads/trunk
Commit: aa6233aa19fd052a526fb49b7bb78592ff3e148d
Parents: eccf25a
Author: Jake Luciani j...@apache.org
Authored: Wed Nov 5 21:04:55 2014 -0500
Committer: Jake Luciani j...@apache.org
Committed: Wed Nov 5 21:04:55 2014 -0500

--
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa6233aa/build.xml
--
diff --git a/build.xml b/build.xml
index 2642034..2cb637e 100644
--- a/build.xml
+++ b/build.xml
@@ -1106,7 +1106,7 @@
 formatter type=brief usefile=false/
 jvmarg value=-Dstorage-config=${test.conf}/
 jvmarg value=-Djava.awt.headless=true/
-jvmarg value=-javaagent:${basedir}/lib/jamm-0.2.8.jar 
${additionalagent} /
+jvmarg line=-javaagent:${basedir}/lib/jamm-0.2.8.jar 
${additionalagent} /
 jvmarg value=-ea/
 jvmarg value=-Xss256k/
 jvmarg 
value=-Dcassandra.memtable_row_overhead_computation_step=100/

git commit: fix build

2014-10-02 Thread marcuse

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 0793e569b - 1c3932086


fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 1c39320860f2de747a35a922cb04b59585cd74b6
Parents: 0793e56
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Oct 2 11:49:04 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Oct 2 11:49:04 2014 +0200

--
 .../apache/cassandra/db/marshal/DynamicCompositeTypeTest.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c393208/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java 
b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index 87e6ac9..e248eae 100644
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@ -207,7 +207,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader
 ByteBuffer cname5 = createDynamicCompositeKey(test2, uuids[1], 42, 
false, true);
 
 ByteBuffer key = ByteBufferUtil.bytes(kr);
-RowMutation rm = new RowMutation(Keyspace1, key);
+Mutation rm = new Mutation(Keyspace1, key);
 addColumn(rm, cname5);
 addColumn(rm, cname1);
 addColumn(rm, cname4);
@@ -217,7 +217,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader
 
 ColumnFamily cf = 
cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk(kr), cfName, 
System.currentTimeMillis()));
 
-IteratorColumn iter = cf.getSortedColumns().iterator();
+IteratorCell iter = cf.getSortedColumns().iterator();
 
 assert iter.next().name().equals(cname5);
 assert iter.next().name().equals(cname4);

[1/2] git commit: fix build

2014-10-02 Thread marcuse

Repository: cassandra
Updated Branches:
  refs/heads/trunk 0db507454 - 4bb8f14a5


fix build


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

Branch: refs/heads/trunk
Commit: 1c39320860f2de747a35a922cb04b59585cd74b6
Parents: 0793e56
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Oct 2 11:49:04 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Oct 2 11:49:04 2014 +0200

--
 .../apache/cassandra/db/marshal/DynamicCompositeTypeTest.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c393208/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java 
b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index 87e6ac9..e248eae 100644
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@ -207,7 +207,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader
 ByteBuffer cname5 = createDynamicCompositeKey(test2, uuids[1], 42, 
false, true);
 
 ByteBuffer key = ByteBufferUtil.bytes(kr);
-RowMutation rm = new RowMutation(Keyspace1, key);
+Mutation rm = new Mutation(Keyspace1, key);
 addColumn(rm, cname5);
 addColumn(rm, cname1);
 addColumn(rm, cname4);
@@ -217,7 +217,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader
 
 ColumnFamily cf = 
cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk(kr), cfName, 
System.currentTimeMillis()));
 
-IteratorColumn iter = cf.getSortedColumns().iterator();
+IteratorCell iter = cf.getSortedColumns().iterator();
 
 assert iter.next().name().equals(cname5);
 assert iter.next().name().equals(cname4);

[1/2] git commit: fix build

2014-08-15 Thread jake

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 de5bb5854 - eab158462


fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 561f6ef5cfb50878dff2ea3ceb182b48f400a23e
Parents: e9d0214
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 15 15:15:09 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 15 15:15:09 2014 -0400

--
 .../apache/cassandra/io/util/BufferedRandomAccessFileTest.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/561f6ef5/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java 
b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
index cfabf62..7dbbdc2 100644
--- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
+++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
@@ -530,6 +530,8 @@ public class BufferedRandomAccessFileTest
 {
 //see https://issues.apache.org/jira/browse/CASSANDRA-7756
 
+final FileCacheService.CacheKey cacheKey = new 
FileCacheService.CacheKey();
+
 final int THREAD_COUNT = 40;
 ExecutorService executorService = 
Executors.newFixedThreadPool(THREAD_COUNT);
 
@@ -550,8 +552,8 @@ public class BufferedRandomAccessFileTest
 RandomAccessReader r2 = RandomAccessReader.open(w2);
 
 
-FileCacheService.instance.put(r1);
-FileCacheService.instance.put(r2);
+FileCacheService.instance.put(cacheKey, r1);
+FileCacheService.instance.put(cacheKey, r2);
 
 final CountDownLatch finished = new CountDownLatch(THREAD_COUNT);
 final AtomicBoolean hadError = new AtomicBoolean(false);

git commit: fix build

2014-08-15 Thread jake

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 e9d0214a1 - 561f6ef5c


fix build


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

Branch: refs/heads/cassandra-2.1.0
Commit: 561f6ef5cfb50878dff2ea3ceb182b48f400a23e
Parents: e9d0214
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 15 15:15:09 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 15 15:15:09 2014 -0400

--
 .../apache/cassandra/io/util/BufferedRandomAccessFileTest.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/561f6ef5/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java 
b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
index cfabf62..7dbbdc2 100644
--- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
+++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
@@ -530,6 +530,8 @@ public class BufferedRandomAccessFileTest
 {
 //see https://issues.apache.org/jira/browse/CASSANDRA-7756
 
+final FileCacheService.CacheKey cacheKey = new 
FileCacheService.CacheKey();
+
 final int THREAD_COUNT = 40;
 ExecutorService executorService = 
Executors.newFixedThreadPool(THREAD_COUNT);
 
@@ -550,8 +552,8 @@ public class BufferedRandomAccessFileTest
 RandomAccessReader r2 = RandomAccessReader.open(w2);
 
 
-FileCacheService.instance.put(r1);
-FileCacheService.instance.put(r2);
+FileCacheService.instance.put(cacheKey, r1);
+FileCacheService.instance.put(cacheKey, r2);
 
 final CountDownLatch finished = new CountDownLatch(THREAD_COUNT);
 final AtomicBoolean hadError = new AtomicBoolean(false);

[1/3] git commit: fix build

2014-08-15 Thread jake

Repository: cassandra
Updated Branches:
  refs/heads/trunk ff88f2376 - 7879b2fe9


fix build


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

Branch: refs/heads/trunk
Commit: 561f6ef5cfb50878dff2ea3ceb182b48f400a23e
Parents: e9d0214
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 15 15:15:09 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 15 15:15:09 2014 -0400

--
 .../apache/cassandra/io/util/BufferedRandomAccessFileTest.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/561f6ef5/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java 
b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
index cfabf62..7dbbdc2 100644
--- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
+++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
@@ -530,6 +530,8 @@ public class BufferedRandomAccessFileTest
 {
 //see https://issues.apache.org/jira/browse/CASSANDRA-7756
 
+final FileCacheService.CacheKey cacheKey = new 
FileCacheService.CacheKey();
+
 final int THREAD_COUNT = 40;
 ExecutorService executorService = 
Executors.newFixedThreadPool(THREAD_COUNT);
 
@@ -550,8 +552,8 @@ public class BufferedRandomAccessFileTest
 RandomAccessReader r2 = RandomAccessReader.open(w2);
 
 
-FileCacheService.instance.put(r1);
-FileCacheService.instance.put(r2);
+FileCacheService.instance.put(cacheKey, r1);
+FileCacheService.instance.put(cacheKey, r2);
 
 final CountDownLatch finished = new CountDownLatch(THREAD_COUNT);
 final AtomicBoolean hadError = new AtomicBoolean(false);

[28/50] [abbrv] git commit: fix build

2014-08-11 Thread jmckenzie

fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 41f3677841b0e959b912091e4ad36d8f388649fa
Parents: 9e43a2f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Aug 6 14:27:47 2014 -0500

--
 .../apache/cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f36778/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index b375ce2..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -422,15 +422,15 @@ public class CqlConfigHelper
 poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, 
coreConnections.get());
 if (maxConnections.isPresent())
 poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, 
maxConnections.get());
-if (maxSimultaneousRequests.isPresent())
-
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 if (minSimultaneousRequests.isPresent())
 
poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 minSimultaneousRequests.get());
+if (maxSimultaneousRequests.isPresent())
+
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 
 poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0)
   .setMaxConnectionsPerHost(HostDistance.REMOTE, 0)
-  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
-  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
+  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
+  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
 
 return poolingOptions;
 }  
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[27/50] [abbrv] git commit: fix build

2014-08-11 Thread jmckenzie

fix build


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

Branch: refs/heads/cassandra-2.1
Commit: a1924ba3946c9f7f0cc67ef119768b2d9251bc63
Parents: 821a2fe
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Aug 6 14:27:20 2014 -0500

--
 .../apache/cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1924ba3/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index b375ce2..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -422,15 +422,15 @@ public class CqlConfigHelper
 poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, 
coreConnections.get());
 if (maxConnections.isPresent())
 poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, 
maxConnections.get());
-if (maxSimultaneousRequests.isPresent())
-
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 if (minSimultaneousRequests.isPresent())
 
poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 minSimultaneousRequests.get());
+if (maxSimultaneousRequests.isPresent())
+
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 
 poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0)
   .setMaxConnectionsPerHost(HostDistance.REMOTE, 0)
-  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
-  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
+  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
+  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
 
 return poolingOptions;
 }  
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[08/17] git commit: Fix build

2014-08-10 Thread aleksey

Fix build


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

Branch: refs/heads/cassandra-2.1
Commit: d93b8519100076321228935b853829ac78df44ac
Parents: 2af8c9d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Aug 8 17:50:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Aug 8 17:50:56 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d93b8519/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java 
b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 6f17468..3b7b0df 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@ -58,11 +58,11 @@ public class CqlStorage extends AbstractCassandraStorage
 {
 private static final Logger logger = 
LoggerFactory.getLogger(CqlStorage.class);
 private RecordReaderMapString, ByteBuffer, MapString, ByteBuffer 
reader;
-private RecordWriterMapString, ByteBuffer, ListByteBuffer writer;
+protected RecordWriterMapString, ByteBuffer, ListByteBuffer writer;
 
-private int pageSize = 1000;
+protected int pageSize = 1000;
 private String columns;
-private String outputQuery;
+protected String outputQuery;
 private String whereClause;
 private boolean hasCompactValueAlias = false;
 
@@ -130,7 +130,7 @@ public class CqlStorage extends AbstractCassandraStorage
 }
 
 /** set the value to the position of the tuple */
-private void setTupleValue(Tuple tuple, int position, Object value, 
AbstractType? validator) throws ExecException
+protected void setTupleValue(Tuple tuple, int position, Object value, 
AbstractType? validator) throws ExecException
 {
 if (validator instanceof CollectionType)
 setCollectionTupleValues(tuple, position, value, validator);
@@ -184,7 +184,7 @@ public class CqlStorage extends AbstractCassandraStorage
 }
 
 /** convert a cql column to an object */
-private Object cqlColumnToObj(Cell col, CfDef cfDef) throws IOException
+protected Object cqlColumnToObj(Cell col, CfDef cfDef) throws IOException
 {
 // standard
 MapByteBuffer,AbstractType validators = getValidatorMap(cfDef);

[08/18] git commit: Fix build

2014-08-10 Thread aleksey

Fix build


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

Branch: refs/heads/trunk
Commit: d93b8519100076321228935b853829ac78df44ac
Parents: 2af8c9d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Aug 8 17:50:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Aug 8 17:50:56 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d93b8519/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java 
b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 6f17468..3b7b0df 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@ -58,11 +58,11 @@ public class CqlStorage extends AbstractCassandraStorage
 {
 private static final Logger logger = 
LoggerFactory.getLogger(CqlStorage.class);
 private RecordReaderMapString, ByteBuffer, MapString, ByteBuffer 
reader;
-private RecordWriterMapString, ByteBuffer, ListByteBuffer writer;
+protected RecordWriterMapString, ByteBuffer, ListByteBuffer writer;
 
-private int pageSize = 1000;
+protected int pageSize = 1000;
 private String columns;
-private String outputQuery;
+protected String outputQuery;
 private String whereClause;
 private boolean hasCompactValueAlias = false;
 
@@ -130,7 +130,7 @@ public class CqlStorage extends AbstractCassandraStorage
 }
 
 /** set the value to the position of the tuple */
-private void setTupleValue(Tuple tuple, int position, Object value, 
AbstractType? validator) throws ExecException
+protected void setTupleValue(Tuple tuple, int position, Object value, 
AbstractType? validator) throws ExecException
 {
 if (validator instanceof CollectionType)
 setCollectionTupleValues(tuple, position, value, validator);
@@ -184,7 +184,7 @@ public class CqlStorage extends AbstractCassandraStorage
 }
 
 /** convert a cql column to an object */
-private Object cqlColumnToObj(Cell col, CfDef cfDef) throws IOException
+protected Object cqlColumnToObj(Cell col, CfDef cfDef) throws IOException
 {
 // standard
 MapByteBuffer,AbstractType validators = getValidatorMap(cfDef);

[09/12] git commit: Fix build

2014-08-09 Thread slebresne

Fix build


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

Branch: refs/heads/cassandra-2.1.0
Commit: d93b8519100076321228935b853829ac78df44ac
Parents: 2af8c9d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Aug 8 17:50:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Aug 8 17:50:56 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d93b8519/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java 
b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 6f17468..3b7b0df 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@ -58,11 +58,11 @@ public class CqlStorage extends AbstractCassandraStorage
 {
 private static final Logger logger = 
LoggerFactory.getLogger(CqlStorage.class);
 private RecordReaderMapString, ByteBuffer, MapString, ByteBuffer 
reader;
-private RecordWriterMapString, ByteBuffer, ListByteBuffer writer;
+protected RecordWriterMapString, ByteBuffer, ListByteBuffer writer;
 
-private int pageSize = 1000;
+protected int pageSize = 1000;
 private String columns;
-private String outputQuery;
+protected String outputQuery;
 private String whereClause;
 private boolean hasCompactValueAlias = false;
 
@@ -130,7 +130,7 @@ public class CqlStorage extends AbstractCassandraStorage
 }
 
 /** set the value to the position of the tuple */
-private void setTupleValue(Tuple tuple, int position, Object value, 
AbstractType? validator) throws ExecException
+protected void setTupleValue(Tuple tuple, int position, Object value, 
AbstractType? validator) throws ExecException
 {
 if (validator instanceof CollectionType)
 setCollectionTupleValues(tuple, position, value, validator);
@@ -184,7 +184,7 @@ public class CqlStorage extends AbstractCassandraStorage
 }
 
 /** convert a cql column to an object */
-private Object cqlColumnToObj(Cell col, CfDef cfDef) throws IOException
+protected Object cqlColumnToObj(Cell col, CfDef cfDef) throws IOException
 {
 // standard
 MapByteBuffer,AbstractType validators = getValidatorMap(cfDef);

[2/6] git commit: fix build

2014-08-06 Thread brandonwilliams

fix build


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

Branch: refs/heads/trunk
Commit: 41f3677841b0e959b912091e4ad36d8f388649fa
Parents: 9e43a2f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Aug 6 14:27:47 2014 -0500

--
 .../apache/cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f36778/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index b375ce2..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -422,15 +422,15 @@ public class CqlConfigHelper
 poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, 
coreConnections.get());
 if (maxConnections.isPresent())
 poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, 
maxConnections.get());
-if (maxSimultaneousRequests.isPresent())
-
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 if (minSimultaneousRequests.isPresent())
 
poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 minSimultaneousRequests.get());
+if (maxSimultaneousRequests.isPresent())
+
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 
 poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0)
   .setMaxConnectionsPerHost(HostDistance.REMOTE, 0)
-  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
-  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
+  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
+  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
 
 return poolingOptions;
 }  
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/6] git commit: fix build

2014-08-06 Thread brandonwilliams

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 bb0112be1 - 368b63f06
  refs/heads/trunk 9e43a2f8a - fe30c2c23


fix build


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

Branch: refs/heads/trunk
Commit: a1924ba3946c9f7f0cc67ef119768b2d9251bc63
Parents: 821a2fe
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Aug 6 14:27:20 2014 -0500

--
 .../apache/cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1924ba3/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index b375ce2..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -422,15 +422,15 @@ public class CqlConfigHelper
 poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, 
coreConnections.get());
 if (maxConnections.isPresent())
 poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, 
maxConnections.get());
-if (maxSimultaneousRequests.isPresent())
-
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 if (minSimultaneousRequests.isPresent())
 
poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 minSimultaneousRequests.get());
+if (maxSimultaneousRequests.isPresent())
+
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 
 poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0)
   .setMaxConnectionsPerHost(HostDistance.REMOTE, 0)
-  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
-  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
+  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
+  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
 
 return poolingOptions;
 }  
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[5/6] git commit: fix build

2014-08-06 Thread brandonwilliams

fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 368b63f06d86edbcbdd87e0fddd7ca662da6b367
Parents: bb0112b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Aug 6 14:28:00 2014 -0500

--
 .../apache/cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/368b63f0/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index b375ce2..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -422,15 +422,15 @@ public class CqlConfigHelper
 poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, 
coreConnections.get());
 if (maxConnections.isPresent())
 poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, 
maxConnections.get());
-if (maxSimultaneousRequests.isPresent())
-
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 if (minSimultaneousRequests.isPresent())
 
poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 minSimultaneousRequests.get());
+if (maxSimultaneousRequests.isPresent())
+
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 
 poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0)
   .setMaxConnectionsPerHost(HostDistance.REMOTE, 0)
-  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
-  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
+  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
+  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
 
 return poolingOptions;
 }  
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[4/6] git commit: fix build

2014-08-06 Thread brandonwilliams

fix build


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

Branch: refs/heads/trunk
Commit: 368b63f06d86edbcbdd87e0fddd7ca662da6b367
Parents: bb0112b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Aug 6 14:28:00 2014 -0500

--
 .../apache/cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/368b63f0/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index b375ce2..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -422,15 +422,15 @@ public class CqlConfigHelper
 poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, 
coreConnections.get());
 if (maxConnections.isPresent())
 poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, 
maxConnections.get());
-if (maxSimultaneousRequests.isPresent())
-
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 if (minSimultaneousRequests.isPresent())
 
poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 minSimultaneousRequests.get());
+if (maxSimultaneousRequests.isPresent())
+
poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL,
 maxSimultaneousRequests.get());
 
 poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0)
   .setMaxConnectionsPerHost(HostDistance.REMOTE, 0)
-  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
-  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
+  
.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
+  
.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
 
 return poolingOptions;
 }  
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

git commit: Fix build

2014-08-05 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 2d211608e - 9f1e9575c


Fix build


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

Branch: refs/heads/cassandra-2.1.0
Commit: 9f1e9575cb946cf2aa4efd403606474e070c3cc9
Parents: 2d21160
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 15:47:35 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 15:47:35 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f1e9575/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index bd4598f..432cf9e 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -520,6 +520,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/3] git commit: Fix build

2014-08-05 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/trunk bf4c76e47 - 277ca64c7


Fix build


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

Branch: refs/heads/trunk
Commit: 9f1e9575cb946cf2aa4efd403606474e070c3cc9
Parents: 2d21160
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 15:47:35 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 15:47:35 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f1e9575/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index bd4598f..432cf9e 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -520,6 +520,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/2] git commit: Fix build

2014-08-05 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 3612b84c6 - 622ae5085


Fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 9f1e9575cb946cf2aa4efd403606474e070c3cc9
Parents: 2d21160
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 15:47:35 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 15:47:35 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f1e9575/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index bd4598f..432cf9e 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -520,6 +520,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

git commit: Fix build

2014-08-05 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 5151fd5bc - 4b6d6ebd8


Fix build


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

Branch: refs/heads/cassandra-2.0
Commit: 4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c
Parents: 5151fd5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 16:02:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 16:02:56 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b6d6ebd/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/2] git commit: Fix build

2014-08-05 Thread slebresne

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 9f1e9575c - 7b112db6b


Fix build


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

Branch: refs/heads/cassandra-2.1.0
Commit: 4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c
Parents: 5151fd5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 16:02:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 16:02:56 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b6d6ebd/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/3] git commit: fix build

2014-08-05 Thread brandonwilliams

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 622ae5085 - 9faf90574
  refs/heads/trunk efe57f230 - 26cd4408f


fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 9faf905743696264ef0fdf6f962378ce95829e50
Parents: 622ae50
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 5 10:35:30 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 5 10:35:30 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9faf9057/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 7a5fd47..af6e99e 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -518,7 +518,6 @@ public class CqlConfigHelper
 liveRemoteHosts.add(host);
 }
 
-@Override
 public void onSuspected(Host host)
 {
 }

[2/3] git commit: fix build

2014-08-05 Thread brandonwilliams

fix build


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

Branch: refs/heads/trunk
Commit: 9faf905743696264ef0fdf6f962378ce95829e50
Parents: 622ae50
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 5 10:35:30 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 5 10:35:30 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9faf9057/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 7a5fd47..af6e99e 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -518,7 +518,6 @@ public class CqlConfigHelper
 liveRemoteHosts.add(host);
 }
 
-@Override
 public void onSuspected(Host host)
 {
 }

[2/2] git commit: Fix build

2014-08-05 Thread slebresne

Fix build


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

Branch: refs/heads/cassandra-2.1
Commit: ef2785137618672614f40618e99a57ce98671335
Parents: b4741d0
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 16:02:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 18:00:38 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef278513/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[2/3] git commit: Fix build

2014-08-05 Thread slebresne

Fix build


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

Branch: refs/heads/trunk
Commit: ef2785137618672614f40618e99a57ce98671335
Parents: b4741d0
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 16:02:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 18:00:38 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef278513/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/8] git commit: Fix build

2014-08-05 Thread brandonwilliams

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 244f23418 - 73eb68c51
  refs/heads/cassandra-2.0 4b6d6ebd8 - d5d1adb44
  refs/heads/trunk a4d3da319 - f64a113e1


Fix build


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

Branch: refs/heads/trunk
Commit: 4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c
Parents: 5151fd5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 16:02:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 16:02:56 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b6d6ebd/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/3] git commit: fix build, remove dead method again

2014-08-05 Thread brandonwilliams

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 7e71d01a0 - f75988150
  refs/heads/trunk 7dd320c9e - 8625661d5


fix build, remove dead method again


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

Branch: refs/heads/cassandra-2.1
Commit: f7598815059bad05b6c6a4af53c8f5f5c8800a04
Parents: 7e71d01
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 5 14:05:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 5 14:05:21 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7598815/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 7a5fd47..741f599 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,11 +519,6 @@ public class CqlConfigHelper
 }
 
 @Override
-public void onSuspected(Host host)
-{
-}
-
-@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[2/3] git commit: fix build, remove dead method again

2014-08-05 Thread brandonwilliams

fix build, remove dead method again


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

Branch: refs/heads/trunk
Commit: f7598815059bad05b6c6a4af53c8f5f5c8800a04
Parents: 7e71d01
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 5 14:05:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 5 14:05:21 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7598815/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 7a5fd47..741f599 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,11 +519,6 @@ public class CqlConfigHelper
 }
 
 @Override
-public void onSuspected(Host host)
-{
-}
-
-@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[01/11] git commit: Fix build

2014-08-05 Thread brandonwilliams

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 d5d1adb44 - f92291c62
  refs/heads/cassandra-2.1 72241f6d7 - 97e74eece
  refs/heads/trunk 4a69811ee - 740bcb540


Fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c
Parents: 5151fd5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 16:02:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 16:02:56 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b6d6ebd/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[5/6] git commit: fix build on os x

2014-07-17 Thread jbellis

fix build on os x


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

Branch: refs/heads/cassandra-2.1
Commit: 5dfee585dd08c70542a33acdaf55acd5adbc7a05
Parents: 14151a4
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Jun 27 14:04:55 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Jul 17 15:57:30 2014 -0500

--
 build.xml | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dfee585/build.xml
--
diff --git a/build.xml b/build.xml
index c1302eb..40dfbf6 100644
--- a/build.xml
+++ b/build.xml
@@ -688,13 +688,17 @@
 name=build-project
 echo message=${ant.project.name}: ${ant.file}/
 !-- Order matters! --
-javac debug=true debuglevel=${debuglevel}
-   destdir=${build.classes.thrift} includeantruntime=false 
source=${source.version} target=${target.version}
+javac fork=true
+   debug=true debuglevel=${debuglevel}
+   destdir=${build.classes.thrift} includeantruntime=false 
source=${source.version} target=${target.version}
+   memorymaximumsize=512M
 src path=${interface.thrift.dir}/gen-java/
 classpath refid=cassandra.classpath/
 /javac
-javac debug=true debuglevel=${debuglevel}
-   destdir=${build.classes.main} includeantruntime=false 
source=${source.version} target=${target.version}
+javac fork=true
+   debug=true debuglevel=${debuglevel}
+   destdir=${build.classes.main} includeantruntime=false 
source=${source.version} target=${target.version}
+   memorymaximumsize=512M
 src path=${build.src.java}/
 src path=${build.src.gen-java}/
 classpath refid=cassandra.classpath/

[4/6] git commit: fix build on os x

2014-07-17 Thread jbellis

fix build on os x


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

Branch: refs/heads/trunk
Commit: 5dfee585dd08c70542a33acdaf55acd5adbc7a05
Parents: 14151a4
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Jun 27 14:04:55 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Jul 17 15:57:30 2014 -0500

--
 build.xml | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dfee585/build.xml
--
diff --git a/build.xml b/build.xml
index c1302eb..40dfbf6 100644
--- a/build.xml
+++ b/build.xml
@@ -688,13 +688,17 @@
 name=build-project
 echo message=${ant.project.name}: ${ant.file}/
 !-- Order matters! --
-javac debug=true debuglevel=${debuglevel}
-   destdir=${build.classes.thrift} includeantruntime=false 
source=${source.version} target=${target.version}
+javac fork=true
+   debug=true debuglevel=${debuglevel}
+   destdir=${build.classes.thrift} includeantruntime=false 
source=${source.version} target=${target.version}
+   memorymaximumsize=512M
 src path=${interface.thrift.dir}/gen-java/
 classpath refid=cassandra.classpath/
 /javac
-javac debug=true debuglevel=${debuglevel}
-   destdir=${build.classes.main} includeantruntime=false 
source=${source.version} target=${target.version}
+javac fork=true
+   debug=true debuglevel=${debuglevel}
+   destdir=${build.classes.main} includeantruntime=false 
source=${source.version} target=${target.version}
+   memorymaximumsize=512M
 src path=${build.src.java}/
 src path=${build.src.gen-java}/
 classpath refid=cassandra.classpath/

git commit: fix build on os x

2014-06-27 Thread jbellis

Repository: cassandra
Updated Branches:
  refs/heads/trunk 73d517d6d - c027183ea


fix build on os x


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

Branch: refs/heads/trunk
Commit: c027183ea4e901cf1d44e06704f6d78f84405bb4
Parents: 73d517d
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Jun 27 14:04:55 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Jun 27 16:35:28 2014 -0500

--
 build.xml | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c027183e/build.xml
--
diff --git a/build.xml b/build.xml
index 5e4a85b..27ac9c5 100644
--- a/build.xml
+++ b/build.xml
@@ -693,13 +693,17 @@
 name=build-project
 echo message=${ant.project.name}: ${ant.file}/
 !-- Order matters! --
-javac debug=true debuglevel=${debuglevel}
-   destdir=${build.classes.thrift} includeantruntime=false 
source=${source.version} target=${target.version}
+javac fork=true
+   debug=true debuglevel=${debuglevel}
+   destdir=${build.classes.thrift} includeantruntime=false 
source=${source.version} target=${target.version}
+   memorymaximumsize=512M
 src path=${interface.thrift.dir}/gen-java/
 classpath refid=cassandra.classpath/
 /javac
-javac debug=true debuglevel=${debuglevel}
-   destdir=${build.classes.main} includeantruntime=false 
source=${source.version} target=${target.version}
+javac fork=true
+   debug=true debuglevel=${debuglevel}
+   destdir=${build.classes.main} includeantruntime=false 
source=${source.version} target=${target.version}
+   memorymaximumsize=512M
 src path=${build.src.java}/
 src path=${build.src.gen-java}/
compilerarg value=-XDignore.symbol.file/

[02/10] git commit: fix build

2014-05-02 Thread brandonwilliams

fix build


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

Branch: refs/heads/cassandra-2.0
Commit: 837bded794f23975414eb81a73a7120aaabc13ea
Parents: 562a22f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri May 2 16:39:36 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri May 2 16:39:36 2014 -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/837bded7/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 992a13a..bfca642 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1537,7 +1537,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 // set state back to normal, since the node may have tried to 
leave, but failed and is now back up
 tokensToUpdateInMetadata.add(token);
 if (!isClientMode)
-tokensToUpdateInSystemKeyspace.add(token);
+tokensToUpdateInSystemTable.add(token);
 }
 else if (tokenMetadata.isRelocating(token)  
tokenMetadata.getRelocatingRanges().get(token).equals(endpoint))
 {

[04/10] git commit: fix build

2014-05-02 Thread brandonwilliams

fix build


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

Branch: refs/heads/trunk
Commit: 837bded794f23975414eb81a73a7120aaabc13ea
Parents: 562a22f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri May 2 16:39:36 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri May 2 16:39:36 2014 -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/837bded7/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 992a13a..bfca642 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1537,7 +1537,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 // set state back to normal, since the node may have tried to 
leave, but failed and is now back up
 tokensToUpdateInMetadata.add(token);
 if (!isClientMode)
-tokensToUpdateInSystemKeyspace.add(token);
+tokensToUpdateInSystemTable.add(token);
 }
 else if (tokenMetadata.isRelocating(token)  
tokenMetadata.getRelocatingRanges().get(token).equals(endpoint))
 {

[01/10] git commit: fix build

2014-05-02 Thread brandonwilliams

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 562a22fcd - 837bded79
  refs/heads/cassandra-2.0 238a02084 - 2658c90e6
  refs/heads/cassandra-2.1 8939ac492 - baee086f6
  refs/heads/trunk 46539e196 - 909fd5bc9


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: 837bded794f23975414eb81a73a7120aaabc13ea
Parents: 562a22f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri May 2 16:39:36 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri May 2 16:39:36 2014 -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/837bded7/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 992a13a..bfca642 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1537,7 +1537,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 // set state back to normal, since the node may have tried to 
leave, but failed and is now back up
 tokensToUpdateInMetadata.add(token);
 if (!isClientMode)
-tokensToUpdateInSystemKeyspace.add(token);
+tokensToUpdateInSystemTable.add(token);
 }
 else if (tokenMetadata.isRelocating(token)  
tokenMetadata.getRelocatingRanges().get(token).equals(endpoint))
 {

[03/10] git commit: fix build

2014-05-02 Thread brandonwilliams

fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 837bded794f23975414eb81a73a7120aaabc13ea
Parents: 562a22f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri May 2 16:39:36 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri May 2 16:39:36 2014 -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/837bded7/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 992a13a..bfca642 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1537,7 +1537,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 // set state back to normal, since the node may have tried to 
leave, but failed and is now back up
 tokensToUpdateInMetadata.add(token);
 if (!isClientMode)
-tokensToUpdateInSystemKeyspace.add(token);
+tokensToUpdateInSystemTable.add(token);
 }
 else if (tokenMetadata.isRelocating(token)  
tokenMetadata.getRelocatingRanges().get(token).equals(endpoint))
 {

[3/3] git commit: fix build

2014-04-30 Thread jbellis

fix build


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

Branch: refs/heads/trunk
Commit: dbf3e1c574d08dee0450feaf8cc7e0d4df0e0ba8
Parents: 8d993a4
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Apr 30 12:45:45 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Apr 30 12:45:45 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbf3e1c5/src/java/org/apache/cassandra/service/AbstractRowResolver.java
--
diff --git a/src/java/org/apache/cassandra/service/AbstractRowResolver.java 
b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
index 1fbb92b..a84a6b6 100644
--- a/src/java/org/apache/cassandra/service/AbstractRowResolver.java
+++ b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
@@ -18,7 +18,9 @@
 package org.apache.cassandra.service;
 
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.slf4j.Logger;
@@ -34,8 +36,8 @@ public abstract class AbstractRowResolver implements 
IResponseResolverReadRespo
 protected static final Logger logger = 
LoggerFactory.getLogger(AbstractRowResolver.class);
 
 protected final String keyspaceName;
-// CLQ gives us thread-safety without the overhead of guaranteeing 
uniqueness like a Set would
-protected final CollectionMessageInReadResponse replies = new 
ConcurrentLinkedQueue();
+// synchronizedList gives us thread-safety without the overhead of 
guaranteeing uniqueness like a Set would
+protected final CollectionMessageInReadResponse replies = 
Collections.synchronizedList(new ArrayListMessageInReadResponse());
 protected final DecoratedKey key;
 
 public AbstractRowResolver(ByteBuffer key, String keyspaceName)

git commit: fix build

2014-04-30 Thread jbellis

Repository: cassandra
Updated Branches:
  refs/heads/trunk 6b4d98035 - cf3f5b6ef


fix build


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

Branch: refs/heads/trunk
Commit: cf3f5b6efbe80a95bfc57e40e60ef5531eddc71e
Parents: 6b4d980
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Apr 30 14:07:51 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Apr 30 14:08:30 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf3f5b6e/src/java/org/apache/cassandra/service/AbstractRowResolver.java
--
diff --git a/src/java/org/apache/cassandra/service/AbstractRowResolver.java 
b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
index a84a6b6..9e287cf 100644
--- a/src/java/org/apache/cassandra/service/AbstractRowResolver.java
+++ b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.slf4j.Logger;
@@ -37,7 +38,7 @@ public abstract class AbstractRowResolver implements 
IResponseResolverReadRespo
 
 protected final String keyspaceName;
 // synchronizedList gives us thread-safety without the overhead of 
guaranteeing uniqueness like a Set would
-protected final CollectionMessageInReadResponse replies = 
Collections.synchronizedList(new ArrayListMessageInReadResponse());
+protected final ListMessageInReadResponse replies = 
Collections.synchronizedList(new ArrayListMessageInReadResponse());
 protected final DecoratedKey key;
 
 public AbstractRowResolver(ByteBuffer key, String keyspaceName)

[3/7] git commit: fix build

2014-02-28 Thread jbellis

fix build


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

Branch: refs/heads/trunk
Commit: 89da2c9704b5d2a4148a97a274170c3f634a1f0f
Parents: 5b80b97
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 28 14:45:04 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 28 14:45:04 2014 -0600

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/89da2c97/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4acae0b..210ae17 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -387,12 +387,12 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 return data.getMeanColumns();
 }
 
-public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, boolean loadSSTables) throws ConfigurationException
+public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, boolean loadSSTables)
 {
 return createColumnFamilyStore(keyspace, columnFamily, 
StorageService.getPartitioner(), 
Schema.instance.getCFMetaData(keyspace.getName(), columnFamily), loadSSTables);
 }
 
-public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, IPartitioner partitioner, CFMetaData metadata) throws 
ConfigurationException
+public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, IPartitioner partitioner, CFMetaData metadata)
 {
 return createColumnFamilyStore(keyspace, columnFamily, partitioner, 
metadata, true);
 }
@@ -401,7 +401,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
  
String columnFamily,
  
IPartitioner partitioner,
  
CFMetaData metadata,
- 
boolean loadSSTables) throws ConfigurationException
+ 
boolean loadSSTables)
 {
 // get the max generation number, to prevent generation conflicts
 Directories directories = Directories.create(keyspace.getName(), 
columnFamily);
@@ -412,8 +412,8 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 Descriptor desc = entry.getKey();
 generations.add(desc.generation);
 if (!desc.isCompatible())
-throw new ConfigurationException(String.format(Incompatible 
SSTable found.  Current version %s is unable to read file: %s.  Please run 
upgradesstables.,
-   
Descriptor.Version.CURRENT, desc));
+throw new RuntimeException(String.format(Incompatible SSTable 
found.  Current version %s is unable to read file: %s.  Please run 
upgradesstables.,
+  
Descriptor.Version.CURRENT, desc));
 }
 Collections.sort(generations);
 int value = (generations.size()  0) ? 
(generations.get(generations.size() - 1)) : 0;

[2/7] git commit: fix build

2014-02-28 Thread jbellis

fix build


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

Branch: refs/heads/cassandra-2.0
Commit: 89da2c9704b5d2a4148a97a274170c3f634a1f0f
Parents: 5b80b97
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 28 14:45:04 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 28 14:45:04 2014 -0600

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/89da2c97/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4acae0b..210ae17 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -387,12 +387,12 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 return data.getMeanColumns();
 }
 
-public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, boolean loadSSTables) throws ConfigurationException
+public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, boolean loadSSTables)
 {
 return createColumnFamilyStore(keyspace, columnFamily, 
StorageService.getPartitioner(), 
Schema.instance.getCFMetaData(keyspace.getName(), columnFamily), loadSSTables);
 }
 
-public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, IPartitioner partitioner, CFMetaData metadata) throws 
ConfigurationException
+public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, IPartitioner partitioner, CFMetaData metadata)
 {
 return createColumnFamilyStore(keyspace, columnFamily, partitioner, 
metadata, true);
 }
@@ -401,7 +401,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
  
String columnFamily,
  
IPartitioner partitioner,
  
CFMetaData metadata,
- 
boolean loadSSTables) throws ConfigurationException
+ 
boolean loadSSTables)
 {
 // get the max generation number, to prevent generation conflicts
 Directories directories = Directories.create(keyspace.getName(), 
columnFamily);
@@ -412,8 +412,8 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 Descriptor desc = entry.getKey();
 generations.add(desc.generation);
 if (!desc.isCompatible())
-throw new ConfigurationException(String.format(Incompatible 
SSTable found.  Current version %s is unable to read file: %s.  Please run 
upgradesstables.,
-   
Descriptor.Version.CURRENT, desc));
+throw new RuntimeException(String.format(Incompatible SSTable 
found.  Current version %s is unable to read file: %s.  Please run 
upgradesstables.,
+  
Descriptor.Version.CURRENT, desc));
 }
 Collections.sort(generations);
 int value = (generations.size()  0) ? 
(generations.get(generations.size() - 1)) : 0;

[4/7] git commit: fix build

2014-02-28 Thread jbellis

fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 89da2c9704b5d2a4148a97a274170c3f634a1f0f
Parents: 5b80b97
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 28 14:45:04 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 28 14:45:04 2014 -0600

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/89da2c97/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4acae0b..210ae17 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -387,12 +387,12 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 return data.getMeanColumns();
 }
 
-public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, boolean loadSSTables) throws ConfigurationException
+public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, boolean loadSSTables)
 {
 return createColumnFamilyStore(keyspace, columnFamily, 
StorageService.getPartitioner(), 
Schema.instance.getCFMetaData(keyspace.getName(), columnFamily), loadSSTables);
 }
 
-public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, IPartitioner partitioner, CFMetaData metadata) throws 
ConfigurationException
+public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, 
String columnFamily, IPartitioner partitioner, CFMetaData metadata)
 {
 return createColumnFamilyStore(keyspace, columnFamily, partitioner, 
metadata, true);
 }
@@ -401,7 +401,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
  
String columnFamily,
  
IPartitioner partitioner,
  
CFMetaData metadata,
- 
boolean loadSSTables) throws ConfigurationException
+ 
boolean loadSSTables)
 {
 // get the max generation number, to prevent generation conflicts
 Directories directories = Directories.create(keyspace.getName(), 
columnFamily);
@@ -412,8 +412,8 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 Descriptor desc = entry.getKey();
 generations.add(desc.generation);
 if (!desc.isCompatible())
-throw new ConfigurationException(String.format(Incompatible 
SSTable found.  Current version %s is unable to read file: %s.  Please run 
upgradesstables.,
-   
Descriptor.Version.CURRENT, desc));
+throw new RuntimeException(String.format(Incompatible SSTable 
found.  Current version %s is unable to read file: %s.  Please run 
upgradesstables.,
+  
Descriptor.Version.CURRENT, desc));
 }
 Collections.sort(generations);
 int value = (generations.size()  0) ? 
(generations.get(generations.size() - 1)) : 0;

[3/6] git commit: fix build-dep to not require ojdk

2014-02-25 Thread brandonwilliams

fix build-dep to not require ojdk


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

Branch: refs/heads/trunk
Commit: 157cbdfad99c678333c60af0037818eb71eea502
Parents: d21c0c9
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Feb 25 15:19:47 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Feb 25 15:19:47 2014 -0600

--
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/157cbdfa/debian/control
--
diff --git a/debian/control b/debian/control
index 631c60b..2695e8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans eev...@apache.org
 Uploaders: Sylvain Lebresne slebre...@apache.org
-Build-Depends: debhelper (= 5), openjdk-7-jdk | java7-sdk, ant (= 1.7), 
ant-optional (= 1.7), python-support
+Build-Depends: debhelper (= 5), openjdk-7-jdk | java7-jdk, ant (= 1.7), 
ant-optional (= 1.7), python-support
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git

[2/6] git commit: fix build-dep to not require ojdk

2014-02-25 Thread brandonwilliams

fix build-dep to not require ojdk


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

Branch: refs/heads/cassandra-2.1
Commit: 157cbdfad99c678333c60af0037818eb71eea502
Parents: d21c0c9
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Feb 25 15:19:47 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Feb 25 15:19:47 2014 -0600

--
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/157cbdfa/debian/control
--
diff --git a/debian/control b/debian/control
index 631c60b..2695e8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans eev...@apache.org
 Uploaders: Sylvain Lebresne slebre...@apache.org
-Build-Depends: debhelper (= 5), openjdk-7-jdk | java7-sdk, ant (= 1.7), 
ant-optional (= 1.7), python-support
+Build-Depends: debhelper (= 5), openjdk-7-jdk | java7-jdk, ant (= 1.7), 
ant-optional (= 1.7), python-support
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git

[1/6] git commit: fix build-dep to not require ojdk

2014-02-25 Thread brandonwilliams

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 d21c0c932 - 157cbdfad
  refs/heads/cassandra-2.1 d4d4334ad - 3f614ff4b
  refs/heads/trunk 1d598726f - 97f31303b


fix build-dep to not require ojdk


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

Branch: refs/heads/cassandra-2.0
Commit: 157cbdfad99c678333c60af0037818eb71eea502
Parents: d21c0c9
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Feb 25 15:19:47 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Feb 25 15:19:47 2014 -0600

--
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/157cbdfa/debian/control
--
diff --git a/debian/control b/debian/control
index 631c60b..2695e8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans eev...@apache.org
 Uploaders: Sylvain Lebresne slebre...@apache.org
-Build-Depends: debhelper (= 5), openjdk-7-jdk | java7-sdk, ant (= 1.7), 
ant-optional (= 1.7), python-support
+Build-Depends: debhelper (= 5), openjdk-7-jdk | java7-jdk, ant (= 1.7), 
ant-optional (= 1.7), python-support
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git

git commit: Fix build

2014-01-31 Thread slebresne

Updated Branches:
  refs/heads/trunk e5ff1075c - 5200d45a9


Fix build


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

Branch: refs/heads/trunk
Commit: 5200d45a9e7c317c7bd7cb3893810844a62d7dce
Parents: e5ff107
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Jan 31 16:01:39 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Jan 31 16:02:05 2014 +0100

--
 src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java| 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5200d45a/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 64c79c3..3bf5906 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -119,7 +119,7 @@ public class SelectStatement implements CQLStatement, 
MeasurableForPreparedCache
  + meter.measureDeep(keyRestrictions)
  + meter.measureDeep(columnRestrictions)
  + meter.measureDeep(metadataRestrictions)
- + meter.measureDeep(restrictedNames)
+ + meter.measureDeep(restrictedColumns)
  + (sliceRestriction == null ? 0 : 
meter.measureDeep(sliceRestriction))
  + (orderingIndexes == null ? 0 : 
meter.measureDeep(orderingIndexes));
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5200d45a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index ec902cf..a46cde5 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -77,7 +77,6 @@ import org.apache.cassandra.service.CacheService;
 import org.apache.cassandra.service.StorageService;
 
 import org.apache.cassandra.streaming.StreamLockfile;
-import org.apache.cassandra.thrift.IndexExpression;
 import org.apache.cassandra.tracing.Tracing;
 import org.apache.cassandra.utils.*;

git commit: fix build

2014-01-15 Thread dbrosius

Updated Branches:
  refs/heads/trunk 63c490af9 - 602dd62e5


fix build


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

Branch: refs/heads/trunk
Commit: 602dd62e5a93ae1ada5d63f8db5cc3e77fe0e5ee
Parents: 63c490a
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Wed Jan 15 16:37:55 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Wed Jan 15 16:37:55 2014 -0500

--
 .../unit/org/apache/cassandra/db/RangeTombstoneTest.java |  5 +
 .../apache/cassandra/db/SecondaryIndexCellSizeTest.java  | 10 ++
 .../cassandra/db/index/PerRowSecondaryIndexTest.java | 11 ---
 3 files changed, 23 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/602dd62e/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java 
b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index 3bbf4b8..c1e4e8e 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -420,5 +420,10 @@ public class RangeTombstoneTest extends SchemaLoader
 public void truncateBlocking(long truncatedAt) { }
 
 public boolean indexes(CellName name) { return 
name.toByteBuffer().equals(ByteBufferUtil.bytes(1)); }
+
+@Override
+public long estimateResultRows() {
+return 0;
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/602dd62e/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java 
b/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java
index 940a565..3222d29 100644
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java
@@ -143,6 +143,11 @@ public class SecondaryIndexCellSizeTest
 {
 return true;
 }
+
+@Override
+public long estimateResultRows() {
+return 0;
+}
 }
 
 
@@ -226,5 +231,10 @@ public class SecondaryIndexCellSizeTest
 {
 return true;
 }
+
+@Override
+public long estimateResultRows() {
+return 0;
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/602dd62e/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 03f5860..60cb19a 100644
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@ -55,7 +55,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 }
 
 @Test
-public void testIndexInsertAndUpdate() throws IOException
+public void testIndexInsertAndUpdate()
 {
 // create a row then test that the configured index instance was able 
to read the row
 Mutation rm;
@@ -79,7 +79,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 }
 
 @Test
-public void testColumnDelete() throws IOException
+public void testColumnDelete()
 {
 // issue a column delete and test that the configured index instance 
was notified to update
 Mutation rm;
@@ -98,7 +98,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 }
 
 @Test
-public void testRowDelete() throws IOException
+public void testRowDelete()
 {
 // issue a row level delete and test that the configured index 
instance was notified to update
 Mutation rm;
@@ -205,5 +205,10 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 public void truncateBlocking(long truncatedAt)
 {
 }
+
+@Override
+public long estimateResultRows() {
+return 0;
+}
 }
 }

[3/6] git commit: fix build

2013-11-26 Thread jbellis

fix build


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

Branch: refs/heads/trunk
Commit: cc8a05ab6ac22f019e60ec79c11338d4c77d49c3
Parents: 8145c83
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:27:52 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:27:52 2013 -0600

--
 src/java/org/apache/cassandra/db/Table.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8a05ab/src/java/org/apache/cassandra/db/Table.java
--
diff --git a/src/java/org/apache/cassandra/db/Table.java 
b/src/java/org/apache/cassandra/db/Table.java
index a851eee..e6df982 100644
--- a/src/java/org/apache/cassandra/db/Table.java
+++ b/src/java/org/apache/cassandra/db/Table.java
@@ -275,9 +275,6 @@ public class Table
 
 public void createReplicationStrategy(KSMetaData ksm)
 {
-if (replicationStrategy != null)
-
StorageService.instance.getTokenMetadata().unregister(replicationStrategy);
-
 replicationStrategy = 
AbstractReplicationStrategy.createReplicationStrategy(ksm.name,

 ksm.strategyClass,

 StorageService.instance.getTokenMetadata(),

[1/6] git commit: fix build

2013-11-26 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.2 8145c8356 - cc8a05ab6
  refs/heads/cassandra-2.0 504f66dc1 - e68d466eb
  refs/heads/trunk 1bfd062fd - c384d31b8


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: cc8a05ab6ac22f019e60ec79c11338d4c77d49c3
Parents: 8145c83
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:27:52 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:27:52 2013 -0600

--
 src/java/org/apache/cassandra/db/Table.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8a05ab/src/java/org/apache/cassandra/db/Table.java
--
diff --git a/src/java/org/apache/cassandra/db/Table.java 
b/src/java/org/apache/cassandra/db/Table.java
index a851eee..e6df982 100644
--- a/src/java/org/apache/cassandra/db/Table.java
+++ b/src/java/org/apache/cassandra/db/Table.java
@@ -275,9 +275,6 @@ public class Table
 
 public void createReplicationStrategy(KSMetaData ksm)
 {
-if (replicationStrategy != null)
-
StorageService.instance.getTokenMetadata().unregister(replicationStrategy);
-
 replicationStrategy = 
AbstractReplicationStrategy.createReplicationStrategy(ksm.name,

 ksm.strategyClass,

 StorageService.instance.getTokenMetadata(),

[2/6] git commit: fix build

2013-11-26 Thread jbellis

fix build


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

Branch: refs/heads/cassandra-2.0
Commit: cc8a05ab6ac22f019e60ec79c11338d4c77d49c3
Parents: 8145c83
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:27:52 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:27:52 2013 -0600

--
 src/java/org/apache/cassandra/db/Table.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8a05ab/src/java/org/apache/cassandra/db/Table.java
--
diff --git a/src/java/org/apache/cassandra/db/Table.java 
b/src/java/org/apache/cassandra/db/Table.java
index a851eee..e6df982 100644
--- a/src/java/org/apache/cassandra/db/Table.java
+++ b/src/java/org/apache/cassandra/db/Table.java
@@ -275,9 +275,6 @@ public class Table
 
 public void createReplicationStrategy(KSMetaData ksm)
 {
-if (replicationStrategy != null)
-
StorageService.instance.getTokenMetadata().unregister(replicationStrategy);
-
 replicationStrategy = 
AbstractReplicationStrategy.createReplicationStrategy(ksm.name,

 ksm.strategyClass,

 StorageService.instance.getTokenMetadata(),

[2/6] git commit: fix build more

2013-11-26 Thread jbellis

fix build more


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

Branch: refs/heads/cassandra-2.0
Commit: 5f62610969a83a1c33e06a3cf20a136961bd0a08
Parents: cc8a05a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:34:37 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:34:37 2013 -0600

--
 src/java/org/apache/cassandra/locator/PropertyFileSnitch.java | 2 +-
 src/java/org/apache/cassandra/locator/TokenMetadata.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f626109/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java 
b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
index da440af..9138bc2 100644
--- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
@@ -188,7 +188,7 @@ public class PropertyFileSnitch extends 
AbstractNetworkTopologySnitch
 logger.debug(loaded network topology {}, 
FBUtilities.toString(reloadedMap));
 endpointMap = reloadedMap;
 if (StorageService.instance != null) // null check tolerates circular 
dependency; see CASSANDRA-4145
-StorageService.instance.getTokenMetadata().invalidateCaches();
+StorageService.instance.getTokenMetadata().invalidateCachedRings();
 
 if (gossipStarted)
 StorageService.instance.gossipSnitchInfo();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f626109/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 818ca8f..b724894 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -1054,7 +1054,7 @@ public class TokenMetadata
 return ringVersion;
 }
 
-private void invalidateCachedRings()
+public void invalidateCachedRings()
 {
 ringVersion++;
 }

[1/6] git commit: fix build more

2013-11-26 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.2 cc8a05ab6 - 5f6261096
  refs/heads/cassandra-2.0 e68d466eb - ab4cc9c00
  refs/heads/trunk c384d31b8 - a13c6dcbb


fix build more


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

Branch: refs/heads/cassandra-1.2
Commit: 5f62610969a83a1c33e06a3cf20a136961bd0a08
Parents: cc8a05a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:34:37 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:34:37 2013 -0600

--
 src/java/org/apache/cassandra/locator/PropertyFileSnitch.java | 2 +-
 src/java/org/apache/cassandra/locator/TokenMetadata.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f626109/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java 
b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
index da440af..9138bc2 100644
--- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
@@ -188,7 +188,7 @@ public class PropertyFileSnitch extends 
AbstractNetworkTopologySnitch
 logger.debug(loaded network topology {}, 
FBUtilities.toString(reloadedMap));
 endpointMap = reloadedMap;
 if (StorageService.instance != null) // null check tolerates circular 
dependency; see CASSANDRA-4145
-StorageService.instance.getTokenMetadata().invalidateCaches();
+StorageService.instance.getTokenMetadata().invalidateCachedRings();
 
 if (gossipStarted)
 StorageService.instance.gossipSnitchInfo();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f626109/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 818ca8f..b724894 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -1054,7 +1054,7 @@ public class TokenMetadata
 return ringVersion;
 }
 
-private void invalidateCachedRings()
+public void invalidateCachedRings()
 {
 ringVersion++;
 }

[3/6] git commit: fix build more

2013-11-26 Thread jbellis

fix build more


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

Branch: refs/heads/trunk
Commit: 5f62610969a83a1c33e06a3cf20a136961bd0a08
Parents: cc8a05a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:34:37 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:34:37 2013 -0600

--
 src/java/org/apache/cassandra/locator/PropertyFileSnitch.java | 2 +-
 src/java/org/apache/cassandra/locator/TokenMetadata.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f626109/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java 
b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
index da440af..9138bc2 100644
--- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
@@ -188,7 +188,7 @@ public class PropertyFileSnitch extends 
AbstractNetworkTopologySnitch
 logger.debug(loaded network topology {}, 
FBUtilities.toString(reloadedMap));
 endpointMap = reloadedMap;
 if (StorageService.instance != null) // null check tolerates circular 
dependency; see CASSANDRA-4145
-StorageService.instance.getTokenMetadata().invalidateCaches();
+StorageService.instance.getTokenMetadata().invalidateCachedRings();
 
 if (gossipStarted)
 StorageService.instance.gossipSnitchInfo();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f626109/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 818ca8f..b724894 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -1054,7 +1054,7 @@ public class TokenMetadata
 return ringVersion;
 }
 
-private void invalidateCachedRings()
+public void invalidateCachedRings()
 {
 ringVersion++;
 }

[1/2] git commit: Fix build

2013-11-12 Thread slebresne

Updated Branches:
  refs/heads/trunk bfd0144a1 - ed1fabb39


Fix build


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

Branch: refs/heads/trunk
Commit: 7fb2d24fa35d01eab2ff6e5ebaa6885c795a80b8
Parents: acea716
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 12 19:25:26 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 12 19:25:26 2013 +0100

--
 src/java/org/apache/cassandra/tools/SSTableImport.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fb2d24f/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java 
b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 0e8172b..7b65d26 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -44,9 +44,9 @@ import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.CompositeType;
-import org.apache.cassandra.db.marshal.MarshalException;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.io.sstable.SSTableWriter;
+import org.apache.cassandra.serializers.MarshalException;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonParser;
@@ -158,8 +158,7 @@ public class SSTableImport
 }
 else if (isRangeTombstone())
 {
-AbstractType? type = 
CompositeType.getInstance(Arrays.asList(new 
AbstractType?[]{meta.getColumnDefinitionComparator(0)}));
-value = type.fromString((String)fields.get(1));
+value = comparator.fromString((String)fields.get(1));
 }
 else
 {

git commit: Fix build

2013-11-12 Thread slebresne

Updated Branches:
  refs/heads/cassandra-2.0 acea7160e - 7fb2d24fa


Fix build


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

Branch: refs/heads/cassandra-2.0
Commit: 7fb2d24fa35d01eab2ff6e5ebaa6885c795a80b8
Parents: acea716
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 12 19:25:26 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 12 19:25:26 2013 +0100

--
 src/java/org/apache/cassandra/tools/SSTableImport.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fb2d24f/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java 
b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 0e8172b..7b65d26 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -44,9 +44,9 @@ import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.CompositeType;
-import org.apache.cassandra.db.marshal.MarshalException;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.io.sstable.SSTableWriter;
+import org.apache.cassandra.serializers.MarshalException;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonParser;
@@ -158,8 +158,7 @@ public class SSTableImport
 }
 else if (isRangeTombstone())
 {
-AbstractType? type = 
CompositeType.getInstance(Arrays.asList(new 
AbstractType?[]{meta.getColumnDefinitionComparator(0)}));
-value = type.fromString((String)fields.get(1));
+value = comparator.fromString((String)fields.get(1));
 }
 else
 {

[1/3] git commit: fix build

2013-11-05 Thread brandonwilliams

Updated Branches:
  refs/heads/cassandra-2.0 3a4d6beb4 - dc71d2200
  refs/heads/trunk 2d6ab6fb5 - 82c0094a8


fix build


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

Branch: refs/heads/cassandra-2.0
Commit: dc71d2200339f9cf781346afc4b95b60dd3cd88f
Parents: 3a4d6be
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Nov 5 15:33:49 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Nov 5 15:33:49 2013 -0600

--
 .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc71d220/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
--
diff --git 
a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java 
b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 274e43f..7876b62 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -95,9 +95,12 @@ public abstract class AbstractColumnFamilyInputFormatK, Y 
extends InputFormat
 {
 logger.debug(Creating authenticated client for CF input format);
 TTransport transport;
-try {
-transport = 
ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, 
conf);
-} catch (Exception e) {
+try
+{
+transport = 
ConfigHelper.getClientTransportFactory(conf).openTransport(location, port);
+}
+catch (Exception e)
+{
 throw new TTransportException(Failed to open a transport to  + 
location + : + port + ., e);
 }
 TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);

[2/3] git commit: fix build

2013-11-05 Thread brandonwilliams

fix build


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

Branch: refs/heads/trunk
Commit: dc71d2200339f9cf781346afc4b95b60dd3cd88f
Parents: 3a4d6be
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Nov 5 15:33:49 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Nov 5 15:33:49 2013 -0600

--
 .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc71d220/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
--
diff --git 
a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java 
b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 274e43f..7876b62 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -95,9 +95,12 @@ public abstract class AbstractColumnFamilyInputFormatK, Y 
extends InputFormat
 {
 logger.debug(Creating authenticated client for CF input format);
 TTransport transport;
-try {
-transport = 
ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, 
conf);
-} catch (Exception e) {
+try
+{
+transport = 
ConfigHelper.getClientTransportFactory(conf).openTransport(location, port);
+}
+catch (Exception e)
+{
 throw new TTransportException(Failed to open a transport to  + 
location + : + port + ., e);
 }
 TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);

git commit: fix build

2013-10-30 Thread brandonwilliams

Updated Branches:
  refs/heads/trunk 04984ab27 - 3d00fe6cd


fix build


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

Branch: refs/heads/trunk
Commit: 3d00fe6cd5577ee92e5659a1abe9bd9f8d735012
Parents: 04984ab
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Oct 30 15:44:46 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Oct 30 15:44:46 2013 -0500

--
 .../cassandra/io/sstable/SSTableReaderTest.java | 35 
 1 file changed, 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d00fe6c/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
--
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java 
b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 9bd384c..8c0d908 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -303,41 +303,6 @@ public class SSTableReaderTest extends SchemaLoader
 foundScanner = true;
 }
 assertTrue(foundScanner);
-
-@Test
-public void testGetPositionsForRangesFromTableOpenedForBulkLoading() 
throws IOException, ExecutionException, InterruptedException
-{
-Table table = Table.open(Keyspace1);
-ColumnFamilyStore store = table.getColumnFamilyStore(Standard2);
-
-// insert data and compact to a single sstable. The
-// number of keys inserted is greater than index_interval
-// to ensure multiple segments in the index file
-CompactionManager.instance.disableAutoCompaction();
-for (int j = 0; j  130; j++)
-{
-ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j));
-RowMutation rm = new RowMutation(Keyspace1, key);
-rm.add(new QueryPath(Standard2, null, 
ByteBufferUtil.bytes(0)), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
-rm.apply();
-}
-store.forceBlockingFlush();
-CompactionManager.instance.performMaximal(store);
-
-// construct a range which is present in the sstable, but whose
-// keys are not found in the first segment of the index.
-ListRangeToken ranges = new ArrayListRangeToken();
-ranges.add(new RangeToken(t(98), t(99)));
-
-SSTableReader sstable = store.getSSTables().iterator().next();
-ListPairLong,Long sections = sstable.getPositionsForRanges(ranges);
-assert sections.size() == 1 : Expected to find range in sstable ;
-
-// re-open the same sstable as it would be during bulk loading
-SetComponent components = Sets.newHashSet(Component.DATA, 
Component.PRIMARY_INDEX);
-SSTableReader bulkLoaded = 
SSTableReader.openForBatch(sstable.descriptor, components, sstable.partitioner);
-sections = bulkLoaded.getPositionsForRanges(ranges);
-assert sections.size() == 1 : Expected to find range in sstable 
opened for bulk loading;
 }
 
 private void assertIndexQueryWorks(ColumnFamilyStore indexedCFS) throws 
IOException

[2/3] git commit: fix build

2013-10-08 Thread jbellis

fix build


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

Branch: refs/heads/cassandra-2.0
Commit: 102c3c123ed52bff6d2e2418bb393b9fdc427f7e
Parents: 241c70a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Oct 8 12:04:34 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Oct 8 12:04:34 2013 -0500

--
 .../apache/cassandra/db/index/composites/CompositesSearcher.java   | 2 +-
 src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/102c3c12/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 82e227f..5ab1df6 100644
--- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
@@ -56,7 +56,7 @@ public class CompositesSearcher extends SecondaryIndexSearcher
 {
 IndexExpression best = null;
 int bestMeanCount = Integer.MAX_VALUE;
-MapSecondaryIndex, Integer candidates = new HashMap();
+MapSecondaryIndex, Integer candidates = new HashMapSecondaryIndex, 
Integer();
 
 for (IndexExpression expression : clause)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/102c3c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
--
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java 
b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 7d23e6c..bed6104 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -52,7 +52,7 @@ public class KeysSearcher extends SecondaryIndexSearcher
 {
 IndexExpression best = null;
 int bestMeanCount = Integer.MAX_VALUE;
-MapSecondaryIndex, Integer candidates = new HashMap();
+MapSecondaryIndex, Integer candidates = new HashMapSecondaryIndex, 
Integer();
 
 for (IndexExpression expression : clause)
 {

[1/3] git commit: fix build

2013-10-08 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.2 241c70a37 - 102c3c123
  refs/heads/cassandra-2.0 21ab8f81a - b557f7e37


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: 102c3c123ed52bff6d2e2418bb393b9fdc427f7e
Parents: 241c70a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Oct 8 12:04:34 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Oct 8 12:04:34 2013 -0500

--
 .../apache/cassandra/db/index/composites/CompositesSearcher.java   | 2 +-
 src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/102c3c12/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 82e227f..5ab1df6 100644
--- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
@@ -56,7 +56,7 @@ public class CompositesSearcher extends SecondaryIndexSearcher
 {
 IndexExpression best = null;
 int bestMeanCount = Integer.MAX_VALUE;
-MapSecondaryIndex, Integer candidates = new HashMap();
+MapSecondaryIndex, Integer candidates = new HashMapSecondaryIndex, 
Integer();
 
 for (IndexExpression expression : clause)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/102c3c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
--
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java 
b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 7d23e6c..bed6104 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -52,7 +52,7 @@ public class KeysSearcher extends SecondaryIndexSearcher
 {
 IndexExpression best = null;
 int bestMeanCount = Integer.MAX_VALUE;
-MapSecondaryIndex, Integer candidates = new HashMap();
+MapSecondaryIndex, Integer candidates = new HashMapSecondaryIndex, 
Integer();
 
 for (IndexExpression expression : clause)
 {

[01/11] git commit: fix build

2013-10-08 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.2 102c3c123 - f31e399ab
  refs/heads/cassandra-2.0 b557f7e37 - 9620e0cc3
  refs/heads/trunk a8a2ffb97 - 465e90c2b


fix build


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

Branch: refs/heads/trunk
Commit: 102c3c123ed52bff6d2e2418bb393b9fdc427f7e
Parents: 241c70a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Oct 8 12:04:34 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Oct 8 12:04:34 2013 -0500

--
 .../apache/cassandra/db/index/composites/CompositesSearcher.java   | 2 +-
 src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/102c3c12/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 82e227f..5ab1df6 100644
--- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
@@ -56,7 +56,7 @@ public class CompositesSearcher extends SecondaryIndexSearcher
 {
 IndexExpression best = null;
 int bestMeanCount = Integer.MAX_VALUE;
-MapSecondaryIndex, Integer candidates = new HashMap();
+MapSecondaryIndex, Integer candidates = new HashMapSecondaryIndex, 
Integer();
 
 for (IndexExpression expression : clause)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/102c3c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
--
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java 
b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 7d23e6c..bed6104 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -52,7 +52,7 @@ public class KeysSearcher extends SecondaryIndexSearcher
 {
 IndexExpression best = null;
 int bestMeanCount = Integer.MAX_VALUE;
-MapSecondaryIndex, Integer candidates = new HashMap();
+MapSecondaryIndex, Integer candidates = new HashMapSecondaryIndex, 
Integer();
 
 for (IndexExpression expression : clause)
 {

[1/6] git commit: fix build

2013-10-06 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.2 4784e6717 - d396fd47d
  refs/heads/cassandra-2.0 e9b624a73 - 6a603046e
  refs/heads/trunk d34d84223 - a2edbede5


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: d396fd47df2c04d75504208eb1de9d683747f5ee
Parents: 4784e67
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Oct 6 13:35:11 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Oct 6 13:35:11 2013 -0500

--
 .../cassandra/exceptions/PreparedQueryNotFoundException.java| 5 ++---
 src/java/org/apache/cassandra/thrift/CassandraServer.java   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d396fd47/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
--
diff --git 
a/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java 
b/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
index 7a165f4..a43f83e 100644
--- 
a/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
+++ 
b/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.exceptions;
 
-import org.apache.cassandra.cql3.QueryProcessor;
 import org.apache.cassandra.utils.MD5Digest;
 
 public class PreparedQueryNotFoundException extends RequestValidationException
@@ -34,7 +33,7 @@ public class PreparedQueryNotFoundException extends 
RequestValidationException
 {
 return String.format(Prepared query with ID %s not found +
   (either the query was not prepared on this host 
(maybe the host has been restarted?) +
-  or you have prepared more than %d queries and 
query %s has been evicted from the internal cache),
- id, QueryProcessor.MAX_CACHE_PREPARED, id);
+  or you have prepared too many queries and it 
has been evicted from the internal cache),
+ id);
 }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d396fd47/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 65ae177..dbaabbb 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1827,8 +1827,8 @@ public class CassandraServer implements Cassandra.Iface
 if (statement == null)
 throw new InvalidRequestException(String.format(Prepared 
query with ID %d not found +
  (either the 
query was not prepared on this host (maybe the host has been restarted?) +
- or you have 
prepared more than %d queries and queries %d has been evicted from the internal 
cache),
-itemId, 
org.apache.cassandra.cql3.QueryProcessor.MAX_CACHE_PREPARED, itemId));
+ or you have 
prepared too many queries and it has been evicted from the internal cache),
+itemId));
 logger.trace(Retrieved prepared statement #{} with {} bind 
markers, itemId, statement.getBoundsTerms());
 
 return 
org.apache.cassandra.cql3.QueryProcessor.processPrepared(statement, 
ThriftConversion.fromThrift(cLevel), cState.getQueryState(), 
bindVariables).toThriftResult();

[3/6] git commit: fix build

2013-10-06 Thread jbellis

fix build


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

Branch: refs/heads/trunk
Commit: d396fd47df2c04d75504208eb1de9d683747f5ee
Parents: 4784e67
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Oct 6 13:35:11 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Oct 6 13:35:11 2013 -0500

--
 .../cassandra/exceptions/PreparedQueryNotFoundException.java| 5 ++---
 src/java/org/apache/cassandra/thrift/CassandraServer.java   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d396fd47/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
--
diff --git 
a/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java 
b/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
index 7a165f4..a43f83e 100644
--- 
a/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
+++ 
b/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.exceptions;
 
-import org.apache.cassandra.cql3.QueryProcessor;
 import org.apache.cassandra.utils.MD5Digest;
 
 public class PreparedQueryNotFoundException extends RequestValidationException
@@ -34,7 +33,7 @@ public class PreparedQueryNotFoundException extends 
RequestValidationException
 {
 return String.format(Prepared query with ID %s not found +
   (either the query was not prepared on this host 
(maybe the host has been restarted?) +
-  or you have prepared more than %d queries and 
query %s has been evicted from the internal cache),
- id, QueryProcessor.MAX_CACHE_PREPARED, id);
+  or you have prepared too many queries and it 
has been evicted from the internal cache),
+ id);
 }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d396fd47/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 65ae177..dbaabbb 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1827,8 +1827,8 @@ public class CassandraServer implements Cassandra.Iface
 if (statement == null)
 throw new InvalidRequestException(String.format(Prepared 
query with ID %d not found +
  (either the 
query was not prepared on this host (maybe the host has been restarted?) +
- or you have 
prepared more than %d queries and queries %d has been evicted from the internal 
cache),
-itemId, 
org.apache.cassandra.cql3.QueryProcessor.MAX_CACHE_PREPARED, itemId));
+ or you have 
prepared too many queries and it has been evicted from the internal cache),
+itemId));
 logger.trace(Retrieved prepared statement #{} with {} bind 
markers, itemId, statement.getBoundsTerms());
 
 return 
org.apache.cassandra.cql3.QueryProcessor.processPrepared(statement, 
ThriftConversion.fromThrift(cLevel), cState.getQueryState(), 
bindVariables).toThriftResult();

[2/6] git commit: fix build

2013-10-06 Thread jbellis

fix build


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

Branch: refs/heads/cassandra-2.0
Commit: d396fd47df2c04d75504208eb1de9d683747f5ee
Parents: 4784e67
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Oct 6 13:35:11 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Oct 6 13:35:11 2013 -0500

--
 .../cassandra/exceptions/PreparedQueryNotFoundException.java| 5 ++---
 src/java/org/apache/cassandra/thrift/CassandraServer.java   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d396fd47/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
--
diff --git 
a/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java 
b/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
index 7a165f4..a43f83e 100644
--- 
a/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
+++ 
b/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java
@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.exceptions;
 
-import org.apache.cassandra.cql3.QueryProcessor;
 import org.apache.cassandra.utils.MD5Digest;
 
 public class PreparedQueryNotFoundException extends RequestValidationException
@@ -34,7 +33,7 @@ public class PreparedQueryNotFoundException extends 
RequestValidationException
 {
 return String.format(Prepared query with ID %s not found +
   (either the query was not prepared on this host 
(maybe the host has been restarted?) +
-  or you have prepared more than %d queries and 
query %s has been evicted from the internal cache),
- id, QueryProcessor.MAX_CACHE_PREPARED, id);
+  or you have prepared too many queries and it 
has been evicted from the internal cache),
+ id);
 }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d396fd47/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 65ae177..dbaabbb 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1827,8 +1827,8 @@ public class CassandraServer implements Cassandra.Iface
 if (statement == null)
 throw new InvalidRequestException(String.format(Prepared 
query with ID %d not found +
  (either the 
query was not prepared on this host (maybe the host has been restarted?) +
- or you have 
prepared more than %d queries and queries %d has been evicted from the internal 
cache),
-itemId, 
org.apache.cassandra.cql3.QueryProcessor.MAX_CACHE_PREPARED, itemId));
+ or you have 
prepared too many queries and it has been evicted from the internal cache),
+itemId));
 logger.trace(Retrieved prepared statement #{} with {} bind 
markers, itemId, statement.getBoundsTerms());
 
 return 
org.apache.cassandra.cql3.QueryProcessor.processPrepared(statement, 
ThriftConversion.fromThrift(cLevel), cState.getQueryState(), 
bindVariables).toThriftResult();

git commit: fix build

2013-10-01 Thread dbrosius

Updated Branches:
  refs/heads/trunk 023589bf3 - 7a1436704


fix build


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

Branch: refs/heads/trunk
Commit: 7a1436704dc33a1d1cdd987b1a5f4947cd34bf31
Parents: 023589b
Author: Dave Brosius dbros...@apache.org
Authored: Tue Oct 1 21:10:02 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Tue Oct 1 21:10:02 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a143670/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java 
b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index a69fe4c..a70b4ce 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -595,7 +595,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
 // Read the index and we check we do get no value (and no NPE)
 // Note: the index will return the entry because it hasn't been 
deleted (we
 // haven't read yet nor compacted) but the data read itself will 
return null
-IndexExpression expr = new IndexExpression(colName, IndexOperator.EQ, 
val1);
+IndexExpression expr = new IndexExpression(colName, 
IndexExpression.Operator.EQ, val1);
 ListIndexExpression clause = Arrays.asList(expr);
 IDiskAtomFilter filter = new IdentityQueryFilter();
 RangeRowPosition range = Util.range(, );

git commit: fix build - log4j is gone

2013-08-22 Thread marcuse

Updated Branches:
  refs/heads/trunk 8bc0f5990 - 3f5322f02


fix build - log4j is gone


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

Branch: refs/heads/trunk
Commit: 3f5322f02af3ef7e93706cd80ca65c5b127478e0
Parents: 8bc0f59
Author: Marcus Eriksson marc...@spotify.com
Authored: Thu Aug 22 15:39:16 2013 +0200
Committer: Marcus Eriksson marc...@spotify.com
Committed: Thu Aug 22 15:39:16 2013 +0200

--
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f5322f0/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
--
diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java 
b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
index 245d824..44cbc33 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
@@ -32,7 +32,6 @@ import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.db.compaction.LeveledManifest;
 import org.apache.cassandra.db.compaction.SSTableSplitter;
 import org.apache.cassandra.io.sstable.*;
-import org.apache.cassandra.service.CassandraDaemon;
 import org.apache.cassandra.utils.Pair;
 
 import static org.apache.cassandra.tools.BulkLoader.CmdLineOptions;
@@ -41,11 +40,6 @@ public class StandaloneSplitter
 {
 public static final int DEFAULT_SSTABLE_SIZE = 50;
 
-static
-{
-CassandraDaemon.initLog4j();
-}
-
 private static final String TOOL_NAME = sstablessplit;
 private static final String VERBOSE_OPTION = verbose;
 private static final String DEBUG_OPTION = debug;

[1/3] git commit: fix build

2013-07-18 Thread brandonwilliams

Updated Branches:
  refs/heads/cassandra-1.2 76ad645a3 - 373c0336e
  refs/heads/trunk ee85c8ea9 - f6fd5bab7


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: 373c0336e3e902d2332765ce712546a9e1bef837
Parents: 76ad645
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jul 18 18:46:12 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jul 18 18:46:12 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/373c0336/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 c4ceee5..d166553 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -944,7 +944,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 Tracing.instance();
 if (!Gossiper.instance.seenAnySeed())
-throw new IllegalStateException(Unable to contact any seeds!)
+throw new IllegalStateException(Unable to contact any seeds!);
 setMode(Mode.JOINING, Starting to bootstrap..., true);
 new BootStrapper(FBUtilities.getBroadcastAddress(), tokens, 
tokenMetadata).bootstrap(); // handles token update
 logger.info(Bootstrap completed! for the tokens {}, tokens);

[2/3] git commit: fix build

2013-07-18 Thread brandonwilliams

fix build


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

Branch: refs/heads/trunk
Commit: 373c0336e3e902d2332765ce712546a9e1bef837
Parents: 76ad645
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jul 18 18:46:12 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jul 18 18:46:12 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/373c0336/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 c4ceee5..d166553 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -944,7 +944,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 Tracing.instance();
 if (!Gossiper.instance.seenAnySeed())
-throw new IllegalStateException(Unable to contact any seeds!)
+throw new IllegalStateException(Unable to contact any seeds!);
 setMode(Mode.JOINING, Starting to bootstrap..., true);
 new BootStrapper(FBUtilities.getBroadcastAddress(), tokens, 
tokenMetadata).bootstrap(); // handles token update
 logger.info(Bootstrap completed! for the tokens {}, tokens);

[2/3] git commit: fix build

2013-07-15 Thread brandonwilliams

fix build


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

Branch: refs/heads/trunk
Commit: d6145668c6cee8e30246f912ee58e8cd2ffdb9ba
Parents: ba6396a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Jul 15 16:10:23 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Jul 15 16:10:23 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6145668/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 91ae675..55d78b8 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -728,7 +728,7 @@ public class DatabaseDescriptor
 
 public static boolean isReplacing()
 {
-return 0 != getReplaceTokens().size() || getReplaceNode() != null
+return 0 != getReplaceTokens().size() || getReplaceNode() != null;
 }
 
 public static String getClusterName()

[1/3] git commit: fix build

2013-07-15 Thread brandonwilliams

Updated Branches:
  refs/heads/cassandra-1.2 ba6396a20 - d6145668c
  refs/heads/trunk 280284961 - 11928f7d8


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: d6145668c6cee8e30246f912ee58e8cd2ffdb9ba
Parents: ba6396a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Jul 15 16:10:23 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Jul 15 16:10:23 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6145668/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 91ae675..55d78b8 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -728,7 +728,7 @@ public class DatabaseDescriptor
 
 public static boolean isReplacing()
 {
-return 0 != getReplaceTokens().size() || getReplaceNode() != null
+return 0 != getReplaceTokens().size() || getReplaceNode() != null;
 }
 
 public static String getClusterName()

git commit: Fix build

2013-05-31 Thread slebresne

Updated Branches:
  refs/heads/trunk 1a70df0c0 - 496035585


Fix build


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

Branch: refs/heads/trunk
Commit: 496035585a5a9b115a23ba311459e5e08b494334
Parents: 1a70df0
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri May 31 15:02:03 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri May 31 15:02:03 2013 +0200

--
 .../org/apache/cassandra/transport/Client.java |4 +-
 .../org/apache/cassandra/transport/Message.java|4 +-
 .../cassandra/transport/ServerConnection.java  |4 +-
 .../transport/messages/AuthChallenge.java  |   67 ++
 .../cassandra/transport/messages/AuthResponse.java |   99 +++
 .../cassandra/transport/messages/AuthSuccess.java  |7 +-
 .../transport/messages/SaslChallenge.java  |   62 -
 .../cassandra/transport/messages/SaslResponse.java |   94 --
 8 files changed, 178 insertions(+), 163 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/49603558/src/java/org/apache/cassandra/transport/Client.java
--
diff --git a/src/java/org/apache/cassandra/transport/Client.java 
b/src/java/org/apache/cassandra/transport/Client.java
index 13e1308..8e2d765 100644
--- a/src/java/org/apache/cassandra/transport/Client.java
+++ b/src/java/org/apache/cassandra/transport/Client.java
@@ -41,7 +41,7 @@ import org.apache.cassandra.transport.messages.OptionsMessage;
 import org.apache.cassandra.transport.messages.PrepareMessage;
 import org.apache.cassandra.transport.messages.QueryMessage;
 import org.apache.cassandra.transport.messages.RegisterMessage;
-import org.apache.cassandra.transport.messages.SaslResponse;
+import org.apache.cassandra.transport.messages.AuthResponse;
 import org.apache.cassandra.transport.messages.StartupMessage;
 import org.apache.cassandra.utils.Hex;
 
@@ -171,7 +171,7 @@ public class Client extends SimpleClient
 System.err.println([ERROR] Authentication requires both 
'username' and 'password');
 return null;
 }
-return new SaslResponse(encodeCredentialsForSasl(credentials));
+return new AuthResponse(encodeCredentialsForSasl(credentials));
 }
 else if (msgType.equals(REGISTER))
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49603558/src/java/org/apache/cassandra/transport/Message.java
--
diff --git a/src/java/org/apache/cassandra/transport/Message.java 
b/src/java/org/apache/cassandra/transport/Message.java
index 1a3afa1..54da6a2 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -71,8 +71,8 @@ public abstract class Message
 REGISTER   (11, Direction.REQUEST,  RegisterMessage.codec),
 EVENT  (12, Direction.RESPONSE, EventMessage.codec),
 BATCH  (13, Direction.REQUEST,  BatchMessage.codec),
-AUTH_CHALLENGE (14, Direction.RESPONSE, SaslChallenge.codec),
-AUTH_RESPONSE  (15, Direction.REQUEST,  SaslResponse.codec),
+AUTH_CHALLENGE (14, Direction.RESPONSE, AuthChallenge.codec),
+AUTH_RESPONSE  (15, Direction.REQUEST,  AuthResponse.codec),
 AUTH_SUCCESS   (16, Direction.RESPONSE, AuthSuccess.codec);
 
 public final int opcode;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49603558/src/java/org/apache/cassandra/transport/ServerConnection.java
--
diff --git a/src/java/org/apache/cassandra/transport/ServerConnection.java 
b/src/java/org/apache/cassandra/transport/ServerConnection.java
index bb43934..ec99440 100644
--- a/src/java/org/apache/cassandra/transport/ServerConnection.java
+++ b/src/java/org/apache/cassandra/transport/ServerConnection.java
@@ -76,7 +76,7 @@ public class ServerConnection extends Connection
 break;
 case AUTHENTICATION:
 // Support both SASL auth from protocol v2 and the older style 
Credentials auth from v1
-if (type != Message.Type.SASL_RESPONSE  type != 
Message.Type.CREDENTIALS)
+if (type != Message.Type.AUTH_RESPONSE  type != 
Message.Type.CREDENTIALS)
 throw new ProtocolException(String.format(Unexpected 
message %s, expecting %s, type, version == 1 ? CREDENTIALS : 
SASL_RESPONSE));
 break;
 case READY:
@@ -103,7 +103,7 @@ public class

[06/14] git commit: fix build, sort of

2013-04-22 Thread jbellis

fix build, sort of


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

Branch: refs/heads/trunk
Commit: 811f82c5b151bb1f6178392470981883d5e1dfc5
Parents: 317ab72
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Apr 19 14:04:41 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Apr 19 14:04:41 2013 -0500

--
 src/java/org/apache/cassandra/db/ColumnIndex.java  |8 
 .../org/apache/cassandra/cache/ObjectSizeTest.java |3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/811f82c5/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 e2ac3e4..658e94f 100644
--- a/src/java/org/apache/cassandra/db/ColumnIndex.java
+++ b/src/java/org/apache/cassandra/db/ColumnIndex.java
@@ -22,6 +22,8 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.*;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.io.sstable.IndexHelper;
 import org.apache.cassandra.utils.AlwaysPresentFilter;
@@ -49,6 +51,12 @@ public class ColumnIndex
 this.bloomFilter = bloomFilter;
 }
 
+@VisibleForTesting
+public static ColumnIndex nothing()
+{
+return new ColumnIndex(0);
+}
+
 /**
  * Help to create an index for a column family based on size of columns,
  * and write said columns to disk.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/811f82c5/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 47aab6d..94e795f 100644
--- a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
+++ b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
@@ -6,6 +6,7 @@ import java.util.UUID;
 import org.junit.Test;
 
 import junit.framework.Assert;
+import org.apache.cassandra.db.ColumnIndex;
 import org.apache.cassandra.db.DeletionTime;
 import org.apache.cassandra.db.RowIndexEntry;
 import org.apache.cassandra.utils.ObjectSizes;
@@ -56,7 +57,7 @@ public class ObjectSizeTest
 @Test
 public void testKeyCacheValueWithDelInfo()
 {
-RowIndexEntry entry = RowIndexEntry.create(123, new DeletionTime(123, 
123), null);
+RowIndexEntry entry = RowIndexEntry.create(123, new DeletionTime(123, 
123), ColumnIndex.nothing());
 long size = entry.memorySize();
 long size2 = meter.measureDeep(entry);
 Assert.assertEquals(size, size2);

git commit: fix build, sort of

2013-04-19 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.2 317ab72a8 - 811f82c5b


fix build, sort of


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

Branch: refs/heads/cassandra-1.2
Commit: 811f82c5b151bb1f6178392470981883d5e1dfc5
Parents: 317ab72
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Apr 19 14:04:41 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Apr 19 14:04:41 2013 -0500

--
 src/java/org/apache/cassandra/db/ColumnIndex.java  |8 
 .../org/apache/cassandra/cache/ObjectSizeTest.java |3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/811f82c5/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 e2ac3e4..658e94f 100644
--- a/src/java/org/apache/cassandra/db/ColumnIndex.java
+++ b/src/java/org/apache/cassandra/db/ColumnIndex.java
@@ -22,6 +22,8 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.*;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.io.sstable.IndexHelper;
 import org.apache.cassandra.utils.AlwaysPresentFilter;
@@ -49,6 +51,12 @@ public class ColumnIndex
 this.bloomFilter = bloomFilter;
 }
 
+@VisibleForTesting
+public static ColumnIndex nothing()
+{
+return new ColumnIndex(0);
+}
+
 /**
  * Help to create an index for a column family based on size of columns,
  * and write said columns to disk.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/811f82c5/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 47aab6d..94e795f 100644
--- a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
+++ b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
@@ -6,6 +6,7 @@ import java.util.UUID;
 import org.junit.Test;
 
 import junit.framework.Assert;
+import org.apache.cassandra.db.ColumnIndex;
 import org.apache.cassandra.db.DeletionTime;
 import org.apache.cassandra.db.RowIndexEntry;
 import org.apache.cassandra.utils.ObjectSizes;
@@ -56,7 +57,7 @@ public class ObjectSizeTest
 @Test
 public void testKeyCacheValueWithDelInfo()
 {
-RowIndexEntry entry = RowIndexEntry.create(123, new DeletionTime(123, 
123), null);
+RowIndexEntry entry = RowIndexEntry.create(123, new DeletionTime(123, 
123), ColumnIndex.nothing());
 long size = entry.memorySize();
 long size2 = meter.measureDeep(entry);
 Assert.assertEquals(size, size2);

git commit: fix build post-rebase

2013-04-08 Thread jbellis

Updated Branches:
  refs/heads/trunk 220a828b7 - 4902bdc7b


fix build post-rebase


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

Branch: refs/heads/trunk
Commit: 4902bdc7b97d8f514724ebf1ccb2598f8e69d64d
Parents: 220a828
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Apr 8 13:36:04 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Apr 8 13:36:04 2013 -0500

--
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   10 +-
 src/java/org/apache/cassandra/db/DataTracker.java  |   10 +-
 .../db/compaction/AbstractCompactionTask.java  |9 -
 .../cassandra/db/compaction/CompactionManager.java |   14 +++---
 .../cassandra/db/compaction/CompactionTask.java|4 ++--
 .../compaction/SizeTieredCompactionStrategy.java   |2 +-
 6 files changed, 24 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4902bdc7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index fe6dca0..516fcd6 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1894,15 +1894,15 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 }
 }
 
-public CollectionSSTableReader markAllCompacting()
+public IterableSSTableReader markAllCompacting()
 {
-CallableCollectionSSTableReader callable = new 
CallableCollectionSSTableReader()
+CallableIterableSSTableReader callable = new 
CallableIterableSSTableReader()
 {
-public CollectionSSTableReader call() throws Exception
+public IterableSSTableReader call() throws Exception
 {
 assert data.getCompacting().isEmpty() : data.getCompacting();
-CollectionSSTableReader sstables = 
AbstractCompactionStrategy.filterSuspectSSTables(getSSTables());
-if (sstables.isEmpty())
+IterableSSTableReader sstables = 
AbstractCompactionStrategy.filterSuspectSSTables(getSSTables());
+if (Iterables.isEmpty(sstables))
 return null;
 boolean success = data.markCompacting(sstables);
 assert success : something marked things compacting while 
compactions are disabled;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4902bdc7/src/java/org/apache/cassandra/db/DataTracker.java
--
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java 
b/src/java/org/apache/cassandra/db/DataTracker.java
index 8cc78b4..27c0480 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -186,13 +186,13 @@ public class DataTracker
  * unmarkCompacting, but since we will never call markCompacted on a 
sstable marked
  * as compacting (unless there is a serious bug), we can skip this.
  */
-public boolean markCompacting(CollectionSSTableReader sstables)
+public boolean markCompacting(IterableSSTableReader sstables)
 {
-assert sstables != null  !sstables.isEmpty();
+assert sstables != null  !Iterables.isEmpty(sstables);
 
 View currentView = view.get();
 SetSSTableReader inactive = 
Sets.difference(ImmutableSet.copyOf(sstables), currentView.compacting);
-if (inactive.size()  sstables.size())
+if (inactive.size()  Iterables.size(sstables))
 return false;
 
 View newView = currentView.markCompacting(inactive);
@@ -203,7 +203,7 @@ public class DataTracker
  * Removes files from compacting status: this is different from 
'markCompacted'
  * because it should be run regardless of whether a compaction succeeded.
  */
-public void unmarkCompacting(CollectionSSTableReader unmark)
+public void unmarkCompacting(IterableSSTableReader unmark)
 {
 if (!cfstore.isValid())
 {
@@ -533,7 +533,7 @@ public class DataTracker
 return new View(memtable, memtablesPendingFlush, sstables, 
compactingNew, intervalTree);
 }
 
-public View unmarkCompacting(CollectionSSTableReader tounmark)
+public View unmarkCompacting(IterableSSTableReader tounmark)
 {
 SetSSTableReader compactingNew = 
ImmutableSet.copyOf(Sets.difference(compacting, ImmutableSet.copyOf(tounmark)));

git commit: fix build and test error, should not use QueryPath

2013-04-05 Thread marcuse

Updated Branches:
  refs/heads/trunk e37ca25cf - 6afbed371


fix build and test error, should not use QueryPath


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

Branch: refs/heads/trunk
Commit: 6afbed371c0d12a15a969e4f52ba670998bab282
Parents: e37ca25
Author: Marcus Eriksson marc...@spotify.com
Authored: Fri Apr 5 10:40:50 2013 +0200
Committer: Marcus Eriksson marc...@spotify.com
Committed: Fri Apr 5 10:40:50 2013 +0200

--
 .../apache/cassandra/config/ColumnDefinition.java  |4 +++-
 test/unit/org/apache/cassandra/SchemaLoader.java   |2 +-
 .../db/index/PerRowSecondaryIndexTest.java |8 
 3 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6afbed37/src/java/org/apache/cassandra/config/ColumnDefinition.java
--
diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java 
b/src/java/org/apache/cassandra/config/ColumnDefinition.java
index fed095d..a777d1a 100644
--- a/src/java/org/apache/cassandra/config/ColumnDefinition.java
+++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.config;
 import java.nio.ByteBuffer;
 import java.util.*;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Objects;
 import com.google.common.collect.Maps;
 
@@ -97,7 +98,8 @@ public class ColumnDefinition
 this(name, validator, null, null, null, componentIndex, type);
 }
 
-private ColumnDefinition(ByteBuffer name, AbstractType? validator, 
IndexType index_type, MapString, String index_options, String index_name, 
Integer componentIndex, Type type)
+@VisibleForTesting
+public ColumnDefinition(ByteBuffer name, AbstractType? validator, 
IndexType index_type, MapString, String index_options, String index_name, 
Integer componentIndex, Type type)
 {
 assert name != null  validator != null;
 this.name = name;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6afbed37/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 55e5591..0035b1e 100644
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -310,7 +310,7 @@ public class SchemaLoader
 IndexType.CUSTOM,
 indexOptions,
 ByteBufferUtil.bytesToHex(cName),
-null));
+null, ColumnDefinition.Type.REGULAR));
 }});
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6afbed37/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 3a4f947..4ca84cb 100644
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@ -50,7 +50,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 // create a row then test that the configured index instance was able 
to read the row
 RowMutation rm;
 rm = new RowMutation(PerRowSecondaryIndex, 
ByteBufferUtil.bytes(k1));
-rm.add(new QueryPath(Indexed1, null, 
ByteBufferUtil.bytes(indexed)), ByteBufferUtil.bytes(foo), 1);
+rm.add(Indexed1, ByteBufferUtil.bytes(indexed), 
ByteBufferUtil.bytes(foo), 1);
 rm.apply();
 
 ColumnFamily indexedRow = TestIndex.LAST_INDEXED_ROW;
@@ -59,7 +59,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 
 // update the row and verify what was indexed
 rm = new RowMutation(PerRowSecondaryIndex, 
ByteBufferUtil.bytes(k1));
-rm.add(new QueryPath(Indexed1, null, 
ByteBufferUtil.bytes(indexed)), ByteBufferUtil.bytes(bar), 2);
+rm.add(Indexed1, ByteBufferUtil.bytes(indexed), 
ByteBufferUtil.bytes(bar), 2);
 rm.apply();
 
 indexedRow = TestIndex.LAST_INDEXED_ROW;
@@ -80,7 +80,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
 public void index(ByteBuffer rowKey)
 {
 QueryFilter filter =

git commit: Fix build

2012-10-24 Thread slebresne

Updated Branches:
  refs/heads/trunk c86a7f8ca - 0f255da32


Fix build


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

Branch: refs/heads/trunk
Commit: 0f255da32f23b5e00dcd08dcbd8bca02bf190d8e
Parents: c86a7f8
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Oct 24 20:52:32 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Oct 24 20:52:32 2012 +0200

--
 .../db/marshal/AbstractCompositeType.java  |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f255da3/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
--
diff --git 
a/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java 
b/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
index 3e5f7cc..12ecd9f 100644
--- a/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
@@ -222,7 +222,7 @@ public abstract class AbstractCompositeType extends 
AbstractTypeByteBuffer
 if (bb.remaining() != bytes.remaining())
 sb.append(:);
 
-AbstractType? comparator = getAndAppendNextComparator(i, bb, sb);
+AbstractType? comparator = getAndAppendComparator(i, bb, sb);
 ByteBuffer value = getWithShortLength(bb);
 
 sb.append(escape(comparator.getString(value)));

[1/2] git commit: fix build

2012-09-22 Thread jbellis

Updated Branches:
  refs/heads/trunk d634f0516 - fa9bbf7e1


fix build


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

Branch: refs/heads/trunk
Commit: fa9bbf7e196835ea9c4aad684b840aeac85e8eda
Parents: fe5fa0e
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Sep 22 15:18:54 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Sep 22 15:18:54 2012 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa9bbf7e/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 6834987..122d3fd 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -790,7 +790,7 @@ public class StorageProxy implements StorageProxyMBean
 responseHandler.response(null);
 
 // then send to replicas, if any
-SetInetAddress remotes = 
Sets.difference(ImmutableSet.copyOf(targets), 
ImmutableSet.of(FBUtilities.getBroadcastAddress()));
+final SetInetAddress remotes = 
Sets.difference(ImmutableSet.copyOf(targets), 
ImmutableSet.of(FBUtilities.getBroadcastAddress()));
 if (cm.shouldReplicateOnWrite()  !remotes.isEmpty())
 {
 // We do the replication on another stage because it 
involves a read (see CM.makeReplicationMutation)

git commit: fix build

2012-09-03 Thread dbrosius

Updated Branches:
  refs/heads/trunk ae6a58fd7 - 84b25f0b0


fix build


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

Branch: refs/heads/trunk
Commit: 84b25f0b097ec2480e8805bb2c4f8d7e93ebe737
Parents: ae6a58f
Author: Dave Brosius dbros...@apache.org
Authored: Mon Sep 3 12:18:12 2012 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Mon Sep 3 12:18:12 2012 -0400

--
 .../org/apache/cassandra/service/CacheService.java |2 +-
 src/java/org/apache/cassandra/utils/Pair.java  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b25f0b/src/java/org/apache/cassandra/service/CacheService.java
--
diff --git a/src/java/org/apache/cassandra/service/CacheService.java 
b/src/java/org/apache/cassandra/service/CacheService.java
index 2342cac..ee39406 100644
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@ -331,7 +331,7 @@ public class CacheService implements CacheServiceMBean
 {
 DecoratedKey key = cfs.partitioner.decorateKey(buffer);
 ColumnFamily data = 
cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(key, new 
QueryPath(cfs.columnFamily)), Integer.MIN_VALUE, true);
-return Pair.create(new RowCacheKey(cfs.metadata.cfId, 
key), data);
+return Pair.create(new RowCacheKey(cfs.metadata.cfId, 
key), (IRowCacheEntry) data);
 }
 });
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b25f0b/src/java/org/apache/cassandra/utils/Pair.java
--
diff --git a/src/java/org/apache/cassandra/utils/Pair.java 
b/src/java/org/apache/cassandra/utils/Pair.java
index c654176..a14a9b8 100644
--- a/src/java/org/apache/cassandra/utils/Pair.java
+++ b/src/java/org/apache/cassandra/utils/Pair.java
@@ -24,7 +24,7 @@ public class PairT1, T2
 public final T1 left;
 public final T2 right;
 
-private Pair(T1 left, T2 right)
+public Pair(T1 left, T2 right)
 {
 this.left = left;
 this.right = right;

git commit: fix build including antlr

2012-09-03 Thread jbellis

Updated Branches:
  refs/heads/trunk 84b25f0b0 - 94e4ace75


fix build including antlr


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

Branch: refs/heads/trunk
Commit: 94e4ace7570d8fbc6c2fd638d45ea5c946b85ffe
Parents: 84b25f0
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Sep 3 12:15:58 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Sep 3 12:20:09 2012 -0500

--
 src/java/org/apache/cassandra/cql/Cql.g   |2 +-
 src/java/org/apache/cassandra/utils/Pair.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/94e4ace7/src/java/org/apache/cassandra/cql/Cql.g
--
diff --git a/src/java/org/apache/cassandra/cql/Cql.g 
b/src/java/org/apache/cassandra/cql/Cql.g
index 270a48b..0b7e3b6 100644
--- a/src/java/org/apache/cassandra/cql/Cql.g
+++ b/src/java/org/apache/cassandra/cql/Cql.g
@@ -492,7 +492,7 @@ relation returns [Relation rel]
 
 // TRUNCATE CF;
 truncateStatement returns [PairString,String cf]
-: K_TRUNCATE (keyspace=( IDENT | STRING_LITERAL | INTEGER ) '.')? 
columnFamily=( IDENT | STRING_LITERAL | INTEGER ) { $cf = new PairString, 
String($keyspace.text, $columnFamily.text); } endStmnt
+: K_TRUNCATE (keyspace=( IDENT | STRING_LITERAL | INTEGER ) '.')? 
columnFamily=( IDENT | STRING_LITERAL | INTEGER ) { $cf = 
Pair.create($keyspace.text, $columnFamily.text); } endStmnt
 ;
 
 endStmnt

http://git-wip-us.apache.org/repos/asf/cassandra/blob/94e4ace7/src/java/org/apache/cassandra/utils/Pair.java
--
diff --git a/src/java/org/apache/cassandra/utils/Pair.java 
b/src/java/org/apache/cassandra/utils/Pair.java
index a14a9b8..ea8b8fc 100644
--- a/src/java/org/apache/cassandra/utils/Pair.java
+++ b/src/java/org/apache/cassandra/utils/Pair.java
@@ -24,7 +24,7 @@ public class PairT1, T2
 public final T1 left;
 public final T2 right;
 
-public Pair(T1 left, T2 right)
+protected Pair(T1 left, T2 right)
 {
 this.left = left;
 this.right = right;

[4/5] git commit: fix build

2012-08-17 Thread jbellis

fix build


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

Branch: refs/heads/trunk
Commit: d14717504ba1e05e06c6a820166f0c86b4c4f6f5
Parents: 1124615
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Aug 16 17:48:08 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Aug 17 10:06:17 2012 -0500

--
 .../org/apache/cassandra/service/CacheService.java |2 --
 .../cassandra/service/DatacenterReadCallback.java  |8 
 2 files changed, 0 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1471750/src/java/org/apache/cassandra/service/CacheService.java
--
diff --git a/src/java/org/apache/cassandra/service/CacheService.java 
b/src/java/org/apache/cassandra/service/CacheService.java
index 6c7b0a2..58600ef 100644
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@ -334,7 +334,6 @@ public class CacheService implements CacheServiceMBean
 return new PairRowCacheKey, IRowCacheEntry(new 
RowCacheKey(cfs.metadata.cfId, key), data);
 }
 
-@Override
 public void load(SetByteBuffer buffers, ColumnFamilyStore cfs)
 {
 for (ByteBuffer key : buffers)
@@ -390,7 +389,6 @@ public class CacheService implements CacheServiceMBean
 return null;
 }
 
-@Override
 public void load(SetByteBuffer buffers, ColumnFamilyStore cfs)
 {
 for (ByteBuffer key : buffers)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1471750/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
--
diff --git a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java 
b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
index 8005073..76d6f01 100644
--- a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
+++ b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
@@ -67,14 +67,6 @@ public class DatacenterReadCallbackTMessage, TResolved 
extends ReadCallbackTM
 }
 
 @Override
-protected boolean waitingFor(ReadResponse response)
-{
-// cheat and leverage our knowledge that a local read is the only way 
the ReadResponse
-// version of this method gets called
-return true;
-}
-
-@Override
 public int determineBlockFor(ConsistencyLevel consistency_level, String 
table)
 {
 NetworkTopologyStrategy stategy = (NetworkTopologyStrategy) 
Table.open(table).getReplicationStrategy();

[2/2] git commit: fix build

2012-07-30 Thread jbellis

fix build


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

Branch: refs/heads/trunk
Commit: 844b9c46c9ceb08a52da7738c8312e8c0b599737
Parents: 652ae9a
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Jul 30 15:38:53 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Jul 30 15:38:53 2012 -0500

--
 .../cassandra/thrift/ThriftValidationTest.java |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/844b9c46/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
--
diff --git a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java 
b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
index 04f0d0f..478294f 100644
--- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
+++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
@@ -21,6 +21,8 @@ package org.apache.cassandra.thrift;
  */
 
 
+import java.util.Arrays;
+
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
@@ -54,7 +56,7 @@ public class ThriftValidationTest extends SchemaLoader
 boolean gotException = false;
 
 // add a key_alias = id
-newMetadata.keyAlias(AsciiType.instance.decompose(id));
+
newMetadata.keyAliases(Arrays.asList(AsciiType.instance.decompose(id)));
 
 // should not throw IRE here
 try

git commit: fix build - re-add CompactionController.removeDeletedInCache for commit fbb5ec0374e1a5f1b24680f1604b6e9201fb535f restore pre-CASSANDRA-3862 approach to removing expired tombstones during c

2012-07-02 Thread dbrosius

Updated Branches:
  refs/heads/trunk 4f1e5e288 - 086c06ad7


fix build - re-add CompactionController.removeDeletedInCache for commit 
fbb5ec0374e1a5f1b24680f1604b6e9201fb535f restore pre-CASSANDRA-3862 approach to 
removing expired tombstones during compaction


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

Branch: refs/heads/trunk
Commit: 086c06ad7fb211de6be877c3c1ea2ee4f86c6d7e
Parents: 4f1e5e2
Author: Dave Brosius dbros...@apache.org
Authored: Mon Jul 2 11:13:03 2012 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Mon Jul 2 11:13:03 2012 -0400

--
 .../db/compaction/CompactionController.java|   19 +-
 1 files changed, 17 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/086c06ad/src/java/org/apache/cassandra/db/compaction/CompactionController.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/CompactionController.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
index 4b42ed4..90fe68d 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@ -20,17 +20,18 @@ package org.apache.cassandra.db.compaction;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.DataTracker;
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
 import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.service.CacheService;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.Throttle;
 
@@ -113,6 +114,20 @@ public class CompactionController
 cfs.invalidateCachedRow(key);
 }
 
+public void removeDeletedInCache(DecoratedKey key)
+{
+// For the copying cache, we'd need to re-serialize the updated 
cachedRow, which would be racy
+// vs other updates.  We'll just ignore it instead, since the next 
update to this row will invalidate it
+// anyway, so the odds of a tombstones consuming memory indefinitely 
problem are minimal.
+// See https://issues.apache.org/jira/browse/CASSANDRA-3921 for more 
discussion.
+if (CacheService.instance.rowCache.isPutCopying())
+return;
+
+ColumnFamily cachedRow = cfs.getRawCachedRow(key);
+if (cachedRow != null)
+ColumnFamilyStore.removeDeleted(cachedRow, gcBefore);
+}
+
 /**
  * @return an AbstractCompactedRow implementation to write the merged rows 
in question.
  *
@@ -141,7 +156,7 @@ public class CompactionController
 {
 return getCompactedRow(Collections.singletonList(row));
 }
-
+
 public void mayThrottle(long currentBytes)
 {
 throttle.throttle(currentBytes);

git commit: Fix build from variable rename

2012-02-28 Thread brandonwilliams

Updated Branches:
  refs/heads/trunk 17ee45930 - 061595faf


Fix build from variable rename


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

Branch: refs/heads/trunk
Commit: 061595fafd01f412c2922aae360b95da8d8ee086
Parents: 17ee459
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Feb 28 22:02:40 2012 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Feb 28 22:02:40 2012 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/061595fa/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 7107b58..6cd7af2 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -345,7 +345,7 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
 }
 catch (UnknownColumnFamilyException e)
 {
-logger_.debug(Skipping delivery of hint for deleted 
columnfamily, e);
+logger.debug(Skipping delivery of hint for deleted 
columnfamily, e);
 rm = null;
 }

git commit: fix build patch by Peter Schuller for CASSANDRA-3806

2012-01-28 Thread jbellis

Updated Branches:
  refs/heads/trunk aa20c7206 - 4fb396319


fix build
patch by Peter Schuller for CASSANDRA-3806


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

Branch: refs/heads/trunk
Commit: 4fb3963197761244e86eab7e92883fa0ca0bb687
Parents: aa20c72
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Jan 28 08:21:47 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Jan 28 08:21:47 2012 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fb39631/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 4cf17c2..4ebeddc 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1305,6 +1305,7 @@ public class StorageService implements 
IEndpointStateChangeSubscriber, StorageSe
 for (RangeToken range : 
strategy.getAddressRanges(allLeftMetadata).get(endpoint))
 pendingRanges.put(range, endpoint);
 allLeftMetadata.removeEndpoint(endpoint);
+}
 }
 
 // At this stage pendingRanges has been updated according to leaving 
and bootstrapping nodes.

git commit: fix build

2012-01-26 Thread jbellis

Updated Branches:
  refs/heads/trunk 2f9518591 - 998dbcef2


fix build


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

Branch: refs/heads/trunk
Commit: 998dbcef21e1075b4d64031281c467b2172fa8f9
Parents: 2f95185
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Jan 26 20:48:59 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Jan 26 20:48:59 2012 -0600

--
 .../statements/CreateColumnFamilyStatement.java|   14 +++---
 1 files changed, 3 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/998dbcef/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
 
b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index eec47cf..44d187c 100644
--- 
a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++ 
b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@ -70,17 +70,9 @@ public class CreateColumnFamilyStatement extends 
SchemaAlteringStatement
 
 for (Map.EntryColumnIdentifier, String col : columns.entrySet())
 {
-try
-{
-AbstractType? validator = 
CFPropDefs.parseType(col.getValue());
-columnDefs.put(col.getKey().key, new 
ColumnDefinition(col.getKey().key, validator, null, null, null));
-}
-catch (ConfigurationException e)
-{
-InvalidRequestException ex = new 
InvalidRequestException(e.toString());
-ex.initCause(e);
-throw ex;
-}
+AbstractType? validator = CFPropDefs.parseType(col.getValue());
+
+columnDefs.put(col.getKey().key, new 
ColumnDefinition(col.getKey().key, validator, null, null, null));
 }
 
 return columnDefs;

98 matches

Mail list logo