From 02b83d9a8c240ad94461fb305cc90f275fba03b3 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Fri, 17 Oct 2014 13:02:29 +0200
Subject: [PATCH 1/2] Update versions for 2.0.11

---
 NEWS.txt         | 8 ++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/NEWS.txt b/NEWS.txt
index 102a87b696..6f6b795458 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -15,14 +15,22 @@ using the provided 'sstableupgrade' tool.
 
 2.0.11
 ======
+
+Upgrading
+---------
+    - Nothing specific to this release, but refer to previous entries if you
+      are upgrading from a previous version.
+
 New features
 ------------
     - DateTieredCompactionStrategy added, optimized for time series data and groups
       data that is written closely in time (CASSANDRA-6602 for details). Consider
       this experimental for now.
 
+
 2.0.10
 ======
+
 New features
 ------------
     - CqlPaginRecordReader and CqlPagingInputFormat have both been removed.
diff --git a/build.xml b/build.xml
index 829c873c8a..8c23407f05 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="2.0.10"/>
+    <property name="base.version" value="2.0.11"/>
     <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --git a/debian/changelog b/debian/changelog
index e0b1eae726..39d9520ff3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.11) unstable; urgency=medium
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 17 Oct 2014 13:01:02 +0200
+
 cassandra (2.0.10) unstable; urgency=medium
 
   * New release

From b10c2ab86ecece22409d5072a79bcb3ea60c552c Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Thu, 23 Oct 2014 11:53:36 -0500
Subject: [PATCH 2/2] Pig: Remove errant LIMIT clause in CqlNativeStorage

---
 CHANGES.txt                                       |  4 ++++
 .../cassandra/hadoop/cql3/CqlRecordReader.java    | 15 ++-------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4ed7bede71..11f4651ce7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.0.12:
+ * Pig: Remove errant LIMIT clause in CqlNativeStorage
+
+
 2.0.11:
  * Reject conditions on DELETE unless full PK is given (CASSANDRA-6430)
  * Properly reject the token function DELETE (CASSANDRA-7747)
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 3eab7c05c7..df06e8ebbd 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -86,7 +86,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
     private IPartitioner partitioner;
     private String inputColumns;
     private String userDefinedWhereClauses;
-    private int pageRowSize;
 
     private List<String> partitionKeys = new ArrayList<>();
 
@@ -111,14 +110,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         inputColumns = CqlConfigHelper.getInputcolumns(conf);
         userDefinedWhereClauses = CqlConfigHelper.getInputWhereClauses(conf);
         Optional<Integer> pageRowSizeOptional = CqlConfigHelper.getInputPageRowSize(conf);
-        try
-        {
-            pageRowSize = pageRowSizeOptional.isPresent() ? pageRowSizeOptional.get() : DEFAULT_CQL_PAGE_LIMIT;
-        }
-        catch(NumberFormatException e)
-        {
-            pageRowSize = DEFAULT_CQL_PAGE_LIMIT;
-        }
+
         try
         {
             if (cluster != null)
@@ -143,7 +135,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         // otherwise we will fall back to building a query using the:
         //   inputColumns
         //   whereClauses
-        //   pageRowSize
         cqlQuery = CqlConfigHelper.getInputCql(conf);
         // validate that the user hasn't tried to give us a custom query along with input columns
         // and where clauses
@@ -519,8 +510,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
     /**
      * Build a query for the reader of the form:
      *
-     * SELECT * FROM ks>cf token(pk1,...pkn)>? AND token(pk1,...pkn)<=? [AND user where clauses]
-     * LIMIT pageRowSize [ALLOW FILTERING]
+     * SELECT * FROM ks>cf token(pk1,...pkn)>? AND token(pk1,...pkn)<=? [AND user where clauses] [ALLOW FILTERING]
      */
     private String buildQuery()
     {
@@ -539,7 +529,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         String whereClause = "";
         if (StringUtils.isNotEmpty(userDefinedWhereClauses))
             whereClause += " AND " + userDefinedWhereClauses;
-        whereClause += " LIMIT " + pageRowSize;
         if (StringUtils.isNotEmpty(userDefinedWhereClauses))
             whereClause += " ALLOW FILTERING";
         return whereClause;