subject:"\[9\/9\] cassandra git commit\: Merge branch 'cassandra\-3.11' into trunk"

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-12-06 Thread benedict

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 49f72af7923ebdbdf88259643356253463d2e7a7
Parents: 1f19d5f d502165
Author: Benedict Elliott Smith 
Authored: Thu Dec 6 15:52:38 2018 +
Committer: Benedict Elliott Smith 
Committed: Thu Dec 6 15:52:38 2018 +

--
 CHANGES.txt | 1 +
 conf/cassandra.yaml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49f72af7/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 2d5cdd3,2cc119a..dde4296
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -1207,84 -1234,4 +1207,84 @@@ back_pressure_strategy
  # time and queue contention while iterating the backlog of messages.
  # An interval of 0 disables any wait time, which is the behavior of former 
Cassandra versions.
  #
 -# otc_backlog_expiration_interval_ms: 200
 +# otc_backlog_expiration_interval_ms: 200
 +
 +# Track a metric per keyspace indicating whether replication achieved the 
ideal consistency
 +# level for writes without timing out. This is different from the consistency 
level requested by
 +# each write which may be lower in order to facilitate availability.
 +# ideal_consistency_level: EACH_QUORUM
 +
 +# Path to write full query log data to when the full query log is enabled
 +# The full query log will recrusively delete the contents of this path at
 +# times. Don't place links in this directory to other parts of the filesystem.
 +#full_query_log_dir: /tmp/cassandrafullquerylog
 +
 +# Automatically upgrade sstables after upgrade - if there is no ordinary 
compaction to do, the
 +# oldest non-upgraded sstable will get upgraded to the latest version
 +# automatic_sstable_upgrade: false
 +# Limit the number of concurrent sstable upgrades
 +# max_concurrent_automatic_sstable_upgrades: 1
 +
 +# Audit logging - Logs every incoming CQL command request, authentication to 
a node. See the docs
 +# on audit_logging for full details about the various configuration options.
 +audit_logging_options:
 +enabled: false
 +logger: BinAuditLogger
 +# audit_logs_dir:
 +# included_keyspaces:
 +# excluded_keyspaces: system, system_schema, system_virtual_schema
 +# included_categories:
 +# excluded_categories:
 +# included_users:
 +# excluded_users:
 +# roll_cycle: HOURLY
 +# block: true
 +# max_queue_weight: 268435456 # 256 MiB
 +# max_log_size: 17179869184 # 16 GiB
 +## archive command is "/path/to/script.sh %path" where %path is replaced 
with the file being rolled:
 +# archive_command:
 +# max_archive_retries: 10
 +
 +
 +# default options for full query logging - these can be overridden from 
command line when executing
 +# nodetool enablefullquerylog
 +#full_query_logging_options:
 +# log_dir:
 +# roll_cycle: HOURLY
 +# block: true
 +# max_queue_weight: 268435456 # 256 MiB
 +# max_log_size: 17179869184 # 16 GiB
 +## archive command is "/path/to/script.sh %path" where %path is replaced 
with the file being rolled:
 +# archive_command:
 +# max_archive_retries: 10
 +
 +# validate tombstones on reads and compaction
 +# can be either "disabled", "warn" or "exception"
 +# corrupted_tombstone_strategy: disabled
 +
 +# Diagnostic Events #
 +# If enabled, diagnostic events can be helpful for troubleshooting 
operational issues. Emitted events contain details
 +# on internal state and temporal relationships across events, accessible by 
clients via JMX.
 +diagnostic_events_enabled: false
 +
- # Define use of legacy delayed flusher for replies to TCP connections. This 
will increase latency, but might be beneficial for
- # legacy use-cases where only a single connection is used for each Cassandra 
node. Default is false.
++# Use native transport TCP message coalescing. If on upgrade to 4.0 you found 
your throughput decreasing, and in
++# particular you run an old kernel or have very fewer client connections, 
this option might be worth evaluating.
 +#native_transport_flush_in_batches_legacy: false
 +
 +# Enable tracking of repaired state of data during reads and comparison 
between replicas
 +# Mismatches between the repaired sets of replicas can be characterized as 
either confirmed
 +# or unconfirmed. In this context, unconfirmed indicates that the presence of 
pending repair
 +# sessions, unrepaired

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-12-06 Thread benedict

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 2275ab6d686e7bdf3cf12c9ef972c6f4d36ded0c
Parents: 1f19d5f 866a894
Author: Benedict Elliott Smith 
Authored: Thu Dec 6 15:46:28 2018 +
Committer: Benedict Elliott Smith 
Committed: Thu Dec 6 15:46:28 2018 +

--
 CHANGES.txt | 1 +
 conf/cassandra.yaml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2275ab6d/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 2d5cdd3,2cc119a..dde4296
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -1207,84 -1234,4 +1207,84 @@@ back_pressure_strategy
  # time and queue contention while iterating the backlog of messages.
  # An interval of 0 disables any wait time, which is the behavior of former 
Cassandra versions.
  #
 -# otc_backlog_expiration_interval_ms: 200
 +# otc_backlog_expiration_interval_ms: 200
 +
 +# Track a metric per keyspace indicating whether replication achieved the 
ideal consistency
 +# level for writes without timing out. This is different from the consistency 
level requested by
 +# each write which may be lower in order to facilitate availability.
 +# ideal_consistency_level: EACH_QUORUM
 +
 +# Path to write full query log data to when the full query log is enabled
 +# The full query log will recrusively delete the contents of this path at
 +# times. Don't place links in this directory to other parts of the filesystem.
 +#full_query_log_dir: /tmp/cassandrafullquerylog
 +
 +# Automatically upgrade sstables after upgrade - if there is no ordinary 
compaction to do, the
 +# oldest non-upgraded sstable will get upgraded to the latest version
 +# automatic_sstable_upgrade: false
 +# Limit the number of concurrent sstable upgrades
 +# max_concurrent_automatic_sstable_upgrades: 1
 +
 +# Audit logging - Logs every incoming CQL command request, authentication to 
a node. See the docs
 +# on audit_logging for full details about the various configuration options.
 +audit_logging_options:
 +enabled: false
 +logger: BinAuditLogger
 +# audit_logs_dir:
 +# included_keyspaces:
 +# excluded_keyspaces: system, system_schema, system_virtual_schema
 +# included_categories:
 +# excluded_categories:
 +# included_users:
 +# excluded_users:
 +# roll_cycle: HOURLY
 +# block: true
 +# max_queue_weight: 268435456 # 256 MiB
 +# max_log_size: 17179869184 # 16 GiB
 +## archive command is "/path/to/script.sh %path" where %path is replaced 
with the file being rolled:
 +# archive_command:
 +# max_archive_retries: 10
 +
 +
 +# default options for full query logging - these can be overridden from 
command line when executing
 +# nodetool enablefullquerylog
 +#full_query_logging_options:
 +# log_dir:
 +# roll_cycle: HOURLY
 +# block: true
 +# max_queue_weight: 268435456 # 256 MiB
 +# max_log_size: 17179869184 # 16 GiB
 +## archive command is "/path/to/script.sh %path" where %path is replaced 
with the file being rolled:
 +# archive_command:
 +# max_archive_retries: 10
 +
 +# validate tombstones on reads and compaction
 +# can be either "disabled", "warn" or "exception"
 +# corrupted_tombstone_strategy: disabled
 +
 +# Diagnostic Events #
 +# If enabled, diagnostic events can be helpful for troubleshooting 
operational issues. Emitted events contain details
 +# on internal state and temporal relationships across events, accessible by 
clients via JMX.
 +diagnostic_events_enabled: false
 +
- # Define use of legacy delayed flusher for replies to TCP connections. This 
will increase latency, but might be beneficial for
- # legacy use-cases where only a single connection is used for each Cassandra 
node. Default is false.
++# Use native transport TCP message coalescing. If on upgrade to 4.0 you found 
your throughput decreasing, and in
++# particular you run an old kernel or have very fewer client connections, 
this option might be worth evaluating.
 +#native_transport_flush_in_batches_legacy: false
 +
 +# Enable tracking of repaired state of data during reads and comparison 
between replicas
 +# Mismatches between the repaired sets of replicas can be characterized as 
either confirmed
 +# or unconfirmed. In this context, unconfirmed indicates that the presence of 
pending repair
 +# sessions, unrepaired

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-11-29 Thread benedict

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 2ee9d6854bd82608cd36eb3fb606108e84714932
Parents: 9a7db29 1084ad9
Author: Benedict Elliott Smith 
Authored: Thu Nov 29 14:54:21 2018 +
Committer: Benedict Elliott Smith 
Committed: Thu Nov 29 14:54:21 2018 +

--
 CHANGES.txt |   2 +
 src/java/org/apache/cassandra/db/Columns.java   |   2 +
 .../cassandra/db/SerializationHeader.java   |  44 +++---
 .../org/apache/cassandra/db/ColumnsTest.java|  29 +++-
 .../cassandra/db/SerializationHeaderTest.java   | 145 +++
 5 files changed, 203 insertions(+), 19 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ee9d685/src/java/org/apache/cassandra/db/Columns.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ee9d685/src/java/org/apache/cassandra/db/SerializationHeader.java
--
diff --cc src/java/org/apache/cassandra/db/SerializationHeader.java
index 4266629,8e2844b..deadf68
--- a/src/java/org/apache/cassandra/db/SerializationHeader.java
+++ b/src/java/org/apache/cassandra/db/SerializationHeader.java
@@@ -21,20 -21,21 +21,21 @@@ import java.io.IOException
  import java.nio.ByteBuffer;
  import java.util.*;
  
+ import com.google.common.collect.ImmutableList;
 -import org.apache.cassandra.config.CFMetaData;
 -import org.apache.cassandra.config.ColumnDefinition;
  import org.apache.cassandra.db.filter.ColumnFilter;
 -import org.apache.cassandra.db.rows.*;
  import org.apache.cassandra.db.marshal.AbstractType;
 -import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.db.marshal.TypeParser;
 +import org.apache.cassandra.db.marshal.UTF8Type;
 +import org.apache.cassandra.db.rows.*;
  import org.apache.cassandra.io.sstable.format.SSTableReader;
  import org.apache.cassandra.io.sstable.format.Version;
 -import org.apache.cassandra.io.sstable.metadata.MetadataType;
 -import org.apache.cassandra.io.sstable.metadata.MetadataComponent;
  import org.apache.cassandra.io.sstable.metadata.IMetadataComponentSerializer;
 +import org.apache.cassandra.io.sstable.metadata.MetadataComponent;
 +import org.apache.cassandra.io.sstable.metadata.MetadataType;
  import org.apache.cassandra.io.util.DataInputPlus;
  import org.apache.cassandra.io.util.DataOutputPlus;
 +import org.apache.cassandra.schema.ColumnMetadata;
 +import org.apache.cassandra.schema.TableMetadata;
  import org.apache.cassandra.utils.ByteBufferUtil;
  
  public class SerializationHeader
@@@ -291,33 -295,40 +292,40 @@@
  return MetadataType.HEADER;
  }
  
 -public SerializationHeader toHeader(CFMetaData metadata)
 +public SerializationHeader toHeader(TableMetadata metadata)
  {
  Map> typeMap = new 
HashMap<>(staticColumns.size() + regularColumns.size());
- typeMap.putAll(staticColumns);
- typeMap.putAll(regularColumns);
  
 -PartitionColumns.Builder builder = PartitionColumns.builder();
 +RegularAndStaticColumns.Builder builder = 
RegularAndStaticColumns.builder();
- for (ByteBuffer name : typeMap.keySet())
+ for (Map> map : 
ImmutableList.of(staticColumns, regularColumns))
  {
- ColumnMetadata column = metadata.getColumn(name);
- if (column == null)
+ boolean isStatic = map == staticColumns;
+ for (Map.Entry> e : 
map.entrySet())
  {
- // TODO: this imply we don't read data for a column we 
don't yet know about, which imply this is theoretically
- // racy with column addition. Currently, it is up to the 
user to not write data before the schema has propagated
- // and this is far from being the only place that has 
such problem in practice. This doesn't mean we shouldn't
- // improve this.
- 
- // If we don't find the definition, it could be we have 
data for a dropped column, and we shouldn't
- // fail deserialization because of that. So we grab a 
"fake" ColumnMetadata that ensure proper
- // deserialization. The column will be ignore later on 
anyway.
- boolean isStatic =

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-09-14 Thread benedict

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: d44059bfc6aabc88a370a84b082a9dbaa5560d0e
Parents: 047bcd7 5d55882
Author: Benedict Elliott Smith 
Authored: Fri Sep 14 11:25:27 2018 +0100
Committer: Benedict Elliott Smith 
Committed: Fri Sep 14 11:25:27 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d44059bf/CHANGES.txt
--
diff --cc CHANGES.txt
index 3c3,f04cae1..76b7b8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,317 -1,7 +1,319 @@@
 +4.0
 + * Fail query on transient replica if coordinator only expects full data 
(CASSANDRA-14704)
 + * Remove mentions of transient replication from repair path (CASSANDRA-14698)
 + * Fix handleRepairStatusChangedNotification to remove first then add 
(CASSANDRA-14720)
 + * Allow transient node to serve as a repair coordinator (CASSANDRA-14693)
 + * DecayingEstimatedHistogramReservoir.EstimatedHistogramReservoirSnapshot 
returns wrong value for size() and incorrectly calculates count 
(CASSANDRA-14696)
 + * AbstractReplicaCollection equals and hash code should throw due to 
conflict between order sensitive/insensitive uses (CASSANDRA-14700)
 + * Detect inconsistencies in repaired data on the read path (CASSANDRA-14145)
 + * Add checksumming to the native protocol (CASSANDRA-13304)
 + * Make AuthCache more easily extendable (CASSANDRA-14662)
 + * Extend RolesCache to include detailed role info (CASSANDRA-14497)
 + * Add fqltool compare (CASSANDRA-14619)
 + * Add fqltool replay (CASSANDRA-14618)
 + * Log keyspace in full query log (CASSANDRA-14656)
 + * Transient Replication and Cheap Quorums (CASSANDRA-14404)
 + * Log server-generated timestamp and nowInSeconds used by queries in FQL 
(CASSANDRA-14675)
 + * Add diagnostic events for read repairs (CASSANDRA-14668)
 + * Use consistent nowInSeconds and timestamps values within a request 
(CASSANDRA-14671)
 + * Add sampler for query time and expose with nodetool (CASSANDRA-14436)
 + * Clean up Message.Request implementations (CASSANDRA-14677)
 + * Disable old native protocol versions on demand (CASANDRA-14659)
 + * Allow specifying now-in-seconds in native protocol (CASSANDRA-14664)
 + * Improve BTree build performance by avoiding data copy (CASSANDRA-9989)
 + * Make monotonic read / read repair configurable (CASSANDRA-14635)
 + * Refactor CompactionStrategyManager (CASSANDRA-14621)
 + * Flush netty client messages immediately by default (CASSANDRA-13651)
 + * Improve read repair blocking behavior (CASSANDRA-10726)
 + * Add a virtual table to expose settings (CASSANDRA-14573)
 + * Fix up chunk cache handling of metrics (CASSANDRA-14628)
 + * Extend IAuthenticator to accept peer SSL certificates (CASSANDRA-14652)
 + * Incomplete handling of exceptions when decoding incoming messages 
(CASSANDRA-14574)
 + * Add diagnostic events for user audit logging (CASSANDRA-13668)
 + * Allow retrieving diagnostic events via JMX (CASSANDRA-14435)
 + * Add base classes for diagnostic events (CASSANDRA-13457)
 + * Clear view system metadata when dropping keyspace (CASSANDRA-14646)
 + * Allocate ReentrantLock on-demand in java11 AtomicBTreePartitionerBase 
(CASSANDRA-14637)
 + * Make all existing virtual tables use LocalPartitioner (CASSANDRA-14640)
 + * Revert 4.0 GC alg back to CMS (CASANDRA-14636)
 + * Remove hardcoded java11 jvm args in idea workspace files (CASSANDRA-14627)
 + * Update netty to 4.1.128 (CASSANDRA-14633)
 + * Add a virtual table to expose thread pools (CASSANDRA-14523)
 + * Add a virtual table to expose caches (CASSANDRA-14538, CASSANDRA-14626)
 + * Fix toDate function for timestamp arguments (CASSANDRA-14502)
 + * Revert running dtests by default in circleci (CASSANDRA-14614)
 + * Stream entire SSTables when possible (CASSANDRA-14556)
 + * Cell reconciliation should not depend on nowInSec (CASSANDRA-14592)
 + * Add experimental support for Java 11 (CASSANDRA-9608)
 + * Make PeriodicCommitLogService.blockWhenSyncLagsNanos configurable 
(CASSANDRA-14580)
 + * Improve logging in MessageInHandler's constructor (CASSANDRA-14576)
 + * Set broadcast address in internode messaging handshake (CASSANDRA-14579)
 + * Wait for schema agreement prior to building MVs (CASSANDRA-14571)
 + * Make all DDL statements idempotent and not dependent on global state 
(CASSANDRA-13426)
 + * Bump the hints messaging version to match the current one (CASSANDRA-14536)
 + * OffsetAwareConfigurationLoader doesn't set ssl storage port causing bind 
errors in CircleCI

[9/9] cassandra git commit: Merge branch cassandra-3.11 into trunk

2018-08-02 Thread blerer

Merge branch cassandra-3.11 into trunk


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

Branch: refs/heads/trunk
Commit: 521f50bb120064d866e93a86cb0c90c1a7ae0307
Parents: 62423f6 975e1d3
Author: Benjamin Lerer 
Authored: Thu Aug 2 11:33:21 2018 +0200
Committer: Benjamin Lerer 
Committed: Thu Aug 2 11:33:21 2018 +0200

--
 CHANGES.txt  |  1 +
 src/java/org/apache/cassandra/db/marshal/DoubleType.java |  6 +-
 src/java/org/apache/cassandra/db/marshal/FloatType.java  |  6 +-
 .../cassandra/cql3/validation/entities/JsonTest.java | 11 +++
 4 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/521f50bb/CHANGES.txt
--
diff --cc CHANGES.txt
index fb9b7c4,b50d27e..53babca
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -321,6 -54,9 +321,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:
+  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
 - * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
 - * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/521f50bb/src/java/org/apache/cassandra/db/marshal/DoubleType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/521f50bb/src/java/org/apache/cassandra/db/marshal/FloatType.java
--

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


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

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-07-03 Thread aleksey

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: d500100a44b52a93c21ee945f3fc275f770d219a
Parents: dfddeb4 c3a66ab
Author: Aleksey Yeshchenko 
Authored: Tue Jul 3 14:23:15 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Tue Jul 3 14:23:15 2018 +0100

--

--



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

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-04-18 Thread aleksey

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 6ad99802f20504170c3a447114f5694cf51662a5
Parents: f3d1b45 35823fc
Author: Aleksey Yeshchenko 
Authored: Wed Apr 18 11:35:58 2018 +0100
Committer: Aleksey Yeshchenko 
Committed: Wed Apr 18 11:36:28 2018 +0100

--
 CHANGES.txt |  2 +
 NEWS.txt|  3 +
 conf/cassandra.yaml |  2 +-
 doc/cql3/CQL.textile|  8 +--
 doc/source/architecture/dynamo.rst  |  8 +--
 doc/source/cql/ddl.rst  | 15 +
 doc/source/operating/compaction.rst |  3 +-
 doc/source/operating/snitch.rst |  4 +-
 pylib/cqlshlib/cql3handling.py  |  5 +-
 pylib/cqlshlib/test/test_cqlsh_completion.py|  9 +--
 pylib/cqlshlib/test/test_cqlsh_output.py|  2 -
 .../org/apache/cassandra/auth/AuthKeyspace.java |  1 -
 .../cql3/statements/TableAttributes.java|  6 --
 .../apache/cassandra/db/ConsistencyLevel.java   | 47 ++-
 .../org/apache/cassandra/db/SystemKeyspace.java |  1 -
 .../org/apache/cassandra/db/TableCQLHelper.java |  2 -
 .../cassandra/metrics/ReadRepairMetrics.java|  3 +
 .../repair/SystemDistributedKeyspace.java   |  1 -
 .../apache/cassandra/schema/SchemaKeyspace.java | 15 ++---
 .../apache/cassandra/schema/TableMetadata.java  | 18 +-
 .../apache/cassandra/schema/TableParams.java| 42 --
 .../service/reads/AbstractReadExecutor.java | 57 ++
 .../service/reads/AsyncRepairCallback.java  | 61 
 .../cassandra/service/reads/DataResolver.java   | 29 ++
 .../cassandra/service/reads/DigestResolver.java |  8 ---
 .../cassandra/service/reads/ReadCallback.java   |  9 +--
 .../service/reads/ReadRepairDecision.java   | 23 
 .../service/reads/ResponseResolver.java |  6 --
 .../reads/repair/BlockingReadRepair.java| 34 +--
 .../service/reads/repair/NoopReadRepair.java| 17 +-
 .../service/reads/repair/ReadRepair.java| 29 ++
 .../apache/cassandra/tracing/TraceKeyspace.java |  1 -
 .../validation/miscellaneous/OverflowTest.java  |  4 --
 .../apache/cassandra/db/TableCQLHelperTest.java |  4 --
 .../cassandra/schema/MigrationManagerTest.java  |  2 -
 .../reads/repair/TestableReadRepair.java| 18 +-
 36 files changed, 59 insertions(+), 440 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ad99802/CHANGES.txt
--
diff --cc CHANGES.txt
index f2c9ffc,990c5db..76321dd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,227 -1,3 +1,229 @@@
 +4.0
++ * Eliminate background repair and probablistic read_repair_chance table 
options
++   (CASSANDRA-13910)
 + * Bind to correct local address in 4.0 streaming (CASSANDRA-14362)
 + * Use standard Amazon naming for datacenter and rack in Ec2Snitch 
(CASSANDRA-7839)
 + * Fix junit failure for SSTableReaderTest (CASSANDRA-14387)
 + * Abstract write path for pluggable storage (CASSANDRA-14118)
 + * nodetool describecluster should be more informative (CASSANDRA-13853)
 + * Compaction performance improvements (CASSANDRA-14261) 
 + * Refactor Pair usage to avoid boxing ints/longs (CASSANDRA-14260)
 + * Add options to nodetool tablestats to sort and limit output 
(CASSANDRA-13889)
 + * Rename internals to reflect CQL vocabulary (CASSANDRA-14354)
 + * Add support for hybrid MIN(), MAX() speculative retry policies
 +   (CASSANDRA-14293, CASSANDRA-14338, CASSANDRA-14352)
 + * Fix some regressions caused by 14058 (CASSANDRA-14353)
 + * Abstract repair for pluggable storage (CASSANDRA-14116)
 + * Add meaningful toString() impls (CASSANDRA-13653)
 + * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
 + * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
 + * Add coordinator write metric per CF (CASSANDRA-14232)
 + * Correct and clarify SSLFactory.getSslContext method and call sites 
(CASSANDRA-14314)
 + * Handle static and partition deletion properly on 
ThrottledUnfilteredIterator (CASSANDRA-14315)
 + * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
 + * Add ability to specify driver name and version (CASSANDRA-14275)
 + * Abstract streaming for pluggable storage (CASSANDRA-14115)
 + * Forced incremental repairs should promote sstables if they can 
(CASSANDRA-14294)
 + * Use Murmur3 for validation

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-03-23 Thread aleksey

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 39bcdcd32ea5dcfd372d4b3eaf10c1c3de0547fb
Parents: 8b7e967 d2248f2
Author: Aleksey Yeshchenko 
Authored: Fri Mar 23 14:49:51 2018 +
Committer: Aleksey Yeshchenko 
Committed: Fri Mar 23 14:49:51 2018 +

--
 CHANGES.txt |  3 ++-
 .../org/apache/cassandra/db/ReadResponse.java   | 22 +++-
 .../db/rows/RangeTombstoneBoundMarker.java  |  2 +-
 .../db/rows/RangeTombstoneBoundaryMarker.java   |  5 +++-
 .../reads/repair/RowIteratorMergeListener.java  | 27 +++-
 5 files changed, 49 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bcdcd3/CHANGES.txt
--
diff --cc CHANGES.txt
index d4e5e37,987b9f7..76803a8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,213 -1,3 +1,212 @@@
 +4.0
 + * Fix scheduling of speculative retry threshold recalculation 
(CASSANDRA-14338)
 + * Add support for hybrid MIN(), MAX() speculative retry policies 
(CASSANDRA-14293)
 + * Correct and clarify SSLFactory.getSslContext method and call sites 
(CASSANDRA-14314)
-  * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Handle static and partition deletion properly on 
ThrottledUnfilteredIterator (CASSANDRA-14315)
 + * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
 + * Add ability to specify driver name and version (CASSANDRA-14275)
 + * Abstract streaming for pluggable storage (CASSANDRA-14115)
 + * Forced incremental repairs should promote sstables if they can 
(CASSANDRA-14294)
 + * Use Murmur3 for validation compactions (CASSANDRA-14002)
 + * Comma at the end of the seed list is interpretated as localhost 
(CASSANDRA-14285)
 + * Refactor read executor and response resolver, abstract read repair 
(CASSANDRA-14058)
 + * Add optional startup delay to wait until peers are ready (CASSANDRA-13993)
 + * Add a few options to nodetool verify (CASSANDRA-14201)
 + * CVE-2017-5929 Security vulnerability and redefine default log rotation 
policy (CASSANDRA-14183)
 + * Use JVM default SSL validation algorithm instead of custom default 
(CASSANDRA-13259)
 + * Better document in code InetAddressAndPort usage post 7544, incorporate 
port into UUIDGen node (CASSANDRA-14226)
 + * Fix sstablemetadata date string for minLocalDeletionTime (CASSANDRA-14132)
 + * Make it possible to change neverPurgeTombstones during runtime 
(CASSANDRA-14214)
 + * Remove GossipDigestSynVerbHandler#doSort() (CASSANDRA-14174)
 + * Add nodetool clientlist (CASSANDRA-13665)
 + * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211)
 + * Non-disruptive seed node list reload (CASSANDRA-14190)
 + * Nodetool tablehistograms to print statics for all the tables 
(CASSANDRA-14185)
 + * Migrate dtests to use pytest and python3 (CASSANDRA-14134)
 + * Allow storage port to be configurable per node (CASSANDRA-7544)
 + * Make sub-range selection for non-frozen collections return null instead of 
empty (CASSANDRA-14182)
 + * BloomFilter serialization format should not change byte ordering 
(CASSANDRA-9067)
 + * Remove unused on-heap BloomFilter implementation (CASSANDRA-14152)
 + * Delete temp test files on exit (CASSANDRA-14153)
 + * Make PartitionUpdate and Mutation immutable (CASSANDRA-13867)
 + * Fix CommitLogReplayer exception for CDC data (CASSANDRA-14066)
 + * Fix cassandra-stress startup failure (CASSANDRA-14106)
 + * Remove initialDirectories from CFS (CASSANDRA-13928)
 + * Fix trivial log format error (CASSANDRA-14015)
 + * Allow sstabledump to do a json object per partition (CASSANDRA-13848)
 + * Add option to optimise merkle tree comparison across replicas 
(CASSANDRA-3200)
 + * Remove unused and deprecated methods from AbstractCompactionStrategy 
(CASSANDRA-14081)
 + * Fix Distribution.average in cassandra-stress (CASSANDRA-14090)
 + * Support a means of logging all queries as they were invoked 
(CASSANDRA-13983)
 + * Presize collections (CASSANDRA-13760)
 + * Add GroupCommitLogService (CASSANDRA-13530)
 + * Parallelize initial materialized view build (CASSANDRA-12245)
 + * Fix flaky SecondaryIndexManagerTest.assert[Not]MarkedAsBuilt 
(CASSANDRA-13965)
 + * Make LWTs send resultset metadata on every request (CASSANDRA-13992)
 + * Fix flaky indexWithFailedInitializationIsNotQueryableAfterPartialRebuild 
(CASSANDRA-13963)
 + * Introduce leaf-only iterator (CASSANDRA-9988)
 + * Upgrade Guava to 23.3 and Airline to 0.8 (CASSANDRA-13997)
 + *

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-07-14 Thread bdeggleston

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 834031cc01d555714c15341ddbbd25243118cf96
Parents: 965c774 6d0e95a
Author: Blake Eggleston 
Authored: Fri Jul 14 10:52:30 2017 -0700
Committer: Blake Eggleston 
Committed: Fri Jul 14 10:53:16 2017 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/rows/AbstractCell.java  |  2 +-
 test/unit/org/apache/cassandra/db/CellTest.java | 78 +++-
 3 files changed, 79 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/834031cc/CHANGES.txt
--
diff --cc CHANGES.txt
index 44b8ce8,8abf1f4..087bacc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -99,6 -2,8 +99,7 @@@
   * 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:
 -3.0.15
+  * Purge tombstones created by expired cells (CASSANDRA-13643)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/834031cc/src/java/org/apache/cassandra/db/rows/AbstractCell.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/834031cc/test/unit/org/apache/cassandra/db/CellTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CellTest.java
index febfa3c,d69617e..906da8a
--- a/test/unit/org/apache/cassandra/db/CellTest.java
+++ b/test/unit/org/apache/cassandra/db/CellTest.java
@@@ -325,15 -395,20 +396,20 @@@ public class CellTes
  return BufferCell.live(cdef, timestamp, ByteBufferUtil.bytes(value));
  }
  
 -private Cell expiring(CFMetaData cfm, String columnName, String value, 
long timestamp, int localExpirationTime)
 +private Cell expiring(TableMetadata cfm, String columnName, String value, 
long timestamp, int localExpirationTime)
  {
+ return expiring(cfm, columnName, value, timestamp, 1, 
localExpirationTime);
+ }
+ 
 -private Cell expiring(CFMetaData cfm, String columnName, String value, 
long timestamp, int ttl, int localExpirationTime)
++private Cell expiring(TableMetadata cfm, String columnName, String value, 
long timestamp, int ttl, int localExpirationTime)
+ {
 -ColumnDefinition cdef = 
cfm.getColumnDefinition(ByteBufferUtil.bytes(columnName));
 +ColumnMetadata cdef = cfm.getColumn(ByteBufferUtil.bytes(columnName));
- return new BufferCell(cdef, timestamp, 1, localExpirationTime, 
ByteBufferUtil.bytes(value), null);
+ return new BufferCell(cdef, timestamp, ttl, localExpirationTime, 
ByteBufferUtil.bytes(value), null);
  }
  
 -private Cell deleted(CFMetaData cfm, String columnName, int 
localDeletionTime, long timestamp)
 +private Cell deleted(TableMetadata cfm, String columnName, int 
localDeletionTime, long timestamp)
  {
 -ColumnDefinition cdef = 
cfm.getColumnDefinition(ByteBufferUtil.bytes(columnName));
 +ColumnMetadata cdef = cfm.getColumn(ByteBufferUtil.bytes(columnName));
  return BufferCell.tombstone(cdef, timestamp, localDeletionTime);
  }
  }


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

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-05-10 Thread adelapena

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 69aa1737d17089278c725cffeca3f69fb25f0aa0
Parents: bf1cd8e f33cdcb
Author: adelapena 
Authored: Wed May 10 11:47:20 2017 +0100
Committer: adelapena 
Committed: Wed May 10 11:47:20 2017 +0100

--
 .../validation/entities/SecondaryIndexTest.java | 42 
 1 file changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69aa1737/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
index c5fb45d,3aed07a..29ceb3b
--- 
a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
@@@ -1524,13 -1535,56 +1524,55 @@@ public class SecondaryIndexTest extend
  assertInvalidMessage("full() indexes can only be created on frozen 
collections", "CREATE INDEX ON %s (full(v))");
  }
  
+ @Test
+ public void testIndexOnPartitionKeyInsertExpiringColumn() throws Throwable
+ {
+ createTable("CREATE TABLE %s (k1 int, k2 int, a int, b int, PRIMARY 
KEY ((k1, k2)))");
+ createIndex("CREATE INDEX on %s(k1)");
+ execute("INSERT INTO %s (k1, k2, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE k1 = 1"), row(1, 2, 3, 4));
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE k1 = 1 AND k2 = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE k1 = 1"), row(1, 2, 3, 
null));
+ }
+ 
+ @Test
+ public void testIndexOnClusteringKeyInsertExpiringColumn() throws 
Throwable
+ {
+ createTable("CREATE TABLE %s (pk int, ck int, a int, b int, PRIMARY 
KEY (pk, ck))");
+ createIndex("CREATE INDEX on %s(ck)");
+ execute("INSERT INTO %s (pk, ck, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE ck = 2"), row(1, 2, 3, 4));
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE ck = 2"), row(1, 2, 3, 
null));
+ }
+ 
+ @Test
+ public void testIndexOnRegularColumnInsertExpiringColumn() throws 
Throwable
+ {
+ createTable("CREATE TABLE %s (pk int, ck int, a int, b int, PRIMARY 
KEY (pk, ck))");
+ createIndex("CREATE INDEX on %s(a)");
+ execute("INSERT INTO %s (pk, ck, a, b) VALUES (1, 2, 3, 4)");
+ assertRows(execute("SELECT * FROM %s WHERE a = 3"), row(1, 2, 3, 4));
+ 
+ execute("UPDATE %s USING TTL 1 SET b = 10 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertRows(execute("SELECT * FROM %s WHERE a = 3"), row(1, 2, 3, 
null));
+ 
+ execute("UPDATE %s USING TTL 1 SET a = 5 WHERE pk = 1 AND ck = 2");
+ Thread.sleep(1000);
+ assertEmpty(execute("SELECT * FROM %s WHERE a = 3"));
+ assertEmpty(execute("SELECT * FROM %s WHERE a = 5"));
+ }
+ 
 -private ResultMessage.Prepared prepareStatement(String cql, boolean 
forThrift)
 +private ResultMessage.Prepared prepareStatement(String cql)
  {
  return QueryProcessor.prepare(String.format(cql, KEYSPACE, 
currentTable()),
 -  ClientState.forInternalCalls(),
 -  forThrift);
 +  ClientState.forInternalCalls());
  }
  
 -private void validateCell(Cell cell, ColumnDefinition def, ByteBuffer 
val, long timestamp)
 +private void validateCell(Cell cell, ColumnMetadata def, ByteBuffer val, 
long timestamp)
  {
  assertNotNull(cell);
  assertEquals(0, def.type.compare(cell.value(), val));


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

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-04-20 Thread paulo

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 50ba850beb573ae4aa62ac46e645ce48413815ce
Parents: b687641 4d24958
Author: Paulo Motta 
Authored: Thu Apr 20 10:40:22 2017 -0300
Committer: Paulo Motta 
Committed: Thu Apr 20 10:48:37 2017 -0300

--
 CHANGES.txt |  1 +
 .../cassandra/service/ActiveRepairService.java  | 21 
 2 files changed, 14 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50ba850b/CHANGES.txt
--
diff --cc CHANGES.txt
index db863e1,08df2dd..2710060
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -80,7 -24,9 +80,8 @@@
   * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
   * Address message coalescing regression (CASSANDRA-12676)
   * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
 - * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
  Merged from 3.0:
+  * Fail repair if insufficient responses received (CASSANDRA-13397)
   * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
   * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
   * Handling partially written hint files (CASSANDRA-12728)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/50ba850b/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java
index 381af48,fea690e..c03c470
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@@ -358,14 -324,17 +358,16 @@@ public class ActiveRepairService implem
  }
  else
  {
- status.set(false);
- failedNodes.add(neighbour.getHostAddress());
- prepareLatch.countDown();
+ // bailout early to avoid potentially waiting for a long time.
+ failRepair(parentRepairSession, "Endpoint not alive: " + 
neighbour);
  }
  }
 -
  try
  {
- prepareLatch.await(DatabaseDescriptor.getRpcTimeout(), 
TimeUnit.MILLISECONDS);
+ // Failed repair is expensive so we wait for longer time.
+ if (!prepareLatch.await(1, TimeUnit.HOURS)) {
+ failRepair(parentRepairSession, "Did not get replies from all 
endpoints.");
+ }
  }
  catch (InterruptedException e)
  {
@@@ -382,9 -349,13 +382,14 @@@
  return parentRepairSession;
  }
  
+ private void failRepair(UUID parentRepairSession, String errorMsg) {
+ removeParentRepairSession(parentRepairSession);
+ throw new RuntimeException(errorMsg);
+ }
+ 
 -public void registerParentRepairSession(UUID parentRepairSession, 
InetAddress coordinator, List columnFamilyStores, 
Collection ranges, boolean isIncremental, long timestamp, boolean 
isGlobal)
 +public void registerParentRepairSession(UUID parentRepairSession, 
InetAddress coordinator, List columnFamilyStores, 
Collection ranges, boolean isIncremental, long repairedAt, 
boolean isGlobal)
  {
 +assert isIncremental || repairedAt == 
ActiveRepairService.UNREPAIRED_SSTABLE;
  if (!registeredForEndpointChanges)
  {
  Gossiper.instance.register(this);

[9/9] cassandra git commit: Merge branch cassandra-3.11 into trunk

2017-04-07 Thread blerer

Merge branch cassandra-3.11 into trunk


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

Branch: refs/heads/trunk
Commit: 94aa57e27240316373c5b9218d2848baebf45a71
Parents: 231c343 5efaaf9
Author: Benjamin Lerer 
Authored: Fri Apr 7 12:00:21 2017 +0200
Committer: Benjamin Lerer 
Committed: Fri Apr 7 12:00:29 2017 +0200

--
 CHANGES.txt |  1 +
 .../index/internal/CassandraIndex.java  |  2 +-
 .../validation/entities/SecondaryIndexTest.java | 23 
 3 files changed, 25 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/94aa57e2/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
--

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

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-03-28 Thread snazy

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: a04776173a70dac66de939a26ea50544d5a45986
Parents: 35042ee 52fc62f
Author: Robert Stupp 
Authored: Tue Mar 28 09:46:07 2017 +0200
Committer: Robert Stupp 
Committed: Tue Mar 28 09:47:27 2017 +0200

--
 CHANGES.txt | 1 +
 NEWS.txt| 2 ++
 src/java/org/apache/cassandra/net/MessagingService.java | 9 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0477617/NEWS.txt
--
diff --cc NEWS.txt
index cfb48e2,4c2e217..9048121
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,39 -13,6 +13,41 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +4.0
 +===
 +
 +New features
 +
 +   - The currentTimestamp, currentDate, currentTime and currentTimeUUID 
functions have been added.
 + See CASSANDRA-13132
 +   - Support for arithmetic operations between `timestamp`/`date` and 
`duration` has been added.
 + See CASSANDRA-11936
 +   - Support for arithmetic operations on number has been added. See 
CASSANDRA-11935
 +
 +Upgrading
 +-
 +- Cassandra 4.0 removed support for the deprecated Thrift interface. 
Amongst
 +  Tother things, this imply the removal of all yaml option related to 
thrift
 +  ('start_rpc', rpc_port, ...).
 +- Cassandra 4.0 removed support for any pre-3.0 format. This means you
 +  cannot upgrade from a 2.x version to 4.0 directly, you have to upgrade 
to
 +  a 3.0.x/3.x version first (and run upgradesstable). In particular, this
 +  mean Cassandra 4.0 cannot load or read pre-3.0 sstables in any way: you
 +  will need to upgrade those sstable in 3.0.x/3.x first.
++- Upgrades from 3.0.x or 3.x are supported since 3.0.13 or 3.11.0, 
previous
++  versions will causes issues during rolling upgrades (CASSANDRA-13274).
 +- Cassandra will no longer allow invalid keyspace replication options, 
such
 +  as invalid datacenter names for NetworkTopologyStrategy. Operators MUST
 +  add new nodes to a datacenter before they can set set ALTER or CREATE
 +  keyspace replication policies using that datacenter. Existing keyspaces
 +  will continue to operate, but CREATE and ALTER will validate that all
 +  datacenters specified exist in the cluster.
 +- Cassandra 4.0 fixes a problem with incremental repair which caused 
repaired
 +  data to be inconsistent between nodes. The fix changes the behavior of 
both
 +  full and incremental repairs. For full repairs, data is no longer marked
 +  repaired. For incremental repairs, anticompaction is run at the 
beginning
 +  of the repair, instead of at the end.
 +- Config option index_interval has been removed (it was deprecated since 
2.0)
  
  3.11.0
  ==

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0477617/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index b7d4329,0e81c06..b3e7b61
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -1122,20 -1071,55 +1122,22 @@@ public final class MessagingService imp
   */
  public int setVersion(InetAddress endpoint, int version)
  {
- // We can't talk to someone from the future
- version = Math.min(version, current_version);
  logger.trace("Setting version {} for {}", version, endpoint);
  
 -if (version < VERSION_22)
 -allNodesAtLeast22 = false;
 -if (version < VERSION_30)
 -allNodesAtLeast30 = false;
 -
  Integer v = versions.put(endpoint, version);
 -
 -// if the version was increased to 2.2 or later see if the min 
version across the cluster has changed
 -if (v != null && (v < VERSION_30 && version >= VERSION_22))
 -refreshAllNodeMinVersions();
 -
  return v == null ? version : v;
  }
  
  public void resetVersion(InetAddress endpoint)
  {
  logger.trace("Resetting version for {}",

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-02-15 Thread paulo

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 31eac784f1bae9ec3509d7a7726d9b8725764fa0
Parents: a0827fb ef9df6e
Author: Paulo Motta 
Authored: Wed Feb 15 10:53:21 2017 -0200
Committer: Paulo Motta 
Committed: Wed Feb 15 10:53:21 2017 -0200

--
 CHANGES.txt |  1 +
 NEWS.txt| 11 ++--
 .../cassandra/db/SizeEstimatesRecorder.java | 54 ++--
 .../cassandra/service/ActiveRepairService.java  |  5 +-
 4 files changed, 40 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/31eac784/CHANGES.txt
--
diff --cc CHANGES.txt
index 6016674,ee5a5cb..6efcaa3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,8 -7,8 +37,9 @@@
   * More fixes to the TokenAllocator (CASSANDRA-12990)
   * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
  Merged from 3.0:
+  * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
   * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31eac784/NEWS.txt
--
diff --cc NEWS.txt
index 9c183f6,fc27526..d936dbe
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,40 -13,15 +13,45 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +4.0
 +===
 +
 +New features
 +
 +   - Support for arithmetic operations between `timestamp`/`date` and 
`duration` has been added.
 + See CASSANDRA-11936
 +   - Support for arithmetic operations on number has been added. See 
CASSANDRA-11935
 +
- 3.11
- 
- 
 +Upgrading
 +-
 +- Cassandra 4.0 removed support for the deprecated Thrift interface. 
Amongst
 +  Tother things, this imply the removal of all yaml option related to 
thrift
 +  ('start_rpc', rpc_port, ...).
 +- Cassandra 4.0 removed support for any pre-3.0 format. This means you
 +  cannot upgrade from a 2.x version to 4.0 directly, you have to upgrade 
to
 +  a 3.0.x/3.x version first (and run upgradesstable). In particular, this
 +  mean Cassandra 4.0 cannot load or read pre-3.0 sstables in any way: you
 +  will need to upgrade those sstable in 3.0.x/3.x first.
 +- Cassandra will no longer allow invalid keyspace replication options, 
such
 +  as invalid datacenter names for NetworkTopologyStrategy. Operators MUST
 +  add new nodes to a datacenter before they can set set ALTER or CREATE
 +  keyspace replication policies using that datacenter. Existing keyspaces
 +  will continue to operate, but CREATE and ALTER will validate that all
 +  datacenters specified exist in the cluster.
 +- Cassandra 4.0 fixes a problem with incremental repair which caused 
repaired
 +  data to be inconsistent between nodes. The fix changes the behavior of 
both
 +  full and incremental repairs. For full repairs, data is no longer marked
 +  repaired. For incremental repairs, anticompaction is run at the 
beginning
 +  of the repair, instead of at the end.
  
+ 3.11.0
+ ==
+ 
+ Upgrading
+ -
+- Primary ranges in the system.size_estimates table are now based on the 
keyspace
+  replication settings and adjacent ranges are no longer merged 
(CASSANDRA-9639).
+ 
  3.10
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31eac784/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31eac784/src/java/org/apache/cassandra/service/ActiveRepairService.java
--

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-02-14 Thread aleksey

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: a0827fb2e7e3ac643573eab987ebb0b92f8b73e2
Parents: 48bfc8e 515e4a2
Author: Aleksey Yeschenko 
Authored: Tue Feb 14 23:26:55 2017 +
Committer: Aleksey Yeschenko 
Committed: Tue Feb 14 23:26:55 2017 +

--
 build.xml | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0827fb2/build.xml
--
diff --cc build.xml
index d5962fe,0eef700..8fde61b
--- a/build.xml
+++ b/build.xml
@@@ -436,9 -450,10 +436,10 @@@



 -
 +
  
  
+

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch cassandra-3.11 into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch cassandra-3.11 into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

15 matches

Site Navigation

Mail list logo

Footer information