[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90058a97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90058a97 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90058a97 Branch: refs/heads/cassandra-2.1 Commit: 90058a97ac07d0408f1b8f1b4dae66a22832981c Parents: 9da742d 93f54fc Author: Jonathan Ellis jbel...@apache.org Authored: Fri Jun 20 15:32:26 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Jun 20 15:32:26 2014 -0500 -- CHANGES.txt| 1 - src/java/org/apache/cassandra/db/Memtable.java | 14 -- 2 files changed, 4 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90058a97/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90058a97/src/java/org/apache/cassandra/db/Memtable.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/429e5cf1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/429e5cf1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/429e5cf1
Branch: refs/heads/trunk
Commit: 429e5cf19e3c306f05f47b68b9b485114f2bd062
Parents: 0dbb4e0 ce98b2d
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Jun 7 23:45:12 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Jun 7 23:45:12 2014 +0300
--
.../org/apache/cassandra/cql3/statements/CreateTableStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/429e5cf1/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
--
diff --cc
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index 632194c,000..28c7fb2
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@@ -1,437 -1,0 +1,437 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.cql3.statements;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+
+import org.apache.cassandra.exceptions.*;
+import org.apache.commons.lang3.StringUtils;
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Multiset;
+
+import org.apache.cassandra.auth.Permission;
+import org.apache.cassandra.config.ColumnDefinition;
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.cql3.*;
+import org.apache.cassandra.db.ColumnFamilyType;
+import org.apache.cassandra.db.marshal.*;
+import org.apache.cassandra.exceptions.AlreadyExistsException;
+import org.apache.cassandra.io.compress.CompressionParameters;
+import org.apache.cassandra.service.ClientState;
+import org.apache.cassandra.service.MigrationManager;
+import org.apache.cassandra.thrift.CqlResult;
+import org.apache.cassandra.transport.messages.ResultMessage;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
+/** A codeCREATE TABLE/code parsed from a CQL query statement. */
+public class CreateTableStatement extends SchemaAlteringStatement
+{
+public AbstractType? comparator;
+private AbstractType? defaultValidator;
+private AbstractType? keyValidator;
+
+private final ListByteBuffer keyAliases = new ArrayListByteBuffer();
+private final ListByteBuffer columnAliases = new
ArrayListByteBuffer();
+private ByteBuffer valueAlias;
+
+private final MapColumnIdentifier, AbstractType columns = new
HashMapColumnIdentifier, AbstractType();
+private final SetColumnIdentifier staticColumns;
+private final CFPropDefs properties;
+private final boolean ifNotExists;
+
+public CreateTableStatement(CFName name, CFPropDefs properties, boolean
ifNotExists, SetColumnIdentifier staticColumns)
+{
+super(name);
+this.properties = properties;
+this.ifNotExists = ifNotExists;
+this.staticColumns = staticColumns;
+
+try
+{
+if (!this.properties.hasProperty(CFPropDefs.KW_COMPRESSION)
CFMetaData.DEFAULT_COMPRESSOR != null)
+this.properties.addProperty(CFPropDefs.KW_COMPRESSION,
+new HashMapString, String()
+{{
+
put(CompressionParameters.SSTABLE_COMPRESSION, CFMetaData.DEFAULT_COMPRESSOR);
+}});
+}
+catch (SyntaxException e)
+{
+throw new AssertionError(e);
+}
+}
+
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4a3b520 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4a3b520 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4a3b520 Branch: refs/heads/trunk Commit: b4a3b52076e221f3fa7c65a70c7c4ddec439689c Parents: 8d4dc6d 0132e54 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Wed May 7 01:37:48 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Wed May 7 01:37:48 2014 -0400 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4a3b520/CHANGES.txt -- diff --cc CHANGES.txt index d65a694,d7b7f00..517f0ab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -26,69 -15,15 +26,70 @@@ Merged from 1.2 * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058) - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * Always clean up references in SerializingCache (CASSANDRA-6994) + * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751) * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831) - * fix time conversion to milliseconds in SimpleCondition.await (CASSANDRA-7149) + * remove duplicate query for local tokens (CASSANDRA-7182) -1.2.16 +2.0.7 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961) + * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787) + * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980) + * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025) + * Schedule schema pulls on change (CASSANDRA-6971) + * Avoid early loading of non-system keyspaces before compaction-leftovers + cleanup at startup (CASSANDRA-6913) + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958) + * Fix LIMIT with static columns (CASSANDRA-6956) + * Fix clash with CQL column name in thrift
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 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/e974b6f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e974b6f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e974b6f9 Branch: refs/heads/cassandra-2.1 Commit: e974b6f9359bf66225155b1547e99c5ca8492321 Parents: 98dcde1 63ba588 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Apr 25 16:51:35 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Apr 25 16:51:35 2014 -0500 -- CHANGES.txt | 8 src/java/org/apache/cassandra/tools/NodeCmd.java | 8 2 files changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e974b6f9/CHANGES.txt -- diff --cc CHANGES.txt index 73c5034,aad3721..cd6443e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,12 +1,21 @@@ -1.2.17 +2.0.8 + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) +Merged from 1.2: + * Fix nodetool display with vnodes (CASSANDRA-7082) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps +(CASSANDRA-6822) + * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787) + * Schedule schema pulls on change (CASSANDRA-6971) + * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980) + * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025) * Fix batchlog to account for CF truncation records (CASSANDRA-6999) * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e974b6f9/src/java/org/apache/cassandra/tools/NodeCmd.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92b6d7a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92b6d7a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92b6d7a3 Branch: refs/heads/cassandra-2.1 Commit: 92b6d7a3900dbaf97a8ae7283aecd23aa1f2a25e Parents: faffbf2 5030d42 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Mar 13 12:00:56 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Mar 13 12:00:56 2014 -0500 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b6d7a3/CHANGES.txt --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5321d50 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5321d50 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5321d50 Branch: refs/heads/trunk Commit: b5321d50bba3733e9dc359714eb658c191ca2975 Parents: 16f99c5 c562700 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Feb 10 09:37:43 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Feb 10 09:37:43 2014 -0600 -- src/java/org/apache/cassandra/service/MigrationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5321d50/src/java/org/apache/cassandra/service/MigrationManager.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56a615d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56a615d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56a615d7 Branch: refs/heads/trunk Commit: 56a615d7397a937b8f6586fe2ecc79cfc2da28f0 Parents: 3d5b5c3 beefd0b Author: Jonathan Ellis jbel...@apache.org Authored: Fri Feb 7 10:18:31 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Feb 7 10:18:31 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 2 +- src/java/org/apache/cassandra/db/DataTracker.java | 7 --- .../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56a615d7/CHANGES.txt -- diff --cc CHANGES.txt index 85c6533,5511e01..94cd19c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,42 -1,24 +1,43 @@@ -1.2.16 +2.0.6 + * Failure detector correctly converts initial value to nanos (CASSANDRA-6658) + * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445) + * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) + * Improve nodetool cfhistograms formatting (CASSANDRA-6360) + * Expose bulk loading progress over JMX (CASSANDRA-4757) + * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) + * Account for range/row tombstones in tombstone drop + time histogram (CASSANDRA-6522) +Merged from 1.2: * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655) + * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) - -1.2.15 - * Move handling of migration event source to solve bootstrap race (CASSANDRA-6648) - * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647) - - -1.2.14 - * Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592) - * add cassandra.default_messaging_version property to allow easier - upgrading from 1.1 (CASSANDRA-6619) - * Allow executing CREATE statements multiple times (CASSANDRA-6471) - * Don't send confusing info with timeouts (CASSANDRA-6491) - * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) - * Don't drop local mutations without a hint (CASSANDRA-6510) - * Don't allow null max_hint_window_in_ms (CASSANDRA-6419) - * Validate SliceRange start and finish lengths (CASSANDRA-6521) +2.0.5 + * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) + * Add ks.cf names to tombstone logging (CASSANDRA-6597) + * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) + * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) + * Delete unfinished compaction incrementally (CASSANDRA-6086) + * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) + * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485) + * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584) + * Don't special case received counts in CAS timeout exceptions (CASSANDRA-6595) + * Add support for 2.1 global counter shards (CASSANDRA-6505) + * Fix NPE when streaming connection is not yet established (CASSANDRA-6210) + * Avoid rare duplicate read repair triggering (CASSANDRA-6606) + * Fix paging discardFirst (CASSANDRA-6555) + * Fix ArrayIndexOutOfBoundsException in 2ndary index query (CASSANDRA-6470) + * Release sstables upon rebuilding 2i (CASSANDRA-6635) + * Add AbstractCompactionStrategy.startup() method (CASSANDRA-6637) + * SSTableScanner may skip rows during cleanup (CASSANDRA-6638) + * sstables from stalled repair sessions can resurrect deleted data (CASSANDRA-6503) + * Switch stress to use ITransportFactory (CASSANDRA-6641) + * Fix IllegalArgumentException during prepare (CASSANDRA-6592) + * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517) + * Fix direct Memory on architectures that do not support unaligned long access + (CASSANDRA-6628) + * Let scrub optionally skip broken counter partitions (CASSANDRA-5930) +Merged from 1.2: * fsync compression metadata (CASSANDRA-6531) * Validate CF existence on execution for prepared statement (CASSANDRA-6535) * Add ability to throttle batchlog replay (CASSANDRA-6550) http://git-wip-us.apache.org/repos/asf/cassandra/blob/56a615d7/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe571421 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe571421 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe571421 Branch: refs/heads/trunk Commit: fe571421dadea7e8a904a7b5b3127cd6b71263a8 Parents: 56a615d ab5372f Author: Jonathan Ellis jbel...@apache.org Authored: Fri Feb 7 10:30:30 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Feb 7 10:30:50 2014 -0600 -- CHANGES.txt | 1 + .../cassandra/db/HintedHandOffManager.java | 26 2 files changed, 17 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe571421/CHANGES.txt -- diff --cc CHANGES.txt index 94cd19c,82783f8..d32490e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -11,33 -2,24 +11,34 @@@ Merged from 1.2 * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655) * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) + * Compact hints after partial replay to clean out tombstones (CASSANDRA-) - -1.2.15 - * Move handling of migration event source to solve bootstrap race (CASSANDRA-6648) - * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647) - - -1.2.14 - * Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592) - * add cassandra.default_messaging_version property to allow easier - upgrading from 1.1 (CASSANDRA-6619) - * Allow executing CREATE statements multiple times (CASSANDRA-6471) - * Don't send confusing info with timeouts (CASSANDRA-6491) - * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) - * Don't drop local mutations without a hint (CASSANDRA-6510) - * Don't allow null max_hint_window_in_ms (CASSANDRA-6419) - * Validate SliceRange start and finish lengths (CASSANDRA-6521) +2.0.5 + * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) + * Add ks.cf names to tombstone logging (CASSANDRA-6597) + * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) + * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) + * Delete unfinished compaction incrementally (CASSANDRA-6086) + * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) + * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485) + * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584) + * Don't special case received counts in CAS timeout exceptions (CASSANDRA-6595) + * Add support for 2.1 global counter shards (CASSANDRA-6505) + * Fix NPE when streaming connection is not yet established (CASSANDRA-6210) + * Avoid rare duplicate read repair triggering (CASSANDRA-6606) + * Fix paging discardFirst (CASSANDRA-6555) + * Fix ArrayIndexOutOfBoundsException in 2ndary index query (CASSANDRA-6470) + * Release sstables upon rebuilding 2i (CASSANDRA-6635) + * Add AbstractCompactionStrategy.startup() method (CASSANDRA-6637) + * SSTableScanner may skip rows during cleanup (CASSANDRA-6638) + * sstables from stalled repair sessions can resurrect deleted data (CASSANDRA-6503) + * Switch stress to use ITransportFactory (CASSANDRA-6641) + * Fix IllegalArgumentException during prepare (CASSANDRA-6592) + * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517) + * Fix direct Memory on architectures that do not support unaligned long access + (CASSANDRA-6628) + * Let scrub optionally skip broken counter partitions (CASSANDRA-5930) +Merged from 1.2: * fsync compression metadata (CASSANDRA-6531) * Validate CF existence on execution for prepared statement (CASSANDRA-6535) * Add ability to throttle batchlog replay (CASSANDRA-6550) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe571421/src/java/org/apache/cassandra/db/HintedHandOffManager.java -- diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java index 40d5aaa,b1ccbc3..b9914a6 --- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java @@@ -367,13 -318,17 +368,17 @@@ public class HintedHandOffManager imple startColumn, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, -pageSize); +
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7407cf98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7407cf98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7407cf98 Branch: refs/heads/trunk Commit: 7407cf981b928886a868cb82f899a99dd03fe612 Parents: fe57142 2dd55c7 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Feb 7 10:38:00 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Feb 7 10:38:00 2014 -0600 -- test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7407cf98/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/130d135a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/130d135a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/130d135a
Branch: refs/heads/trunk
Commit: 130d135a63b213844270e3f94e5b07658ac897dd
Parents: 7407cf9 c70f6d8
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 7 13:19:38 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 7 13:19:38 2014 -0600
--
build.xml | 12
1 file changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/130d135a/build.xml
--
diff --cc build.xml
index 6804a1b,eaf35b5..bfbd8b2
--- a/build.xml
+++ b/build.xml
@@@ -55,13 -56,13 +55,14 @@@
property name=test.conf value=${test.dir}/conf/
property name=test.data value=${test.dir}/data/
property name=test.name value=*Test/
+ property name=test.methods value=/
property name=test.unit.src value=${test.dir}/unit/
property name=test.long.src value=${test.dir}/long/
+property name=test.pig.src value=${test.dir}/pig/
property name=dist.dir value=${build.dir}/dist/
- property name=source.version value=1.6/
- property name=target.version value=1.6/
+ property name=source.version value=1.7/
+ property name=target.version value=1.7/
condition property=version value=${base.version}
isset property=release/
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63059a81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63059a81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63059a81 Branch: refs/heads/trunk Commit: 63059a81944094e4946fdc337ff8951dd2c6ca3e Parents: 55211bc 35c78d6 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Jan 29 08:56:25 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Jan 29 08:56:25 2014 -0600 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f866483 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f866483 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f866483 Branch: refs/heads/trunk Commit: 2f866483c7b27814ede14bf700353e68679e76fd Parents: 63059a8 1d81765 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Jan 29 09:53:02 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Jan 29 09:53:02 2014 -0600 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39bdb2be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39bdb2be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39bdb2be
Branch: refs/heads/trunk
Commit: 39bdb2be978b490c9b64068a67e812c07b63dca2
Parents: b44683c 6c4333e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 29 17:35:22 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 29 17:35:22 2014 -0600
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
.../cassandra/service/StorageService.java | 39 +---
3 files changed, 35 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bdb2be/CHANGES.txt
--
diff --cc CHANGES.txt
index 94eaa79,d88bb26..a059d84
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -28,29 -19,10 +28,30 @@@ Merged from 1.2
* Add properties to adjust FD initial value and max interval (CASSANDRA-4375)
* Fix preparing with batch and delete from collection (CASSANDRA-6607)
* Fix ABSC reverse iterator's remove() method (CASSANDRA-6629)
+ * Handle host ID conflicts properly (CASSANDRA-6615)
-1.2.13
+2.0.4
+ * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
+ * add StorageService.stopDaemon() (CASSANDRA-4268)
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
+ * add client encryption support to sstableloader (CASSANDRA-6378)
+ * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
+ * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
+ * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+ * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
+ * Fix cleanup ClassCastException (CASSANDRA-6462)
+ * Reduce gossip memory use by interning VersionedValue strings
(CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: handle symlinks properly (CASSANDRA-6425)
+ * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
+ * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
+ * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
+Merged from 1.2:
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
* Randomize batchlog candidates selection (CASSANDRA-6481)
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bdb2be/src/java/org/apache/cassandra/gms/Gossiper.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bdb2be/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 0870362,c93ea5b..9eb4e92
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1452,6 -1453,12 +1452,12 @@@ public class StorageService extends Not
tokens = getTokensFor(endpoint, pieces[1]);
+ SetToken tokensToUpdateInMetadata = new HashSetToken();
-SetToken tokensToUpdateInSystemTable = new HashSetToken();
++SetToken tokensToUpdateInSystemKeyspace = new HashSetToken();
+ SetToken localTokensToRemove = new HashSetToken();
+ SetInetAddress endpointsToRemove = new HashSetInetAddress();
+
+
if (logger.isDebugEnabled())
logger.debug(Node + endpoint + state normal, token +
tokens);
@@@ -1465,14 -1473,35 +1472,34 @@@
if (DatabaseDescriptor.isReplacing()
Gossiper.instance.getEndpointStateForEndpoint(DatabaseDescriptor.getReplaceAddress())
!= null
(hostId.equals(Gossiper.instance.getHostId(DatabaseDescriptor.getReplaceAddress()
logger.warn(Not updating token metadata for {} because I am
replacing it, endpoint);
else
- tokenMetadata.updateHostId(hostId, endpoint);
+ {
+ if (existing != null !existing.equals(endpoint))
+ {
+ if
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/gms/FailureDetector.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c988180
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c988180
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c988180
Branch: refs/heads/trunk
Commit: 9c988180730a18a12f14f3868bf9cb6afced414a
Parents: e9a57fb c0c31ed
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 22 13:42:30 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 22 13:42:30 2014 -0600
--
CHANGES.txt | 1 +
.../apache/cassandra/gms/FailureDetector.java | 30 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c988180/CHANGES.txt
--
diff --cc CHANGES.txt
index b08f04b,524ffb7..6aa944d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,29 -14,10 +18,30 @@@ Merged from 1.2
* Paginate batchlog replay (CASSANDRA-6569)
* skip blocking on streaming during drain (CASSANDRA-6603)
* Improve error message when schema doesn't match loaded sstable
(CASSANDRA-6262)
+ * Add properties to adjust FD initial value and max interval (CASSANDRA-4375)
-1.2.13
+2.0.4
+ * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
+ * add StorageService.stopDaemon() (CASSANDRA-4268)
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
+ * add client encryption support to sstableloader (CASSANDRA-6378)
+ * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
+ * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
+ * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+ * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
+ * Fix cleanup ClassCastException (CASSANDRA-6462)
+ * Reduce gossip memory use by interning VersionedValue strings
(CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: handle symlinks properly (CASSANDRA-6425)
+ * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
+ * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
+ * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
+Merged from 1.2:
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
* Randomize batchlog candidates selection (CASSANDRA-6481)
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c988180/src/java/org/apache/cassandra/gms/FailureDetector.java
--
diff --cc src/java/org/apache/cassandra/gms/FailureDetector.java
index 4e5ba90,7a35c34..a7eb82f
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@@ -288,20 -293,32 +301,33 @@@ class ArrivalWindo
// in the event of a long partition, never record an interval longer than
the rpc timeout,
// since if a host is regularly experiencing connectivity problems
lasting this long we'd
// rather mark it down quickly instead of adapting
- private final long MAX_INTERVAL_IN_NANO =
DatabaseDescriptor.getRpcTimeout() * MILLI_TO_NANO;
+ // this value defaults to the same initial value the FD is seeded with
-private final int MAX_INTERVAL_IN_MS = getMaxInterval();
++private final long MAX_INTERVAL_IN_NANO = getMaxInterval() *
MILLI_TO_NANO;
ArrivalWindow(int size)
{
arrivalIntervals = new BoundedStatsDeque(size);
}
+ private static int getMaxInterval()
+ {
+ String newvalue = System.getProperty(cassandra.fd_max_interval_ms);
+ if (newvalue != null)
+ {
+ logger.info(Overriding FD MAX_INTERVAL to {}ms, newvalue);
+ return Integer.parseInt(newvalue);
+ }
+ else
+ return FailureDetector.INITIAL_VALUE;
+ }
+
-synchronized void add(double value)
+synchronized void add(long value)
{
+assert tLast = 0;
if (tLast 0L)
{
-double interArrivalTime = (value - tLast);
-if (interArrivalTime = MAX_INTERVAL_IN_MS)
+long interArrivalTime = (value - tLast);
+
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7f9de52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7f9de52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7f9de52
Branch: refs/heads/trunk
Commit: f7f9de52fd71660d5a09e75266697a0c7bcdc701
Parents: 6348ce0 0eac408
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 22 17:12:35 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 22 17:12:35 2014 -0600
--
NEWS.txt | 16
1 file changed, 4 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7f9de52/NEWS.txt
--
diff --cc NEWS.txt
index 4c95bea,8c22bea..92446c8
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -44,130 -28,18 +44,122 @@@ New feature
Upgrading
-
-- Nothing specific to this release, but please see 1.2.12 if you are
upgrading
- from a previous version.
+- NaN and Infinity are new valid floating point constants in CQL3 and are
now reserved
+ keywords. In the unlikely case you were using one of them as an
identifier (for a
+ column, a keyspace or a table), you will now have to double-quote them
(see
+ http://cassandra.apache.org/doc/cql3/CQL.html#identifiers for quoted
identifiers).
+- The IEndpointStateChangeSubscriber has a new method, beforeChange, that
+ any custom implemenations using the class will need to implement.
-1.2.12
-==
+2.0.2
+=
+New features
+
+- Speculative retry defaults to 99th percentile
+ (See blog post at
http://www.datastax.com/dev/blog/rapid-read-protection-in-cassandra-2-0-2)
+- Configurable metrics reporting
+ (see conf/metrics-reporter-config-sample.yaml)
+- Compaction history and stats are now saved to system keyspace
+ (system.compaction_history table). You can access historiy via
+ new 'nodetool compactionhistory' command or CQL.
- - Added a new consistency level, LOCAL_ONE, that forces all CL.ONE
operations to
- execute only in the local datacenter.
- - New replace_address to supplant the (now removed) replace_token and
- replace_node workflows to replace a dead node in place. Works like the
- old options, but takes the IP address of the node to be replaced.
- - A new CQLSSTableWriter class has been added. It is the equivalent of
- the existing SSTableSimpleWriter/SSTableSimpleUnsortedWriter but is
- CQL oriented.
+
+Upgrading
+-
+- Nodetool defaults to Sequential mode for repair operations
+
+
+2.0.1
+=
Upgrading
-
-- Altering CQL3 tables from Thrift is now rejected as this had the
- potential of corrupting the schema. You should use cqlsh otherwise.
+- The default memtable allocation has changed from 1/3 of heap to 1/4
+ of heap. Also, default (single-partition) read and write timeouts
+ have been reduced from 10s to 5s and 2s, respectively.
+
+2.0.0
+=
+
+Upgrading
+-
+- Java 7 is now *required*!
+- Upgrading is ONLY supported from Cassandra 1.2.9 or later. This
+ goes for sstable compatibility as well as network. When
+ upgrading from an earlier release, upgrade to 1.2.9 first and
+ run upgradesstables before proceeding to 2.0.
+- CAS and new features in CQL such as DROP COLUMN assume that cell
+ timestamps are microseconds-since-epoch. Do not use these
+ features if you are using client-specified timestamps with some
+ other source.
+- Replication and strategy options do not accept unknown options anymore.
+ This was already the case for CQL3 in 1.2 but this is now the case for
+ thrift too.
+- auto_bootstrap of a single-token node with no initial_token will
+ now pick a random token instead of bisecting an existing token
+ range. We recommend upgrading to vnodes; failing that, we
+ recommend specifying initial_token.
+- reduce_cache_sizes_at, reduce_cache_capacity_to, and
+ flush_largest_memtables_at options have been removed from
cassandra.yaml.
+- CacheServiceMBean.reduceCacheSizes() has been removed.
+ Use CacheServiceMBean.set{Key,Row}CacheCapacityInMB() instead.
+- authority option in cassandra.yaml has been deprecated since 1.2.0,
+ but it has been completely removed in 2.0. Please use 'authorizer'
option.
+- ASSUME command has been removed from cqlsh. Use CQL3 blobAsType() and
+ typeAsBlob() conversion functions instead.
+ See
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14c6f703 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14c6f703 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14c6f703 Branch: refs/heads/trunk Commit: 14c6f70301d30f81369b614b6e43e8da2ddf2f80 Parents: 90f661e a3f7035 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jan 17 10:07:24 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jan 17 10:07:24 2014 -0600 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27488a57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27488a57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27488a57
Branch: refs/heads/trunk
Commit: 27488a57ca9e0c872fb1e34d2c6e89a0608404b5
Parents: 7514e61 5f63578
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 15 16:02:14 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 15 16:02:14 2014 -0600
--
src/java/org/apache/cassandra/service/StorageService.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27488a57/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 1ab97b2,7c8a257..8470078
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2148,13 -2165,15 +2148,15 @@@ public class StorageService extends Not
}
/**
- * Takes the snapshot for the given tables. A snapshot name must be
specified.
+ * Takes the snapshot for the given keyspaces. A snapshot name must be
specified.
*
* @param tag the tag given to the snapshot; may not be null or empty
- * @param tableNames the name of the tables to snapshot; empty means
all.
+ * @param keyspaceNames the names of the keyspaces to snapshot; empty
means all.
*/
-public void takeSnapshot(String tag, String... tableNames) throws
IOException
+public void takeSnapshot(String tag, String... keyspaceNames) throws
IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException(Cannot snapshot until bootstrap
completes);
if (tag == null || tag.equals())
throw new IOException(You must supply a snapshot name.);
@@@ -2188,10 -2207,12 +2190,12 @@@
* @param columnFamilyName the column family to snapshot
* @param tag the tag given to the snapshot; may not be null or empty
*/
-public void takeColumnFamilySnapshot(String tableName, String
columnFamilyName, String tag) throws IOException
+public void takeColumnFamilySnapshot(String keyspaceName, String
columnFamilyName, String tag) throws IOException
{
+if (keyspaceName == null)
+throw new IOException(You must supply a keyspace name);
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException(Cannot snapshot until bootstrap
completes);
-if (tableName == null)
-throw new IOException(You must supply a table name);
if (columnFamilyName == null)
throw new IOException(You must supply a column family name);
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f50406a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f50406a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f50406a Branch: refs/heads/trunk Commit: 4f50406af7b5df75049d0fe411d2338aed0f2daa Parents: 200e494 0d38b25 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Jan 14 15:20:00 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Jan 14 15:20:00 2014 -0600 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87c6ec11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87c6ec11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87c6ec11 Branch: refs/heads/trunk Commit: 87c6ec11c47ff5c96353418d4e318f4ee3f81ddd Parents: c1c3d8f cd381f0 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jan 10 13:04:50 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jan 10 13:04:50 2014 -0600 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbc08912 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbc08912 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbc08912 Branch: refs/heads/trunk Commit: bbc089125a6031abd5fb5e1a175e1f3655a53d20 Parents: 0e0884f 3eef540 Author: Jonathan Ellis jbel...@apache.org Authored: Sat Dec 28 20:49:02 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Sat Dec 28 20:49:02 2013 -0600 -- .../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbc08912/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1365749e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1365749e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1365749e Branch: refs/heads/trunk Commit: 1365749e456ac674c35633141a08dcf1db06599b Parents: 03f4c92 f219e83 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Dec 26 10:56:08 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Dec 26 10:56:08 2013 -0600 -- .gitignore | 55 +++ 1 file changed, 55 insertions(+) --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca7335e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca7335e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca7335e6 Branch: refs/heads/trunk Commit: ca7335e651a963033b890f6d6d56c893f48b5ae3 Parents: f5526d5 79f7d6b Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Dec 12 12:04:56 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Dec 12 12:04:56 2013 -0600 -- bin/cassandra.in.sh | 7 +++ bin/json2sstable| 2 +- bin/nodetool| 2 +- bin/sstable2json| 2 +- bin/sstablekeys | 2 +- bin/sstableloader | 2 +- bin/sstablescrub| 2 +- bin/sstablesplit| 2 +- bin/sstableupgrade | 2 +- 9 files changed, 15 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca7335e6/bin/json2sstable -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca7335e6/bin/nodetool -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca7335e6/bin/sstable2json -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca7335e6/bin/sstablekeys -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca7335e6/bin/sstableloader --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41d64cd0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41d64cd0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41d64cd0 Branch: refs/heads/trunk Commit: 41d64cd0a4afdd304671f301bfbe1fd13705370c Parents: 1a80a43 7ad3960 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Dec 2 20:56:42 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Dec 2 20:56:42 2013 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/41d64cd0/CHANGES.txt -- diff --cc CHANGES.txt index 8a95fa8,88474ce..b8a477d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -12,44 -8,10 +12,45 @@@ Merged from 1.2 * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598) * Expose Thread metrics for the native protocol server (CASSANDRA-6234) * Change snapshot response message verb (CASSANDRA-6415) + * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410) -1.2.12 +2.0.3 + * Fix FD leak on slice read path (CASSANDRA-6275) + * Cancel read meter task when closing SSTR (CASSANDRA-6358) + * free off-heap IndexSummary during bulk (CASSANDRA-6359) + * Recover from IOException in accept() thread (CASSANDRA-6349) + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) + * Fix trying to hint timed out counter writes (CASSANDRA-6322) + * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) + * Avoid flushing compaction_history after each operation (CASSANDRA-6287) + * Fix repair assertion error when tombstones expire (CASSANDRA-6277) + * Skip loading corrupt key cache (CASSANDRA-6260) + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) + * Compact hottest sstables first and optionally omit coldest from + compaction entirely (CASSANDRA-6109) + * Fix modifying column_metadata from thrift (CASSANDRA-6182) + * cqlsh: fix LIST USERS output (CASSANDRA-6242) + * Add IRequestSink interface (CASSANDRA-6248) + * Update memtable size while flushing (CASSANDRA-6249) + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252) + * Require Permission.SELECT for CAS updates (CASSANDRA-6247) + * New CQL-aware SSTableWriter (CASSANDRA-5894) + * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270) + * Correctly throw error when frame too large (CASSANDRA-5981) + * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299) + * Fix CQL3 table validation in Thrift (CASSANDRA-6140) + * Fix bug missing results with IN clauses (CASSANDRA-6327) + * Fix paging with reversed slices (CASSANDRA-6343) + * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337) + * Support NaN and Infinity as float literals (CASSANDRA-6003) + * Remove RF from nodetool ring output (CASSANDRA-6289) + * Fix attempting to flush empty rows (CASSANDRA-6374) + * Fix potential out of bounds exception when paging (CASSANDRA-6333) +Merged from 1.2: + * Optimize FD phi calculation (CASSANDRA-6386) + * Improve initial FD phi estimate when starting up (CASSANDRA-6385) + * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750) * Invalidate row cache when dropping CF (CASSANDRA-6351) * add non-jamm path for cached statements (CASSANDRA-6293) * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/41d64cd0/src/java/org/apache/cassandra/gms/VersionedValue.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef768a55 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef768a55 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef768a55 Branch: refs/heads/trunk Commit: ef768a555d2423add1a3be649043f6e3725bb5de Parents: 41d64cd ecd9422 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Dec 2 21:16:33 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Dec 2 21:16:33 2013 -0600 -- CHANGES.txt | 1 - src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef768a55/CHANGES.txt -- diff --cc CHANGES.txt index b8a477d,c80a00a..8a95fa8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -12,45 -8,9 +12,44 @@@ Merged from 1.2 * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598) * Expose Thread metrics for the native protocol server (CASSANDRA-6234) * Change snapshot response message verb (CASSANDRA-6415) - * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410) -1.2.12 +2.0.3 + * Fix FD leak on slice read path (CASSANDRA-6275) + * Cancel read meter task when closing SSTR (CASSANDRA-6358) + * free off-heap IndexSummary during bulk (CASSANDRA-6359) + * Recover from IOException in accept() thread (CASSANDRA-6349) + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) + * Fix trying to hint timed out counter writes (CASSANDRA-6322) + * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) + * Avoid flushing compaction_history after each operation (CASSANDRA-6287) + * Fix repair assertion error when tombstones expire (CASSANDRA-6277) + * Skip loading corrupt key cache (CASSANDRA-6260) + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) + * Compact hottest sstables first and optionally omit coldest from + compaction entirely (CASSANDRA-6109) + * Fix modifying column_metadata from thrift (CASSANDRA-6182) + * cqlsh: fix LIST USERS output (CASSANDRA-6242) + * Add IRequestSink interface (CASSANDRA-6248) + * Update memtable size while flushing (CASSANDRA-6249) + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252) + * Require Permission.SELECT for CAS updates (CASSANDRA-6247) + * New CQL-aware SSTableWriter (CASSANDRA-5894) + * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270) + * Correctly throw error when frame too large (CASSANDRA-5981) + * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299) + * Fix CQL3 table validation in Thrift (CASSANDRA-6140) + * Fix bug missing results with IN clauses (CASSANDRA-6327) + * Fix paging with reversed slices (CASSANDRA-6343) + * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337) + * Support NaN and Infinity as float literals (CASSANDRA-6003) + * Remove RF from nodetool ring output (CASSANDRA-6289) + * Fix attempting to flush empty rows (CASSANDRA-6374) + * Fix potential out of bounds exception when paging (CASSANDRA-6333) +Merged from 1.2: + * Optimize FD phi calculation (CASSANDRA-6386) + * Improve initial FD phi estimate when starting up (CASSANDRA-6385) + * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750) * Invalidate row cache when dropping CF (CASSANDRA-6351) * add non-jamm path for cached statements (CASSANDRA-6293) * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef768a55/src/java/org/apache/cassandra/gms/VersionedValue.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2af07649 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2af07649 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2af07649 Branch: refs/heads/trunk Commit: 2af076494d9528841153d892877cbfb723c7e6a9 Parents: ef33f95 a16fa77 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Nov 27 11:38:08 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Nov 27 11:38:08 2013 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2af07649/CHANGES.txt -- diff --cc CHANGES.txt index d52c508,0c7bb29..2bafb90 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,48 -1,13 +1,49 @@@ -1.2.13 +2.0.4 + * Fix divide-by-zero in PCI (CASSANDRA-6403) + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) + * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395) +Merged from 1.2: * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345) - * Optimize FD phi calculation (CASSANDRA-6386) - * Improve initial FD phi estimate when starting up (CASSANDRA-6385) - * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750) * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172) + * Improve gossip performance for typical messages (CASSANDRA-6409) -1.2.12 +2.0.3 + * Fix FD leak on slice read path (CASSANDRA-6275) + * Cancel read meter task when closing SSTR (CASSANDRA-6358) + * free off-heap IndexSummary during bulk (CASSANDRA-6359) + * Recover from IOException in accept() thread (CASSANDRA-6349) + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) + * Fix trying to hint timed out counter writes (CASSANDRA-6322) + * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) + * Avoid flushing compaction_history after each operation (CASSANDRA-6287) + * Fix repair assertion error when tombstones expire (CASSANDRA-6277) + * Skip loading corrupt key cache (CASSANDRA-6260) + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) + * Compact hottest sstables first and optionally omit coldest from + compaction entirely (CASSANDRA-6109) + * Fix modifying column_metadata from thrift (CASSANDRA-6182) + * cqlsh: fix LIST USERS output (CASSANDRA-6242) + * Add IRequestSink interface (CASSANDRA-6248) + * Update memtable size while flushing (CASSANDRA-6249) + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252) + * Require Permission.SELECT for CAS updates (CASSANDRA-6247) + * New CQL-aware SSTableWriter (CASSANDRA-5894) + * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270) + * Correctly throw error when frame too large (CASSANDRA-5981) + * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299) + * Fix CQL3 table validation in Thrift (CASSANDRA-6140) + * Fix bug missing results with IN clauses (CASSANDRA-6327) + * Fix paging with reversed slices (CASSANDRA-6343) + * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337) + * Support NaN and Infinity as float literals (CASSANDRA-6003) + * Remove RF from nodetool ring output (CASSANDRA-6289) + * Fix attempting to flush empty rows (CASSANDRA-6374) + * Fix potential out of bounds exception when paging (CASSANDRA-6333) +Merged from 1.2: + * Optimize FD phi calculation (CASSANDRA-6386) + * Improve initial FD phi estimate when starting up (CASSANDRA-6385) + * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750) * Invalidate row cache when dropping CF (CASSANDRA-6351) * add non-jamm path for cached statements (CASSANDRA-6293) * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2af07649/src/java/org/apache/cassandra/service/StorageService.java -- diff --cc src/java/org/apache/cassandra/service/StorageService.java index e91ac8c,c9326ae..418a496 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -1381,10 -1393,9 +1381,9 @@@ public class StorageService extends Not } SetToken tokensToUpdateInMetadata = new HashSetToken(); -SetToken tokensToUpdateInSystemTable = new HashSetToken(); +SetToken tokensToUpdateInSystemKeyspace = new HashSetToken();
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e68d466e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e68d466e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e68d466e
Branch: refs/heads/trunk
Commit: e68d466eb226134a73469648af5085da43669fd8
Parents: 504f66d cc8a05a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:27:58 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:27:58 2013 -0600
--
src/java/org/apache/cassandra/db/Keyspace.java | 3 ---
1 file changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e68d466e/src/java/org/apache/cassandra/db/Keyspace.java
--
diff --cc src/java/org/apache/cassandra/db/Keyspace.java
index 4914c11,000..0280ed2
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@@ -1,454 -1,0 +1,451 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.db;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Future;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.db.commitlog.CommitLog;
+import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.db.index.SecondaryIndex;
+import org.apache.cassandra.db.index.SecondaryIndexManager;
+import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.locator.AbstractReplicationStrategy;
+import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.service.pager.QueryPagers;
+import org.apache.cassandra.tracing.Tracing;
+
+/**
+ * It represents a Keyspace.
+ */
+public class Keyspace
+{
+public static final String SYSTEM_KS = system;
+private static final int DEFAULT_PAGE_SIZE = 1;
+
+private static final Logger logger =
LoggerFactory.getLogger(Keyspace.class);
+
+/**
+ * accesses to CFS.memtable should acquire this for thread safety.
+ * CFS.maybeSwitchMemtable should aquire the writeLock; see that method
for the full explanation.
+ * p/
+ * (Enabling fairness in the RRWL is observed to decrease throughput, so
we leave it off.)
+ */
+public static final ReentrantReadWriteLock switchLock = new
ReentrantReadWriteLock();
+
+// It is possible to call Keyspace.open without a running daemon, so it
makes sense to ensure
+// proper directories here as well as in CassandraDaemon.
+static
+{
+if (!StorageService.instance.isClientMode())
+DatabaseDescriptor.createAllDirectories();
+}
+
+public final KSMetaData metadata;
+
+/* ColumnFamilyStore per column family */
+private final ConcurrentMapUUID, ColumnFamilyStore columnFamilyStores =
new ConcurrentHashMapUUID, ColumnFamilyStore();
+private volatile AbstractReplicationStrategy replicationStrategy;
+public static final FunctionString,Keyspace keyspaceTransformer = new
FunctionString, Keyspace()
+{
+public Keyspace apply(String keyspaceName)
+{
+return Keyspace.open(keyspaceName);
+}
+};
+
+public static Keyspace open(String keyspaceName)
+{
+return open(keyspaceName, Schema.instance, true);
+}
+
+public static Keyspace openWithoutSSTables(String keyspaceName)
+{
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab4cc9c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab4cc9c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab4cc9c0 Branch: refs/heads/trunk Commit: ab4cc9c007adb65631fb6f1dce614437e6856fd1 Parents: e68d466 5f62610 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Nov 26 14:34:43 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Nov 26 14:34:43 2013 -0600 -- src/java/org/apache/cassandra/locator/PropertyFileSnitch.java | 2 +- src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab4cc9c0/src/java/org/apache/cassandra/locator/TokenMetadata.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e0523ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e0523ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e0523ea Branch: refs/heads/trunk Commit: 8e0523ea6bf5755dd7b042030a7725c5c6c10a74 Parents: dbc7978 85668c5 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Nov 22 12:02:32 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Nov 22 12:02:32 2013 -0600 -- debian/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e0523ea/debian/init --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fd322f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fd322f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4fd322f5
Branch: refs/heads/trunk
Commit: 4fd322f53daf37fff9b4a22c41af56f7274ef72c
Parents: 8e0523e da5ff08
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Nov 22 13:22:53 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Nov 22 13:22:53 2013 -0600
--
src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
.../org/apache/cassandra/service/StorageService.java| 12 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd322f5/src/java/org/apache/cassandra/dht/BootStrapper.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd322f5/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index cb4e6ea,cec9a7a..a8e91ea
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -401,10 -384,10 +401,10 @@@ public class Gossiper implements IFailu
/**
* This method will begin removing an existing endpoint from the cluster
by spoofing its state
- * This should never be called unless this coordinator has had
'removetoken' invoked
+ * This should never be called unless this coordinator has had
'removenode' invoked
*
- * @param endpoint - the endpoint being removed
- * @param hostId - the ID of the host being removed
+ * @param endpoint- the endpoint being removed
+ * @param hostId - the ID of the host being removed
* @param localHostId - my own host ID for replication coordination
*/
public void advertiseRemoving(InetAddress endpoint, UUID hostId, UUID
localHostId)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd322f5/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 50419c4,250fa62..e91ac8c
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3049,13 -3173,13 +3049,13 @@@ public class StorageService extends Not
logger.warn(Node + endpoint + is already being removed,
continuing removal anyway);
if (!replicatingNodes.isEmpty())
- throw new UnsupportedOperationException(This node is already
processing a removal. Wait for it to complete, or use 'removetoken force' if
this has failed.);
+ throw new UnsupportedOperationException(This node is already
processing a removal. Wait for it to complete, or use 'removenode force' if
this has failed.);
// Find the endpoints that are going to become responsible for data
-for (String table : Schema.instance.getNonSystemTables())
+for (String keyspaceName : Schema.instance.getNonSystemKeyspaces())
{
// if the replication factor is 1 the data is lost so we
shouldn't wait for confirmation
-if
(Table.open(table).getReplicationStrategy().getReplicationFactor() == 1)
+if
(Keyspace.open(keyspaceName).getReplicationStrategy().getReplicationFactor() ==
1)
continue;
// get all ranges that change ownership (that is, a node needs
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41358f63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41358f63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41358f63 Branch: refs/heads/trunk Commit: 41358f6325d51807e21ea4b2df459eba17a2105a Parents: 6b1fb2c 4cf2a48 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Nov 19 16:30:14 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Nov 19 16:30:14 2013 -0600 -- src/java/org/apache/cassandra/db/Memtable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/41358f63/src/java/org/apache/cassandra/db/Memtable.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cb95d69 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cb95d69 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cb95d69 Branch: refs/heads/trunk Commit: 2cb95d698c7d9a00fa81f6917252e11266ad04de Parents: 41358f6 5097032 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Nov 19 16:42:41 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Nov 19 16:42:41 2013 -0600 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91f976ce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91f976ce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91f976ce Branch: refs/heads/trunk Commit: 91f976ce19bd22c5e80c38f9e81dacdabcd0e56e Parents: 7fb2d24 9a594c3 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Nov 12 15:50:59 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Nov 12 15:50:59 2013 -0600 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/91f976ce/CHANGES.txt -- diff --cc CHANGES.txt index 69b22a3,f186c37..3305739 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,42 -16,10 +37,43 @@@ Merged from 1.2 * cqlsh: handle 'null' as session duration (CASSANDRA-6317) * Fix json2sstable handling of range tombstones (CASSANDRA-6316) * Fix missing one row in reverse query (CASSANDRA-6330) + * Fix reading expired row value from row cache (CASSANDRA-6325) -1.2.11 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + * Fix NPE while loading paxos state (CASSANDRA-6211) + * cqlsh: add SHOW SESSION tracing-session command (CASSANDRA-6228) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946)
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d1085dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d1085dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d1085dd Branch: refs/heads/trunk Commit: 2d1085dde65e94dece6ec131de6da9f501edd125 Parents: 3af19c4 85b6574 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Nov 11 11:43:38 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Nov 11 11:43:38 2013 -0600 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d1085dd/CHANGES.txt --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cc4670a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cc4670a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cc4670a Branch: refs/heads/trunk Commit: 2cc4670acd6598c2a31d895f7f1159e248a2c886 Parents: 2d1085d 512ea5a Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Nov 11 11:54:04 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Nov 11 11:54:04 2013 -0600 -- bin/cqlsh.bat | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc4670a/bin/cqlsh.bat -- diff --cc bin/cqlsh.bat index 79adcff,ffa8e0b..68235b6 --- a/bin/cqlsh.bat +++ b/bin/cqlsh.bat @@@ -1,20 -1,19 +1,21 @@@ + @ECHO OFF @REM -@REM Licensed to the Apache Software Foundation (ASF) under one or more -@REM contributor license agreements. See the NOTICE file distributed with -@REM this work for additional information regarding copyright ownership. -@REM The ASF licenses this file to You under the Apache License, Version 2.0 -@REM (the License); you may not use this file except in compliance with -@REM the License. You may obtain a copy of the License at +@REM Licensed to the Apache Software Foundation (ASF) under one or more +@REM contributor license agreements. See the NOTICE file distributed with +@REM this work for additional information regarding copyright ownership. +@REM The ASF licenses this file to You under the Apache License, Version 2.0 +@REM (the License); you may not use this file except in compliance with +@REM the License. You may obtain a copy of the License at @REM -@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an AS IS BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, software +@REM distributed under the License is distributed on an AS IS BASIS, +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. + +@echo off if %OS% == Windows_NT setlocal
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4020979 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4020979 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4020979 Branch: refs/heads/trunk Commit: b4020979ccba9514b7d70fb47d76b5e2edaeffdc Parents: dc71d22 8c24044 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Nov 6 12:33:51 2013 -0800 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Nov 6 12:33:51 2013 -0800 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/MessagingService.java | 12 +--- 2 files changed, 10 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4020979/CHANGES.txt -- diff --cc CHANGES.txt index 7e9201a,eab185a..4a1fd05 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -29,42 -11,10 +29,43 @@@ Merged from 1.2 * Nodetool gets default JMX port from cassandra-env.sh (CASSANDRA-6273) * make calculatePendingRanges asynchronous (CASSANDRA-6244) * Remove blocking flushes in gossip thread (CASSANDRA-6297) + * Fix potential socket leak in connectionpool creation (CASSANDRA-6308) -1.2.11 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + * Fix NPE while loading paxos state (CASSANDRA-6211) + * cqlsh: add SHOW SESSION tracing-session command (CASSANDRA-6228) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4020979/src/java/org/apache/cassandra/net/MessagingService.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d38ca325
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d38ca325
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d38ca325
Branch: refs/heads/trunk
Commit: d38ca325218b75436d674c4ecaba564d2abc36eb
Parents: 91a81b7 cd7b05f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Nov 5 13:41:45 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Nov 5 13:41:45 2013 -0600
--
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java| 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38ca325/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
--
diff --cc
src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 060469d,8fd66ab..274e43f
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@@ -60,7 -55,12 +60,8 @@@ import org.apache.thrift.TException
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TTransport;
+ import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
public abstract class AbstractColumnFamilyInputFormatK, Y extends
InputFormatK, Y implements org.apache.hadoop.mapred.InputFormatK, Y
{
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a4d6beb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a4d6beb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a4d6beb Branch: refs/heads/trunk Commit: 3a4d6beb4d42b0400f2fef511fecf699fc68e00a Parents: d38ca32 8e7d728 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Nov 5 15:27:28 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Nov 5 15:27:28 2013 -0600 -- .../hadoop/cql3/CqlPagingRecordReader.java | 32 ++-- 1 file changed, 23 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a4d6beb/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc1fc936 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc1fc936 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc1fc936 Branch: refs/heads/trunk Commit: fc1fc93647f1e30d460fab47b78dcbddb20b0187 Parents: 424fb48 46a26ed Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Nov 4 12:55:56 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Nov 4 12:55:56 2013 -0600 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/io/sstable/SSTableReader.java
test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89911c82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89911c82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89911c82
Branch: refs/heads/trunk
Commit: 89911c82ac7bddb32ccac4adc224c764d87b5cf3
Parents: 4169aa3 18f7935
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Oct 30 14:09:47 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Oct 30 14:09:47 2013 -0500
--
.../cassandra/io/sstable/SSTableReaderTest.java | 37
1 file changed, 37 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89911c82/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index eeb22e6,fef27f1..8a9619d
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@@ -26,9 -27,10 +26,11 @@@ import java.nio.ByteBuffer
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+ import java.util.Set;
import java.util.concurrent.ExecutionException;
+import org.junit.Assert;
+ import com.google.common.collect.Sets;
import org.junit.Test;
import org.junit.runner.RunWith;
@@@ -284,25 -317,40 +286,60 @@@ public class SSTableReaderTest extends
assert reopened.first.token instanceof LocalToken;
}
+/** see CASSANDRA-5407 */
+@Test
+public void testGetScannerForNoIntersectingRanges()
+{
+Keyspace keyspace = Keyspace.open(Keyspace1);
+ColumnFamilyStore store = keyspace.getColumnFamilyStore(Standard1);
+ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(k1));
+RowMutation rm = new RowMutation(Keyspace1, key);
+rm.add(Standard1, ByteBufferUtil.bytes(xyz),
ByteBufferUtil.bytes(abc), 0);
+rm.apply();
+store.forceBlockingFlush();
+boolean foundScanner = false;
+for (SSTableReader s : store.getSSTables())
+{
+ICompactionScanner scanner = s.getScanner(new RangeToken(t(0),
t(1), s.partitioner), null);
+scanner.next(); // throws exception pre 5407
+foundScanner = true;
+}
+assertTrue(foundScanner);
++
+ @Test
+ public void testGetPositionsForRangesFromTableOpenedForBulkLoading()
throws IOException, ExecutionException, InterruptedException
+ {
+ Table table = Table.open(Keyspace1);
+ ColumnFamilyStore store = table.getColumnFamilyStore(Standard2);
+
+ // insert data and compact to a single sstable. The
+ // number of keys inserted is greater than index_interval
+ // to ensure multiple segments in the index file
+ CompactionManager.instance.disableAutoCompaction();
+ for (int j = 0; j 130; j++)
+ {
+ ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j));
+ RowMutation rm = new RowMutation(Keyspace1, key);
+ rm.add(new QueryPath(Standard2, null,
ByteBufferUtil.bytes(0)), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
+ rm.apply();
+ }
+ store.forceBlockingFlush();
+ CompactionManager.instance.performMaximal(store);
+
+ // construct a range which is present in the sstable, but whose
+ // keys are not found in the first segment of the index.
+ ListRangeToken ranges = new ArrayListRangeToken();
+ ranges.add(new RangeToken(t(98), t(99)));
+
+ SSTableReader sstable = store.getSSTables().iterator().next();
+ ListPairLong,Long sections =
sstable.getPositionsForRanges(ranges);
+ assert sections.size() == 1 : Expected to find range in sstable ;
+
+ // re-open the same sstable as it would be during bulk loading
+ SetComponent components = Sets.newHashSet(Component.DATA,
Component.PRIMARY_INDEX);
+ SSTableReader bulkLoaded =
SSTableReader.openForBatch(sstable.descriptor, components, sstable.partitioner);
+ sections = bulkLoaded.getPositionsForRanges(ranges);
+ assert sections.size() == 1 : Expected to find range in sstable
opened for bulk loading;
}
private void assertIndexQueryWorks(ColumnFamilyStore indexedCFS) throws
IOException
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/830711c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/830711c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/830711c7 Branch: refs/heads/trunk Commit: 830711c72402fa1250ad5fc72ca0b8ac1c608897 Parents: 89911c8 b461c3b Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Oct 30 15:05:36 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Oct 30 15:05:36 2013 -0500 -- CHANGES.txt | 1 + bin/nodetool | 32 +++- 2 files changed, 32 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/830711c7/CHANGES.txt -- diff --cc CHANGES.txt index 6aad468,e2fcbb8..ecec238 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,54 -1,16 +1,55 @@@ -1.2.12 - * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) - * Fix altering column types (CASSANDRA-6185) - * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) - * add windows bat files for shell commands (CASSANDRA-6145) - * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181) - * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214) +2.0.3 + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) + * Compact hottest sstables first and optionally omit coldest from + compaction entirely (CASSANDRA-6109) + * Fix modifying column_metadata from thrift (CASSANDRA-6182) + * cqlsh: fix LIST USERS output (CASSANDRA-6242) + * Add IRequestSink interface (CASSANDRA-6248) + * Update memtable size while flushing (CASSANDRA-6249) + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252) + * Require Permission.SELECT for CAS updates (CASSANDRA-6247) + * New CQL-aware SSTableWriter (CASSANDRA-5894) + * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270) +Merged from 1.2: * Require logging in for Thrift CQL2/3 statement preparation (CASSANDRA-6254) * restrict max_num_tokens to 1536 (CASSANDRA-6267) + * Nodetool gets default JMX port from cassandra-env.sh (CASSANDRA-6273) -1.2.11 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + * Fix NPE while loading paxos state (CASSANDRA-6211) + * cqlsh: add SHOW SESSION tracing-session command (CASSANDRA-6228) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946) http://git-wip-us.apache.org/repos/asf/cassandra/blob/830711c7/bin/nodetool --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e47591d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e47591d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e47591d Branch: refs/heads/trunk Commit: 9e47591d3a7ab2092e3b72300b1aa86fc9ce04de Parents: fcd657c a0831bb Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Oct 28 11:52:14 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Oct 28 11:52:14 2013 -0500 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e84ab16 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e84ab16 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e84ab16 Branch: refs/heads/trunk Commit: 2e84ab16bb86565339d848b805521280a069b0b4 Parents: b5d563e 7793a85 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Oct 28 14:37:31 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Oct 28 14:37:31 2013 -0500 -- src/java/org/apache/cassandra/utils/FBUtilities.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e84ab16/src/java/org/apache/cassandra/utils/FBUtilities.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9385cfde Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9385cfde Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9385cfde Branch: refs/heads/trunk Commit: 9385cfded7fb6cbfdac65d195a178a754e1b4514 Parents: 3dc4e65 dcbf35c Author: Jonathan Ellis jbel...@apache.org Authored: Fri Oct 25 09:47:12 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Oct 25 09:47:12 2013 -0500 -- src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9385cfde/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f248b3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f248b3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f248b3f Branch: refs/heads/trunk Commit: 2f248b3f905380347cf45652462d1fc5989ee8d0 Parents: 9385cfd cb506b7 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Oct 25 11:11:31 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Oct 25 11:11:31 2013 -0500 -- .../cassandra/hadoop/pig/AbstractCassandraStorage.java | 4 +++- .../org/apache/cassandra/hadoop/pig/CassandraStorage.java| 6 +- src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 3 files changed, 16 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bdd4733 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bdd4733 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bdd4733 Branch: refs/heads/trunk Commit: 8bdd4733bf8412eca18e9b0b436e9def4c77a8d3 Parents: 21e6ec6 1f4070d Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Oct 24 14:46:21 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Oct 24 14:46:21 2013 -0500 -- debian/cassandra.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bee0b4b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bee0b4b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bee0b4b9 Branch: refs/heads/trunk Commit: bee0b4b9df0b633580ba5e22671423967f4f2244 Parents: 2629e5e df77881 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Oct 22 16:58:27 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Oct 22 16:58:27 2013 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bee0b4b9/CHANGES.txt -- diff --cc CHANGES.txt index c01b4a8,b5f83b7..5abb16b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,41 -1,13 +1,41 @@@ -1.2.12 - * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) - * Fix altering column types (CASSANDRA-6185) - * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) +2.0.3 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) -1.2.11 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) - * Mark CF clean if a mutation raced the drop and got it marked dirty + * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946) * Add a LOCAL_ONE consistency level (CASSANDRA-6202) * Limit CQL prepared statement cache by size instead of count (CASSANDRA-6107) * Tracing should log write failure rather than raw exceptions (CASSANDRA-6133)
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 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/ebd50ff2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebd50ff2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebd50ff2 Branch: refs/heads/trunk Commit: ebd50ff2a95b6a1a9a48a25c0509f07d0fba8cd5 Parents: bee0b4b dbca6d6 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Oct 22 17:08:54 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Oct 22 17:08:54 2013 -0500 -- CHANGES.txt | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebd50ff2/CHANGES.txt -- diff --cc CHANGES.txt index 5abb16b,9e150b8..d60cff1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -227,7 -114,17 +227,15 @@@ Merged from 1.2 * (Hadoop) quote identifiers in CqlPagingRecordReader (CASSANDRA-5763) * Add replace_node functionality for vnodes (CASSANDRA-5337) * Add timeout events to query traces (CASSANDRA-5520) - * make starting native protocol server idempotent (CASSANDRA-5728) - * Fix loading key cache when a saved entry is no longer valid (CASSANDRA-5706) * Fix serialization of the LEFT gossip value (CASSANDRA-5696) + * Pig: support for cql3 tables (CASSANDRA-5234) + * cqlsh: Don't show 'null' in place of empty values (CASSANDRA-5675) + * Race condition in detecting version on a mixed 1.1/1.2 cluster +(CASSANDRA-5692) + * Fix skipping range tombstones with reverse queries (CASSANDRA-5712) + * Expire entries out of ThriftSessionManager (CASSANDRA-5719) + * Don't keep ancestor information in memory (CASSANDRA-5342) + * cqlsh: fix handling of semicolons inside BATCH queries (CASSANDRA-5697) * Expose native protocol server status in nodetool info (CASSANDRA-5735) * Fix pathetic performance of range tombstones (CASSANDRA-5677) * Fix querying with an empty (impossible) range (CASSANDRA-5573)
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf3bd6f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf3bd6f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf3bd6f8 Branch: refs/heads/trunk Commit: cf3bd6f8611684fc80390b660e3783b98599eecf Parents: 91bd207 44f8ba4 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Oct 18 09:45:25 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Oct 18 09:45:25 2013 -0500 -- .../apache/cassandra/hadoop/pig/CqlStorage.java | 15 +- .../cassandra/pig/CqlTableDataTypeTest.java | 422 +++ .../pig/ThriftColumnFamilyDataTypeTest.java | 181 3 files changed, 614 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf3bd6f8/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/718e3ec8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/718e3ec8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/718e3ec8 Branch: refs/heads/trunk Commit: 718e3ec8b7edd83dacc89987c41a838286acbeca Parents: cf3bd6f 300f153 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Oct 18 10:08:37 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Oct 18 10:08:37 2013 -0500 -- lib/cql-internal-only-1.4.0.zip | Bin 92738 - 0 bytes lib/cql-internal-only-1.4.1.zip | Bin 0 - 92738 bytes 2 files changed, 0 insertions(+), 0 deletions(-) --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: NEWS.txt src/java/org/apache/cassandra/gms/Gossiper.java src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0841195 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0841195 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0841195 Branch: refs/heads/trunk Commit: f0841195410d5cb5c8d5c4f0750ae5dc5a39b3ec Parents: f19610c 351d43e Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Oct 17 21:04:33 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Oct 17 21:04:33 2013 -0500 -- NEWS.txt| 5 +- .../cassandra/config/DatabaseDescriptor.java| 17 ++- .../org/apache/cassandra/db/SystemKeyspace.java | 11 +- .../gms/GossipDigestAckVerbHandler.java | 10 +- .../gms/GossipDigestSynVerbHandler.java | 2 +- src/java/org/apache/cassandra/gms/Gossiper.java | 71 +++- .../cassandra/service/StorageService.java | 115 --- 7 files changed, 183 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0841195/NEWS.txt -- diff --cc NEWS.txt index 3fa0c8d,a676aa1..4bffa77 --- a/NEWS.txt +++ b/NEWS.txt @@@ -14,34 -14,24 +14,35 @@@ restore snapshots created with the prev using the provided 'sstableupgrade' tool. -1.2.11 -== -Features - +2.0.2 += + +New features + +- Speculative retry defaults to 99th percentile + (See blog post at http://www.datastax.com/dev/blog/rapid-read-protection-in-cassandra-2-0-2) +- Configurable metrics reporting + (see conf/metrics-reporter-config-sample.yaml) +- Compaction history and stats are now saved to system keyspace + (system.compaction_history table). You can access historiy via + new 'nodetool compactionhistory' command or CQL. - Added a new consistenct level, LOCAL_ONE, that forces all CL.ONE operations to execute only in the local datacenter. - + - New replace_address to supplant the (now removed) replace_token and + replace_node workflows to replace a dead node in place. Works like the + old options, but takes the IP address of the node to be replaced. +2.0.1 += - Upgrading - -- ColumnFamilyMetrics#sstablesPerReadHistogram switched from uniform sampling - to biased-to-last-five-minutes sampling. +- The default memtable allocation has changed from 1/3 of heap to 1/4 + of heap. Also, default (single-partition) read and write timeouts + have been reduced from 10s to 5s and 2s, respectively. -1.2.10 -== +2.0.0 += Upgrading - http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0841195/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0841195/src/java/org/apache/cassandra/db/SystemKeyspace.java -- diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java index 50af82d,000..e5f2025 mode 100644,00..100644 --- a/src/java/org/apache/cassandra/db/SystemKeyspace.java +++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java @@@ -1,946 -1,0 +1,953 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.db; + +import java.io.DataInputStream; +import java.io.IOException; +import java.net.InetAddress; +import java.nio.ByteBuffer; +import java.util.*; +import javax.management.openmbean.*; + +import com.google.common.base.Function; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Iterables; +import
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb585ef9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb585ef9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb585ef9 Branch: refs/heads/trunk Commit: cb585ef9e93a352bbc054ac219be05590c3ec33d Parents: f084119 acd4f80 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Oct 17 21:56:52 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Oct 17 21:56:52 2013 -0500 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb585ef9/CHANGES.txt -- diff --cc CHANGES.txt index b551400,87be6fa..cccfc60 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -55,43 -30,10 +55,44 @@@ Merged from 1.2 * Fix compaction race during columnfamily drop (CASSANDRA-5957) * Fix validation of empty column names for compact tables (CASSANDRA-6152) * Skip replaying mutations that pass CRC but fail to deserialize (CASSANDRA-6183) + * Rework token replacement to use replace_address (CASSANDRA-5916) -1.2.10 +2.0.1 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025) + * Improve memory use defaults (CASSANDRA-5069) + * Make ThriftServer more easlly extensible (CASSANDRA-6058) + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062) + * add file_cache_size_in_mb setting (CASSANDRA-5661) + * Improve error message when yaml contains invalid properties (CASSANDRA-5958) + * Improve leveled compaction's ability to find non-overlapping L0 compactions + to work on concurrently (CASSANDRA-5921) + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) + * Improve offheap memcpy performance (CASSANDRA-5884) + * Use a range aware scanner for cleanup (CASSANDRA-2524) + * Cleanup doesn't need to inspect sstables that contain only local data + (CASSANDRA-5722) + * Add ability for CQL3 to list partition keys (CASSANDRA-4536) + * Improve native protocol serialization (CASSANDRA-5664) + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923) + * Require superuser status for adding triggers (CASSANDRA-5963) + * Make standalone scrubber handle old and new style leveled manifest + (CASSANDRA-6005) + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023) + * Fix paged ranges with multiple replicas (CASSANDRA-6004) + * Fix potential AssertionError during tracing (CASSANDRA-6041) + * Fix NPE in sstablesplit (CASSANDRA-6027) + * Migrate pre-2.0 key/value/column aliases to system.schema_columns + (CASSANDRA-6009) + * Paging filter empty rows too agressively (CASSANDRA-6040) + * Support variadic parameters for IN clauses (CASSANDRA-4210) + * cqlsh: return the result of CAS writes (CASSANDRA-5796) + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050) + * Support named bind variables in CQL (CASSANDRA-6033) +Merged from 1.2: + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980) * Avoid second-guessing out-of-space state (CASSANDRA-5605) * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982) * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ab13706 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ab13706 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ab13706 Branch: refs/heads/trunk Commit: 2ab13706baae737d456991abc704d68bd55cf44a Parents: a1e594b 8d319b0 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Oct 16 07:32:55 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Oct 16 07:32:55 2013 -0500 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab13706/src/java/org/apache/cassandra/tools/NodeCmd.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96c0256d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96c0256d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96c0256d
Branch: refs/heads/trunk
Commit: 96c0256d3dd4b9e245bee7676fc8af6265340782
Parents: 2ab1370 e655d62
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Oct 16 13:45:38 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Oct 16 13:45:38 2013 -0500
--
src/java/org/apache/cassandra/config/CFMetaData.java | 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c0256d/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 374f4a5,85c3dcb..d63ee01
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -445,21 -304,11 +445,17 @@@ public final class CFMetaDat
public CFMetaData(String keyspace, String name, ColumnFamilyType type,
AbstractType? comp, AbstractType? subcc)
{
-this(keyspace, name, type, comp, subcc, getId(keyspace, name));
+this(keyspace, name, type, makeComparator(type, comp, subcc));
}
-CFMetaData(String keyspace, String name, ColumnFamilyType type,
AbstractType? comp, AbstractType? subcc, UUID id)
+public CFMetaData(String keyspace, String name, ColumnFamilyType type,
AbstractType? comp)
+{
+this(keyspace, name, type, comp, getId(keyspace, name));
+}
+
+@VisibleForTesting
+CFMetaData(String keyspace, String name, ColumnFamilyType type,
AbstractType? comp, UUID id)
{
- assert keyspace != null;
- assert name != null;
- assert type != null;
- assert id != null;
// (subcc may be null for non-supercolumns)
// (comp may also be null for custom indexes, which is kind of broken
if you ask me)
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/NodeCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd45c4c5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd45c4c5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd45c4c5
Branch: refs/heads/trunk
Commit: bd45c4c590e49d2b2692bcb71a2ab60a49f2a5a2
Parents: 6bd71a5 8dcdce4
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Oct 15 11:18:19 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Oct 15 11:18:19 2013 -0500
--
CHANGES.txt | 3 +
.../org/apache/cassandra/tools/NodeCmd.java | 104 +--
.../apache/cassandra/tools/NodeToolHelp.yaml| 4 +-
3 files changed, 102 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd45c4c5/CHANGES.txt
--
diff --cc CHANGES.txt
index 0459bfa,2dbadc4..6fab83b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,7 +1,31 @@@
-1.2.12
+2.0.2
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows
(CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full
startup (CASSANDRA-6166)
+Merged from 1.2:
+ * Add ability to list specific KS/CF combinations in nodetool cfstats
(CASSANDRA-4191)
+
+ 1.2.11
* Limit CQL prepared statement cache by size instead of count
(CASSANDRA-6107)
* Tracing should log write failure rather than raw exceptions
(CASSANDRA-6133)
* lock access to TM.endpointToHostIdMap (CASSANDRA-6103)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd45c4c5/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 011d823,7e0bf67..05f46f9
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -790,33 -816,37 +793,37 @@@ public class NodeCm
while (cfamilies.hasNext())
{
EntryString, ColumnFamilyStoreMBean entry = cfamilies.next();
-String tableName = entry.getKey();
+String keyspaceName = entry.getKey();
ColumnFamilyStoreMBean cfsProxy = entry.getValue();
- if (!cfstoreMap.containsKey(keyspaceName))
-if (!cfstoreMap.containsKey(tableName)
filter.isColumnFamilyIncluded(entry.getKey(), cfsProxy.getColumnFamilyName()))
++if (!cfstoreMap.containsKey(keyspaceName)
filter.isColumnFamilyIncluded(entry.getKey(), cfsProxy.getColumnFamilyName()))
{
ListColumnFamilyStoreMBean columnFamilies = new
ArrayListColumnFamilyStoreMBean();
columnFamilies.add(cfsProxy);
-cfstoreMap.put(tableName, columnFamilies);
+cfstoreMap.put(keyspaceName, columnFamilies);
}
- else
+ else if (filter.isColumnFamilyIncluded(entry.getKey(),
cfsProxy.getColumnFamilyName()))
{
-cfstoreMap.get(tableName).add(cfsProxy);
+cfstoreMap.get(keyspaceName).add(cfsProxy);
}
}
- // print out the keyspace statistics
+ // make sure all specified kss and cfs exist
+
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a29c748 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a29c748 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a29c748 Branch: refs/heads/trunk Commit: 3a29c748071e229686970d41a9371334ed74cdc7 Parents: b0b868f 17ae042 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Oct 14 13:34:13 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Oct 14 13:34:13 2013 -0500 -- examples/pig/example-populate-cql.txt | 24 examples/pig/example-script.pig| 13 ++ examples/pig/libdata.csv | 200 examples/pig/test/populate-cql.txt | 33 + examples/pig/test/test_cql_storage.pig | 14 ++ 5 files changed, 284 insertions(+) --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
build.xml
src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe598e77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe598e77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe598e77
Branch: refs/heads/trunk
Commit: fe598e77e6e06a6408ea8e8b1fa80b25977e572d
Parents: 3a29c74 4e35969
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Oct 14 14:17:05 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Oct 14 14:17:05 2013 -0500
--
build.xml | 8 +
.../hadoop/pig/AbstractCassandraStorage.java| 4 +-
.../cassandra/hadoop/pig/CassandraStorage.java | 25 +-
.../apache/cassandra/hadoop/pig/CqlStorage.java | 25 +-
test/conf/log4j-junit.properties| 3 +
.../org/apache/cassandra/pig/CqlTableTest.java | 236 ++
.../org/apache/cassandra/pig/PigTestBase.java | 167
.../cassandra/pig/ThriftColumnFamilyTest.java | 809 +++
test/unit/org/apache/pig/test/MiniCluster.java | 78 ++
.../org/apache/pig/test/MiniGenericCluster.java | 122 +++
10 files changed, 1470 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe598e77/build.xml
--
diff --cc build.xml
index 4be1d10,37109c8..5e7f269
--- a/build.xml
+++ b/build.xml
@@@ -364,7 -370,9 +364,8 @@@
exclusion groupId=commons-lang artifactId=commons-lang/
/dependency
dependency groupId=org.apache.hadoop artifactId=hadoop-core
version=1.0.3/
+ dependency groupId=org.apache.hadoop
artifactId=hadoop-minicluster version=1.0.3/
dependency groupId=org.apache.pig artifactId=pig
version=0.10.0/
- dependency groupId=net.sf.jopt-simple artifactId=jopt-simple
version=3.2/
dependency groupId=net.java.dev.jna artifactId=jna
version=3.2.7/
dependency groupId=net.sourceforge.cobertura
artifactId=cobertura version=${cobertura.version}/
@@@ -404,7 -418,9 +405,8 @@@
dependency groupId=commons-logging artifactId=commons-logging/
dependency groupId=org.apache.rat artifactId=apache-rat/
dependency groupId=org.apache.hadoop artifactId=hadoop-core/
+ dependency groupId=org.apache.hadoop
artifactId=hadoop-minicluster/
dependency groupId=org.apache.pig artifactId=pig/
-dependency groupId=net.sf.jopt-simple artifactId=jopt-simple/
dependency groupId=net.java.dev.jna artifactId=jna/
/artifact:pom
@@@ -1120,9 -1163,11 +1123,14 @@@
/testmacro
/target
+ target name=test-all
+ depends=test,long-test,test-compression,test-clientutil-jar
+ description=Run all tests /
+ target name=pig-test depends=build-test description=Excute Pig tests
+ testmacro suitename=unit inputdir=${test.unit.src}
+timeout=120 filter=**/pig/*Test.java
+ /testmacro
+ /target
!-- instruments the classes to later create code coverage reports --
target name=cobertura-instrument depends=build,build-test
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe598e77/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe598e77/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index 5357709,0512a37..4708359
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -792,11 -818,11 +810,12 @@@ public class CassandraStorage extends A
catch (Exception e)
{
throw new IOException(Expected
'cassandra://[username:password@]keyspace/columnfamily +
-
[?slice_start=startslice_end=end[reversed=true][limit=1] +
-
[allow_deletes=true][widerows=true][use_secondary=true] +
-
[comparator=comparator][split_size=size][partitioner=partitioner]]':
+ e.getMessage());
+
[?slice_start=startslice_end=end[reversed=true][limit=1] +
+
[allow_deletes=true][widerows=true][use_secondary=true] +
+
[comparator=comparator][split_size=size][partitioner=partitioner] +
+
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4eaca390 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4eaca390 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4eaca390 Branch: refs/heads/trunk Commit: 4eaca3907ff16d996762c696ab37f9519dce4e8f Parents: b1c60a0 d6d35ba Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Oct 14 16:36:13 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Oct 14 16:36:13 2013 -0500 -- src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4eaca390/src/java/org/apache/cassandra/service/CassandraDaemon.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/tools/NodeProbe.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecee3955 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecee3955 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecee3955 Branch: refs/heads/trunk Commit: ecee39551c16e2edb203e586215cdf17400fbbac Parents: cce6863 fbe19b8 Author: Yuki Morishita yu...@apache.org Authored: Wed Oct 9 10:36:42 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Wed Oct 9 10:36:42 2013 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/tools/NodeProbe.java | 57 ++-- 2 files changed, 42 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecee3955/CHANGES.txt -- diff --cc CHANGES.txt index 53de29e,f0ee993..64febd8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -44,43 -19,10 +44,44 @@@ Merged from 1.2 * Update sstablesPerReadHistogram to use biased sampling (CASSANDRA-6164) * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725) * Properly error out on CREATE INDEX for counters table (CASSANDRA-6160) + * Handle JMX notification failure for repair (CASSANDRA-6097) -1.2.10 +2.0.1 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025) + * Improve memory use defaults (CASSANDRA-5069) + * Make ThriftServer more easlly extensible (CASSANDRA-6058) + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062) + * add file_cache_size_in_mb setting (CASSANDRA-5661) + * Improve error message when yaml contains invalid properties (CASSANDRA-5958) + * Improve leveled compaction's ability to find non-overlapping L0 compactions + to work on concurrently (CASSANDRA-5921) + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) + * Improve offheap memcpy performance (CASSANDRA-5884) + * Use a range aware scanner for cleanup (CASSANDRA-2524) + * Cleanup doesn't need to inspect sstables that contain only local data + (CASSANDRA-5722) + * Add ability for CQL3 to list partition keys (CASSANDRA-4536) + * Improve native protocol serialization (CASSANDRA-5664) + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923) + * Require superuser status for adding triggers (CASSANDRA-5963) + * Make standalone scrubber handle old and new style leveled manifest + (CASSANDRA-6005) + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023) + * Fix paged ranges with multiple replicas (CASSANDRA-6004) + * Fix potential AssertionError during tracing (CASSANDRA-6041) + * Fix NPE in sstablesplit (CASSANDRA-6027) + * Migrate pre-2.0 key/value/column aliases to system.schema_columns + (CASSANDRA-6009) + * Paging filter empty rows too agressively (CASSANDRA-6040) + * Support variadic parameters for IN clauses (CASSANDRA-4210) + * cqlsh: return the result of CAS writes (CASSANDRA-5796) + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050) + * Support named bind variables in CQL (CASSANDRA-6033) +Merged from 1.2: + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980) * Avoid second-guessing out-of-space state (CASSANDRA-5605) * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982) * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecee3955/src/java/org/apache/cassandra/tools/NodeProbe.java -- diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java index f05cfb7,1557a6a..0d58979 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@@ -32,7 -32,7 +32,8 @@@ import java.util.concurrent.ExecutionEx import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.Condition; import javax.management.*; +import javax.management.openmbean.CompositeData; + import javax.management.remote.JMXConnectionNotification; import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; @@@ -184,41 -183,42 +185,42 @@@ public class NodeProb jmxc.close(); } -public void forceTableCleanup(String tableName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException +public void forceKeyspaceCleanup(String keyspaceName, String... columnFamilies) throws IOException, ExecutionException,
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d9fc03e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d9fc03e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d9fc03e
Branch: refs/heads/trunk
Commit: 4d9fc03edaad60913dc1586e062cc3bd80621398
Parents: ecee395 5d5925a
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 9 11:31:41 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 9 11:31:41 2013 -0500
--
src/java/org/apache/cassandra/tracing/TraceState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d9fc03e/src/java/org/apache/cassandra/tracing/TraceState.java
--
diff --cc src/java/org/apache/cassandra/tracing/TraceState.java
index b7d67a4,f6f95a5..1f7f17a
--- a/src/java/org/apache/cassandra/tracing/TraceState.java
+++ b/src/java/org/apache/cassandra/tracing/TraceState.java
@@@ -97,12 -94,12 +97,12 @@@ public class TraceStat
public void runMayThrow()
{
CFMetaData cfMeta = CFMetaData.TraceEventsCf;
-ColumnFamily cf = ColumnFamily.create(cfMeta);
+ColumnFamily cf =
ArrayBackedSortedColumns.factory.create(cfMeta);
+Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId,
ByteBufferUtil.bytes(activity)), message);
Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId,
ByteBufferUtil.bytes(source)), FBUtilities.getBroadcastAddress());
-Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId,
ByteBufferUtil.bytes(thread)), threadName);
if (elapsed = 0)
Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId,
ByteBufferUtil.bytes(source_elapsed)), elapsed);
- Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId,
ByteBufferUtil.bytes(thread)), threadName);
+ Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId,
ByteBufferUtil.bytes(activity)), message);
Tracing.mutateWithCatch(new RowMutation(Tracing.TRACE_KS,
sessionIdBytes, cf));
}
});
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/75024744 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75024744 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/75024744 Branch: refs/heads/trunk Commit: 7502474483079963b87e888978abe33392c56d50 Parents: 4d9fc03 eee485e Author: Jonathan Ellis jbel...@apache.org Authored: Wed Oct 9 13:35:55 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Oct 9 13:35:55 2013 -0500 -- CHANGES.txt| 1 + .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 6 -- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/75024744/CHANGES.txt -- diff --cc CHANGES.txt index 64febd8,7d63a4b..0a00f2b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -45,43 -20,10 +45,44 @@@ Merged from 1.2 * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725) * Properly error out on CREATE INDEX for counters table (CASSANDRA-6160) * Handle JMX notification failure for repair (CASSANDRA-6097) + * (Hadoop) Fetch no more than 128 splits in parallel (CASSANDRA-6169) -1.2.10 +2.0.1 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025) + * Improve memory use defaults (CASSANDRA-5069) + * Make ThriftServer more easlly extensible (CASSANDRA-6058) + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062) + * add file_cache_size_in_mb setting (CASSANDRA-5661) + * Improve error message when yaml contains invalid properties (CASSANDRA-5958) + * Improve leveled compaction's ability to find non-overlapping L0 compactions + to work on concurrently (CASSANDRA-5921) + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) + * Improve offheap memcpy performance (CASSANDRA-5884) + * Use a range aware scanner for cleanup (CASSANDRA-2524) + * Cleanup doesn't need to inspect sstables that contain only local data + (CASSANDRA-5722) + * Add ability for CQL3 to list partition keys (CASSANDRA-4536) + * Improve native protocol serialization (CASSANDRA-5664) + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923) + * Require superuser status for adding triggers (CASSANDRA-5963) + * Make standalone scrubber handle old and new style leveled manifest + (CASSANDRA-6005) + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023) + * Fix paged ranges with multiple replicas (CASSANDRA-6004) + * Fix potential AssertionError during tracing (CASSANDRA-6041) + * Fix NPE in sstablesplit (CASSANDRA-6027) + * Migrate pre-2.0 key/value/column aliases to system.schema_columns + (CASSANDRA-6009) + * Paging filter empty rows too agressively (CASSANDRA-6040) + * Support variadic parameters for IN clauses (CASSANDRA-4210) + * cqlsh: return the result of CAS writes (CASSANDRA-5796) + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050) + * Support named bind variables in CQL (CASSANDRA-6033) +Merged from 1.2: + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980) * Avoid second-guessing out-of-space state (CASSANDRA-5605) * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982) * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002) http://git-wip-us.apache.org/repos/asf/cassandra/blob/75024744/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java -- diff --cc src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java index d05b890,16d03f9..060469d --- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java @@@ -27,14 -27,11 +27,16 @@@ import java.util.Map import java.util.Random; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; - import java.util.concurrent.Executors; import java.util.concurrent.Future; + import java.util.concurrent.LinkedBlockingQueue; + import java.util.concurrent.ThreadPoolExecutor; + import java.util.concurrent.TimeUnit; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range;
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/690dac3c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/690dac3c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/690dac3c Branch: refs/heads/trunk Commit: 690dac3c2bf6b583d75055124bf2a4d6deb0d564 Parents: dccc91d fe56518 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Oct 8 05:28:04 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Oct 8 05:28:04 2013 -0500 -- .../apache/cassandra/gms/FailureDetector.java | 22 .../cassandra/gms/FailureDetectorMBean.java | 4 2 files changed, 26 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/690dac3c/src/java/org/apache/cassandra/gms/FailureDetector.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a603046
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a603046
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a603046
Branch: refs/heads/trunk
Commit: 6a603046e6cb981775e38925ff853e864151a4fc
Parents: e9b624a d396fd4
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Oct 6 13:35:24 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Oct 6 13:35:24 2013 -0500
--
.../cassandra/exceptions/PreparedQueryNotFoundException.java| 5 ++---
src/java/org/apache/cassandra/thrift/CassandraServer.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a603046/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index 12176b7,dbaabbb..8a1bdb5
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -2054,13 -1827,11 +2054,13 @@@ public class CassandraServer implement
if (statement == null)
throw new InvalidRequestException(String.format(Prepared
query with ID %d not found +
(either the
query was not prepared on this host (maybe the host has been restarted?) +
- or you have
prepared more than %d queries and queries %d has been evicted from the internal
cache),
- itemId,
org.apache.cassandra.cql3.QueryProcessor.MAX_CACHE_PREPARED, itemId));
+ or you have
prepared too many queries and it has been evicted from the internal cache),
+ itemId));
logger.trace(Retrieved prepared statement #{} with {} bind
markers, itemId, statement.getBoundsTerms());
-return
org.apache.cassandra.cql3.QueryProcessor.processPrepared(statement,
ThriftConversion.fromThrift(cLevel), cState.getQueryState(),
bindVariables).toThriftResult();
+return
org.apache.cassandra.cql3.QueryProcessor.processPrepared(statement,
+
cState.getQueryState(),
+
new QueryOptions(ThriftConversion.fromThrift(cLevel),
bindVariables)).toThriftResult();
}
catch (RequestExecutionException e)
{
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213f6bb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/213f6bb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/213f6bb8 Branch: refs/heads/trunk Commit: 213f6bb883a3072855061ac2528b9403f05398e9 Parents: ef69bd5 731e83b Author: Jonathan Ellis jbel...@apache.org Authored: Thu Oct 3 22:19:36 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Oct 3 22:19:36 2013 -0500 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bd86261 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bd86261 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bd86261 Branch: refs/heads/trunk Commit: 4bd8626189fe32e46f6ef267fff0e19f54cefc3e Parents: e7c90e0 c8f0e3a Author: Jonathan Ellis jbel...@apache.org Authored: Wed Oct 2 19:11:39 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Oct 2 19:11:39 2013 -0500 -- src/java/org/apache/cassandra/service/StorageProxy.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bd86261/src/java/org/apache/cassandra/service/StorageProxy.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/006eec4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/006eec4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/006eec4a
Branch: refs/heads/trunk
Commit: 006eec4a5dc76d79f3147ab1e1e78e17e304a88c
Parents: d493030 389ff55
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Sep 26 13:53:46 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Sep 26 13:53:46 2013 -0500
--
.../hadoop/pig/AbstractCassandraStorage.java| 151 ++-
.../cassandra/hadoop/pig/CassandraStorage.java | 2 +-
.../apache/cassandra/hadoop/pig/CqlStorage.java | 144 +-
3 files changed, 153 insertions(+), 144 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/006eec4a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/006eec4a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index e66f585,09171a0..c9afff0
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -700,12 -698,20 +700,12 @@@ public class CassandraStorage extends A
/** get a list of column for the column family */
protected ListColumnDef getColumnMetadata(Cassandra.Client client,
boolean cql3Table)
-throws InvalidRequestException,
-UnavailableException,
-TimedOutException,
-SchemaDisagreementException,
-TException,
-CharacterCodingException,
-org.apache.cassandra.exceptions.InvalidRequestException,
-ConfigurationException,
-NotFoundException
+throws TException, CharacterCodingException, InvalidRequestException,
ConfigurationException
{
if (cql3Table)
-return new ArrayListColumnDef();
+return new ArrayList();
- return getColumnMeta(client, true);
+ return getColumnMeta(client, true, true);
}
/** convert key to a tuple */
http://git-wip-us.apache.org/repos/asf/cassandra/blob/006eec4a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 86fe338,79abc2c..b96d10e
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@@ -23,6 -23,9 +23,8 @@@ import java.nio.charset.CharacterCoding
import java.util.*;
+ import org.apache.cassandra.cql3.CFDefinition;
+ import org.apache.cassandra.cql3.ColumnIdentifier;
-import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.Column;
import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.exceptions.ConfigurationException;
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fb089e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fb089e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fb089e4 Branch: refs/heads/trunk Commit: 2fb089e4c8430e4e46f335cf85ee791e1299de35 Parents: 7a87fc1 bdb269a Author: Jonathan Ellis jbel...@apache.org Authored: Thu Sep 26 17:10:39 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Sep 26 17:10:39 2013 -0500 -- conf/cassandra.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fb089e4/conf/cassandra.yaml --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3b7508c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3b7508c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3b7508c
Branch: refs/heads/trunk
Commit: b3b7508cce7f9d3678c7847aeddd41334288168d
Parents: 102e911 25926d0
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Sep 25 10:08:50 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Sep 25 10:08:50 2013 -0500
--
.../org/apache/cassandra/config/DatabaseDescriptor.java | 11 +++
1 file changed, 11 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3b7508c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index a936f14,633ea9a..14b932a
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -112,375 -111,416 +112,386 @@@ public class DatabaseDescripto
}
catch (Exception e)
{
-ClassLoader loader = DatabaseDescriptor.class.getClassLoader();
-url = loader.getResource(configUrl);
-if (url == null)
-throw new ConfigurationException(Cannot locate +
configUrl);
+logger.error(Fatal error during configuration loading, e);
+System.err.println(e.getMessage() + \nFatal error during
configuration loading; unable to start. See log for stacktrace.);
+System.exit(1);
}
-
-return url;
}
-static
+@VisibleForTesting
+static Config loadConfig() throws ConfigurationException
{
-if (Config.getLoadYaml())
-loadYaml();
-else
-conf = new Config();
+String loaderClass = System.getProperty(cassandra.config.loader);
+ConfigurationLoader loader = loaderClass == null
+ ? new YamlConfigurationLoader()
+ :
FBUtilities.ConfigurationLoaderconstruct(loaderClass, configuration
loading);
+return loader.loadConfig();
}
-static void loadYaml()
+
+private static void applyConfig(Config config) throws
ConfigurationException
{
-try
-{
-URL url = getStorageConfigURL();
-logger.info(Loading settings from + url);
-InputStream input;
-try
-{
-input = url.openStream();
-}
-catch (IOException e)
-{
-// getStorageConfigURL should have ruled this out
-throw new AssertionError(e);
-}
-org.yaml.snakeyaml.constructor.Constructor constructor = new
org.yaml.snakeyaml.constructor.Constructor(Config.class);
-TypeDescription seedDesc = new
TypeDescription(SeedProviderDef.class);
-seedDesc.putMapPropertyType(parameters, String.class,
String.class);
-constructor.addTypeDescription(seedDesc);
-Yaml yaml = new Yaml(new Loader(constructor));
-conf = (Config)yaml.load(input);
+conf = config;
-logger.info(Data files directories: +
Arrays.toString(conf.data_file_directories));
-logger.info(Commit log directory: + conf.commitlog_directory);
+logger.info(Data files directories: +
Arrays.toString(conf.data_file_directories));
+logger.info(Commit log directory: + conf.commitlog_directory);
-if (conf.commitlog_sync == null)
-{
-throw new ConfigurationException(Missing required directive
CommitLogSync);
-}
+if (conf.commitlog_sync == null)
+{
+throw new ConfigurationException(Missing required directive
CommitLogSync);
+}
-if (conf.commitlog_sync == Config.CommitLogSync.batch)
-{
-if (conf.commitlog_sync_batch_window_in_ms == null)
-{
-throw new ConfigurationException(Missing value for
commitlog_sync_batch_window_in_ms: Double expected.);
-}
-else if (conf.commitlog_sync_period_in_ms != null)
-{
-throw new ConfigurationException(Batch sync specified,
but commitlog_sync_period_in_ms found. Only specify
commitlog_sync_batch_window_in_ms when using batch sync);
-}
-
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8845ad60 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8845ad60 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8845ad60 Branch: refs/heads/trunk Commit: 8845ad6096ef80ff0dc0f214d7a054eca8514040 Parents: 643dc00 308a3e4 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Sep 25 16:08:39 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Sep 25 16:08:39 2013 -0500 -- .../hadoop/pig/AbstractCassandraStorage.java| 97 1 file changed, 36 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8845ad60/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83da4bdb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83da4bdb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83da4bdb
Branch: refs/heads/trunk
Commit: 83da4bdb6dbaa3df5d9c39cccfbe2f511dba0771
Parents: 8845ad6 ff76003
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Sep 25 16:27:39 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Sep 25 16:27:39 2013 -0500
--
.../hadoop/pig/AbstractCassandraStorage.java| 30 ++--
.../cassandra/hadoop/pig/CassandraStorage.java | 18 ++--
.../apache/cassandra/hadoop/pig/CqlStorage.java | 8 +++---
3 files changed, 28 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83da4bdb/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83da4bdb/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83da4bdb/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 1ef69b7,7780ca9..86fe338
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@@ -526,9 -525,11 +526,9 @@@ public class CqlStorage extends Abstrac
* Return cql where clauses for the corresponding partition filter. Make
sure the data format matches
* Only support the following Pig data types: int, long, float, double,
boolean and chararray
* */
- private String partitionFilterToWhereClauseString(Expression expression)
+ private String partitionFilterToWhereClauseString(Expression expression)
throws IOException
{
Expression.BinaryExpression be = (Expression.BinaryExpression)
expression;
-String name = be.getLhs().toString();
-String value = be.getRhs().toString();
OpType op = expression.getOpType();
String opString = op.toString();
switch (op)
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c6e5525 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c6e5525 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c6e5525 Branch: refs/heads/trunk Commit: 7c6e5525acdc973c4ddfb4abc510e656923b0bcd Parents: 3448ca5 3a4d10f Author: Jonathan Ellis jbel...@apache.org Authored: Tue Sep 24 08:41:13 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Sep 24 08:41:13 2013 -0500 -- src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c6e5525/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/io/sstable/SSTableReader.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9c027a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9c027a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9c027a3 Branch: refs/heads/trunk Commit: e9c027a3a74d4be211b7f95308c7b2a106dc3b9e Parents: 2648047 9d7bb1e Author: Yuki Morishita yu...@apache.org Authored: Wed Sep 18 14:23:52 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Wed Sep 18 14:23:52 2013 -0500 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 14 +++-- .../cassandra/io/sstable/SSTableReader.java | 30 ++-- 3 files changed, 34 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c027a3/CHANGES.txt -- diff --cc CHANGES.txt index fd8d852,c6e1169..26fcc2f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -47,54 -20,14 +47,55 @@@ Merged from 1.2 * Add SSTableDeletingNotification to DataTracker (CASSANDRA-6010) * Fix snapshots in use get deleted during snapshot repair (CASSANDRA-6011) * Move hints and exception count to o.a.c.metrics (CASSANDRA-6017) + * Fix memory leak in snapshot repair (CASSANDRA-6047) -1.2.9 +2.0.0 + * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) + * Fix periodic memtable flushing behavior with clean memtables (CASSANDRA-5931) + * Fix dateOf() function for pre-2.0 timestamp columns (CASSANDRA-5928) + * Fix SSTable unintentionally loads BF when opened for batch (CASSANDRA-5938) + * Add stream session progress to JMX (CASSANDRA-4757) + * Fix NPE during CAS operation (CASSANDRA-5925) +Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases - (CASSANDRA-5800) - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831) + * Don't announce schema version until we've loaded the changes locally + (CASSANDRA-5904) + * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903) + * Properly handle parsing huge map and set literals (CASSANDRA-5893) + + +2.0.0-rc2 + * enable vnodes by default (CASSANDRA-5869) + * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) + * Fix (some) 2i on composite components omissions (CASSANDRA-5851) + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880) +Merged from 1.2: + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) + * cqlsh: add support for multiline comments (CASSANDRA-5798) + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns + (CASSANDRA-5856) + + +2.0.0-rc1 + * improve DecimalSerializer performance (CASSANDRA-5837) + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819) + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822) + * Fix buffer underflow on socket close (CASSANDRA-5792) +Merged from 1.2: + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) + * cqlsh: add collections support to COPY (CASSANDRA-5698) + * retry important messages for any IOException (CASSANDRA-5804) + * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626) + * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812) * fix bulk-loading compressed sstables (CASSANDRA-5820) * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c027a3/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 2f9aed2,5c17b0a..f3c2011 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -755,12 -713,12 +755,13 @@@ public class CompactionManager implemen return;
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
src/java/org/apache/cassandra/metrics/ReadRepairMetrics.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e3a241e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e3a241e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e3a241e
Branch: refs/heads/trunk
Commit: 6e3a241e1a421d391f499a5e430b37a85fb05714
Parents: 997c49a eb390d0
Author: Yuki Morishita yu...@apache.org
Authored: Thu Sep 19 00:50:09 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Sep 19 00:50:09 2013 -0500
--
.../apache/cassandra/metrics/CacheMetrics.java | 18 +++--
.../cassandra/metrics/ClientRequestMetrics.java | 10 +--
.../cassandra/metrics/CommitLogMetrics.java | 10 ++-
.../cassandra/metrics/CompactionMetrics.java| 12 ++--
.../cassandra/metrics/ConnectionMetrics.java| 32 -
.../cassandra/metrics/DefaultNameFactory.java | 71
.../metrics/DroppedMessageMetrics.java | 7 +-
.../cassandra/metrics/HintedHandoffMetrics.java | 8 +--
.../cassandra/metrics/LatencyMetrics.java | 30 ++---
.../cassandra/metrics/ReadRepairMetrics.java| 37 +-
.../cassandra/metrics/StorageMetrics.java | 11 +--
.../cassandra/metrics/StreamingMetrics.java | 13 ++--
.../cassandra/scheduler/WeightedQueue.java | 2 +-
13 files changed, 148 insertions(+), 113 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e3a241e/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e3a241e/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
--
diff --cc src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
index 560f290,a851f50..d002e39
--- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
@@@ -40,8 -40,7 +39,7 @@@ public class HintedHandoffMetric
{
private static final Logger logger =
LoggerFactory.getLogger(HintedHandoffMetrics.class);
- public static final String GROUP_NAME = org.apache.cassandra.metrics;
- public static final String TYPE_NAME = HintedHandOffManager;
-private final MetricNameFactory factory;
++private final MetricNameFactory factory = new
DefaultNameFactory(HintedHandOffManager);
/** Total number of hints which are not stored, This is not a cache. */
private final LoadingCacheInetAddress, DifferencingCounter notStored =
CacheBuilder.newBuilder().build(new CacheLoaderInetAddress,
DifferencingCounter()
@@@ -52,18 -51,9 +50,18 @@@
}
});
-public HintedHandoffMetrics()
+/** Total number of hints that have been created, This is not a cache. */
+private final LoadingCacheInetAddress, Counter createdHintCounts =
CacheBuilder.newBuilder().build(new CacheLoaderInetAddress, Counter()
{
-factory = new DefaultNameFactory(HintedHandOffManager);
+public Counter load(InetAddress address)
+{
- return Metrics.newCounter(new MetricName(GROUP_NAME, TYPE_NAME,
Hints_created- + address.getHostAddress()));
++return
Metrics.newCounter(factory.createMetricName(Hints_created- +
address.getHostAddress()));
+}
+});
+
+public void incrCreatedHints(InetAddress address)
+{
+createdHintCounts.getUnchecked(address).inc();
}
public void incrPastWindow(InetAddress address)
@@@ -90,15 -87,15 +88,15 @@@
public DifferencingCounter(InetAddress address)
{
- this.meter = Metrics.newCounter(new MetricName(GROUP_NAME,
TYPE_NAME, Hints_not_stored- + address.getHostAddress()));
-this.meter =
Metrics.newCounter(factory.createMetricName(Hints_not_stored- +
address.toString()));
++this.meter =
Metrics.newCounter(factory.createMetricName(Hints_not_stored- +
address.getHostAddress()));
}
-public long diffrence()
+public long difference()
{
long current = meter.count();
-long diffrence = current - reported;
+long difference = current - reported;
this.reported = current;
-return diffrence;
+return difference;
}
public long count()
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9f4f0d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9f4f0d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9f4f0d6 Branch: refs/heads/trunk Commit: c9f4f0d644076875b970b2cfc666e00225314fb4 Parents: 1daf191 08c07f5 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Sep 13 12:18:41 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Sep 13 12:18:41 2013 -0500 -- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9f4f0d6/src/java/org/apache/cassandra/service/StorageService.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/service/StorageProxy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1daf1916 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1daf1916 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1daf1916 Branch: refs/heads/trunk Commit: 1daf191650dea12297e38734572d040b0ebc85e1 Parents: ab31b21 0e18f23 Author: Yuki Morishita yu...@apache.org Authored: Fri Sep 13 11:51:28 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Fri Sep 13 11:51:28 2013 -0500 -- CHANGES.txt| 1 + .../apache/cassandra/metrics/StorageMetrics.java | 3 +++ .../apache/cassandra/service/CassandraDaemon.java | 5 ++--- .../org/apache/cassandra/service/StorageProxy.java | 17 - .../apache/cassandra/service/StorageService.java | 3 ++- .../cassandra/service/StorageServiceMBean.java | 1 + 6 files changed, 17 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daf1916/CHANGES.txt -- diff --cc CHANGES.txt index c7aa165,ad32460..9e3c25a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,54 -18,14 +37,55 @@@ Merged from 1.2 * Replace the deprecated MapMaker with CacheLoader (CASSANDRA-6007) * Add SSTableDeletingNotification to DataTracker (CASSANDRA-6010) * Fix snapshots in use get deleted during snapshot repair (CASSANDRA-6011) + * Move hints and exception count to o.a.c.metrics (CASSANDRA-6017) -1.2.9 +2.0.0 + * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) + * Fix periodic memtable flushing behavior with clean memtables (CASSANDRA-5931) + * Fix dateOf() function for pre-2.0 timestamp columns (CASSANDRA-5928) + * Fix SSTable unintentionally loads BF when opened for batch (CASSANDRA-5938) + * Add stream session progress to JMX (CASSANDRA-4757) + * Fix NPE during CAS operation (CASSANDRA-5925) +Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases - (CASSANDRA-5800) - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831) + * Don't announce schema version until we've loaded the changes locally + (CASSANDRA-5904) + * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903) + * Properly handle parsing huge map and set literals (CASSANDRA-5893) + + +2.0.0-rc2 + * enable vnodes by default (CASSANDRA-5869) + * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) + * Fix (some) 2i on composite components omissions (CASSANDRA-5851) + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880) +Merged from 1.2: + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) + * cqlsh: add support for multiline comments (CASSANDRA-5798) + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns + (CASSANDRA-5856) + + +2.0.0-rc1 + * improve DecimalSerializer performance (CASSANDRA-5837) + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819) + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822) + * Fix buffer underflow on socket close (CASSANDRA-5792) +Merged from 1.2: + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) + * cqlsh: add collections support to COPY (CASSANDRA-5698) + * retry important messages for any IOException (CASSANDRA-5804) + * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626) + * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812) * fix bulk-loading compressed sstables (CASSANDRA-5820) * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daf1916/src/java/org/apache/cassandra/service/CassandraDaemon.java -- diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index 20c70e7,b2fc367..2879f1d --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -44,10
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab7fed68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab7fed68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab7fed68 Branch: refs/heads/trunk Commit: ab7fed6834ca675520651c2d3bf9dc1a8109fa36 Parents: c9f4f0d b281dd1 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Sep 13 13:53:51 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Sep 13 13:53:51 2013 -0500 -- src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab7fed68/src/java/org/apache/cassandra/tools/StandaloneSplitter.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/678aa37a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/678aa37a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/678aa37a Branch: refs/heads/trunk Commit: 678aa37af3322e805a3a639890e18391ce22426f Parents: 1ff0d8e 70297f9 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Sep 10 13:44:47 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Sep 10 13:44:47 2013 -0500 -- CHANGES.txt | 1 + .../hadoop/pig/AbstractCassandraStorage.java| 78 +++- .../apache/cassandra/hadoop/pig/CqlStorage.java | 78 +++- 3 files changed, 135 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/678aa37a/CHANGES.txt -- diff --cc CHANGES.txt index 22fa74b,4d5b446..f9a3b80 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -25,54 -9,14 +25,55 @@@ Merged from 1.2 * Fix streaming does not transfer wrapped range (CASSANDRA-5948) * Fix loading index summary containing empty key (CASSANDRA-5965) * Correctly handle limits in CompositesSearcher (CASSANDRA-5975) + * Pig: handle CQL collections (CASSANDRA-5867) -1.2.9 +2.0.0 + * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) + * Fix periodic memtable flushing behavior with clean memtables (CASSANDRA-5931) + * Fix dateOf() function for pre-2.0 timestamp columns (CASSANDRA-5928) + * Fix SSTable unintentionally loads BF when opened for batch (CASSANDRA-5938) + * Add stream session progress to JMX (CASSANDRA-4757) + * Fix NPE during CAS operation (CASSANDRA-5925) +Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases - (CASSANDRA-5800) - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831) + * Don't announce schema version until we've loaded the changes locally + (CASSANDRA-5904) + * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903) + * Properly handle parsing huge map and set literals (CASSANDRA-5893) + + +2.0.0-rc2 + * enable vnodes by default (CASSANDRA-5869) + * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) + * Fix (some) 2i on composite components omissions (CASSANDRA-5851) + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880) +Merged from 1.2: + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) + * cqlsh: add support for multiline comments (CASSANDRA-5798) + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns + (CASSANDRA-5856) + + +2.0.0-rc1 + * improve DecimalSerializer performance (CASSANDRA-5837) + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819) + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822) + * Fix buffer underflow on socket close (CASSANDRA-5792) +Merged from 1.2: + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) + * cqlsh: add collections support to COPY (CASSANDRA-5698) + * retry important messages for any IOException (CASSANDRA-5804) + * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626) + * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812) * fix bulk-loading compressed sstables (CASSANDRA-5820) * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) http://git-wip-us.apache.org/repos/asf/cassandra/blob/678aa37a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/678aa37a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java -- diff --cc src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java index 84d7a7a,a73e5a5..2b76b83 --- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java +++
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce9d3030 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce9d3030 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce9d3030 Branch: refs/heads/trunk Commit: ce9d3030b876283f8b1e5d376f6238ec524ee6b8 Parents: b248b1a 30f5e56 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Sep 9 08:57:09 2013 +0100 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Sep 9 08:57:09 2013 +0100 -- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce9d3030/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85be04bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85be04bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85be04bb Branch: refs/heads/trunk Commit: 85be04bb207826ad8098b1dd5aaf625694fad3c2 Parents: 1267116 3d9c3dd Author: Jonathan Ellis jbel...@apache.org Authored: Thu Sep 5 11:04:33 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Sep 5 11:04:33 2013 -0500 -- --
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/io/sstable/IndexSummary.java
test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0573d95d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0573d95d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0573d95d
Branch: refs/heads/trunk
Commit: 0573d95dee25f78d0b2111e6a249844f7bae3a5a
Parents: 31f6ec1 c49ad3c
Author: Yuki Morishita yu...@apache.org
Authored: Tue Sep 3 16:16:29 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Sep 3 16:16:29 2013 -0500
--
.../apache/cassandra/utils/ByteBufferUtil.java | 2 +-
.../cassandra/io/sstable/IndexSummaryTest.java | 65 +---
2 files changed, 44 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0573d95d/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0573d95d/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index cdb7242,26d2226..8e73161
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@@ -8,101 -6,49 +6,124 @@@
* to you under the Apache License, Version 2.0 (the
* License); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
+ package org.apache.cassandra.io.sstable;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
- import org.junit.Assert;
++import com.google.common.collect.Lists;
+ import org.junit.Test;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.DecoratedKey;
+ import org.apache.cassandra.dht.IPartitioner;
+ import org.apache.cassandra.dht.RandomPartitioner;
+import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.Pair;
- import org.junit.Test;
- import com.google.common.collect.Lists;
+ import static org.junit.Assert.assertArrayEquals;
+ import static org.junit.Assert.assertEquals;
public class IndexSummaryTest
{
@Test
+public void testGetKey()
+{
+PairListDecoratedKey, IndexSummary random =
generateRandomIndex(100, 1);
+for (int i = 0; i 100; i++)
- Assert.assertEquals(random.left.get(i).key,
ByteBuffer.wrap(random.right.getKey(i)));
++assertEquals(random.left.get(i).key,
ByteBuffer.wrap(random.right.getKey(i)));
+}
+
+@Test
+public void testBinarySearch()
+{
+PairListDecoratedKey, IndexSummary random =
generateRandomIndex(100, 1);
+for (int i = 0; i 100; i++)
- Assert.assertEquals(i,
random.right.binarySearch(random.left.get(i)));
++assertEquals(i, random.right.binarySearch(random.left.get(i)));
+}
+
+@Test
+public void testGetPosition()
+{
+PairListDecoratedKey, IndexSummary random =
generateRandomIndex(100, 2);
+for (int i = 0; i 50; i++)
- Assert.assertEquals(i*2, random.right.getPosition(i));
++assertEquals(i*2, random.right.getPosition(i));
+}
+
+@Test
+public void testSerialization() throws IOException
+{
+
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/streaming/StreamOut.java test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9495eb59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9495eb59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9495eb59 Branch: refs/heads/trunk Commit: 9495eb59c403cd97ba41e68e68903abb4f8ff113 Parents: 8d4b51d 18be7fa Author: Yuki Morishita yu...@apache.org Authored: Thu Aug 29 10:18:32 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Thu Aug 29 10:18:32 2013 -0500 -- CHANGES.txt | 1 + .../cassandra/streaming/StreamSession.java | 5 +- .../streaming/StreamingTransferTest.java| 119 --- 3 files changed, 79 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9495eb59/CHANGES.txt -- diff --cc CHANGES.txt index 5621436,5cb1522..8a1004f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,61 -1,16 +1,62 @@@ -1.2.10 - * Add snitch, schema version, cluster, partitioner to JMX (CASSANDRA-5881) +2.0.1 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) + * Improve offheap memcpy performance (CASSANDRA-5884) + * Use a range aware scanner for cleanup (CASSANDRA-2524) + * Cleanup doesn't need to inspect sstables that contain only local data + (CASSANDRA-5722) + * Add ability for CQL3 to list partition keys (CASSANDRA-4536) + * Improve native protocol serialization (CASSANDRA-5664) +Merged from 1.2: * Fix CqlRecordWriter with composite keys (CASSANDRA-5949) + * Add snitch, schema version, cluster, partitioner to JMX (CASSANDRA-5881) * Allow disabling SlabAllocator (CASSANDRA-5935) * Make user-defined compaction JMX blocking (CASSANDRA-4952) + * Fix streaming does not transfer wrapped range (CASSANDRA-5948) -1.2.9 +2.0.0 + * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) + * Fix periodic memtable flushing behavior with clean memtables (CASSANDRA-5931) + * Fix dateOf() function for pre-2.0 timestamp columns (CASSANDRA-5928) + * Fix SSTable unintentionally loads BF when opened for batch (CASSANDRA-5938) + * Add stream session progress to JMX (CASSANDRA-4757) + * Fix NPE during CAS operation (CASSANDRA-5925) +Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases - (CASSANDRA-5800) - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831) + * Don't announce schema version until we've loaded the changes locally + (CASSANDRA-5904) + * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903) + * Properly handle parsing huge map and set literals (CASSANDRA-5893) + + +2.0.0-rc2 + * enable vnodes by default (CASSANDRA-5869) + * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) + * Fix (some) 2i on composite components omissions (CASSANDRA-5851) + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880) +Merged from 1.2: + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) + * cqlsh: add support for multiline comments (CASSANDRA-5798) + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns + (CASSANDRA-5856) + + +2.0.0-rc1 + * improve DecimalSerializer performance (CASSANDRA-5837) + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819) + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822) + * Fix buffer underflow on socket close (CASSANDRA-5792) +Merged from 1.2: * fix bulk-loading compressed sstables (CASSANDRA-5820) * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9495eb59/src/java/org/apache/cassandra/streaming/StreamSession.java -- diff --cc
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/299c9507 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/299c9507 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/299c9507 Branch: refs/heads/trunk Commit: 299c950758c0f330bcc9652e3c635b8072bc3c06 Parents: c8bef78 a35f1c2 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Aug 28 18:27:00 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Aug 28 18:27:00 2013 -0500 -- --
