cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [6/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Wed, 06 Aug 2014 17:58:58 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	build.xml


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/304260d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/304260d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/304260d0

Branch: refs/heads/cassandra-2.1
Commit: 304260d04e9a7f30aa11a13d40083448812c22a8
Parents: b4aa750 f4551eb
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Aug 6 12:57:05 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Aug 6 12:57:05 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +-
 conf/cassandra-env.sh                           |  4 ---
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +++-------
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 19 ++++++--------
 .../cassandra/locator/SimpleSeedProvider.java   | 27 ++++----------------
 .../service/EmbeddedCassandraService.java       |  5 ----
 6 files changed, 18 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/304260d0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fd33bca,b91711d..eb3485a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,3 +1,24 @@@
 +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:
-  * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
 + * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/304260d0/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --cc conf/cassandra-env.sh
index 965b3a2,21a4244..bb820e1
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -217,14 -217,8 +217,10 @@@ JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThre
  JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
  JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
  JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
 +JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
 +JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=10000"
  
  # note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
- if { [ "$JVM_VERSION" \> "1.7" ] && [ "$JVM_VERSION" \< "1.8.0" ] &&
[ "$JVM_PATCH_VERSION" -ge "60" ]; } || [ "$JVM_VERSION" \> "1.8" ] ; then
-     JVM_OPTS="$JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways"
- fi
- 
  if [ "$JVM_ARCH" = "64-Bit" ] ; then
      JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
  fi

http://git-wip-us.apache.org/repos/asf/cassandra/blob/304260d0/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/304260d0/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 36da92d,e1cdf32..09bd80c
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@@ -18,10 -18,10 +18,8 @@@
  package org.apache.cassandra.hadoop.cql3;
  
  import java.io.IOException;
 -import java.nio.ByteBuffer;
 -import java.util.Map;
  
- 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;


Mime
View raw message