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 2015/01/30 23:42:31 UTC
[1/4] cassandra git commit: ninja follow-up to 8619
Repository: cassandra
Updated Branches:
refs/heads/trunk 2e4ad069d -> c1960d8b7
ninja follow-up to 8619
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ae8adaa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ae8adaa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ae8adaa
Branch: refs/heads/trunk
Commit: 6ae8adaa3c9eef3606ef1f6a27b828066225aac2
Parents: 31324ee
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Jan 29 09:41:49 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Jan 29 09:41:49 2015 +0000
----------------------------------------------------------------------
.../cassandra/io/sstable/CQLSSTableWriter.java | 2 +-
.../io/sstable/SSTableSimpleUnsortedWriter.java | 32 ++++++++++++++------
2 files changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ae8adaa/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
index d58b28f..8006112 100644
--- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
@@ -534,7 +534,7 @@ public class CQLSSTableWriter implements Closeable
};
}
- protected void addColumn(Cell cell) throws IOException
+ protected void addColumn(Column column) throws IOException
{
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ae8adaa/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
index b58e574..db03ea1 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
import com.google.common.base.Throwables;
@@ -165,17 +166,21 @@ public class SSTableSimpleUnsortedWriter extends AbstractSSTableSimpleWriter
if (buffer.isEmpty())
return;
- checkForWriterException();
-
- columnFamily = null;
- try
+ while (true)
{
- writeQueue.put(buffer);
- }
- catch (InterruptedException e)
- {
- throw new RuntimeException(e);
+ checkForWriterException();
+ columnFamily = null;
+ try
+ {
+ if (writeQueue.offer(buffer, 1L, TimeUnit.SECONDS))
+ break;
+ }
+ catch (InterruptedException e)
+ {
+ throw new RuntimeException(e);
+
+ }
}
buffer = new Buffer();
currentSize = 0;
@@ -213,8 +218,15 @@ public class SSTableSimpleUnsortedWriter extends AbstractSSTableSimpleWriter
return;
writer = getWriter();
+ boolean first = true;
for (Map.Entry<DecoratedKey, ColumnFamily> entry : b.entrySet())
- writer.append(entry.getKey(), entry.getValue());
+ {
+ if (entry.getValue().getColumnCount() > 0)
+ writer.append(entry.getKey(), entry.getValue());
+ else if (!first)
+ throw new AssertionError("Empty partition");
+ first = false;
+ }
writer.close();
}
}
[2/4] cassandra git commit: Disallow default_time_to_live on counter
tables
Posted by ty...@apache.org.
Disallow default_time_to_live on counter tables
Patch by Jeff Jirsa; reviewed by Tyler Hobbs for CASSANDRA-8678
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0005a83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0005a83
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0005a83
Branch: refs/heads/trunk
Commit: d0005a83ef9bfc1042747cbe45708ded1f2002ba
Parents: 6ae8ada
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Fri Jan 30 16:33:56 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Jan 30 16:33:56 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 5 ++++-
src/java/org/apache/cassandra/config/CFMetaData.java | 5 +++++
.../apache/cassandra/cql3/statements/AlterTableStatement.java | 4 ++++
src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java | 5 +++++
.../apache/cassandra/cql3/statements/CreateTableStatement.java | 6 ++++++
src/java/org/apache/cassandra/db/marshal/AbstractType.java | 5 +++++
.../org/apache/cassandra/db/marshal/CounterColumnType.java | 5 +++++
7 files changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0005a83/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7fa5f63..4754867 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
2.0.13:
- * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException (CASSANDRA-8619)
+ * Prevent non-zero default_time_to_live on tables with counters
+ (CASSANDRA-8678)
+ * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException
+ (CASSANDRA-8619)
* Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
* Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0005a83/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 9d69710..04a5b01 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -2192,6 +2192,11 @@ public final class CFMetaData
return true;
}
+ public boolean isCounter()
+ {
+ return defaultValidator.isCounter();
+ }
+
public boolean hasStaticColumns()
{
return !staticColumns.isEmpty();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0005a83/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 32f949f..f74670f 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -268,6 +268,10 @@ public class AlterTableStatement extends SchemaAlteringStatement
throw new InvalidRequestException(String.format("ALTER COLUMNFAMILY WITH invoked, but no parameters found"));
cfProps.validate();
+
+ if (meta.isCounter() && cfProps.getDefaultTimeToLive() > 0)
+ throw new InvalidRequestException("Cannot set default_time_to_live on a table with counters");
+
cfProps.applyToCFMetadata(cfm);
break;
case RENAME:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0005a83/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
index 6ce6406..11aa9b2 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
@@ -138,6 +138,11 @@ public class CFPropDefs extends PropertyDefinitions
return compressionOptions;
}
+ public Integer getDefaultTimeToLive() throws SyntaxException
+ {
+ return getInt(KW_DEFAULT_TIME_TO_LIVE, 0);
+ }
+
public void applyToCFMetadata(CFMetaData cfm) throws ConfigurationException, SyntaxException
{
if (hasProperty(KW_COMMENT))
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0005a83/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index 5160d6f..5215118 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@ -207,6 +207,7 @@ public class CreateTableStatement extends SchemaAlteringStatement
CreateTableStatement stmt = new CreateTableStatement(cfName, properties, ifNotExists, staticColumns);
+ boolean hasCounters = false;
Map<ByteBuffer, CollectionType> definedCollections = null;
for (Map.Entry<ColumnIdentifier, CQL3Type> entry : definitions.entrySet())
{
@@ -218,6 +219,9 @@ public class CreateTableStatement extends SchemaAlteringStatement
definedCollections = new HashMap<ByteBuffer, CollectionType>();
definedCollections.put(id.key, (CollectionType)pt.getType());
}
+ else if (entry.getValue().isCounter())
+ hasCounters = true;
+
stmt.columns.put(id, pt.getType()); // we'll remove what is not a column below
}
@@ -225,6 +229,8 @@ public class CreateTableStatement extends SchemaAlteringStatement
throw new InvalidRequestException("No PRIMARY KEY specifed (exactly one required)");
else if (keyAliases.size() > 1)
throw new InvalidRequestException("Multiple PRIMARY KEYs specifed (exactly one required)");
+ else if (hasCounters && properties.getDefaultTimeToLive() > 0)
+ throw new InvalidRequestException("Cannot set default_time_to_live on a table with counters");
List<ColumnIdentifier> kAliases = keyAliases.get(0);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0005a83/src/java/org/apache/cassandra/db/marshal/AbstractType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/AbstractType.java b/src/java/org/apache/cassandra/db/marshal/AbstractType.java
index e92f272..dce521b 100644
--- a/src/java/org/apache/cassandra/db/marshal/AbstractType.java
+++ b/src/java/org/apache/cassandra/db/marshal/AbstractType.java
@@ -212,6 +212,11 @@ public abstract class AbstractType<T> implements Comparator<ByteBuffer>
return false;
}
+ public boolean isCounter()
+ {
+ return false;
+ }
+
public static AbstractType<?> parseDefaultParameters(AbstractType<?> baseType, TypeParser parser) throws SyntaxException
{
Map<String, String> parameters = parser.getKeyValueParameters();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0005a83/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java b/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java
index 6a77458..1ecdad9 100644
--- a/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java
@@ -31,6 +31,11 @@ public class CounterColumnType extends AbstractCommutativeType
CounterColumnType() {} // singleton
+ public boolean isCounter()
+ {
+ return true;
+ }
+
public int compare(ByteBuffer o1, ByteBuffer o2)
{
if (o1 == null)
[4/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1960d8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1960d8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1960d8b
Branch: refs/heads/trunk
Commit: c1960d8b792428d70967c6d196df11673b1533d2
Parents: 2e4ad06 9c38a10
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Jan 30 16:42:21 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Jan 30 16:42:21 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 5 ++++-
.../apache/cassandra/cql3/statements/AlterTableStatement.java | 4 ++++
src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java | 5 +++++
.../apache/cassandra/cql3/statements/CreateTableStatement.java | 6 ++++++
4 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1960d8b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1960d8b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index b340524,9d07459..5ee48b8
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -257,9 -257,13 +257,13 @@@ public class AlterTableStatement extend
break;
case OPTS:
if (cfProps == null)
- throw new InvalidRequestException(String.format("ALTER COLUMNFAMILY WITH invoked, but no parameters found"));
+ throw new InvalidRequestException(String.format("ALTER TABLE WITH invoked, but no parameters found"));
cfProps.validate();
+
+ if (meta.isCounter() && cfProps.getDefaultTimeToLive() > 0)
+ throw new InvalidRequestException("Cannot set default_time_to_live on a table with counters");
+
cfProps.applyToCFMetadata(cfm);
break;
case RENAME:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1960d8b/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1960d8b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------
[3/4] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
src/java/org/apache/cassandra/db/marshal/CounterColumnType.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c38a103
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c38a103
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c38a103
Branch: refs/heads/trunk
Commit: 9c38a103bab8244ea2887cdb821752e0c815f79b
Parents: cdcf646 d0005a8
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Jan 30 16:41:23 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Jan 30 16:41:23 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 7 ++++---
.../apache/cassandra/cql3/statements/AlterTableStatement.java | 4 ++++
src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java | 5 +++++
.../cassandra/cql3/statements/CreateTableStatement.java | 6 ++++++
4 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c38a103/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 92c1a17,4754867..129e1c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,95 -1,13 +1,96 @@@
-2.0.13:
+2.1.3
+ * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
+ * Don't use the shared ref in sstableloader (CASSANDRA-8704)
+ * Purge internal prepared statements if related tables or
+ keyspaces are dropped (CASSANDRA-8693)
+ * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
+ * Stop compactions before exiting offline tools (CASSANDRA-8623)
+ * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
+ * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
+ * Safer Resource Management (CASSANDRA-7705)
+ * Make sure we compact highly overlapping cold sstables with
+ STCS (CASSANDRA-8635)
+ * rpc_interface and listen_interface generate NPE on startup when specified
+ interface doesn't exist (CASSANDRA-8677)
+ * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms (CASSANDRA-8514)
+ * Switch from yammer metrics for nodetool cf/proxy histograms (CASSANDRA-8662)
+ * Make sure we don't add tmplink files to the compaction
+ strategy (CASSANDRA-8580)
+ * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
+ * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
+ * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
+ * Add tooling to detect hot partitions (CASSANDRA-7974)
+ * Fix cassandra-stress user-mode truncation of partition generation (CASSANDRA-8608)
+ * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
+ * Don't allow starting multiple inc repairs on the same sstables (CASSANDRA-8316)
+ * Invalidate prepared BATCH statements when related tables
+ or keyspaces are dropped (CASSANDRA-8652)
+ * Fix missing results in secondary index queries on collections
+ with ALLOW FILTERING (CASSANDRA-8421)
+ * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
+ * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
+ * Fix NPE when passing wrong argument in ALTER TABLE statement (CASSANDRA-8355)
+ * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
+ * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
+ * Fix case-sensitivity of index name on CREATE and DROP INDEX
+ statements (CASSANDRA-8365)
+ * Better detection/logging for corruption in compressed sstables (CASSANDRA-8192)
+ * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
+ * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
+ * Properly calculate expected write size during compaction (CASSANDRA-8532)
+ * Invalidate affected prepared statements when a table's columns
+ are altered (CASSANDRA-7910)
+ * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
+ * Fix regression in SSTableRewriter causing some rows to become unreadable
+ during compaction (CASSANDRA-8429)
+ * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
+ * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
+ is disabled (CASSANDRA-8288)
+ * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
+ * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
+ * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
+ * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
+ * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
+ * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
+ * Disable mmap on Windows (CASSANDRA-6993)
+ * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
+ * Add auth support to cassandra-stress (CASSANDRA-7985)
+ * Fix ArrayIndexOutOfBoundsException when generating error message
+ for some CQL syntax errors (CASSANDRA-8455)
+ * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
+ * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
+ * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
+ * Ensure memtable flush cannot expire commit log entries from its future (CASSANDRA-8383)
+ * Make read "defrag" async to reclaim memtables (CASSANDRA-8459)
+ * Remove tmplink files for offline compactions (CASSANDRA-8321)
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+ * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
+ * Fix sstableupgrade throws exception (CASSANDRA-8688)
+Merged from 2.0:
- =======
- 2.0.13:
- * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException (CASSANDRA-8619)
+ * Prevent non-zero default_time_to_live on tables with counters
+ (CASSANDRA-8678)
+ * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException
+ (CASSANDRA-8619)
* Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
* Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
-
-
-2.0.12:
+ * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
* Use more efficient slice size for querying internal secondary
index tables (CASSANDRA-8550)
* Fix potentially returning deleted rows with range tombstone (CASSANDRA-8558)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c38a103/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c38a103/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
index aee86a8,11aa9b2..343c0c0
--- a/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
@@@ -149,22 -137,12 +149,27 @@@ public class CFPropDefs extends Propert
return new HashMap<>();
return compressionOptions;
}
+ public CachingOptions getCachingOptions() throws SyntaxException, ConfigurationException
+ {
+ CachingOptions options = null;
+ Object val = properties.get(KW_CACHING);
+ if (val == null)
+ return null;
+ else if (val instanceof Map)
+ options = CachingOptions.fromMap(getMap(KW_CACHING));
+ else if (val instanceof String) // legacy syntax
+ {
+ options = CachingOptions.fromString(getSimple(KW_CACHING));
+ logger.warn("Setting caching options with deprecated syntax.");
+ }
+ return options;
+ }
+ public Integer getDefaultTimeToLive() throws SyntaxException
+ {
+ return getInt(KW_DEFAULT_TIME_TO_LIVE, 0);
+ }
+
public void applyToCFMetadata(CFMetaData cfm) throws ConfigurationException, SyntaxException
{
if (hasProperty(KW_COMMENT))
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c38a103/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index 5f70ab8,5215118..17fd6fd
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@@ -199,17 -207,21 +199,21 @@@ public class CreateTableStatement exten
CreateTableStatement stmt = new CreateTableStatement(cfName, properties, ifNotExists, staticColumns);
+ boolean hasCounters = false;
- Map<ByteBuffer, CollectionType> definedCollections = null;
- for (Map.Entry<ColumnIdentifier, CQL3Type> entry : definitions.entrySet())
+ Map<ByteBuffer, CollectionType> definedMultiCellCollections = null;
+ for (Map.Entry<ColumnIdentifier, CQL3Type.Raw> entry : definitions.entrySet())
{
ColumnIdentifier id = entry.getKey();
- CQL3Type pt = entry.getValue();
- if (pt.isCollection())
+ CQL3Type pt = entry.getValue().prepare(keyspace());
+ if (pt.isCollection() && ((CollectionType) pt.getType()).isMultiCell())
{
- if (definedCollections == null)
- definedCollections = new HashMap<ByteBuffer, CollectionType>();
- definedCollections.put(id.key, (CollectionType)pt.getType());
+ if (definedMultiCellCollections == null)
+ definedMultiCellCollections = new HashMap<>();
+ definedMultiCellCollections.put(id.bytes, (CollectionType) pt.getType());
}
+ else if (entry.getValue().isCounter())
+ hasCounters = true;
+
stmt.columns.put(id, pt.getType()); // we'll remove what is not a column below
}