This is an automated email from the ASF dual-hosted git repository.
samt pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from c86f9b8 Merge branch 'cassandra-3.0' into cassandra-3.11
new daf6c85 Skip cells with illegal column names when reading legacy
sstables
new ba01089 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 | 1 +
...tion.java => IllegalLegacyColumnException.java} | 28 ++++------
src/java/org/apache/cassandra/db/LegacyLayout.java | 57 +++++++++++++++++----
src/java/org/apache/cassandra/db/ReadCommand.java | 2 +-
.../cassandra/db/UnfilteredDeserializer.java | 7 +++
.../cassandra/db/UnknownColumnException.java | 16 +-----
.../apache/cassandra/thrift/CassandraServer.java | 34 ++++++------
.../apache/cassandra/thrift/ThriftValidation.java | 5 +-
...s-legacy_ka_with_illegal_cell_names-ka-1-CRC.db | Bin 0 -> 8 bytes
...-legacy_ka_with_illegal_cell_names-ka-1-Data.db | Bin 0 -> 292 bytes
...acy_ka_with_illegal_cell_names-ka-1-Digest.sha1 | 1 +
...egacy_ka_with_illegal_cell_names-ka-1-Filter.db | Bin 0 -> 16 bytes
...legacy_ka_with_illegal_cell_names-ka-1-Index.db | Bin 0 -> 36 bytes
..._ka_with_illegal_cell_names-ka-1-Statistics.db} | Bin 4474 -> 4464 bytes
...gacy_ka_with_illegal_cell_names-ka-1-Summary.db | Bin 0 -> 128 bytes
...legacy_ka_with_illegal_cell_names-ka-1-TOC.txt} | 10 ++--
.../apache/cassandra/db/LegacyCellNameTest.java | 17 +++++-
.../cassandra/io/sstable/LegacySSTableTest.java | 36 +++++++++++++
18 files changed, 144 insertions(+), 70 deletions(-)
copy src/java/org/apache/cassandra/db/{UnknownColumnException.java =>
IllegalLegacyColumnException.java} (57%)
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-1-CRC.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-1-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-1-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-1-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-1-Index.db
copy
test/data/legacy-sstables/ka/legacy_tables/{legacy_ka_14912/legacy_tables-legacy_ka_14912-ka-1-Statistics.db
=>
legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-1-Statistics.db}
(92%)
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-1-Summary.db
copy test/data/legacy-sstables/{jb/Keyspace1/Keyspace1-Standard1-jb-0-TOC.txt
=>
ka/legacy_tables/legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-1-TOC.txt}
(100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
