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 75fde25  Merge branch 'cassandra-3.0' into cassandra-3.11
     new f4b6e1d  Filter illegal legacy cells when collating rows
     new 83baa27  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 +
 .../cassandra/db/IllegalLegacyColumnException.java |  41 --------
 src/java/org/apache/cassandra/db/LegacyLayout.java |  76 +++++---------
 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  |  10 +-
 ..._ka_with_illegal_cell_names_indexed-ka-1-CRC.db | Bin 0 -> 8 bytes
 ...ka_with_illegal_cell_names_indexed-ka-1-Data.db | Bin 0 -> 6487 bytes
 ...ith_illegal_cell_names_indexed-ka-1-Digest.sha1 |   1 +
 ..._with_illegal_cell_names_indexed-ka-1-Filter.db | Bin 0 -> 16 bytes
 ...a_with_illegal_cell_names_indexed-ka-1-Index.db | Bin 0 -> 453 bytes
 ..._illegal_cell_names_indexed-ka-1-Statistics.db} | Bin 4450 -> 4472 bytes
 ...a_with_illegal_cell_names_indexed-ka-1-TOC.txt} |   8 +-
 .../cql3/validation/ThriftIllegalColumnsTest.java  | 100 +++++++++++++++++++
 .../apache/cassandra/db/LegacyCellNameTest.java    |  18 +++-
 .../cassandra/io/sstable/LegacySSTableTest.java    | 109 ++++++++++++++++-----
 18 files changed, 269 insertions(+), 154 deletions(-)
 delete mode 100644 
src/java/org/apache/cassandra/db/IllegalLegacyColumnException.java
 create mode 100644 
test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_indexed/legacy_tables-legacy_ka_with_illegal_cell_names_indexed-ka-1-CRC.db
 create mode 100644 
test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_indexed/legacy_tables-legacy_ka_with_illegal_cell_names_indexed-ka-1-Data.db
 create mode 100644 
test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_indexed/legacy_tables-legacy_ka_with_illegal_cell_names_indexed-ka-1-Digest.sha1
 create mode 100644 
test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_indexed/legacy_tables-legacy_ka_with_illegal_cell_names_indexed-ka-1-Filter.db
 create mode 100644 
test/data/legacy-sstables/ka/legacy_tables/legacy_ka_with_illegal_cell_names_indexed/legacy_tables-legacy_ka_with_illegal_cell_names_indexed-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_indexed/legacy_tables-legacy_ka_with_illegal_cell_names_indexed-ka-1-Statistics.db}
 (89%)
 copy 
test/data/legacy-sstables/ka/legacy_tables/{legacy_ka_with_illegal_cell_names/legacy_tables-legacy_ka_with_illegal_cell_names-ka-1-TOC.txt
 => 
legacy_ka_with_illegal_cell_names_indexed/legacy_tables-legacy_ka_with_illegal_cell_names_indexed-ka-1-TOC.txt}
 (100%)
 create mode 100644 
test/unit/org/apache/cassandra/cql3/validation/ThriftIllegalColumnsTest.java


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to