You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2019/10/30 14:18:00 UTC
[cassandra] branch cassandra-3.11 updated (fb50d82 -> 2d90e3c)
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from fb50d82 Increment version to 3.11.6
new 767a68c Ensure legacy rows have primary key livenessinfo when they contain illegal cells
new 2d90e3c Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 5 +-
src/java/org/apache/cassandra/db/LegacyLayout.java | 56 ++++++++++++---
...with_illegal_cell_names-ka-2-CompressionInfo.db | Bin 0 -> 43 bytes
...-legacy_ka_with_illegal_cell_names-ka-2-Data.db | Bin 0 -> 59 bytes
...acy_ka_with_illegal_cell_names-ka-2-Digest.sha1 | 1 +
...egacy_ka_with_illegal_cell_names-ka-2-Filter.db | Bin 0 -> 16 bytes
...legacy_ka_with_illegal_cell_names-ka-2-Index.db | Bin 0 -> 18 bytes
..._ka_with_illegal_cell_names-ka-2-Statistics.db} | Bin 4450 -> 4452 bytes
...legacy_ka_with_illegal_cell_names-ka-2-TOC.txt} | 10 +--
...th_illegal_cell_names_2-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
...egacy_ka_with_illegal_cell_names_2-ka-1-Data.db | Bin 0 -> 67 bytes
...y_ka_with_illegal_cell_names_2-ka-1-Digest.sha1 | 1 +
...acy_ka_with_illegal_cell_names_2-ka-1-Filter.db | Bin 0 -> 16 bytes
...gacy_ka_with_illegal_cell_names_2-ka-1-Index.db | Bin 0 -> 18 bytes
...a_with_illegal_cell_names_2-ka-1-Statistics.db} | Bin 4450 -> 4452 bytes
...cy_ka_with_illegal_cell_names_2-ka-1-Summary.db | Bin 0 -> 92 bytes
...gacy_ka_with_illegal_cell_names_2-ka-1-TOC.txt} | 10 +--
.../cassandra/io/sstable/LegacySSTableTest.java | 80 +++++++++++++++++++--
18 files changed, 138 insertions(+), 25 deletions(-)
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-2-CompressionInfo.db
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-2-Data.db
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-2-Digest.sha1
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-2-Filter.db
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-2-Index.db
copy test/data/legacy-sstables/ka/legacy_tables/{legacy_ka_14766/legacy_tables-legacy_ka_14766-ka-1-Statistics.db => legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-2-Statistics.db} (91%)
copy test/data/{bloom-filter/ka/foo/foo-atable-ka-1-TOC.txt => legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-2-TOC.txt} (100%)
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_2/legacy_tables-legacy_ka_with_illegal_cell_names_2-ka-1-CompressionInfo.db
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_2/legacy_tables-legacy_ka_with_illegal_cell_names_2-ka-1-Data.db
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_2/legacy_tables-legacy_ka_with_illegal_cell_names_2-ka-1-Digest.sha1
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_2/legacy_tables-legacy_ka_with_illegal_cell_names_2-ka-1-Filter.db
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_2/legacy_tables-legacy_ka_with_illegal_cell_names_2-ka-1-Index.db
copy test/data/legacy-sstables/ka/legacy_tables/{legacy_ka_14766/legacy_tables-legacy_ka_14766-ka-1-Statistics.db => legacy_ka_with_illegal_cell_names_2/legacy_tables-legacy_ka_with_illegal_cell_names_2-ka-1-Statistics.db} (91%)
create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_2/legacy_tables-legacy_ka_with_illegal_cell_names_2-ka-1-Summary.db
copy test/data/{bloom-filter/ka/foo/foo-atable-ka-1-TOC.txt => legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_2/legacy_tables-legacy_ka_with_illegal_cell_names_2-ka-1-TOC.txt} (100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2d90e3c2a443e4da3d04cb5701d30fb709406c96
Merge: fb50d82 767a68c
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Wed Oct 30 15:10:41 2019 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 5 +-
src/java/org/apache/cassandra/db/LegacyLayout.java | 56 ++++++++++++---
...with_illegal_cell_names-ka-2-CompressionInfo.db | Bin 0 -> 43 bytes
...-legacy_ka_with_illegal_cell_names-ka-2-Data.db | Bin 0 -> 59 bytes
...acy_ka_with_illegal_cell_names-ka-2-Digest.sha1 | 1 +
...egacy_ka_with_illegal_cell_names-ka-2-Filter.db | Bin 0 -> 16 bytes
...legacy_ka_with_illegal_cell_names-ka-2-Index.db | Bin 0 -> 18 bytes
...y_ka_with_illegal_cell_names-ka-2-Statistics.db | Bin 0 -> 4452 bytes
...-legacy_ka_with_illegal_cell_names-ka-2-TOC.txt | 8 +++
...th_illegal_cell_names_2-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
...egacy_ka_with_illegal_cell_names_2-ka-1-Data.db | Bin 0 -> 67 bytes
...y_ka_with_illegal_cell_names_2-ka-1-Digest.sha1 | 1 +
...acy_ka_with_illegal_cell_names_2-ka-1-Filter.db | Bin 0 -> 16 bytes
...gacy_ka_with_illegal_cell_names_2-ka-1-Index.db | Bin 0 -> 18 bytes
...ka_with_illegal_cell_names_2-ka-1-Statistics.db | Bin 0 -> 4452 bytes
...cy_ka_with_illegal_cell_names_2-ka-1-Summary.db | Bin 0 -> 92 bytes
...egacy_ka_with_illegal_cell_names_2-ka-1-TOC.txt | 8 +++
.../cassandra/io/sstable/LegacySSTableTest.java | 80 +++++++++++++++++++--
18 files changed, 144 insertions(+), 15 deletions(-)
diff --cc CHANGES.txt
index efd9ecb,d58a199..c21b2cf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,10 +1,17 @@@
-3.0.20
+3.11.6
- Merged from 2.2
++Merged from 3.0:
+ * Ensure legacy rows have primary key livenessinfo when they contain illegal cells (CASSANDRA-15365)
-Merged from 2.2
++Merged from 2.2:
* In-JVM DTest: Set correct internode message version for upgrade test (CASSANDRA-15371)
+
-3.0.19
+3.11.5
+ * Fix SASI non-literal string comparisons (range operators) (CASSANDRA-15169)
+ * Make sure user defined compaction transactions are always closed (CASSANDRA-15123)
+ * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config (CASSANDRA-14305)
+ * Fixed nodetool cfstats printing index name twice (CASSANDRA-14903)
+ * Add flag to disable SASI indexes, and warnings on creation (CASSANDRA-14866)
+Merged from 3.0:
* Add ability to cap max negotiable protocol version (CASSANDRA-15193)
* Gossip tokens on startup if available (CASSANDRA-15335)
* Fix resource leak in CompressedSequentialWriter (CASSANDRA-15340)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org