You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2017/02/03 17:34:13 UTC
[1/6] cassandra git commit: Provide user workaround for partially
corrupt schema tables
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 6caf3c4f1 -> a70b0d4d3
refs/heads/cassandra-3.11 2a0acfa64 -> 13f654e6e
refs/heads/trunk 546df00bc -> 31208d00d
Provide user workaround for partially corrupt schema tables
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-13180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a70b0d4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a70b0d4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a70b0d4d
Branch: refs/heads/cassandra-3.0
Commit: a70b0d4d37851891ec1c8af96063985a5122edda
Parents: 6caf3c4
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Feb 3 11:25:27 2017 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Feb 3 11:25:27 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../apache/cassandra/schema/SchemaKeyspace.java | 36 ++++++++++++++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a70b0d4d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e3bda6c..ade3d5a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.11
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
* Dump threads when unit tests time out (CASSANDRA-13117)
* Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
* Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a70b0d4d/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 84a5e13..eee4fbb 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -67,6 +67,7 @@ public final class SchemaKeyspace
private static final Logger logger = LoggerFactory.getLogger(SchemaKeyspace.class);
private static final boolean FLUSH_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.test.flush_local_schema_changes", "true"));
+ private static final boolean IGNORE_CORRUPTED_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.ignore_corrupted_schema_tables", "false"));
public static final String NAME = "system_schema";
@@ -925,7 +926,26 @@ public final class SchemaKeyspace
Tables.Builder tables = org.apache.cassandra.schema.Tables.builder();
for (UntypedResultSet.Row row : query(query, keyspaceName))
- tables.add(fetchTable(keyspaceName, row.getString("table_name"), types));
+ {
+ String tableName = row.getString("table_name");
+ try
+ {
+ tables.add(fetchTable(keyspaceName, tableName, types));
+ }
+ catch (MissingColumns exc)
+ {
+ if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+ {
+ logger.error("No columns found for table {}.{} in {}.{}. This may be due to " +
+ "corruption or concurrent dropping and altering of a table. If this table " +
+ "is supposed to be dropped, restart cassandra with -Dcassandra.ignore_corrupted_schema_tables=true " +
+ "and run the following query: \"DELETE FROM {}.{} WHERE keyspace_name = '{}' AND table_name = '{}';\"." +
+ "If the table is not supposed to be dropped, restore {}.{} sstables from backups.",
+ keyspaceName, tableName, NAME, COLUMNS, NAME, TABLES, keyspaceName, tableName, NAME, COLUMNS);
+ throw exc;
+ }
+ }
+ }
return tables.build();
}
@@ -991,8 +1011,12 @@ public final class SchemaKeyspace
private static List<ColumnDefinition> fetchColumns(String keyspace, String table, Types types)
{
String query = format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", NAME, COLUMNS);
+ UntypedResultSet columnRows = query(query, keyspace, table);
+ if (columnRows.isEmpty())
+ throw new MissingColumns("Columns not found in schema table for " + keyspace + "." + table);
+
List<ColumnDefinition> columns = new ArrayList<>();
- query(query, keyspace, table).forEach(row -> columns.add(createColumnFromRow(row, types)));
+ columnRows.forEach(row -> columns.add(createColumnFromRow(row, types)));
return columns;
}
@@ -1399,4 +1423,12 @@ public final class SchemaKeyspace
.map(SchemaKeyspace::expandUserTypes)
.collect(toList());
}
+
+ private static class MissingColumns extends RuntimeException
+ {
+ MissingColumns(String message)
+ {
+ super(message);
+ }
+ }
}
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ty...@apache.org.
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/31208d00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31208d00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31208d00
Branch: refs/heads/trunk
Commit: 31208d00d4d3e3d055dc544a30e71875aa3ccfd1
Parents: 546df00 13f654e
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Feb 3 11:33:47 2017 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Feb 3 11:33:47 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 3 ++
.../apache/cassandra/schema/SchemaKeyspace.java | 40 +++++++++++++++++++-
2 files changed, 41 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31208d00/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 63dc803,9274771..42e6b85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,8 +1,40 @@@
-3.11
+4.0
+ * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425)
+ * Refactor ColumnCondition (CASSANDRA-12981)
+ * Parallelize streaming of different keyspaces (CASSANDRA-4663)
+ * Improved compactions metrics (CASSANDRA-13015)
+ * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031)
+ * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
+ * Thrift removal (CASSANDRA-11115)
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+ * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
+ * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510)
+ * Allow IN restrictions on column families with collections (CASSANDRA-12654)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
+ * Add mutation size and batch metrics (CASSANDRA-12649)
+ * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
+ * Add support for arithmetic operators (CASSANDRA-11935)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ Merged from 3.0:
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
+
3.10
* Fix secondary index queries regression (CASSANDRA-13013)
* Add duration type to the protocol V5 (CASSANDRA-12850)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31208d00/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 6716652,58580b9..5e5ba34
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -961,11 -1040,15 +985,15 @@@ public final class SchemaKeyspac
.build();
}
- private static List<ColumnDefinition> fetchColumns(String keyspace, String table, Types types)
+ private static List<ColumnMetadata> fetchColumns(String keyspace, String table, Types types)
{
String query = format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS);
+ UntypedResultSet columnRows = query(query, keyspace, table);
+ if (columnRows.isEmpty())
+ throw new MissingColumns("Columns not found in schema table for " + keyspace + "." + table);
+
- List<ColumnDefinition> columns = new ArrayList<>();
+ List<ColumnMetadata> columns = new ArrayList<>();
- query(query, keyspace, table).forEach(row -> columns.add(createColumnFromRow(row, types)));
+ columnRows.forEach(row -> columns.add(createColumnFromRow(row, types)));
return columns;
}
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ty...@apache.org.
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/13f654e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13f654e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13f654e6
Branch: refs/heads/trunk
Commit: 13f654e6eeb910a87e8e56fd12b5422ccf48f84b
Parents: 2a0acfa a70b0d4
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Feb 3 11:31:45 2017 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Feb 3 11:31:45 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 5 +++
.../apache/cassandra/schema/SchemaKeyspace.java | 40 +++++++++++++++++++-
2 files changed, 43 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13f654e6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8da4bc0,ade3d5a..9274771
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,120 -1,6 +1,125 @@@
-3.0.11
++3.11
++Merged from 3.0:
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
++
+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 IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
+ * ColumnIndex does not reuse buffer (CASSANDRA-12502)
+ * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
+ * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
+ * Tune compaction thread count via nodetool (CASSANDRA-12248)
+ * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
+ * Include repair session IDs in repair start message (CASSANDRA-12532)
+ * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
+ * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
+ * Support optional backpressure strategies at the coordinator (CASSANDRA-9318)
+ * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
+ * Fix cassandra-stress graphing (CASSANDRA-12237)
+ * Allow filtering on partition key columns for queries without secondary indexes (CASSANDRA-11031)
+ * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
+ * Add JMH benchmarks.jar (CASSANDRA-12586)
+ * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
+ * Add keep-alive to streaming (CASSANDRA-11841)
+ * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
+ * avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261)
+ * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
+ * Retry all internode messages once after a connection is
+ closed and reopened (CASSANDRA-12192)
+ * Add support to rebuild from targeted replica (CASSANDRA-9875)
+ * Add sequence distribution type to cassandra stress (CASSANDRA-12490)
+ * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154)
+ * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474)
+ * Extend read/write failure messages with a map of replica addresses
+ to error codes in the v5 native protocol (CASSANDRA-12311)
+ * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374)
+ * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054, 12550)
+ * Fix clustering indexes in presence of static columns in SASI (CASSANDRA-12378)
+ * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223)
+ * Added slow query log (CASSANDRA-12403)
+ * Count full coordinated request against timeout (CASSANDRA-12256)
+ * Allow TTL with null value on insert and update (CASSANDRA-12216)
+ * Make decommission operation resumable (CASSANDRA-12008)
+ * Add support to one-way targeted repair (CASSANDRA-9876)
+ * Remove clientutil jar (CASSANDRA-11635)
+ * Fix compaction throughput throttle (CASSANDRA-12366, CASSANDRA-12717)
+ * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358)
+ * Cassandra stress should dump all setting on startup (CASSANDRA-11914)
+ * Make it possible to compact a given token range (CASSANDRA-10643)
+ * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
+ * Collect metrics on queries by consistency level (CASSANDRA-7384)
+ * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
+ * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228)
+ * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
+ * Add version command to cassandra-stress (CASSANDRA-12258)
+ * Create compaction-stress tool (CASSANDRA-11844)
+ * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
+ * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
+ * Support filtering on non-PRIMARY KEY columns in the CREATE
+ MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
+ * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
+ * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
+ * Faster write path (CASSANDRA-12269)
+ * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
+ * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
+ * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635)
+ * Prepend snapshot name with "truncated" or "dropped" when a snapshot
+ is taken before truncating or dropping a table (CASSANDRA-12178)
+ * Optimize RestrictionSet (CASSANDRA-12153)
+ * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
+ * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
+ * Create a system table to expose prepared statements (CASSANDRA-8831)
+ * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
+ * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
+ * Add supplied username to authentication error messages (CASSANDRA-12076)
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+ * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
+ * Restore resumable hints delivery (CASSANDRA-11960)
+ * Properly report LWT contention (CASSANDRA-12626)
+Merged from 3.0:
* Dump threads when unit tests time out (CASSANDRA-13117)
* Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
* Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13f654e6/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 2dffe58,eee4fbb..58580b9
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -67,7 -66,10 +67,8 @@@ public final class SchemaKeyspac
private static final Logger logger = LoggerFactory.getLogger(SchemaKeyspace.class);
- private static final boolean FLUSH_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.test.flush_local_schema_changes", "true"));
- private static final boolean IGNORE_CORRUPTED_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.ignore_corrupted_schema_tables", "false"));
-
- public static final String NAME = "system_schema";
+ private static final boolean FLUSH_SCHEMA_TABLES = Boolean.parseBoolean(System.getProperty("cassandra.test.flush_local_schema_changes", "true"));
++ private static final boolean IGNORE_CORRUPTED_SCHEMA_TABLES = Boolean.parseBoolean(System.getProperty("cassandra.ignore_corrupted_schema_tables", "false"));
public static final String KEYSPACES = "keyspaces";
public static final String TABLES = "tables";
@@@ -946,7 -926,26 +947,30 @@@
Tables.Builder tables = org.apache.cassandra.schema.Tables.builder();
for (UntypedResultSet.Row row : query(query, keyspaceName))
- tables.add(fetchTable(keyspaceName, row.getString("table_name"), types));
+ {
+ String tableName = row.getString("table_name");
+ try
+ {
+ tables.add(fetchTable(keyspaceName, tableName, types));
+ }
+ catch (MissingColumns exc)
+ {
+ if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+ {
+ logger.error("No columns found for table {}.{} in {}.{}. This may be due to " +
+ "corruption or concurrent dropping and altering of a table. If this table " +
+ "is supposed to be dropped, restart cassandra with -Dcassandra.ignore_corrupted_schema_tables=true " +
+ "and run the following query: \"DELETE FROM {}.{} WHERE keyspace_name = '{}' AND table_name = '{}';\"." +
+ "If the table is not supposed to be dropped, restore {}.{} sstables from backups.",
- keyspaceName, tableName, NAME, COLUMNS, NAME, TABLES, keyspaceName, tableName, NAME, COLUMNS);
++ keyspaceName, tableName,
++ SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS,
++ SchemaConstants.SCHEMA_KEYSPACE_NAME, TABLES,
++ keyspaceName, tableName,
++ SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS);
+ throw exc;
+ }
+ }
+ }
return tables.build();
}
@@@ -1018,9 -1010,13 +1042,13 @@@
private static List<ColumnDefinition> fetchColumns(String keyspace, String table, Types types)
{
- String query = format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", NAME, COLUMNS);
+ String query = format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS);
+ UntypedResultSet columnRows = query(query, keyspace, table);
+ if (columnRows.isEmpty())
+ throw new MissingColumns("Columns not found in schema table for " + keyspace + "." + table);
+
List<ColumnDefinition> columns = new ArrayList<>();
- query(query, keyspace, table).forEach(row -> columns.add(createColumnFromRow(row, types)));
+ columnRows.forEach(row -> columns.add(createColumnFromRow(row, types)));
return columns;
}
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ty...@apache.org.
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/13f654e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13f654e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13f654e6
Branch: refs/heads/cassandra-3.11
Commit: 13f654e6eeb910a87e8e56fd12b5422ccf48f84b
Parents: 2a0acfa a70b0d4
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Feb 3 11:31:45 2017 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Feb 3 11:31:45 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 5 +++
.../apache/cassandra/schema/SchemaKeyspace.java | 40 +++++++++++++++++++-
2 files changed, 43 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13f654e6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8da4bc0,ade3d5a..9274771
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,120 -1,6 +1,125 @@@
-3.0.11
++3.11
++Merged from 3.0:
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
++
+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 IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
+ * ColumnIndex does not reuse buffer (CASSANDRA-12502)
+ * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
+ * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
+ * Tune compaction thread count via nodetool (CASSANDRA-12248)
+ * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
+ * Include repair session IDs in repair start message (CASSANDRA-12532)
+ * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
+ * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
+ * Support optional backpressure strategies at the coordinator (CASSANDRA-9318)
+ * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
+ * Fix cassandra-stress graphing (CASSANDRA-12237)
+ * Allow filtering on partition key columns for queries without secondary indexes (CASSANDRA-11031)
+ * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
+ * Add JMH benchmarks.jar (CASSANDRA-12586)
+ * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
+ * Add keep-alive to streaming (CASSANDRA-11841)
+ * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
+ * avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261)
+ * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
+ * Retry all internode messages once after a connection is
+ closed and reopened (CASSANDRA-12192)
+ * Add support to rebuild from targeted replica (CASSANDRA-9875)
+ * Add sequence distribution type to cassandra stress (CASSANDRA-12490)
+ * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154)
+ * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474)
+ * Extend read/write failure messages with a map of replica addresses
+ to error codes in the v5 native protocol (CASSANDRA-12311)
+ * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374)
+ * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054, 12550)
+ * Fix clustering indexes in presence of static columns in SASI (CASSANDRA-12378)
+ * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223)
+ * Added slow query log (CASSANDRA-12403)
+ * Count full coordinated request against timeout (CASSANDRA-12256)
+ * Allow TTL with null value on insert and update (CASSANDRA-12216)
+ * Make decommission operation resumable (CASSANDRA-12008)
+ * Add support to one-way targeted repair (CASSANDRA-9876)
+ * Remove clientutil jar (CASSANDRA-11635)
+ * Fix compaction throughput throttle (CASSANDRA-12366, CASSANDRA-12717)
+ * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358)
+ * Cassandra stress should dump all setting on startup (CASSANDRA-11914)
+ * Make it possible to compact a given token range (CASSANDRA-10643)
+ * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
+ * Collect metrics on queries by consistency level (CASSANDRA-7384)
+ * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
+ * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228)
+ * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
+ * Add version command to cassandra-stress (CASSANDRA-12258)
+ * Create compaction-stress tool (CASSANDRA-11844)
+ * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
+ * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
+ * Support filtering on non-PRIMARY KEY columns in the CREATE
+ MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
+ * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
+ * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
+ * Faster write path (CASSANDRA-12269)
+ * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
+ * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
+ * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635)
+ * Prepend snapshot name with "truncated" or "dropped" when a snapshot
+ is taken before truncating or dropping a table (CASSANDRA-12178)
+ * Optimize RestrictionSet (CASSANDRA-12153)
+ * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
+ * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
+ * Create a system table to expose prepared statements (CASSANDRA-8831)
+ * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
+ * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
+ * Add supplied username to authentication error messages (CASSANDRA-12076)
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+ * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
+ * Restore resumable hints delivery (CASSANDRA-11960)
+ * Properly report LWT contention (CASSANDRA-12626)
+Merged from 3.0:
* Dump threads when unit tests time out (CASSANDRA-13117)
* Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
* Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13f654e6/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 2dffe58,eee4fbb..58580b9
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -67,7 -66,10 +67,8 @@@ public final class SchemaKeyspac
private static final Logger logger = LoggerFactory.getLogger(SchemaKeyspace.class);
- private static final boolean FLUSH_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.test.flush_local_schema_changes", "true"));
- private static final boolean IGNORE_CORRUPTED_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.ignore_corrupted_schema_tables", "false"));
-
- public static final String NAME = "system_schema";
+ private static final boolean FLUSH_SCHEMA_TABLES = Boolean.parseBoolean(System.getProperty("cassandra.test.flush_local_schema_changes", "true"));
++ private static final boolean IGNORE_CORRUPTED_SCHEMA_TABLES = Boolean.parseBoolean(System.getProperty("cassandra.ignore_corrupted_schema_tables", "false"));
public static final String KEYSPACES = "keyspaces";
public static final String TABLES = "tables";
@@@ -946,7 -926,26 +947,30 @@@
Tables.Builder tables = org.apache.cassandra.schema.Tables.builder();
for (UntypedResultSet.Row row : query(query, keyspaceName))
- tables.add(fetchTable(keyspaceName, row.getString("table_name"), types));
+ {
+ String tableName = row.getString("table_name");
+ try
+ {
+ tables.add(fetchTable(keyspaceName, tableName, types));
+ }
+ catch (MissingColumns exc)
+ {
+ if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+ {
+ logger.error("No columns found for table {}.{} in {}.{}. This may be due to " +
+ "corruption or concurrent dropping and altering of a table. If this table " +
+ "is supposed to be dropped, restart cassandra with -Dcassandra.ignore_corrupted_schema_tables=true " +
+ "and run the following query: \"DELETE FROM {}.{} WHERE keyspace_name = '{}' AND table_name = '{}';\"." +
+ "If the table is not supposed to be dropped, restore {}.{} sstables from backups.",
- keyspaceName, tableName, NAME, COLUMNS, NAME, TABLES, keyspaceName, tableName, NAME, COLUMNS);
++ keyspaceName, tableName,
++ SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS,
++ SchemaConstants.SCHEMA_KEYSPACE_NAME, TABLES,
++ keyspaceName, tableName,
++ SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS);
+ throw exc;
+ }
+ }
+ }
return tables.build();
}
@@@ -1018,9 -1010,13 +1042,13 @@@
private static List<ColumnDefinition> fetchColumns(String keyspace, String table, Types types)
{
- String query = format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", NAME, COLUMNS);
+ String query = format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", SchemaConstants.SCHEMA_KEYSPACE_NAME, COLUMNS);
+ UntypedResultSet columnRows = query(query, keyspace, table);
+ if (columnRows.isEmpty())
+ throw new MissingColumns("Columns not found in schema table for " + keyspace + "." + table);
+
List<ColumnDefinition> columns = new ArrayList<>();
- query(query, keyspace, table).forEach(row -> columns.add(createColumnFromRow(row, types)));
+ columnRows.forEach(row -> columns.add(createColumnFromRow(row, types)));
return columns;
}
[3/6] cassandra git commit: Provide user workaround for partially
corrupt schema tables
Posted by ty...@apache.org.
Provide user workaround for partially corrupt schema tables
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-13180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a70b0d4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a70b0d4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a70b0d4d
Branch: refs/heads/trunk
Commit: a70b0d4d37851891ec1c8af96063985a5122edda
Parents: 6caf3c4
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Feb 3 11:25:27 2017 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Feb 3 11:25:27 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../apache/cassandra/schema/SchemaKeyspace.java | 36 ++++++++++++++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a70b0d4d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e3bda6c..ade3d5a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.11
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
* Dump threads when unit tests time out (CASSANDRA-13117)
* Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
* Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a70b0d4d/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 84a5e13..eee4fbb 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -67,6 +67,7 @@ public final class SchemaKeyspace
private static final Logger logger = LoggerFactory.getLogger(SchemaKeyspace.class);
private static final boolean FLUSH_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.test.flush_local_schema_changes", "true"));
+ private static final boolean IGNORE_CORRUPTED_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.ignore_corrupted_schema_tables", "false"));
public static final String NAME = "system_schema";
@@ -925,7 +926,26 @@ public final class SchemaKeyspace
Tables.Builder tables = org.apache.cassandra.schema.Tables.builder();
for (UntypedResultSet.Row row : query(query, keyspaceName))
- tables.add(fetchTable(keyspaceName, row.getString("table_name"), types));
+ {
+ String tableName = row.getString("table_name");
+ try
+ {
+ tables.add(fetchTable(keyspaceName, tableName, types));
+ }
+ catch (MissingColumns exc)
+ {
+ if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+ {
+ logger.error("No columns found for table {}.{} in {}.{}. This may be due to " +
+ "corruption or concurrent dropping and altering of a table. If this table " +
+ "is supposed to be dropped, restart cassandra with -Dcassandra.ignore_corrupted_schema_tables=true " +
+ "and run the following query: \"DELETE FROM {}.{} WHERE keyspace_name = '{}' AND table_name = '{}';\"." +
+ "If the table is not supposed to be dropped, restore {}.{} sstables from backups.",
+ keyspaceName, tableName, NAME, COLUMNS, NAME, TABLES, keyspaceName, tableName, NAME, COLUMNS);
+ throw exc;
+ }
+ }
+ }
return tables.build();
}
@@ -991,8 +1011,12 @@ public final class SchemaKeyspace
private static List<ColumnDefinition> fetchColumns(String keyspace, String table, Types types)
{
String query = format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", NAME, COLUMNS);
+ UntypedResultSet columnRows = query(query, keyspace, table);
+ if (columnRows.isEmpty())
+ throw new MissingColumns("Columns not found in schema table for " + keyspace + "." + table);
+
List<ColumnDefinition> columns = new ArrayList<>();
- query(query, keyspace, table).forEach(row -> columns.add(createColumnFromRow(row, types)));
+ columnRows.forEach(row -> columns.add(createColumnFromRow(row, types)));
return columns;
}
@@ -1399,4 +1423,12 @@ public final class SchemaKeyspace
.map(SchemaKeyspace::expandUserTypes)
.collect(toList());
}
+
+ private static class MissingColumns extends RuntimeException
+ {
+ MissingColumns(String message)
+ {
+ super(message);
+ }
+ }
}
[2/6] cassandra git commit: Provide user workaround for partially
corrupt schema tables
Posted by ty...@apache.org.
Provide user workaround for partially corrupt schema tables
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-13180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a70b0d4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a70b0d4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a70b0d4d
Branch: refs/heads/cassandra-3.11
Commit: a70b0d4d37851891ec1c8af96063985a5122edda
Parents: 6caf3c4
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Feb 3 11:25:27 2017 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Feb 3 11:25:27 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../apache/cassandra/schema/SchemaKeyspace.java | 36 ++++++++++++++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a70b0d4d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e3bda6c..ade3d5a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.11
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
* Dump threads when unit tests time out (CASSANDRA-13117)
* Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
* Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a70b0d4d/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 84a5e13..eee4fbb 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -67,6 +67,7 @@ public final class SchemaKeyspace
private static final Logger logger = LoggerFactory.getLogger(SchemaKeyspace.class);
private static final boolean FLUSH_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.test.flush_local_schema_changes", "true"));
+ private static final boolean IGNORE_CORRUPTED_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.ignore_corrupted_schema_tables", "false"));
public static final String NAME = "system_schema";
@@ -925,7 +926,26 @@ public final class SchemaKeyspace
Tables.Builder tables = org.apache.cassandra.schema.Tables.builder();
for (UntypedResultSet.Row row : query(query, keyspaceName))
- tables.add(fetchTable(keyspaceName, row.getString("table_name"), types));
+ {
+ String tableName = row.getString("table_name");
+ try
+ {
+ tables.add(fetchTable(keyspaceName, tableName, types));
+ }
+ catch (MissingColumns exc)
+ {
+ if (!IGNORE_CORRUPTED_SCHEMA_TABLES)
+ {
+ logger.error("No columns found for table {}.{} in {}.{}. This may be due to " +
+ "corruption or concurrent dropping and altering of a table. If this table " +
+ "is supposed to be dropped, restart cassandra with -Dcassandra.ignore_corrupted_schema_tables=true " +
+ "and run the following query: \"DELETE FROM {}.{} WHERE keyspace_name = '{}' AND table_name = '{}';\"." +
+ "If the table is not supposed to be dropped, restore {}.{} sstables from backups.",
+ keyspaceName, tableName, NAME, COLUMNS, NAME, TABLES, keyspaceName, tableName, NAME, COLUMNS);
+ throw exc;
+ }
+ }
+ }
return tables.build();
}
@@ -991,8 +1011,12 @@ public final class SchemaKeyspace
private static List<ColumnDefinition> fetchColumns(String keyspace, String table, Types types)
{
String query = format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", NAME, COLUMNS);
+ UntypedResultSet columnRows = query(query, keyspace, table);
+ if (columnRows.isEmpty())
+ throw new MissingColumns("Columns not found in schema table for " + keyspace + "." + table);
+
List<ColumnDefinition> columns = new ArrayList<>();
- query(query, keyspace, table).forEach(row -> columns.add(createColumnFromRow(row, types)));
+ columnRows.forEach(row -> columns.add(createColumnFromRow(row, types)));
return columns;
}
@@ -1399,4 +1423,12 @@ public final class SchemaKeyspace
.map(SchemaKeyspace::expandUserTypes)
.collect(toList());
}
+
+ private static class MissingColumns extends RuntimeException
+ {
+ MissingColumns(String message)
+ {
+ super(message);
+ }
+ }
}