[1/2] git commit: fix merge

2014-07-30 Thread marcuse 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 3da7d9e25 - 40d7bdf80


fix merge


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

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

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


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

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

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

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

2014-05-23 Thread dbrosius 
Repository: cassandra
Updated Branches:
  refs/heads/trunk deee02c53 - f5c54aac9


fix merge-created bad map key lookup type


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

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

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


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

[1/2] git commit: Fix merge

2014-03-03 Thread marcuse 
Repository: cassandra
Updated Branches:
  refs/heads/trunk e80564f39 - 2c8100af2


Fix merge


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

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

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


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

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

2013-09-10 Thread aleksey 
Updated Branches:
  refs/heads/trunk 36610aaf7 - 382261218


Fix merge (s//= in CompositesSearcher)


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

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

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


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

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

2012-01-18 Thread eevans 
Updated Branches:
  refs/heads/trunk 7c92fc52e - bce44ff32


fix merge error; recompile Cassandra.java with thrift 0.7.0


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

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

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