[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-12-10 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2edd6fd2e02b9e2769e4ea751c1030428f70ce47
Parents: 732c43b 4f3a6fe
Author: Aleksey Yeshchenko 
Authored: Mon Dec 10 18:19:31 2018 +
Committer: Aleksey Yeshchenko 
Committed: Mon Dec 10 18:19:31 2018 +

--
 .../operations/SelectOrderByTest.java   | 78 
 1 file changed, 78 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2edd6fd2/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-11-20 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 54be1fa8f6ebf59ca33da6b558e440c708a061e5
Parents: 78c7d57 c9dc69d
Author: Aleksey Yeshchenko 
Authored: Tue Nov 20 15:23:55 2018 +
Committer: Aleksey Yeshchenko 
Committed: Tue Nov 20 15:23:55 2018 +

--
 .../SelectMultiColumnRelationTest.java  | 25 
 1 file changed, 25 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54be1fa8/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-10-15 Thread spod 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 9afd3a5d4f2b4e53b284852bbc0157030fe8a625
Parents: 7030356 300fff2
Author: Stefan Podkowinski 
Authored: Mon Oct 15 09:42:43 2018 +0200
Committer: Stefan Podkowinski 
Committed: Mon Oct 15 09:43:19 2018 +0200

--
 .circleci/config.yml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--



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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-09-04 Thread mck 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 0aca1b9df8b594710e6fbe820bd54ed17dc3176e
Parents: d8b7630 21ec39a
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:19:22 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:20:12 2018 +1000

--
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aca1b9d/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 801a8f7,1f1fa47..71f8491
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1116,14 -1374,7 +1116,14 @@@ class Shell(cmd.Cmd)
  # print header only
  self.print_formatted_result(formatted_names, None)
  return
 -formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names]) for row in rows]
 +
 +cql_types = []
 +if result.column_types:
 +ks_name = table_meta.keyspace_name if table_meta else 
self.current_keyspace
 +ks_meta = self.conn.metadata.keyspaces.get(ks_name, None)
 +cql_types = [CqlType(cql_typename(t), ks_meta) for t in 
result.column_types]
 +
- formatted_values = [map(self.myformat_value, row.values(), cql_types) 
for row in result.current_rows]
++formatted_values = [map(self.myformat_value, [row[column] for column 
in column_names], cql_types) for row in result.current_rows]
  
  if self.expand_enabled:
  self.print_formatted_result_vertically(formatted_names, 
formatted_values)


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-08-21 Thread blambov 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 991e19711f8762bbf93d6af588cef0a14668cc59
Parents: 65a4682 299782c
Author: Branimir Lambov 
Authored: Tue Aug 21 11:56:05 2018 +0300
Committer: Branimir Lambov 
Committed: Tue Aug 21 11:56:05 2018 +0300

--
 .../io/sstable/IndexSummaryBuilder.java |  4 +-
 .../cassandra/io/util/DataOutputBuffer.java |  8 +-
 .../io/util/DataOutputBufferFixed.java  |  2 +-
 .../cassandra/io/util/SafeMemoryWriter.java | 16 ++--
 .../cassandra/io/util/DataOutputTest.java   |  4 +-
 .../cassandra/io/util/SafeMemoryWriterTest.java | 90 
 6 files changed, 110 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/991e1971/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
--
diff --cc src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
index 144edad,7586543..28ca468
--- a/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
+++ b/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
@@@ -38,43 -37,11 +38,43 @@@ public class DataOutputBuffer extends B
  /*
   * Threshold at which resizing transitions from doubling to increasing by 
50%
   */
- private static final long DOUBLING_THRESHOLD = 
Long.getLong(Config.PROPERTY_PREFIX + "DOB_DOUBLING_THRESHOLD_MB", 64);
+ static final long DOUBLING_THRESHOLD = 
Long.getLong(Config.PROPERTY_PREFIX + "DOB_DOUBLING_THRESHOLD_MB", 64);
  
 +/*
 + * Only recycle OutputBuffers up to 1Mb. Larger buffers will be trimmed 
back to this size.
 + */
 +private static final int MAX_RECYCLE_BUFFER_SIZE = 
Integer.getInteger(Config.PROPERTY_PREFIX + "dob_max_recycle_bytes", 1024 * 
1024);
 +
 +private static final int DEFAULT_INITIAL_BUFFER_SIZE = 128;
 +
 +/**
 + * Scratch buffers used mostly for serializing in memory. It's important 
to call #recycle() when finished
 + * to keep the memory overhead from being too large in the system.
 + */
 +public static final FastThreadLocal scratchBuffer = new 
FastThreadLocal()
 +{
 +protected DataOutputBuffer initialValue() throws Exception
 +{
 +return new DataOutputBuffer()
 +{
 +public void close()
 +{
 +if (buffer.capacity() <= MAX_RECYCLE_BUFFER_SIZE)
 +{
 +buffer.clear();
 +}
 +else
 +{
 +buffer = 
ByteBuffer.allocate(DEFAULT_INITIAL_BUFFER_SIZE);
 +}
 +}
 +};
 +}
 +};
 +
  public DataOutputBuffer()
  {
 -this(128);
 +this(DEFAULT_INITIAL_BUFFER_SIZE);
  }
  
  public DataOutputBuffer(int size)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/991e1971/src/java/org/apache/cassandra/io/util/DataOutputBufferFixed.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/991e1971/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
--


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

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2018-08-02 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f8acbd27873ac32e033feaac086077299b231139
Parents: 975e1d3 c4f1f408
Author: Benjamin Lerer 
Authored: Thu Aug 2 15:18:28 2018 +0200
Committer: Benjamin Lerer 
Committed: Thu Aug 2 15:18:59 2018 +0200

--
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8acbd27/CHANGES.txt
--
diff --cc CHANGES.txt
index b50d27e,e4dbbda..ab64ab9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,13 +1,32 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
   * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
+  Merged from 2.2:
+  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -3.0.17
 +3.11.3
 + * Validate supported column type with SASI analyzer (CASSANDRA-13669)
 + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
 + * Reduce nodetool GC thread count (CASSANDRA-14475)
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
   * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
   * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 - * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
   * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
   * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
   * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-07-10 Thread mck 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 6bcc60ae4c440be1ba9f6c2b83f697ac2f2b3f3e
Parents: 847b843 6ce887e
Author: Mick Semb Wever 
Authored: Wed Jul 11 10:16:52 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Jul 11 10:16:52 2018 +1000

--

--



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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-06-29 Thread mck 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: bba0d03e9c5e62c222734839a9adc83f1aec6f95
Parents: ea62d88 489c2f6
Author: Mick Semb Wever 
Authored: Fri Jun 29 16:58:26 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri Jun 29 17:00:02 2018 +1000

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|  67 +++-
 .../db/compaction/AntiCompactionTest.java   | 109 ++-
 3 files changed, 147 insertions(+), 30 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bba0d03e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index f0a4de5,f033bf2..fa6b03e
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -478,115 -474,17 +477,126 @@@ public class CompactionManager implemen
  }, jobs, OperationType.CLEANUP);
  }
  
 +public AllSSTableOpStatus performGarbageCollection(final 
ColumnFamilyStore cfStore, TombstoneOption tombstoneOption, int jobs) throws 
InterruptedException, ExecutionException
 +{
 +assert !cfStore.isIndex();
 +
 +return parallelAllSSTableOperation(cfStore, new OneSSTableOperation()
 +{
 +@Override
 +public Iterable 
filterSSTables(LifecycleTransaction transaction)
 +{
 +Iterable originals = transaction.originals();
 +if 
(cfStore.getCompactionStrategyManager().onlyPurgeRepairedTombstones())
 +originals = Iterables.filter(originals, 
SSTableReader::isRepaired);
 +List sortedSSTables = 
Lists.newArrayList(originals);
 +Collections.sort(sortedSSTables, 
SSTableReader.maxTimestampComparator);
 +return sortedSSTables;
 +}
 +
 +@Override
 +public void execute(LifecycleTransaction txn) throws IOException
 +{
 +logger.debug("Garbage collecting {}", txn.originals());
 +CompactionTask task = new CompactionTask(cfStore, txn, 
getDefaultGcBefore(cfStore, FBUtilities.nowInSeconds()))
 +{
 +@Override
 +protected CompactionController 
getCompactionController(Set toCompact)
 +{
 +return new CompactionController(cfStore, toCompact, 
gcBefore, null, tombstoneOption);
 +}
 +};
 +task.setUserDefined(true);
 +task.setCompactionType(OperationType.GARBAGE_COLLECT);
 +task.execute(metrics);
 +}
 +}, jobs, OperationType.GARBAGE_COLLECT);
 +}
 +
 +public AllSSTableOpStatus relocateSSTables(final ColumnFamilyStore cfs, 
int jobs) throws ExecutionException, InterruptedException
 +{
 +if (!cfs.getPartitioner().splitter().isPresent())
 +{
 +logger.info("Partitioner does not support splitting");
 +return AllSSTableOpStatus.ABORTED;
 +}
 +final Collection> r = 
StorageService.instance.getLocalRanges(cfs.keyspace.getName());
 +
 +if (r.isEmpty())
 +{
 +logger.info("Relocate cannot run before a node has joined the 
ring");
 +return AllSSTableOpStatus.ABORTED;
 +}
 +
 +final DiskBoundaries diskBoundaries = cfs.getDiskBoundaries();
 +
 +return parallelAllSSTableOperation(cfs, new OneSSTableOperation()
 +{
 +@Override
 +public Iterable 
filterSSTables(LifecycleTransaction transaction)
 +{
 +Set originals = 
Sets.newHashSet(transaction.originals());
 +Set needsRelocation = 
originals.stream().filter(s -> 
!inCorrectLocation(s)).collect(Collectors.toSet());
 +transaction.cancel(Sets.difference(originals, 
needsRelocation));
 +
 +Map> groupedByDisk = 
groupByDiskIndex(needsRelocation);
 +
 +int maxSize = 0;
 +for (List diskSSTables : 
groupedByDisk.values())
 +maxSize = Math.max(maxSize, diskSSTables.size());
 +
 +List

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-06-13 Thread mck 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f0403b4e9d0ebe0dab1a96c81f122e780c369e4b
Parents: ed5f834 897b55a
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:32:37 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:33:11 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0403b4e/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-06-07 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b1748198eb278f9965da0196317803e8e3eda7a7
Parents: 7bb88de cce9ab2
Author: Marcus Eriksson 
Authored: Thu Jun 7 08:40:10 2018 -0700
Committer: Marcus Eriksson 
Committed: Thu Jun 7 08:40:10 2018 -0700

--

--



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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-05-03 Thread mck 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 73f5b8f995da0a56babac588a5476397604b707e
Parents: 2d19de1 493f9a2
Author: Mick Semb Wever 
Authored: Thu May 3 18:56:29 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:57:14 2018 +1000

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/73f5b8f9/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-05-01 Thread jzhuang 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 783bbb3c817e7dbfee8181d210487edc13414ac1
Parents: b67d6fb 733f6b0
Author: Jay Zhuang 
Authored: Tue May 1 15:11:22 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:12:14 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |   6 +
 4 files changed, 170 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/CHANGES.txt
--
diff --cc CHANGES.txt
index c392059,9992802..443c298
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -31,8 -20,10 +31,9 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
 - * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
   * Backport circleci yaml (CASSANDRA-14240)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/783bbb3c/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
--
diff --cc 
test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
index a088e20,f04439a..52b18a9
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
@@@ -26,10 -27,9 +26,11 @@@ import java.util.*
  
  import static org.apache.commons.io.FileUtils.readFileToByteArray;
  import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
  
 +import com.google.common.io.Files;
  import org.junit.After;
 +import org.junit.BeforeClass;
  import org.junit.Test;
  
  import junit.framework.Assert;
@@@ -89,42 -88,46 +90,47 @@@ public class CompressedSequentialWriter
  private void testWrite(File f, int bytesToTest) throws IOException
  {
  final String filename = f.getAbsolutePath();
 -final ChannelProxy channel = new ChannelProxy(f);
 -
 -try
 +MetadataCollector sstableMetadataCollector = new 
MetadataCollector(new 
ClusteringComparator(Collections.singletonList(BytesType.instance)));
 +
 +byte[] dataPre = new byte[bytesToTest];
 +byte[] rawPost = new byte[bytesToTest];
 +try (CompressedSequentialWriter writer = new 
CompressedSequentialWriter(f, filename + ".metadata",
 +null, SequentialWriterOption.DEFAULT,
 +compressionParameters,
 +sstableMetadataCollector))
  {
 -MetadataCollector sstableMetadataCollector = new 
MetadataCollector(new 
ClusteringComparator(Arrays.asList(BytesType.instance)));
 +Random r = new Random(42);
 +
 +// Test both write with byte[] and ByteBuffer
 +r.nextBytes(dataPre);
 +r.nextBytes(rawPost);
 +ByteBuffer dataPost = makeBB(bytesToTest);
 +dataPost.put(rawPost);
 +dataPost.flip();
 +
 +writer.write(dataPre);
 +DataPosition mark = writer.mark();
  
 -byte[] dataPre = new byte[bytesToTest];
 -byte[] rawPost = new byte[bytesToTest];
 -try (CompressedSequentialWriter writer = new 
CompressedSequentialWriter(f, filename + ".metadata", compressionParameters, 
sstableMetadataCollector);)
 +// Write enough garbage to transition chunk
 +for (int i = 0; i < CompressionParams.DEFAULT_CHUNK_LENGTH; i++)
  {
 -Random r = new Random(42);
 -
 -// Test both write with byte[] and ByteBuffer
 -r.nextBytes(dataPre);
 -r.nextBytes(rawPost);

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-04-24 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 684120deb8fa5a982fb75523314ccd2181419e31
Parents: 22bb2cf bc1f841
Author: Marcus Eriksson 
Authored: Tue Apr 24 08:51:32 2018 +0200
Committer: Marcus Eriksson 
Committed: Tue Apr 24 08:51:32 2018 +0200

--
 CHANGES.txt   |  1 +
 .../apache/cassandra/db/compaction/CompactionManager.java | 10 +-
 .../cassandra/db/compaction/AntiCompactionTest.java   |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/684120de/CHANGES.txt
--
diff --cc CHANGES.txt
index 990c5db,cf470d6..5450322
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,7 -19,9 +30,8 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
+  * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
 - * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
   * Backport circleci yaml (CASSANDRA-14240)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/684120de/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--


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

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2018-04-17 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 95cfee623456f1df51ce548cc6cf42fe5a78050c
Parents: 845243d 598008d
Author: Benjamin Lerer 
Authored: Tue Apr 17 12:14:58 2018 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 17 12:27:25 2018 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/cql3/ResultSet.java|  5 ++
 .../cassandra/cql3/selection/Selection.java | 70 +---
 .../cql3/statements/SelectStatement.java| 20 +++---
 .../cql3/validation/entities/JsonTest.java  | 41 +++-
 5 files changed, 116 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95cfee62/CHANGES.txt
--
diff --cc CHANGES.txt
index 4c513d7,d3d8036..42ea3b4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -25,6 -15,8 +25,7 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
+  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
 - * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
   * Backport circleci yaml (CASSANDRA-14240)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95cfee62/src/java/org/apache/cassandra/cql3/ResultSet.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95cfee62/src/java/org/apache/cassandra/cql3/selection/Selection.java
--
diff --cc src/java/org/apache/cassandra/cql3/selection/Selection.java
index 7b4e80c,6227158..fb0b60c
--- a/src/java/org/apache/cassandra/cql3/selection/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java
@@@ -271,41 -288,13 +311,43 @@@ public abstract class Selectio
  @Override
  public String toString()
  {
 -return Objects.toStringHelper(this)
 -.add("columns", columns)
 -.add("columnMapping", columnMapping)
 -.add("metadata", metadata)
 -.add("collectTimestamps", collectTimestamps)
 -.add("collectTTLs", collectTTLs)
 -.toString();
 +return MoreObjects.toStringHelper(this)
 +  .add("columns", columns)
 +  .add("columnMapping", columnMapping)
 +  .add("metadata", metadata)
 +  .add("collectTimestamps", collectTimestamps)
 +  .add("collectTTLs", collectTTLs)
 +  .toString();
 +}
 +
 +public static List rowToJson(List row, 
ProtocolVersion protocolVersion, ResultSet.ResultMetadata metadata)
 +{
 +StringBuilder sb = new StringBuilder("{");
- for (int i = 0; i < metadata.names.size(); i++)
++for (int i = 0; i < metadata.getColumnCount(); i++)
 +{
 +if (i > 0)
 +sb.append(", ");
 +
 +ColumnSpecification spec = metadata.names.get(i);
 +String columnName = spec.name.toString();
 +if (!columnName.equals(columnName.toLowerCase(Locale.US)))
 +columnName = "\"" + columnName + "\"";
 +
 +ByteBuffer buffer = row.get(i);
 +sb.append('"');
 +sb.append(Json.quoteAsJsonString(columnName));
 +sb.append("\": ");
 +if (buffer == null)
 +sb.append("null");
 +else if (!buffer.hasRemaining())
 +sb.append("\"\"");
 +else
 +sb.append(spec.type.toJSONString(buffer, protocolVersion));
 +}
 +sb.append("}");
- return 
Collections.singletonList(UTF8Type.instance.getSerializer().serialize(sb.toString()));
++List jsonRow = new ArrayList<>();
++
jsonRow.add(UTF8Type.instance.getSerializer().serialize(sb.toString()));
++return jsonRow;
  }
  
  public class ResultSetBuilder
@@@ -445,12 -409,51 +487,24 @@@
  return resultSet;
  }
  
 -private List getOutputRow(int protocolVersion)
 +private List getOutputRow()
  {
  List outputRow = 
selectors.getOutputRow(protocolVersion);
- return isJson ?

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-04-05 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: ad52c95ae2797155a88a8b0c8d16d8fb07509dd6
Parents: 28bd6c2 41f3b96
Author: Jason Brown 
Authored: Thu Apr 5 06:21:27 2018 -0700
Committer: Jason Brown 
Committed: Thu Apr 5 06:21:27 2018 -0700

--

--



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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-03-30 Thread paulo 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 6f30677b28dcbf82bcd0a291f3294ddf87dafaac
Parents: 18278e4 2d2b1a7
Author: Paulo Motta 
Authored: Fri Mar 30 12:15:37 2018 -0300
Committer: Paulo Motta 
Committed: Fri Mar 30 12:15:37 2018 -0300

--

--



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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-02-19 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: a798257cefe96147370ecae87b7c07fe55769816
Parents: 0ab9fc4 f39e28d
Author: Jason Brown 
Authored: Mon Feb 19 05:50:08 2018 -0800
Committer: Jason Brown 
Committed: Mon Feb 19 05:50:55 2018 -0800

--
 .circleci/config.yml | 339 ++
 CHANGES.txt  |   2 +
 circle.yml   |  18 ---
 3 files changed, 341 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a798257c/CHANGES.txt
--
diff --cc CHANGES.txt
index 022807f,14a62a4..f8af8c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,16 +1,40 @@@
 -3.0.17
 -Merged from 2.1:
 - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
 -Merged from 2.2:
 +3.11.3
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
++Merged from 2.2
+  * Backport circleci yaml (CASSANDRA-14240)
 +Merged from 2.1
 + * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  
 -3.0.16
 - * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)
 - * Add MinGW uname check to start scripts (CASSANDRA-12940)
 - * Protect against overflow of local expiration time (CASSANDRA-14092)
 +3.11.2
 + * Fix ReadCommandTest (CASSANDRA-14234)
 + * Remove trailing period from latency reports at keyspace level 
(CASSANDRA-14233)
 + * Backport CASSANDRA-13080: Use new token allocation for non bootstrap case 
as well (CASSANDRA-14212)
 + * Remove dependencies on JVM internal classes from JMXServerUtils 
(CASSANDRA-14173) 
 + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` 
(CASSANDRA-14205)
 + * Add Unittest for schema migration fix (CASSANDRA-14140)
 + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
 + * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Enable CDC unittest (CASSANDRA-14141)
 + * Acquire read lock before accessing CompactionStrategyManager fields 
(CASSANDRA-14139)
 + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
 + * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
 + * Prevent continuous schema exchange between 3.0 and 3.11 nodes 
(CASSANDRA-14109)
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 + * Correctly count range tombstones in traces and tombstone thresholds 
(CASSANDRA-8527)
 +Merged from 3.0:
 + * Add MinGW uname check to start scripts (CASSANDRA-12840)
   * Use the correct digest file and reload sstable metadata in nodetool verify 
(CASSANDRA-14217)
   * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
 - * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
   * Set encoding for javadoc generation (CASSANDRA-14154)
   * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
   * Improve commit log chain marker updating (CASSANDRA-14108)


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

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-12-14 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 95c8aef81c1bb741643445767e39c82da9aec7cb
Parents: c000827 5050aa3
Author: Benjamin Lerer 
Authored: Thu Dec 14 14:57:16 2017 +0100
Committer: Benjamin Lerer 
Committed: Thu Dec 14 15:01:18 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/service/StartupChecks.java |  34 +-
 .../org/apache/cassandra/utils/JavaUtils.java   | 115 +++
 .../apache/cassandra/utils/JavaUtilsTest.java   |  52 +
 4 files changed, 171 insertions(+), 31 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c8aef8/src/java/org/apache/cassandra/service/StartupChecks.java
--
diff --cc src/java/org/apache/cassandra/service/StartupChecks.java
index 6c309b6,ae44df5..cb10ab4
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@@ -49,9 -47,8 +49,10 @@@ import org.apache.cassandra.exceptions.
  import org.apache.cassandra.exceptions.StartupException;
  import org.apache.cassandra.io.sstable.Descriptor;
  import org.apache.cassandra.io.util.FileUtils;
 -import org.apache.cassandra.schema.SchemaKeyspace;
 -import org.apache.cassandra.utils.*;
 +import org.apache.cassandra.utils.NativeLibrary;
 +import org.apache.cassandra.utils.FBUtilities;
++import org.apache.cassandra.utils.JavaUtils;
 +import org.apache.cassandra.utils.SigarLibrary;
  
  /**
   * Verifies that the system and environment is in a fit state to be started.


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-12-12 Thread paulo 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f6381db8edf1c532f881adb3806205cd24b0b67c
Parents: 0525145 0d12169
Author: Paulo Motta 
Authored: Wed Dec 13 06:41:11 2017 +1100
Committer: Paulo Motta 
Committed: Wed Dec 13 06:41:11 2017 +1100

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java| 15 --
 .../db/compaction/CompactionsBytemanTest.java   | 56 
 3 files changed, 68 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6381db8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--


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

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-12-12 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: a7c45be936bf8aa04b657529964c41b0d82c50e2
Parents: 88a41fb dd187d1
Author: Benjamin Lerer 
Authored: Tue Dec 12 10:38:33 2017 +0100
Committer: Benjamin Lerer 
Committed: Tue Dec 12 10:42:50 2017 +0100

--
 CHANGES.txt |   2 +-
 NEWS.txt|   8 +-
 bin/cassandra   |  19 +-
 conf/cassandra-env.ps1  | 914 ++-
 conf/cassandra-env.sh   |  12 +
 .../apache/cassandra/service/StartupChecks.java |  74 ++
 .../org/apache/cassandra/utils/HeapUtils.java   |  93 +-
 .../cassandra/utils/JVMStabilityInspector.java  |  24 +-
 .../utils/JVMStabilityInspectorTest.java|  28 +-
 9 files changed, 632 insertions(+), 542 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c45be9/CHANGES.txt
--
diff --cc CHANGES.txt
index 6e9a0bd,20ccc4b..116c7e9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,4 +1,14 @@@
 -3.0.16
 +3.11.2
 + * Fix imbalanced disks when replacing node with same address with JBOD 
(CASSANDRA-14084)
 + * Reload compaction strategies when disk boundaries are invalidated 
(CASSANDRA-13948)
 + * Remove OpenJDK log warning (CASSANDRA-13916)
 + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
 + * Cache disk boundaries (CASSANDRA-13215)
 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
 + * Update jackson JSON jars (CASSANDRA-13949)
 + * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 +Merged from 3.0:
- 3.0.16
   * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
   * Accept role names containing forward-slash (CASSANDRA-14088)
   * Optimize CRC check chance probability calculations (CASSANDRA-14094)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c45be9/NEWS.txt
--
diff --cc NEWS.txt
index 9812b22,1bbe1aa..0c32278
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -18,7 -18,13 +18,13 @@@ using the provided 'sstableupgrade' too
  
  Upgrading
  -
- - Nothing specific to this release, but please see previous upgrading 
sections.
 -   - Cassandra is now relying on the JVM options to properly shutdown on 
OutOfMemoryError. By default it will
 - rely on the OnOutOfMemoryError option as the ExitOnOutOfMemoryError and 
CrashOnOutOfMemoryError options
 - are not supported by the older 1.7 and 1.8 JVMs. A warning will be 
logged at startup if none of those JVM
 - options are used. See CASSANDRA-13006 for more details.
 -   - Cassandra is not logging anymore by default an Heap histogram on 
OutOfMemoryError. To enable that behavior
 - set the 'cassandra.printHeapHistogramOnOutOfMemoryError' System property 
to 'true'. See CASSANDRA-13006
 - for more details.
++- Cassandra is now relying on the JVM options to properly shutdown on 
OutOfMemoryError. By default it will
++  rely on the OnOutOfMemoryError option as the ExitOnOutOfMemoryError and 
CrashOnOutOfMemoryError options
++  are not supported by the older 1.7 and 1.8 JVMs. A warning will be 
logged at startup if none of those JVM
++  options are used. See CASSANDRA-13006 for more details
++- Cassandra is not logging anymore by default an Heap histogram on 
OutOfMemoryError. To enable that behavior
++  set the 'cassandra.printHeapHistogramOnOutOfMemoryError' System 
property to 'true'. See CASSANDRA-13006
++  for more details.
  
  Materialized Views
  ---

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c45be9/bin/cassandra
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c45be9/conf/cassandra-env.ps1
--
diff --cc conf/cassandra-env.ps1
index 2df7054,405ed92..49d03ce
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -393,70 -393,98 +393,80 @@@ Function SetCassandraEnvironmen
  $env:JVM_OPTS="$env:JVM_OPTS 
-XX:HeapDumpPath=$env:CASSANDRA_HEAPDUMP_DIR\cassandra-$unixTimestamp-pid$pid.hprof"
  }
  
- if ($env:JVM_VERSION.CompareTo("1.8.0") -eq -1 -or

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-12-11 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 817f3c282debd8f00a7803bee4950cdc73ec7fcc
Parents: 16bcbb9 d7329a6
Author: Marcus Eriksson 
Authored: Mon Dec 11 09:03:55 2017 +0100
Committer: Marcus Eriksson 
Committed: Mon Dec 11 09:03:55 2017 +0100

--
 CHANGES.txt |  2 ++
 .../cassandra/db/compaction/CompactionManager.java  |  1 +
 .../org/apache/cassandra/db/compaction/Scrubber.java|  4 +++-
 .../io/sstable/IndexSummaryRedistribution.java  | 12 
 4 files changed, 14 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/817f3c28/CHANGES.txt
--
diff --cc CHANGES.txt
index b7a6e14,8cff716..5faede2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -26,22 -16,11 +26,24 @@@ Merged from 3.0
   * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
   * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
   * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
+ Merged from 2.2:
+  * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
  
  
 -3.0.15
 +3.11.1
 + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems 
(CASSANDRA-13808)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Add a skip read validation flag to cassandra-stress (CASSANDRA-13772)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
   * Improve TRUNCATE performance (CASSANDRA-13909)
   * Implement short read protection on partition boundaries (CASSANDRA-13595)
   * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries 
(CASSANDRA-13911)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/817f3c28/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 4030384,eaeb089..638e74c
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -1085,18 -865,16 +1085,19 @@@ public class CompactionManager implemen
  
  logger.info("Cleaning up {}", sstable);
  
 -File compactionFileLocation = 
cfs.getDirectories().getWriteableLocationAsFile(cfs.getExpectedCompactedFileSize(txn.originals(),
 OperationType.CLEANUP));
 -if (compactionFileLocation == null)
 -throw new IOException("disk full");
 +File compactionFileLocation = sstable.descriptor.directory;
 +RateLimiter limiter = getRateLimiter();
 +double compressionRatio = sstable.getCompressionRatio();
 +if (compressionRatio == MetadataCollector.NO_COMPRESSION_RATIO)
 +compressionRatio = 1.0;
  
  List finished;
 +
  int nowInSec = FBUtilities.nowInSeconds();
 -try (SSTableRewriter writer = SSTableRewriter.construct(cfs, txn, 
false, sstable.maxDataAge, false);
 - ISSTableScanner scanner = cleanupStrategy.getScanner(sstable, 
getRateLimiter());
 +try (SSTableRewriter writer = SSTableRewriter.construct(cfs, txn, 
false, sstable.maxDataAge);
 + ISSTableScanner scanner = cleanupStrategy.getScanner(sstable, 
null);
   CompactionController controller = new CompactionController(cfs, 
txn.originals(), getDefaultGcBefore(cfs, nowInSec));
+  Refs refs = 
Refs.ref(Collections.singleton(sstable));
   CompactionIterator ci = new 
CompactionIterator(OperationType.CLEANUP, Collections.singletonList(scanner), 
controller, nowInSec,

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-05 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 5a09fafea043d472f2d46b1e17062201f7baa38a
Parents: 2b29f8a fb92a52
Author: Marcus Eriksson 
Authored: Tue Sep 5 10:39:02 2017 +0200
Committer: Marcus Eriksson 
Committed: Tue Sep 5 10:39:02 2017 +0200

--
 CHANGES.txt |   1 +
 .../io/sstable/format/SSTableReader.java|   8 +-
 .../sstable/IndexSummaryRedistributionTest.java | 142 +++
 3 files changed, 147 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a09fafe/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index 03af2bb,25ba212..5d76f75
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -1143,13 -1116,17 +1143,13 @@@ public abstract class SSTableReader ext
  "no adjustments to min/max_index_interval");
  }
  
 -//Always save the resampled index
 -try(SegmentedFile.Builder ibuilder = 
SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode(), false);
 -SegmentedFile.Builder dbuilder = 
SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode(), compression))
 -{
 -saveSummary(ibuilder, dbuilder, newSummary);
 -}
 +// Always save the resampled index
 +saveSummary(newSummary);
  
- long newSize = bytesOnDisk();
- StorageMetrics.load.inc(newSize - oldSize);
- parent.metric.liveDiskSpaceUsed.inc(newSize - oldSize);
- parent.metric.totalDiskSpaceUsed.inc(newSize - oldSize);
+ // The new size will be added in Transactional.commit() as an 
updated SSTable, more details: CASSANDRA-13738
+ StorageMetrics.load.dec(oldSize);
+ parent.metric.liveDiskSpaceUsed.dec(oldSize);
+ parent.metric.totalDiskSpaceUsed.dec(oldSize);
  
  return cloneAndReplace(first, OpenReason.METADATA_CHANGE, 
newSummary);
  }


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-04 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 37d67306accb2fefed9cfc57856fcca4df93a407
Parents: bed7fa5 b0eba5f
Author: Marcus Eriksson 
Authored: Mon Sep 4 15:04:04 2017 +0200
Committer: Marcus Eriksson 
Committed: Mon Sep 4 15:04:04 2017 +0200

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|   4 +-
 .../db/compaction/CompactionExecutorTest.java   | 109 +++
 3 files changed, 112 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37d67306/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37d67306/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
index 000,9b07da9..2f8b5b2
mode 00,100644..100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
@@@ -1,0 -1,107 +1,109 @@@
+ /*
+  * 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.db.compaction;
+ 
+ import java.util.concurrent.Future;
+ import java.util.concurrent.TimeUnit;
+ 
+ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.Test;
+ import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
++import org.apache.cassandra.config.DatabaseDescriptor;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertNotNull;
+ 
+ public class CompactionExecutorTest
+ {
+ static Throwable testTaskThrowable = null;
+ private static class TestTaskExecutor extends 
CompactionManager.CompactionExecutor
+ {
+ @Override
+ public void afterExecute(Runnable r, Throwable t)
+ {
+ if (t == null)
+ {
+ t = DebuggableThreadPoolExecutor.extractThrowable(r);
+ }
+ testTaskThrowable = t;
+ }
+ @Override
+ protected void beforeExecute(Thread t, Runnable r)
+ {
+ }
+ }
+ private CompactionManager.CompactionExecutor executor;
+ 
+ @Before
+ public void setup()
+ {
++DatabaseDescriptor.daemonInitialization();
+ executor = new TestTaskExecutor();
+ }
+ 
+ @After
+ public void destroy() throws Exception
+ {
+ executor.shutdown();
+ executor.awaitTermination(1, TimeUnit.MINUTES);
+ }
+ 
+ @Test
+ public void testFailedRunnable() throws Exception
+ {
+ testTaskThrowable = null;
+ Future tt = executor.submitIfRunning(
+ () -> { assert false : "testFailedRunnable"; }
+ , "compactionExecutorTest");
+ 
+ while (!tt.isDone())
+ Thread.sleep(10);
+ assertNotNull(testTaskThrowable);
+ assertEquals(testTaskThrowable.getMessage(), "testFailedRunnable");
+ }
+ 
+ @Test
+ public void testFailedCallable() throws Exception
+ {
+ testTaskThrowable = null;
+ Future tt = executor.submitIfRunning(
+ () -> { assert false : "testFailedCallable"; return 1; }
+ , "compactionExecutorTest");
+ 
+ while (!tt.isDone())
+ Thread.sleep(10);
+ assertNotNull(testTaskThrowable);
+

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-30 Thread aleksey 
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ad1945e/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
--
diff --cc test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
index e9051b4,000..03d89e1
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
@@@ -1,2566 -1,0 +1,2568 @@@
 +/*
 + * 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.index.sasi;
 +
 +import java.io.FileWriter;
 +import java.io.Writer;
 +import java.nio.ByteBuffer;
 +import java.nio.file.FileSystems;
 +import java.nio.file.Files;
 +import java.nio.file.Path;
 +import java.nio.file.attribute.BasicFileAttributes;
 +import java.util.*;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.Executors;
 +import java.util.concurrent.ThreadLocalRandom;
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicInteger;
 +
 +import org.apache.cassandra.SchemaLoader;
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.index.Index;
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.*;
 +import org.apache.cassandra.cql3.Term;
 +import org.apache.cassandra.cql3.statements.IndexTarget;
 +import org.apache.cassandra.cql3.statements.SelectStatement;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.filter.ColumnFilter;
 +import org.apache.cassandra.db.filter.DataLimits;
 +import org.apache.cassandra.db.filter.RowFilter;
 +import org.apache.cassandra.db.lifecycle.SSTableSet;
 +import org.apache.cassandra.db.marshal.*;
 +import org.apache.cassandra.db.partitions.PartitionUpdate;
 +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.dht.IPartitioner;
 +import org.apache.cassandra.dht.Murmur3Partitioner;
 +import org.apache.cassandra.dht.Range;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.index.sasi.conf.ColumnIndex;
 +import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder;
 +import org.apache.cassandra.index.sasi.exceptions.TimeQuotaExceededException;
 +import org.apache.cassandra.index.sasi.memory.IndexMemtable;
 +import org.apache.cassandra.index.sasi.plan.QueryController;
 +import org.apache.cassandra.index.sasi.plan.QueryPlan;
 +import org.apache.cassandra.io.sstable.SSTable;
 +import org.apache.cassandra.schema.IndexMetadata;
 +import org.apache.cassandra.schema.KeyspaceMetadata;
 +import org.apache.cassandra.schema.KeyspaceParams;
 +import org.apache.cassandra.schema.Tables;
 +import org.apache.cassandra.serializers.MarshalException;
 +import org.apache.cassandra.serializers.TypeSerializer;
 +import org.apache.cassandra.service.MigrationManager;
 +import org.apache.cassandra.service.QueryState;
 +import org.apache.cassandra.thrift.CqlRow;
 +import org.apache.cassandra.transport.messages.ResultMessage;
 +import org.apache.cassandra.utils.ByteBufferUtil;
 +import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.Pair;
 +
 +import com.google.common.collect.Lists;
 +import com.google.common.util.concurrent.Uninterruptibles;
 +
 +import junit.framework.Assert;
 +
 +import org.junit.*;
 +
 +public class SASIIndexTest
 +{
 +private static final IPartitioner PARTITIONER;
 +
 +static {
 +System.setProperty("cassandra.config", "cassandra-murmur.yaml");
 +PARTITIONER = Murmur3Partitioner.instance;
 +}
 +
 +private static final String KS_NAME = "sasi";
 +private static final String CF_NAME = "test_cf";
 +private static final String CLUSTERING_CF_NAME_1 = "clustering_test_cf_1";
 +private static final String CLUSTERING_CF_NAME_2 = "clustering_test_cf_2";
 +private static final String STATIC_CF_NAME = "static_sasi_test_cf";
 +private static final String FTS_CF_NAME =

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-25 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 26fedcd0bb181b3e3b54fd90d663fb06a256b46a
Parents: 6b7d73a 95f1b23
Author: Aleksey Yeschenko 
Authored: Sat Aug 26 01:25:54 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Aug 26 01:25:54 2017 +0100

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



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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-21 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b726f26aee0aa0e42a4d96a69fa8a761610c928c
Parents: 1619413 dc32ed8
Author: Jason Brown 
Authored: Mon Aug 21 15:36:58 2017 -0700
Committer: Jason Brown 
Committed: Mon Aug 21 15:37:43 2017 -0700

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/transport/Message.java | 6 +-
 src/java/org/apache/cassandra/transport/Server.java  | 9 +
 3 files changed, 15 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b726f26a/src/java/org/apache/cassandra/transport/Message.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b726f26a/src/java/org/apache/cassandra/transport/Server.java
--


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

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-08-08 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 303dba6504ba069b5ea92ee18a47d3ba87c1563e
Parents: 47a2839 1a70ded
Author: Benjamin Lerer 
Authored: Tue Aug 8 17:09:06 2017 +0200
Committer: Benjamin Lerer 
Committed: Tue Aug 8 17:11:24 2017 +0200

--
 CHANGES.txt |   1 +
 .../cassandra/config/DatabaseDescriptor.java|  26 ++-
 .../org/apache/cassandra/db/Directories.java|   3 +-
 .../org/apache/cassandra/io/util/FileUtils.java | 181 +--
 4 files changed, 191 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/303dba65/CHANGES.txt
--
diff --cc CHANGES.txt
index b778df6,1f42c70..145a746
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,9 -13,11 +17,10 @@@ Merged from 3.0
   * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
   * Set test.runners based on cores and memory size (CASSANDRA-13078)
   * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
   * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
   * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 - Merged from 2.2:
 +Merged from 2.2:
+  * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
   * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/303dba65/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 87b388e,aba7617..ad43565
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -19,10 -19,8 +19,9 @@@ package org.apache.cassandra.config
  
  import java.io.File;
  import java.io.IOException;
 +import java.lang.reflect.Constructor;
  import java.net.*;
  import java.nio.file.FileStore;
- import java.nio.file.Files;
  import java.nio.file.NoSuchFileException;
  import java.nio.file.Path;
  import java.nio.file.Paths;
@@@ -46,25 -40,24 +45,27 @@@ import org.apache.cassandra.config.Conf
  import org.apache.cassandra.dht.IPartitioner;
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.FSWriteError;
 -import org.apache.cassandra.io.sstable.format.SSTableFormat;
 +import org.apache.cassandra.io.util.DiskOptimizationStrategy;
  import org.apache.cassandra.io.util.FileUtils;
 -import org.apache.cassandra.locator.*;
 -import org.apache.cassandra.net.MessagingService;
 +import org.apache.cassandra.io.util.SpinningDiskOptimizationStrategy;
 +import org.apache.cassandra.io.util.SsdDiskOptimizationStrategy;
 +import org.apache.cassandra.locator.DynamicEndpointSnitch;
 +import org.apache.cassandra.locator.EndpointSnitchInfo;
 +import org.apache.cassandra.locator.IEndpointSnitch;
 +import org.apache.cassandra.locator.SeedProvider;
 +import org.apache.cassandra.net.BackPressureStrategy;
 +import org.apache.cassandra.net.RateBasedBackPressure;
  import org.apache.cassandra.scheduler.IRequestScheduler;
  import org.apache.cassandra.scheduler.NoScheduler;
 -import org.apache.cassandra.service.CacheService;
 -import org.apache.cassandra.thrift.ThriftServer;
 +import org.apache.cassandra.security.EncryptionContext;
 +import org.apache.cassandra.service.CacheService.CacheType;
 +import org.apache.cassandra.thrift.ThriftServer.ThriftServerType;
  import org.apache.cassandra.utils.FBUtilities;
 -import org.apache.cassandra.utils.memory.*;
 +
 +import org.apache.commons.lang3.StringUtils;
  
+ import static org.apache.cassandra.io.util.FileUtils.ONE_GB;
 -import static org.apache.cassandra.io.util.FileUtils.ONE_MB;
+ 
  public class DatabaseDescriptor
  {
  private static final Logger logger = 
LoggerFactory.getLogger(DatabaseDescriptor.class);
@@@ -429,53 -443,96 +430,53 @@@
  if (conf.native_transport_max_frame_size_in_mb <= 0)
  throw new 
ConfigurationException("native_transport_max_frame_size_in_mb must be positive, 
but was " + conf.native_transport_max_frame_size_in_mb, false);
  
 -//

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-07-14 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: bd89f56232859d8076c8da147e983881ce09e5b7
Parents: 29db251 7de853b
Author: Benjamin Lerer 
Authored: Fri Jul 14 11:41:51 2017 +0200
Committer: Benjamin Lerer 
Committed: Fri Jul 14 11:41:51 2017 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/service/StorageService.java| 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd89f562/CHANGES.txt
--
diff --cc CHANGES.txt
index 30fa350,fffda7f..e7ad6fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -6,9 -2,11 +6,10 @@@ Merged from 3.0
   * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
   * Set test.runners based on cores and memory size (CASSANDRA-13078)
   * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
   * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
   * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 - Merged from 2.2:
 +Merged from 2.2:
+   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
* Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
* Fix nested Tuples/UDTs validation (CASSANDRA-13646)
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd89f562/src/java/org/apache/cassandra/service/StorageService.java
--


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

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-07-07 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b5df3b4c367c2927f309ca16a540b7be83636556
Parents: 7afb97c e51c85f
Author: Benjamin Lerer 
Authored: Fri Jul 7 13:36:52 2017 +0200
Committer: Benjamin Lerer 
Committed: Fri Jul 7 13:38:22 2017 +0200

--
 CHANGES.txt |  3 +-
 .../org/apache/cassandra/cql3/UserTypes.java| 12 +---
 .../apache/cassandra/db/marshal/TupleType.java  | 45 -
 .../apache/cassandra/db/marshal/UserType.java   | 51 +--
 .../cassandra/serializers/TupleSerializer.java  | 64 +++
 .../serializers/UserTypeSerializer.java | 67 
 .../validation/entities/CollectionsTest.java| 36 +++
 .../cql3/validation/entities/TupleTypeTest.java | 10 ++-
 .../cql3/validation/entities/UserTypesTest.java | 15 -
 9 files changed, 223 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5df3b4c/CHANGES.txt
--
diff --cc CHANGES.txt
index 096dfa4,c98ffd9..679d55b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,12 +1,52 @@@
 -3.0.15
 +3.11.1
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
   * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
   * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
   * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
- 
 - Merged from 2.2:
 -* Fix nested Tuples/UDTs validation (CASSANDRA-13646)
++Merged from 2.2:
++ * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
  
 -3.0.14
 +3.11.0
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Replace string comparison with regex/number checks in MessagingService 
test (CASSANDRA-13216)
 + * Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
 + * Fix the problem with duplicated rows when using paging with SASI 
(CASSANDRA-13302)
 + * Allow CONTAINS statements filtering on the partition key and it’s parts 
(CASSANDRA-13275)
 + * Fall back to even ranges calculation in clusters with vnodes when tokens 
are distributed unevenly (CASSANDRA-13229)
 + * Fix duration type validation to prevent overflow (CASSANDRA-13218)
 + * Forbid unsupported creation of SASI indexes over partition key columns 
(CASSANDRA-13228)
 + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
 + * UDA fails without input rows (CASSANDRA-13399)
 + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
 + * V5 protocol flags decoding broken (CASSANDRA-13443)
 + * Use write lock not read lock for removing sstables from compaction 
strategies. (CASSANDRA-13422)
 + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors 
(CASSANDRA-13329)
 + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
 + * Add charset to Analyser input stream (CASSANDRA-13151)
 + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
 + * cdc column addition strikes again (CASSANDRA-13382)
 + * Fix static column indexes (CASSANDRA-13277)
 + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
 + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
 + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns 
(CASSANDRA-13247)
 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern 
(CASSANDRA-13317)
 + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound 
(CASSANDRA-13366)
 + * Support unaligned memory access for AArch64 (CASSANDRA-13326)
 + * Improve SASI range iterator efficiency on intersection with an empty range 
(CASSANDRA-12915).
 + * Fix equality comparisons of columns using the duration type 
(CASSANDRA-13174)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 + * Address message coalescing regression (CASSANDRA-12676)
 + * Delete illegal character from StandardTokenizerImpl.jflex

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-06-21 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 903da089ff825b6ac7e2b090ff5583dda14fdc18
Parents: e8a5826 960e16b
Author: Jeff Jirsa 
Authored: Wed Jun 21 17:01:46 2017 -0700
Committer: Jeff Jirsa 
Committed: Wed Jun 21 17:01:46 2017 -0700

--

--



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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-06-12 Thread mck 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 6220108e687e28b05d7cb0bbd254751f51a0f1d7
Parents: 30412b0 7b9868c
Author: mck 
Authored: Tue Jun 13 14:11:15 2017 +1000
Committer: mck 
Committed: Tue Jun 13 14:15:03 2017 +1000

--
 CHANGES.txt|  1 +
 .../cassandra/auth/CassandraRoleManager.java   |  4 
 .../apache/cassandra/service/StorageService.java   | 17 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/CHANGES.txt
--
diff --cc CHANGES.txt
index 2ffa526,26462db..f285ff0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,34 -40,12 +74,35 @@@ Merged from 3.0
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
   * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 - * Fix NPE issue in StorageService (CASSANDRA-13060)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
  Merged from 2.2:
++ * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
 + * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 + * Fix JVM metric names (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 749c6a9,3bad040..b4878c7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -190,12 -177,10 +190,13 @@@ public class StorageService extends Not
  private boolean isSurveyMode = 
Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
  /* true if node is rebuilding and receiving data */
  private final AtomicBoolean isRebuilding = new AtomicBoolean();
 +private final AtomicBoolean isDecommissioning = new AtomicBoolean();
  
 -private

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-06-05 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 92e304277c1b4d43049c59d5511f398e15c40b04
Parents: d8a3aa4 17a7a80
Author: Stefania Alborghetti 
Authored: Tue Jun 6 08:53:34 2017 +0800
Committer: Stefania Alborghetti 
Committed: Tue Jun 6 08:53:34 2017 +0800

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92e30427/CHANGES.txt
--
diff --cc CHANGES.txt
index 5202428,0076b2c..61bff07
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -73,33 -38,12 +73,34 @@@ Merged from 3.0
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
   * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 - * Fix NPE issue in StorageService (CASSANDRA-13060)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
  Merged from 2.2:
++ * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 + * Fix JVM metric names (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/92e30427/pylib/cqlshlib/copyutil.py
--


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

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-05-31 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 54ff61931c04640a0358a9eaac332331f2009b29
Parents: 5a860a7 a2f742c
Author: Benjamin Lerer 
Authored: Wed May 31 14:44:24 2017 +0200
Committer: Benjamin Lerer 
Committed: Wed May 31 14:44:42 2017 +0200

--
 CHANGES.txt|   2 +
 build.xml  |   2 +-
 lib/jna-4.0.0.jar  | Bin 914639 -> 0 bytes
 lib/jna-4.4.0.jar  | Bin 0 -> 1091208 bytes
 lib/licenses/jna-4.0.0.txt | 202 
 lib/licenses/jna-4.4.0.txt | 202 
 6 files changed, 205 insertions(+), 203 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54ff6193/CHANGES.txt
--
diff --cc CHANGES.txt
index c006b50,164470f..26a8018
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -69,33 -32,14 +69,35 @@@ Merged from 3.0
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
   * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 - * Fix NPE issue in StorageService (CASSANDRA-13060)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
  Merged from 2.2:
+  * upgrade JNA version to 4.4.0 (CASSANDRA-13072)
+  * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 + * Fix JVM metric names (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54ff6193/build.xml
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-05-03 Thread aweisberg 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: d56c64a883f70749effc8da11f53e00385a3128a
Parents: 8b97a91 0f118a9
Author: Ariel Weisberg 
Authored: Wed May 3 18:14:45 2017 -0400
Committer: Ariel Weisberg 
Committed: Wed May 3 18:14:45 2017 -0400

--

--



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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-26 Thread spod 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: ca034eacfef08b2e14bee98309bed01f1e5929e7
Parents: a483147 6c840c0
Author: Stefan Podkowinski 
Authored: Wed Apr 26 19:47:11 2017 +0200
Committer: Stefan Podkowinski 
Committed: Wed Apr 26 19:47:11 2017 +0200

--
 redhat/cassandra | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-26 Thread spod 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: a483147077c2f30d194c4e530f56238112919828
Parents: 6679b08 8bb5f1e
Author: Stefan Podkowinski 
Authored: Wed Apr 26 19:35:19 2017 +0200
Committer: Stefan Podkowinski 
Committed: Wed Apr 26 19:35:19 2017 +0200

--
 redhat/cassandra | 1 +
 1 file changed, 1 insertion(+)
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-26 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 6679b085a3798234881fb64fc6202dc35bf06ec1
Parents: 2369faa 8dbf808
Author: Marcus Eriksson 
Authored: Wed Apr 26 09:39:41 2017 +0200
Committer: Marcus Eriksson 
Committed: Wed Apr 26 09:39:41 2017 +0200

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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-20 Thread ifesdjeen 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 638df6f971b806460113031524e14b21ae3e20f8
Parents: fc83418 b063b38
Author: Alex Petrov 
Authored: Thu Apr 20 11:48:12 2017 +0200
Committer: Alex Petrov 
Committed: Thu Apr 20 11:48:12 2017 +0200

--
 CHANGES.txt| 1 +
 test/unit/org/apache/cassandra/service/RemoveTest.java | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/638df6f9/CHANGES.txt
--
diff --cc CHANGES.txt
index 8a2926b,81d5b06..690c959
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -49,31 -21,12 +49,32 @@@ Merged from 3.0
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
   * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 - * Fix NPE issue in StorageService (CASSANDRA-13060)
  Merged from 2.2:
+  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 + * Fix JVM metric names (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/638df6f9/test/unit/org/apache/cassandra/service/RemoveTest.java
--
diff --cc test/unit/org/apache/cassandra/service/RemoveTest.java
index 701ea0f,800c904..f4b203c
--- a/test/unit/org/apache/cassandra/service/RemoveTest.java
+++ b/test/unit/org/apache/cassandra/service/RemoveTest.java
@@@ -30,10 -29,8 +30,9 @@@ import java.util.concurrent.atomic.Atom
  
  import org.junit.*;
  
--import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
 +import org.apache.cassandra.concurrent.NamedThreadFactory;
 +import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.dht.IPartitioner;
  import org.apache.cassandra.dht.RandomPartitioner;
  import org.apache.cassandra.dht.Token;
@@@ -71,7 -60,7 +70,6 @@@ public class RemoveTes
  public static void setupClass() throws ConfigurationException
  {
  oldPartitioner = 
StorageService.instance.setPartitionerUnsafe(partitioner);
- SchemaLoader.loadSchema();
 -SchemaLoader.prepareServer();
  }
  
  @AfterClass

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-09 Thread snazy 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c38e618d69ac30868ae0f413320ffc8e0f27c9be
Parents: 99881b9 58e8008
Author: Robert Stupp 
Authored: Sun Apr 9 10:58:56 2017 +0200
Committer: Robert Stupp 
Committed: Sun Apr 9 10:58:56 2017 +0200

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38e618d/CHANGES.txt
--
diff --cc CHANGES.txt
index a34db06,c5e517f..a7b464a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,30 -15,11 +42,31 @@@ Merged from 3.0
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
   * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 - * Fix NPE issue in StorageService (CASSANDRA-13060)
  Merged from 2.2:
+  * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 + * Fix JVM metric names (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-03 Thread spod 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 05a0658d7645d36b7414d44f11cda1dbee86e5f0
Parents: 5b77e04 13e6699
Author: Stefan Podkowinski 
Authored: Mon Apr 3 20:00:56 2017 +0200
Committer: Stefan Podkowinski 
Committed: Mon Apr 3 20:01:09 2017 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  |  6 +--
 .../metrics/CassandraMetricsRegistryTest.java   | 47 +---
 3 files changed, 45 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/05a0658d/CHANGES.txt
--
diff --cc CHANGES.txt
index 3ead1d1,371abed..2408b8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,145 -57,6 +52,146 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix JVM metric names (CASSANDRA-13103)
 + * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
 + * Discard in-flight shadow round responses (CASSANDRA-12653)
 + * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
 + * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
 + * Fix queries updating multiple time the same list (CASSANDRA-13130)
 + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-03 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 88627598cb8c4bf0af6ed81e5083df2cfe67ca9d
Parents: 81b8895 ac1b7c1
Author: Marcus Eriksson 
Authored: Mon Apr 3 08:34:02 2017 +0200
Committer: Marcus Eriksson 
Committed: Mon Apr 3 08:34:02 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88627598/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-22 Thread jkni 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: ec9ce3dfba0030015c5dd846b8b5b526614cf5f7
Parents: 5484bd1 2836a64
Author: Joel Knighton 
Authored: Wed Mar 22 13:20:24 2017 -0500
Committer: Joel Knighton 
Committed: Wed Mar 22 13:22:43 2017 -0500

--
 CHANGES.txt |   1 +
 .../gms/GossipDigestAckVerbHandler.java |  27 +++--
 src/java/org/apache/cassandra/gms/Gossiper.java |  65 +++
 .../apache/cassandra/service/MigrationTask.java |  12 +-
 .../cassandra/service/StorageService.java   |  17 ++-
 test/conf/cassandra-seeds.yaml  |  43 +++
 .../apache/cassandra/gms/ShadowRoundTest.java   | 116 +++
 .../apache/cassandra/net/MatcherResponse.java   |  24 ++--
 8 files changed, 252 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec9ce3df/CHANGES.txt
--
diff --cc CHANGES.txt
index ce8535d,9140c73..8386c20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,143 -49,6 +37,144 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Discard in-flight shadow round responses (CASSANDRA-12653)
 + * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
 + * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
 + * Fix queries updating multiple time the same list (CASSANDRA-13130)
 + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-20 Thread spod 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 5484bd1acc95e17a2001297f118fe8472d271924
Parents: 6b8da36 f4ba908
Author: Stefan Podkowinski 
Authored: Mon Mar 20 19:50:48 2017 +0100
Committer: Stefan Podkowinski 
Committed: Mon Mar 20 19:52:31 2017 +0100

--
 CHANGES.txt  |  1 +
 .../cassandra/db/compaction/CompactionManager.java   | 11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5484bd1a/CHANGES.txt
--
diff --cc CHANGES.txt
index a800f82,6021315..ce8535d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,142 -48,6 +37,143 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
 + * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
 + * Fix queries updating multiple time the same list (CASSANDRA-13130)
 + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + *

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-16 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 8fcf83738db53dcb637b5dd3ebbf60fd0dfbbff1
Parents: 6e76bbb 0c07840
Author: Jason Brown 
Authored: Thu Mar 16 13:26:53 2017 -0700
Committer: Jason Brown 
Committed: Thu Mar 16 13:27:23 2017 -0700

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/repair/AnticompactionTask.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fcf8373/CHANGES.txt
--
diff --cc CHANGES.txt
index 6d2e6c6,7232d5e..7ea50db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,141 -44,6 +34,142 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
 + * Fix queries updating multiple time the same list (CASSANDRA-13130)
 + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-12 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: a2399d4d309ac6b60a150ea20af8dc6f006d51ff
Parents: 2c111d1 44f79bf
Author: Jeff Jirsa 
Authored: Sun Mar 12 21:56:11 2017 -0700
Committer: Jeff Jirsa 
Committed: Sun Mar 12 21:57:25 2017 -0700

--
 CHANGES.txt  |  1 +
 .../cassandra/db/commitlog/CommitLogReader.java  | 12 
 .../apache/cassandra/db/commitlog/CommitLogTest.java | 15 ++-
 3 files changed, 27 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2399d4d/CHANGES.txt
--
diff --cc CHANGES.txt
index 302a028,140c860..ab28dd4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,140 -43,6 +33,141 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
 + * Fix queries updating multiple time the same list (CASSANDRA-13130)
 + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for

[08/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-03-10 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 7b3415d0b06843aca4410ce9cbd6d68ff37e3978
Parents: dc65a57 aeca1d2
Author: Benjamin Lerer 
Authored: Fri Mar 10 10:06:27 2017 +0100
Committer: Benjamin Lerer 
Committed: Fri Mar 10 10:07:14 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/UpdateParameters.java |  24 -
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  43 ++--
 src/java/org/apache/cassandra/db/rows/Row.java  |   6 ++
 .../org/apache/cassandra/utils/btree/BTree.java |  20 
 .../validation/entities/CollectionsTest.java| 100 +++
 .../apache/cassandra/db/rows/RowBuilder.java|   7 ++
 7 files changed, 192 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b3415d0/CHANGES.txt
--
diff --cc CHANGES.txt
index 2772fc2,52a794b..acef1c2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,139 -42,6 +32,140 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix queries updating multiple time the same list (CASSANDRA-13130)
 + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-07 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 2b62cb997ed163c85b0cb50e3198935b38aa2fb6
Parents: e995859 71c1f98
Author: Aleksey Yeschenko 
Authored: Wed Mar 8 00:22:35 2017 +
Committer: Aleksey Yeschenko 
Committed: Wed Mar 8 00:22:35 2017 +

--
 CHANGES.txt | 2 ++
 .../cql3/statements/PermissionsManagementStatement.java | 5 +
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b62cb99/CHANGES.txt
--
diff --cc CHANGES.txt
index 3852a64,7551a7f..88599b7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,137 -39,6 +30,139 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
++
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-07 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: a7f6bf8cb9d3a963098a7c8ae77c56132f821f7e
Parents: e995859 ddda768
Author: Aleksey Yeschenko 
Authored: Wed Mar 8 00:10:43 2017 +
Committer: Aleksey Yeschenko 
Committed: Wed Mar 8 00:10:43 2017 +

--
 CHANGES.txt | 2 ++
 .../cql3/statements/PermissionsManagementStatement.java | 5 +
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7f6bf8c/CHANGES.txt
--
diff --cc CHANGES.txt
index 3852a64,7551a7f..88599b7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,137 -39,6 +30,139 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Remove unused repositories (CASSANDRA-13278)
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
++
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-04 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 7f5dc696f6658d2e0a40c24276e858a1cf30ce85
Parents: 92b7322 77d45ea
Author: Jason Brown 
Authored: Sat Mar 4 15:38:39 2017 -0800
Committer: Jason Brown 
Committed: Sat Mar 4 15:39:11 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f5dc696/test/unit/org/apache/cassandra/db/DirectoriesTest.java
--
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 5841c36,7c4ff7a..7e800e6
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -156,12 -152,12 +156,12 @@@ public class DirectoriesTes
  Directories directories = new Directories(cfm);
  assertEquals(cfDir(cfm), 
directories.getDirectoryForNewSSTables());
  
 -Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1);
 +Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, 
SSTableFormat.Type.BIG);
  File snapshotDir = new File(cfDir(cfm),  File.separator + 
Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, 
"42"));
+ assertEquals(snapshotDir.getCanonicalFile(), 
Directories.getSnapshotDirectory(desc, "42"));
  
  File backupsDir = new File(cfDir(cfm),  File.separator + 
Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), 
Directories.getBackupsDirectory(desc));
  }
  }

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-03 Thread mshuler 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: a830cf528ea2ab85288bf7503b282507346c71db
Parents: ff170af 244f887
Author: Michael Shuler 
Authored: Fri Mar 3 12:42:19 2017 -0600
Committer: Michael Shuler 
Committed: Fri Mar 3 12:42:19 2017 -0600

--
 debian/control| 2 +-
 redhat/cassandra.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a830cf52/redhat/cassandra.spec
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-01 Thread mshuler 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 4599da2182722d3df9cd7b7000d600e316d31893
Parents: e345d4e 143c503
Author: Michael Shuler 
Authored: Wed Mar 1 18:47:42 2017 -0600
Committer: Michael Shuler 
Committed: Wed Mar 1 18:47:42 2017 -0600

--

--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-03-01 Thread paulo 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: e345d4e7bc83e09e3c273981b5c95e5fb00d1df5
Parents: be0deb9 815508f
Author: Paulo Motta 
Authored: Wed Mar 1 20:33:49 2017 -0300
Committer: Paulo Motta 
Committed: Wed Mar 1 20:33:49 2017 -0300

--

--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-28 Thread aweisberg 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 760d6c33d5727d94e89afb2e43d551f10a2721b7
Parents: 91c8d91 56d3f93
Author: Ariel Weisberg 
Authored: Tue Feb 28 19:54:59 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 28 19:54:59 2017 -0500

--
 CHANGES.txt | 1 +
 build.xml   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/CHANGES.txt
--
diff --cc CHANGES.txt
index 1cced71,a63bd12..497f5c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,4 +1,15 @@@
 -3.0.12
 +3.11.0
 + * Fix equality comparisons of columns using the duration type 
(CASSANDRA-13174)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 +Merged from 3.0:
++ * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
   * Faster StreamingHistogram (CASSANDRA-13038)
   * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
   * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/build.xml
--
diff --cc build.xml
index 0eef700,69b6bdf..dcaa780
--- a/build.xml
+++ b/build.xml
@@@ -156,12 -153,14 +156,14 @@@
  
  
  
 -  
 -  
 -  
 +
 +
++
  
  
 -  
 -  
 -  
 +
 +
++

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-28 Thread aweisberg 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 91c8d915742a8dfcd1ef28b1e326ec201ee68c9c
Parents: 942b83c df28bcf
Author: Ariel Weisberg 
Authored: Tue Feb 28 18:00:07 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 28 18:01:06 2017 -0500

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91c8d915/CHANGES.txt
--
diff --cc CHANGES.txt
index 1810cae,5cdc2e4..1cced71
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,4 +1,14 @@@
 -3.0.12
 +3.11.0
 + * Fix equality comparisons of columns using the duration type 
(CASSANDRA-13174)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 +Merged from 3.0:
++ * Coalescing strategy sleeps too much (CASSANDRA-13090)
   * Faster StreamingHistogram (CASSANDRA-13038)
   * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
   * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
@@@ -227,21 -115,6 +228,20 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
-  * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Fix speculative retry bugs (CASSANDRA-13009)
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
 + * Fix DynamicEndpointSnitch noop in multi-datacenter situations 
(CASSANDRA-13074)
 + * cqlsh copy-from: encode column names to avoid primary key parsing errors 
(CASSANDRA-12909)
 + * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-23 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 0fe76da17ea21237a623cf88121b3d98f30b97fd
Parents: b887ae9 42977db
Author: Stefania Alborghetti 
Authored: Thu Feb 23 09:05:07 2017 +
Committer: Stefania Alborghetti 
Committed: Thu Feb 23 09:05:07 2017 +

--

--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-22 Thread yukim 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b887ae944bfbdbd0a808e368acbbc507311fce0e
Parents: f624b14 61f0c98
Author: Yuki Morishita 
Authored: Thu Feb 23 11:12:46 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 11:12:46 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 50 
 2 files changed, 31 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887ae94/CHANGES.txt
--
diff --cc CHANGES.txt
index ca490ba,e978a5c..3e38844
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -21,135 -23,6 +21,136 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + *

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-22 Thread paulo 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: b3490c06242cdaa8519bf4208dbf653fafacec62
Parents: b0ed0f4 5fba118
Author: Paulo Motta 
Authored: Wed Feb 22 17:20:37 2017 -0300
Committer: Paulo Motta 
Committed: Wed Feb 22 17:20:37 2017 -0300

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 7 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3490c06/CHANGES.txt
--
diff --cc CHANGES.txt
index 6dd4edb,b744b40..3dc192f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -20,134 -21,6 +20,135 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-21 Thread aweisberg 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c382a900b8059303f5ee1632650bc560e40c7cdf
Parents: 87e8c6b 5022264
Author: Ariel Weisberg 
Authored: Tue Feb 21 12:17:02 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 21 12:17:02 2017 -0500

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c382a900/CHANGES.txt
--
diff --cc CHANGES.txt
index a98e43d,f2419d6..846fc20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -219,21 -107,6 +219,21 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
-  * Coalescing strategy sleeps too much and shouldn't be enabled by default 
(CASSANDRA-13090)
++ * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Fix speculative retry bugs (CASSANDRA-13009)
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
 + * Fix DynamicEndpointSnitch noop in multi-datacenter situations 
(CASSANDRA-13074)
 + * cqlsh copy-from: encode column names to avoid primary key parsing errors 
(CASSANDRA-12909)
 + * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-20 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 87e8c6be732c7a4f515d4d33b96db98c296cd7ba
Parents: 3f89d24 0020e79
Author: Sam Tunnicliffe 
Authored: Mon Feb 20 12:00:58 2017 +
Committer: Sam Tunnicliffe 
Committed: Mon Feb 20 12:03:10 2017 +

--
 CHANGES.txt |  1 +
 .../cassandra/service/QueryPagerTest.java   | 82 +++-
 2 files changed, 79 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/87e8c6be/CHANGES.txt
--
diff --cc CHANGES.txt
index 45098ee,922e7f7..a98e43d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,132 -17,6 +19,133 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-17 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 3f89d2446d35021c06a294fb418cb46d9d4aa95e
Parents: cc405c0 e2bdf99
Author: Jason Brown 
Authored: Fri Feb 17 13:36:24 2017 -0800
Committer: Jason Brown 
Committed: Fri Feb 17 13:37:49 2017 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/net/OutboundTcpConnection.java| 22 
 2 files changed, 19 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f89d244/CHANGES.txt
--
diff --cc CHANGES.txt
index 1a9ce2d,af06a02..45098ee
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,131 -16,6 +19,132 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-14 Thread aweisberg 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 23a1dee45f43ea241deb6b677d8c42cb3e9d45a0
Parents: 702ec08 82943d6
Author: Ariel Weisberg 
Authored: Tue Feb 14 15:13:39 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 14 15:13:39 2017 -0500

--
 conf/cassandra.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23a1dee4/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 063a0b7,790dfd7..90e28b2
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -1173,34 -959,12 +1173,34 @@@ gc_warn_threshold_in_ms: 100
  # as corrupted.
  # max_value_size_in_mb: 256
  
 +# Back-pressure settings #
 +# If enabled, the coordinator will apply the back-pressure strategy specified 
below to each mutation
 +# sent to replicas, with the aim of reducing pressure on overloaded replicas.
 +back_pressure_enabled: false
 +# The back-pressure strategy applied.
 +# The default implementation, RateBasedBackPressure, takes three arguments:
 +# high ratio, factor, and flow type, and uses the ratio between incoming 
mutation responses and outgoing mutation requests.
 +# If below high ratio, outgoing mutations are rate limited according to the 
incoming rate decreased by the given factor;
 +# if above high ratio, the rate limiting is increased by the given factor;
 +# such factor is usually best configured between 1 and 10, use larger values 
for a faster recovery
 +# at the expense of potentially more dropped mutations;
 +# the rate limiting is applied according to the flow type: if FAST, it's rate 
limited at the speed of the fastest replica,
 +# if SLOW at the speed of the slowest one.
 +# New strategies can be added. Implementors need to implement 
org.apache.cassandra.net.BackpressureStrategy and
 +# provide a public constructor accepting a Map.
 +back_pressure_strategy:
 +- class_name: org.apache.cassandra.net.RateBasedBackPressure
 +  parameters:
 +- high_ratio: 0.90
 +  factor: 5
 +  flow: FAST
 +
  # Coalescing Strategies #
  # Coalescing multiples messages turns out to significantly boost message 
processing throughput (think doubling or more).
- # On bare metal, the floor for packet processing throughput is high enough 
that many applications won’t notice, but in
+ # On bare metal, the floor for packet processing throughput is high enough 
that many applications won't notice, but in
  # virtualized environments, the point at which an application can be bound by 
network packet processing can be
- # surprisingly low compared to the throughput of task processing that is 
possible inside a VM. It’s not that bare metal
- # doesn’t benefit from coalescing messages, it’s that the number of 
packets a bare metal network interface can process
+ # surprisingly low compared to the throughput of task processing that is 
possible inside a VM. It's not that bare metal
+ # doesn't benefit from coalescing messages, it's that the number of packets a 
bare metal network interface can process
  # is sufficient for many applications such that no load starvation is 
experienced even without coalescing.
  # There are other benefits to coalescing network messages that are harder to 
isolate with a simple metric like messages
  # per second. By coalescing multiple tasks together, a network thread can 
process multiple messages for the cost of one

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-13 Thread aweisberg 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 702ec088f5f61106b41e128f3fb8f109da8cbe1c
Parents: 01b91cc 3d01e90
Author: Ariel Weisberg 
Authored: Mon Feb 13 13:31:23 2017 -0500
Committer: Ariel Weisberg 
Committed: Mon Feb 13 13:32:30 2017 -0500

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml | 27 +
 .../org/apache/cassandra/config/Config.java |  3 +-
 .../cassandra/config/DatabaseDescriptor.java| 16 
 .../cassandra/net/OutboundTcpConnection.java|  4 +-
 .../cassandra/utils/CoalescingStrategies.java   | 32 
 .../utils/CoalescingStrategiesTest.java | 40 
 7 files changed, 114 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/702ec088/CHANGES.txt
--
diff --cc CHANGES.txt
index 67c45e8,b19550a..8164a52
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -215,20 -100,6 +215,21 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * Coalescing strategy sleeps too much and shouldn't be enabled by default 
(CASSANDRA-13090)
 + * Fix speculative retry bugs (CASSANDRA-13009)
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
 + * Fix DynamicEndpointSnitch noop in multi-datacenter situations 
(CASSANDRA-13074)
 + * cqlsh copy-from: encode column names to avoid primary key parsing errors 
(CASSANDRA-12909)
 + * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/702ec088/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 4436a02,a9d4c01..063a0b7
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -1173,24 -959,29 +1173,51 @@@ gc_warn_threshold_in_ms: 100
  # as corrupted.
  # max_value_size_in_mb: 256
  
 +# Back-pressure settings #
 +# If enabled, the coordinator will apply the back-pressure strategy specified 
below to each mutation
 +# sent to replicas, with the aim of reducing pressure on overloaded replicas.
 +back_pressure_enabled: false
 +# The back-pressure strategy applied.
 +# The default implementation, RateBasedBackPressure, takes three arguments:
 +# high ratio, factor, and flow type, and uses the ratio between incoming 
mutation responses and outgoing mutation requests.
 +# If below high ratio, outgoing mutations are rate limited according to the 
incoming rate decreased by the given factor;
 +# if above high ratio, the rate limiting is increased by the given factor;
 +# such factor is usually best configured between 1 and 10, use larger values 
for a faster recovery
 +# at the expense of potentially more dropped mutations;
 +# the rate limiting is applied according to the flow type: if FAST, it's rate 
limited at the speed of the fastest replica,
 +# if SLOW at the speed of the slowest one.
 +# New strategies can be added. Implementors need to implement 
org.apache.cassandra.net.BackpressureStrategy and
 +# provide a public constructor accepting a Map.
 +back_pressure_strategy:
 +- class_name: org.apache.cassandra.net.RateBasedBackPressure
 +  parameters:
 +

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-11 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: ed45d5eb70f67e6379fe089edf6cbc0b5e23dc50
Parents: 94a8c77 51e3660
Author: Jeff Jirsa 
Authored: Sat Feb 11 23:29:24 2017 -0800
Committer: Jeff Jirsa 
Committed: Sat Feb 11 23:29:56 2017 -0800

--
 CHANGES.txt |  3 +-
 .../DecayingEstimatedHistogramReservoir.java|  3 +-
 ...DecayingEstimatedHistogramReservoirTest.java | 31 
 3 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed45d5eb/CHANGES.txt
--
diff --cc CHANGES.txt
index b34e5f6,b720a0e..5be6cef
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,129 -10,6 +17,130 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
-   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
++ * Fix negative mean latency metric (CASSANDRA-12876)
++ * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-03 Thread jake 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: d8dfeb2354a35ac6987a13a72a6d2c20f5a2cb23
Parents: 48cfe7d cc384a5
Author: T Jake Luciani 
Authored: Fri Feb 3 15:19:32 2017 -0500
Committer: T Jake Luciani 
Committed: Fri Feb 3 15:19:32 2017 -0500

--
 CHANGES.txt  | 19 ++-
 .../apache/cassandra/db/ColumnFamilyStore.java   |  4 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8dfeb23/CHANGES.txt
--
diff --cc CHANGES.txt
index be749aa,1d6b53c..d0134e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -195,19 -86,6 +195,20 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * Fix speculative retry bugs (CASSANDRA-13009)
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
 + * Fix DynamicEndpointSnitch noop in multi-datacenter situations 
(CASSANDRA-13074)
 + * cqlsh copy-from: encode column names to avoid primary key parsing errors 
(CASSANDRA-12909)
 + * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
@@@ -339,12 -208,6 +356,12 @@@ Merged from 2.2
   * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
   * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
  Merged from 2.1:
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
-  * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127) 
++ * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127)
 + * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
 + * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
 + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
 + * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
   * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
   * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)
   * Don't try to get sstables for non-repairing column families 
(CASSANDRA-12077)

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