You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/06 16:08:51 UTC
[1/9] git commit: Add 'nodetool sethintedhandoffthrottlekb'
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 d1c4d50ee -> f83909e04
refs/heads/cassandra-2.1 9394f0d9a -> 7fc89ad7f
refs/heads/trunk 774f3acbf -> 94cfec89b
Add 'nodetool sethintedhandoffthrottlekb'
patch by lyubent; reviewed by slebresne for CASSANDRA-7635
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1c4d50e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1c4d50e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1c4d50e
Branch: refs/heads/trunk
Commit: d1c4d50ee05cb6be19d60c2e58a19b0e1fb93023
Parents: f498a94
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 6 12:47:14 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 6 12:47:14 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 +++++
src/java/org/apache/cassandra/service/StorageService.java | 6 ++++++
.../org/apache/cassandra/service/StorageServiceMBean.java | 3 +++
src/java/org/apache/cassandra/tools/NodeCmd.java | 8 +++++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++
src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 3 +++
7 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1c4d50e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 30efd94..87b1bb3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
* Update java driver (for hadoop) (CASSANDRA-7618)
* Fix truncate to always flush (CASSANDRA-7511)
* Remove shuffle and taketoken (CASSANDRA-7601)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1c4d50e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 836edfd..1ca7975 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1250,6 +1250,11 @@ public class DatabaseDescriptor
return conf.hinted_handoff_throttle_in_kb;
}
+ public static void setHintedHandoffThrottleInKB(Integer throttleInKB)
+ {
+ conf.hinted_handoff_throttle_in_kb = throttleInKB;
+ }
+
public static int getBatchlogReplayThrottleInKB()
{
return conf.batchlog_replay_throttle_in_kb;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1c4d50e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 97ae908..d5b5289 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3832,4 +3832,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
DatabaseDescriptor.setTombstoneFailureThreshold(threshold);
}
+
+ public void setHintedHandoffThrottleInKB(int throttleInKB)
+ {
+ DatabaseDescriptor.setHintedHandoffThrottleInKB(throttleInKB);
+ logger.info(String.format("Updated hinted_handoff_throttle_in_kb to %d", throttleInKB));
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1c4d50e/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index f578e10..6308aa5 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -505,4 +505,7 @@ public interface StorageServiceMBean extends NotificationEmitter
public int getTombstoneFailureThreshold();
/** Sets the threshold for abandoning queries with many tombstones */
public void setTombstoneFailureThreshold(int tombstoneDebugThreshold);
+
+ /** Sets the hinted handoff throttle in kb per second, per delivery thread. */
+ public void setHintedHandoffThrottleInKB(int throttleInKB);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1c4d50e/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 1d156ad..aeed913 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -188,7 +188,8 @@ public class NodeCmd
SETCACHEKEYSTOSAVE,
RELOADTRIGGERS,
SETLOGGINGLEVEL,
- GETLOGGINGLEVELS
+ GETLOGGINGLEVELS,
+ SETHINTEDHANDOFFTHROTTLEKB
}
@@ -1250,6 +1251,11 @@ public class NodeCmd
case ENABLEBACKUP : probe.setIncrementalBackupsEnabled(true); break;
case DISABLEBACKUP : probe.setIncrementalBackupsEnabled(false); break;
+ case SETHINTEDHANDOFFTHROTTLEKB:
+ if (arguments.length != 1) { badUse("Missing argument for hinted handoff throttle."); }
+ probe.setHintedHandoffThrottleInKB(Integer.parseInt(arguments[0]));
+ break;
+
case TRUNCATEHINTS:
if (arguments.length > 1) badUse("Too many arguments.");
else if (arguments.length == 1) probe.truncateHints(arguments[0]);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1c4d50e/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index d7ded89..d281219 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -529,6 +529,11 @@ public class NodeProbe
ssProxy.setIncrementalBackupsEnabled(enabled);
}
+ public void setHintedHandoffThrottleInKB(int throttleInKb)
+ {
+ ssProxy.setHintedHandoffThrottleInKB(throttleInKb);
+ }
+
public void setCacheCapacities(int keyCacheCapacity, int rowCacheCapacity)
{
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1c4d50e/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
index 6f57846..416ef1a 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -223,3 +223,6 @@ commands:
- name: getlogginglevels
help: |
Get the runtime logging levels
+ - name: sethintedhandoffthrottlekb <throttle-in-kb>
+ help: |
+ Set hinted handoff throttle in kb per second, per delivery thread.
[4/9] git commit: Fix IncompatibleClassChangeError from hadoop2
Posted by br...@apache.org.
Fix IncompatibleClassChangeError from hadoop2
Patch by Mariusz Kryński, reviewed by brandonwilliams for CASSANDRA-7229
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f83909e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f83909e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f83909e0
Branch: refs/heads/cassandra-2.0
Commit: f83909e04161675addcf7454cea52aa8122dcfef
Parents: d1c4d50
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 09:06:42 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 09:06:42 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlInputFormat.java | 19 +++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f83909e0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 87b1bb3..dcc5bf8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
* Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
* Update java driver (for hadoop) (CASSANDRA-7618)
* Fix truncate to always flush (CASSANDRA-7511)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f83909e0/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 09bd80c..36da92d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@ -19,7 +19,9 @@ package org.apache.cassandra.hadoop.cql3;
import java.io.IOException;
+import org.apache.cassandra.hadoop.HadoopCompat;
import org.apache.cassandra.hadoop.AbstractColumnFamilyInputFormat;
+import org.apache.cassandra.hadoop.ReporterWrapper;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RecordReader;
@@ -53,14 +55,15 @@ public class CqlInputFormat extends AbstractColumnFamilyInputFormat<Long, Row>
public RecordReader<Long, Row> getRecordReader(InputSplit split, JobConf jobConf, final Reporter reporter)
throws IOException
{
- TaskAttemptContext tac = new TaskAttemptContext(jobConf, TaskAttemptID.forName(jobConf.get(MAPRED_TASK_ID)))
- {
- @Override
- public void progress()
- {
- reporter.progress();
- }
- };
+ TaskAttemptContext tac = HadoopCompat.newMapContext(
+ jobConf,
+ TaskAttemptID.forName(jobConf.get(MAPRED_TASK_ID)),
+ null,
+ null,
+ null,
+ new ReporterWrapper(reporter),
+ null);
+
CqlRecordReader recordReader = new CqlRecordReader();
recordReader.initialize((org.apache.hadoop.mapreduce.InputSplit)split, tac);
[3/9] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9394f0d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9394f0d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9394f0d9
Branch: refs/heads/trunk
Commit: 9394f0d9a81720bea20ce54939e5a6d28b8838c4
Parents: 6386abc 3726a38
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 6 12:51:58 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 6 12:51:58 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/9] git commit: Fix IncompatibleClassChangeError from hadoop2
Posted by br...@apache.org.
Fix IncompatibleClassChangeError from hadoop2
Patch by Mariusz Kryński, reviewed by brandonwilliams for CASSANDRA-7229
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f83909e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f83909e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f83909e0
Branch: refs/heads/cassandra-2.1
Commit: f83909e04161675addcf7454cea52aa8122dcfef
Parents: d1c4d50
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 09:06:42 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 09:06:42 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlInputFormat.java | 19 +++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f83909e0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 87b1bb3..dcc5bf8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
* Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
* Update java driver (for hadoop) (CASSANDRA-7618)
* Fix truncate to always flush (CASSANDRA-7511)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f83909e0/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 09bd80c..36da92d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@ -19,7 +19,9 @@ package org.apache.cassandra.hadoop.cql3;
import java.io.IOException;
+import org.apache.cassandra.hadoop.HadoopCompat;
import org.apache.cassandra.hadoop.AbstractColumnFamilyInputFormat;
+import org.apache.cassandra.hadoop.ReporterWrapper;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RecordReader;
@@ -53,14 +55,15 @@ public class CqlInputFormat extends AbstractColumnFamilyInputFormat<Long, Row>
public RecordReader<Long, Row> getRecordReader(InputSplit split, JobConf jobConf, final Reporter reporter)
throws IOException
{
- TaskAttemptContext tac = new TaskAttemptContext(jobConf, TaskAttemptID.forName(jobConf.get(MAPRED_TASK_ID)))
- {
- @Override
- public void progress()
- {
- reporter.progress();
- }
- };
+ TaskAttemptContext tac = HadoopCompat.newMapContext(
+ jobConf,
+ TaskAttemptID.forName(jobConf.get(MAPRED_TASK_ID)),
+ null,
+ null,
+ null,
+ new ReporterWrapper(reporter),
+ null);
+
CqlRecordReader recordReader = new CqlRecordReader();
recordReader.initialize((org.apache.hadoop.mapreduce.InputSplit)split, tac);
[7/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/7fc89ad7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fc89ad7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fc89ad7
Branch: refs/heads/trunk
Commit: 7fc89ad7f59865a52a49a80208be3fd7a69ef74c
Parents: 9394f0d f83909e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 09:08:31 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 09:08:31 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/hadoop/cql3/CqlInputFormat.java | 19 +++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fc89ad7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c698385,dcc5bf8..410cc69
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,88 -1,14 +1,90 @@@
-2.0.10
+2.1.1
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
+
+2.1.0-final
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+Merged from 2.0:
+ * Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Update java driver (for hadoop) (CASSANDRA-7618)
- * Fix truncate to always flush (CASSANDRA-7511)
+ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
+
+
+2.1.0-rc5
+ * Reject counters inside user types (CASSANDRA-7672)
+ * Switch to notification-based GCInspector (CASSANDRA-7638)
+ * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
+ * Don't use strict consistency when replacing (CASSANDRA-7568)
+ * Fix min/max cell name collection on 2.0 SSTables with range
+ tombstones (CASSANDRA-7593)
+ * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
+ * Filter cached results correctly (CASSANDRA-7636)
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
- * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
- * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
- * Always merge ranges owned by a single node (CASSANDRA-6930)
- * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Clean up Windows batch scripts (CASSANDRA-7619)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
+ * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+ * Fix NPE when dropping index from non-existent keyspace, AssertionError when
+ dropping non-existent index with IF EXISTS (CASSANDRA-7590)
+ * Fix sstablelevelresetter hang (CASSANDRA-7614)
+ * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
+ * Use "keyspace updated" schema change message for UDT changes in v1 and
+ v2 protocols (CASSANDRA-7617)
+ * Fix tracing of range slices and secondary index lookups that are local
+ to the coordinator (CASSANDRA-7599)
+ * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
+ * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
+ * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
+ * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
+ * Fix tracing of concurrent range slices and 2ary index queries (CASSANDRA-7626)
+ * Fix scrub against collection type (CASSANDRA-7665)
+Merged from 2.0:
+ * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
+ * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
+ * Always flush on truncate (CASSANDRA-7511)
* Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+
+
+2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
+ * Updated memtable_cleanup_threshold and memtable_flush_writers defaults
+ (CASSANDRA-7551)
+ * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
+ * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539)
+ * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
+ * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
+ * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
+ * Handle queries on multiple secondary index types (CASSANDRA-7525)
+ * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+Merged from 2.0:
* (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
* Fix range merging when DES scores are zero (CASSANDRA-7535)
* Warn when SSL certificates have expired (CASSANDRA-7528)
[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/7fc89ad7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fc89ad7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fc89ad7
Branch: refs/heads/cassandra-2.1
Commit: 7fc89ad7f59865a52a49a80208be3fd7a69ef74c
Parents: 9394f0d f83909e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 09:08:31 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 09:08:31 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/hadoop/cql3/CqlInputFormat.java | 19 +++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fc89ad7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c698385,dcc5bf8..410cc69
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,88 -1,14 +1,90 @@@
-2.0.10
+2.1.1
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
+
+2.1.0-final
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+Merged from 2.0:
+ * Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Update java driver (for hadoop) (CASSANDRA-7618)
- * Fix truncate to always flush (CASSANDRA-7511)
+ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
+
+
+2.1.0-rc5
+ * Reject counters inside user types (CASSANDRA-7672)
+ * Switch to notification-based GCInspector (CASSANDRA-7638)
+ * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
+ * Don't use strict consistency when replacing (CASSANDRA-7568)
+ * Fix min/max cell name collection on 2.0 SSTables with range
+ tombstones (CASSANDRA-7593)
+ * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
+ * Filter cached results correctly (CASSANDRA-7636)
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
- * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
- * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
- * Always merge ranges owned by a single node (CASSANDRA-6930)
- * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Clean up Windows batch scripts (CASSANDRA-7619)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
+ * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+ * Fix NPE when dropping index from non-existent keyspace, AssertionError when
+ dropping non-existent index with IF EXISTS (CASSANDRA-7590)
+ * Fix sstablelevelresetter hang (CASSANDRA-7614)
+ * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
+ * Use "keyspace updated" schema change message for UDT changes in v1 and
+ v2 protocols (CASSANDRA-7617)
+ * Fix tracing of range slices and secondary index lookups that are local
+ to the coordinator (CASSANDRA-7599)
+ * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
+ * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
+ * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
+ * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
+ * Fix tracing of concurrent range slices and 2ary index queries (CASSANDRA-7626)
+ * Fix scrub against collection type (CASSANDRA-7665)
+Merged from 2.0:
+ * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
+ * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
+ * Always flush on truncate (CASSANDRA-7511)
* Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+
+
+2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
+ * Updated memtable_cleanup_threshold and memtable_flush_writers defaults
+ (CASSANDRA-7551)
+ * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
+ * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539)
+ * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
+ * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
+ * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
+ * Handle queries on multiple secondary index types (CASSANDRA-7525)
+ * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+Merged from 2.0:
* (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
* Fix range merging when DES scores are zero (CASSANDRA-7535)
* Warn when SSL certificates have expired (CASSANDRA-7528)
[9/9] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94cfec89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94cfec89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94cfec89
Branch: refs/heads/trunk
Commit: 94cfec89b8bf9401a7f4f1b49d59679e4c50f598
Parents: 774f3ac 7fc89ad
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 09:08:42 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 09:08:42 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/hadoop/cql3/CqlInputFormat.java | 19 +++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94cfec89/CHANGES.txt
----------------------------------------------------------------------
[5/9] git commit: Fix IncompatibleClassChangeError from hadoop2
Posted by br...@apache.org.
Fix IncompatibleClassChangeError from hadoop2
Patch by Mariusz Kryński, reviewed by brandonwilliams for CASSANDRA-7229
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f83909e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f83909e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f83909e0
Branch: refs/heads/trunk
Commit: f83909e04161675addcf7454cea52aa8122dcfef
Parents: d1c4d50
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 09:06:42 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 09:06:42 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlInputFormat.java | 19 +++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f83909e0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 87b1bb3..dcc5bf8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
* Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
* Update java driver (for hadoop) (CASSANDRA-7618)
* Fix truncate to always flush (CASSANDRA-7511)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f83909e0/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 09bd80c..36da92d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@ -19,7 +19,9 @@ package org.apache.cassandra.hadoop.cql3;
import java.io.IOException;
+import org.apache.cassandra.hadoop.HadoopCompat;
import org.apache.cassandra.hadoop.AbstractColumnFamilyInputFormat;
+import org.apache.cassandra.hadoop.ReporterWrapper;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RecordReader;
@@ -53,14 +55,15 @@ public class CqlInputFormat extends AbstractColumnFamilyInputFormat<Long, Row>
public RecordReader<Long, Row> getRecordReader(InputSplit split, JobConf jobConf, final Reporter reporter)
throws IOException
{
- TaskAttemptContext tac = new TaskAttemptContext(jobConf, TaskAttemptID.forName(jobConf.get(MAPRED_TASK_ID)))
- {
- @Override
- public void progress()
- {
- reporter.progress();
- }
- };
+ TaskAttemptContext tac = HadoopCompat.newMapContext(
+ jobConf,
+ TaskAttemptID.forName(jobConf.get(MAPRED_TASK_ID)),
+ null,
+ null,
+ null,
+ new ReporterWrapper(reporter),
+ null);
+
CqlRecordReader recordReader = new CqlRecordReader();
recordReader.initialize((org.apache.hadoop.mapreduce.InputSplit)split, tac);
[2/9] git commit: Merge commit
'd1c4d50ee05cb6be19d60c2e58a19b0e1fb93023' into cassandra-2.1.0
Posted by br...@apache.org.
Merge commit 'd1c4d50ee05cb6be19d60c2e58a19b0e1fb93023' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3726a383
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3726a383
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3726a383
Branch: refs/heads/trunk
Commit: 3726a383d16e14f422a98f440835ecdb78df8278
Parents: a7d950e d1c4d50
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 6 12:51:43 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 6 12:51:43 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------