[5/9] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2016-06-23 Thread marcuse 
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 225232a9ea8945c85ae4f9cac3b97e003c9e9035
Parents: 774e59d 3c8421a
Author: Marcus Eriksson 
Authored: Thu Jun 23 11:22:57 2016 +0200
Committer: Marcus Eriksson 
Committed: Thu Jun 23 11:22:57 2016 +0200

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|  32 ++--
 .../repair/RepairMessageVerbHandler.java|  32 ++--
 .../cassandra/service/ActiveRepairService.java  | 173 +--
 .../service/ActiveRepairServiceTest.java| 110 +++-
 5 files changed, 296 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/225232a9/CHANGES.txt
--
diff --cc CHANGES.txt
index 0be1043,03246ae..b366d21
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,6 +1,37 @@@
 -2.1.15
 +2.2.7
 + * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
 + * Validate bloom_filter_fp_chance against lowest supported
 +   value when the table is created (CASSANDRA-11920)
 + * RandomAccessReader: call isEOF() only when rebuffering, not for every read 
operation (CASSANDRA-12013)
 + * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
 + * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 + * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
 + * Run CommitLog tests with different compression settings (CASSANDRA-9039)
 + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
 + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
 + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
 + * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
 + * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
 + * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
 + * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
 + * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
 + * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 +Merged from 2.1:
   * Prevent select statements with clustering key > 64k (CASSANDRA-11882)
+  * Avoid marking too many sstables as repaired (CASSANDRA-11696)
   * Fix clock skew corrupting other nodes with paxos (CASSANDRA-11991)
   * Remove distinction between non-existing static columns and existing but 
null in LWTs (CASSANDRA-9842)
   * Support mlockall on IBM POWER arch (CASSANDRA-11576)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/225232a9/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index e76abad,87819ba..cf82498
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -1068,9 -1006,9 +1068,16 @@@ public class CompactionManager implemen
  try
  {
  
--String snapshotName = validator.desc.sessionId.toString();
  int gcBefore;
++UUID parentRepairSessionId = validator.desc.parentSessionId;
++String snapshotName;
++boolean isGlobalSnapshotValidation = 
cfs.snapshotExists(parentRepairSessionId.toString());
++if

[5/9] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-11-27 Thread snazy 
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.1
Commit: b3e6a433eaf8486c8bd5306c48ffa3cb826234bb
Parents: db97083 4ecbbc0
Author: Robert Stupp 
Authored: Fri Nov 27 10:44:14 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 10:44:14 2015 +0100

--
 CHANGES.txt |  1 +
 .../cql3/statements/DropTypeStatement.java  | 10 --
 .../cql3/validation/entities/TypeTest.java  | 10 ++
 .../cql3/validation/entities/UFTest.java| 14 
 .../validation/operations/AggregationTest.java  | 14 
 .../cql3/validation/operations/DropTest.java| 37 
 6 files changed, 84 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e6a433/CHANGES.txt
--
diff --cc CHANGES.txt
index 8779275,4adcf4f..c2940cc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -2.1.12
 +2.2.4
 + * CQL.textile syntax incorrectly includes optional keyspace for aggregate 
SFUNC and FINALFUNC (CASSANDRA-10747)
 + * Fix JSON update with prepared statements (CASSANDRA-10631)
 + * Don't do anticompaction after subrange repair (CASSANDRA-10422)
 + * Fix SimpleDateType type compatibility (CASSANDRA-10027)
 + * (Hadoop) fix splits calculation (CASSANDRA-10640)
 + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 + * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing 
KS (CASSANDRA-10658)
   * DeletionTime.compareTo wrong in rare cases (CASSANDRA-10749)
   * Force encoding when computing statement ids (CASSANDRA-10755)
   * Properly reject counters as map keys (CASSANDRA-10760)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e6a433/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e6a433/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java
--

[5/9] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-09-16 Thread snazy 
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e63dacf7/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
--
diff --cc 
src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
index f427389,000..5c51fbb
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
@@@ -1,261 -1,0 +1,261 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.cassandra.io.sstable.format.big;
 +
 +import com.google.common.util.concurrent.RateLimiter;
 +import org.apache.cassandra.cache.KeyCacheKey;
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.db.DataRange;
 +import org.apache.cassandra.db.DecoratedKey;
 +import org.apache.cassandra.db.RowIndexEntry;
 +import org.apache.cassandra.db.RowPosition;
 +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 +import org.apache.cassandra.db.composites.CellName;
 +import org.apache.cassandra.db.filter.ColumnSlice;
 +import org.apache.cassandra.dht.IPartitioner;
 +import org.apache.cassandra.dht.Range;
 +import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.io.sstable.Component;
 +import org.apache.cassandra.io.sstable.CorruptSSTableException;
 +import org.apache.cassandra.io.sstable.Descriptor;
 +import org.apache.cassandra.io.sstable.ISSTableScanner;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
 +import org.apache.cassandra.io.util.FileDataInput;
 +import org.apache.cassandra.io.util.FileUtils;
 +import org.apache.cassandra.tracing.Tracing;
 +import org.apache.cassandra.utils.ByteBufferUtil;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import java.io.IOException;
 +import java.nio.ByteBuffer;
 +import java.util.*;
 +
 +/**
 + * SSTableReaders are open()ed by Keyspace.onStart; after that they are 
created by SSTableWriter.renameAndOpen.
 + * Do not re-call open() on existing SSTable files; use the references kept 
by ColumnFamilyStore post-start instead.
 + */
 +public class BigTableReader extends SSTableReader
 +{
 +private static final Logger logger = 
LoggerFactory.getLogger(BigTableReader.class);
 +
 +BigTableReader(Descriptor desc, Set components, CFMetaData 
metadata, IPartitioner partitioner, Long maxDataAge, StatsMetadata 
sstableMetadata, OpenReason openReason)
 +{
 +super(desc, components, metadata, partitioner, maxDataAge, 
sstableMetadata, openReason);
 +}
 +
 +public OnDiskAtomIterator iterator(DecoratedKey key, SortedSet 
columns)
 +{
 +return new SSTableNamesIterator(this, key, columns);
 +}
 +
 +public OnDiskAtomIterator iterator(FileDataInput input, DecoratedKey key, 
SortedSet columns, RowIndexEntry indexEntry )
 +{
 +return new SSTableNamesIterator(this, input, key, columns, 
indexEntry);
 +}
 +
 +public OnDiskAtomIterator iterator(DecoratedKey key, ColumnSlice[] 
slices, boolean reverse)
 +{
 +return new SSTableSliceIterator(this, key, slices, reverse);
 +}
 +
 +public OnDiskAtomIterator iterator(FileDataInput input, DecoratedKey key, 
ColumnSlice[] slices, boolean reverse, RowIndexEntry indexEntry)
 +{
 +return new SSTableSliceIterator(this, input, key, slices, reverse, 
indexEntry);
 +}
 +/**
 + *
 + * @param dataRange filter to use when reading the columns
 + * @return A Scanner for seeking over the rows of the SSTable.
 + */
 +public ISSTableScanner getScanner(DataRange dataRange, RateLimiter 
limiter)
 +{
 +return BigTableScanner.getScanner(this, dataRange, limiter);
 +}
 +
 +
 +/**
 + * Direct I/O SSTableScanner over a defined collection of ranges of 
tokens.
 + *
 + * @param ranges the range of keys to cover
 + * @return A Scanner for seeking over the rows of the SSTable.
 + */
 +public ISSTableScanner getScanner(Collection ranges, 
RateLimiter limiter)
 +{
 +return

[5/9] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-08-25 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: d526536f288c1851724c0d769f9ebfdabc57d028
Parents: a69558b 7d74563
Author: T Jake Luciani j...@apache.org
Authored: Tue Aug 25 09:40:30 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Tue Aug 25 09:40:30 2015 -0400

--

--

[5/9] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-05-19 Thread samt 
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: e2723a400d1fec823d853374d3a64c6d061c55a5
Parents: 816c2b3 116de2b
Author: Sam Tunnicliffe s...@beobal.com
Authored: Tue May 19 12:02:33 2015 +0100
Committer: Sam Tunnicliffe s...@beobal.com
Committed: Tue May 19 12:02:33 2015 +0100

--
 .../org/apache/cassandra/triggers/ITrigger.java |  4 +--
 .../cassandra/triggers/TriggerExecutor.java | 32 
 2 files changed, 34 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2723a40/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
--