[12/12] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-28 Thread yukim 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 3e75d5a627097b82617e3e7b179f8db289485329
Parents: 59a2861 a96b207
Author: Yuki Morishita yu...@apache.org
Authored: Tue Jul 28 16:52:31 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Jul 28 16:52:31 2015 -0500

--
 CHANGES.txt |  2 ++
 .../apache/cassandra/db/ColumnFamilyStore.java  |  3 ++-
 .../io/sstable/format/SSTableReader.java| 28 
 3 files changed, 21 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e75d5a6/CHANGES.txt
--
diff --cc CHANGES.txt
index 2db4115,4717fca..2e00f3c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -31,8 -6,8 +31,9 @@@ Merged from 2.1
   * Add consistency level to tracing ouput (CASSANDRA-9827)
  Merged from 2.0:
   * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
+  * Don't track hotness when opening from snapshot for validation 
(CASSANDRA-9382)
  
 +
  2.2.0
   * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) 
   * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e75d5a6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e75d5a6/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index e1a9cdc,0c4b797..e9ac200
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -415,10 -411,10 +420,10 @@@ public abstract class SSTableReader ext
  {
  if (!sstable.loadSummary(ibuilder, dbuilder))
  sstable.buildSummary(false, ibuilder, dbuilder, false, 
Downsampling.BASE_SAMPLING_LEVEL);
 -sstable.ifile = 
ibuilder.complete(sstable.descriptor.filenameFor(Component.PRIMARY_INDEX));
 -sstable.dfile = 
dbuilder.complete(sstable.descriptor.filenameFor(Component.DATA));
 +sstable.ifile = ibuilder.buildIndex(sstable.descriptor, 
sstable.indexSummary);
 +sstable.dfile = dbuilder.buildData(sstable.descriptor, 
statsMetadata);
  sstable.bf = FilterFactory.AlwaysPresent;
- sstable.setup(true);
+ sstable.setup(false);
  return sstable;
  }
  }
@@@ -2119,9 -2021,10 +2125,9 @@@
  this.dfile = reader.dfile;
  this.ifile = reader.ifile;
  // get a new reference to the shared descriptor-type tidy
 -this.typeRef = DescriptorTypeTidy.get(reader);
 -this.type = typeRef.get();
 -this.global = type.globalRef.get();
 +this.globalRef = GlobalTidy.get(reader);
 +this.global = globalRef.get();
- if (!isOffline)
+ if (trackHotness)
  global.ensureReadMeter();
  }

[12/12] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-07 Thread benedict 
Merge branch 'cassandra-2.2' into trunk

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/Scrubber.java
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java


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

Branch: refs/heads/trunk
Commit: a8bb75a7e1a09ca05ceb8d566f2c9a88d3122c27
Parents: db68d1c ebe18bb
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Jul 7 16:45:02 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Jul 7 16:45:02 2015 +0100

--
 CHANGES.txt |  3 ++
 .../db/compaction/CompactionManager.java| 15 --
 .../cassandra/db/compaction/Scrubber.java   | 42 -
 .../io/sstable/format/SSTableReader.java| 48 ++--
 .../io/sstable/format/big/BigTableReader.java   |  3 ++
 .../cassandra/tools/StandaloneScrubber.java |  7 +--
 .../unit/org/apache/cassandra/db/ScrubTest.java | 22 +
 7 files changed, 106 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8bb75a7/CHANGES.txt
--
diff --cc CHANGES.txt
index 53beb26,a863ad8..9dee57d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,7 +1,22 @@@
 -2.2.0-rc3
 +3.0
 + * Storage engine refactor (CASSANDRA-8099, 9743)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null 
(CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499)
+ Merged from 2.0:
+  * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
+ 
  
  2.2.0-rc2
   * Re-enable memory-mapped I/O on Windows (CASSANDRA-9658)

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

[12/12] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-02 Thread benedict 
Merge branch 'cassandra-2.2' into trunk

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/streaming/StreamSession.java


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

Branch: refs/heads/trunk
Commit: 72bb4c0c9fc3aa35e994bcb561898e82d5cf5d36
Parents: 61aeb91 2357589
Author: Benedict Elliott Smith bened...@apache.org
Authored: Thu Jul 2 19:16:29 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Thu Jul 2 19:16:29 2015 +0100

--
 CHANGES.txt |   2 +
 .../apache/cassandra/db/lifecycle/Helpers.java  |  23 +---
 .../db/lifecycle/LifecycleTransaction.java  |   7 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  |  11 +-
 .../io/sstable/SSTableDeletingTask.java |  36 ++
 .../cassandra/io/sstable/SSTableRewriter.java   |  33 +++--
 .../io/sstable/format/SSTableReader.java| 128 ---
 .../cassandra/tools/StandaloneScrubber.java |   2 +-
 .../cassandra/tools/StandaloneSplitter.java |   2 +-
 .../cassandra/tools/StandaloneUpgrader.java |   2 +-
 .../cassandra/db/lifecycle/HelpersTest.java |   4 +-
 .../cassandra/db/lifecycle/TrackerTest.java |   9 +-
 .../io/sstable/SSTableRewriterTest.java |   2 +-
 13 files changed, 131 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/CHANGES.txt
--
diff --cc CHANGES.txt
index b7e9733,bc4b57c..80864af
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,6 -19,11 +32,8 @@@
   * Add logback metrics (CASSANDRA-9378)
   * Update and refactor ant test/test-compression to run the tests in parallel 
(CASSANDRA-9583)
  Merged from 2.1:
 -===
 -2.1.8
+  * Eliminate strong self-reference chains in sstable ref tidiers 
(CASSANDRA-9656)
+  * Ensure StreamSession uses canonical sstable reader instances 
(CASSANDRA-9700) 
 - cassandra-2.1
   * Ensure memtable book keeping is not corrupted in the event we shrink usage 
(CASSANDRA-9681)
   * Update internal python driver for cqlsh (CASSANDRA-9064)
   * Fix IndexOutOfBoundsException when inserting tuple with too many

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
index 13bfd6d,ec6439c..f0eb67f
--- a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
@@@ -43,13 -42,13 +43,13 @@@ public class SSTableDeletingTask implem
  // and delete will fail (on Windows) until it is (we only force the 
unmapping on SUN VMs).
  // Additionally, we need to make sure to delete the data file first, so 
on restart the others
  // will be recognized as GCable.
 -private static final SetSSTableDeletingTask failedTasks = new 
CopyOnWriteArraySet();
 +private static final QueueSSTableDeletingTask failedTasks = new 
ConcurrentLinkedQueue();
  private static final Blocker blocker = new Blocker();
  
- private final SSTableReader referent;
  private final Descriptor desc;
  private final SetComponent components;
- private Tracker tracker;
+ private final long bytesOnDisk;
+ private final Counter totalDiskSpaceUsed;
  
  /**
   * realDescriptor is the actual descriptor for the sstable, the 
descriptor inside

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
--

[12/12] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-18 Thread samt 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 40424ee598d2c64e7530a5bf0febd0bd4e8d825c
Parents: 67baaef 1f8516d
Author: Sam Tunnicliffe s...@beobal.com
Authored: Thu Jun 18 17:44:34 2015 +0100
Committer: Sam Tunnicliffe s...@beobal.com
Committed: Thu Jun 18 17:44:34 2015 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/ColumnIdentifier.java |   6 +-
 .../cassandra/cql3/ColumnSpecification.java |   6 +
 .../restrictions/StatementRestrictions.java |  22 +-
 .../selection/AbstractFunctionSelector.java |  13 +
 .../cassandra/cql3/selection/FieldSelector.java |   8 +-
 .../cassandra/cql3/selection/Selectable.java|  10 +-
 .../cassandra/cql3/selection/Selection.java |  58 +--
 .../cql3/selection/SelectionColumnMapping.java  | 118 +++
 .../cql3/selection/SelectionColumns.java|  18 +
 .../cassandra/cql3/selection/Selector.java  |  13 +
 .../cql3/selection/SelectorFactories.java   |   2 +-
 .../cql3/selection/SimpleSelector.java  |  17 +-
 .../cql3/selection/WritetimeOrTTLSelector.java  |  14 +-
 .../cql3/statements/SelectStatement.java|  28 +-
 .../selection/SelectionColumnMappingTest.java   | 353 +++
 16 files changed, 633 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40424ee5/CHANGES.txt
--