cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 16 Oct 2014 16:11:46 GMT
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/ed7eed83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed7eed83
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed7eed83

Branch: refs/heads/cassandra-2.1
Commit: ed7eed83daa2d3b765a27f826cf42cd0fcd57197
Parents: f6ea46e 19c2f54
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Thu Oct 16 11:11:32 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Thu Oct 16 11:11:32 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  4 +++
 .../service/pager/AbstractQueryPager.java       | 28 ++++++++++++++------
 .../service/pager/SliceQueryPager.java          | 10 ++++---
 3 files changed, 31 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed7eed83/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0d39416,967b90c..67b25dc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,84 -1,6 +1,88 @@@
 -2.0.11:
 +2.1.1
++ * Fix ClassCastException in DISTINCT query on static columns with
++   query paging (CASSANDRA-8108)
 + * Fix NPE on null nested UDT inside a set (CASSANDRA-8105)
 + * Fix exception when querying secondary index on set items or map keys
 +   when some clustering columns are specified (CASSANDRA-8073)
 + * Send proper error response when there is an error during native
 +   protocol message decode (CASSANDRA-8118)
 + * Gossip should ignore generation numbers too far in the future (CASSANDRA-8113)
 + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
 + * Fix high memory use due to tracking reads on incrementally opened sstable
 +   readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
 + * Shutdown JVM on OOM (CASSANDRA-7507)
 + * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
 + * Don't duplicate sstables smaller than split size when using
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction (CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
 + * Fix resource leak in event of corrupt sstable
 + * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
 + * Fix saving caches when a table is dropped (CASSANDRA-7784)
 + * Add better error checking of new stress profile (CASSANDRA-7716)
 + * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * 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)
 + * Make repair -pr work with -local (CASSANDRA-7450)
 + * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
 + * Fix snapshot repair error on indexed tables (CASSANDRA-8020)
 + * Do not exit nodetool repair when receiving JMX NOTIF_LOST (CASSANDRA-7909)
 +Merged from 2.0:
+  * Fix duplicate results in DISTINCT queries on static columns with query
+    paging (CASSANDRA-8108)
   * Properly validate ascii and utf8 string literals in CQL queries (CASSANDRA-8101)
   * (cqlsh) Fix autocompletion for alter keyspace (CASSANDRA-8021)
   * Create backup directories for commitlog archiving during startup (CASSANDRA-8111)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed7eed83/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index fc57a13,4210296..964cf64
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@@ -48,7 -48,7 +47,7 @@@ abstract class AbstractQueryPager imple
  
      private int remaining;
      private boolean exhausted;
--    private boolean lastWasRecorded;
++    private boolean shouldFetchExtraRow;
  
      protected AbstractQueryPager(ConsistencyLevel consistencyLevel,
                                   int toFetch,
@@@ -124,9 -124,9 +123,9 @@@
              rows = discardFirst(rows);
              remaining++;
          }
--        // Otherwise, if 'lastWasRecorded', we queried for one more than the page size,
++        // Otherwise, if 'shouldFetchExtraRow' was set, we queried for one more than the
page size,
          // so if the page is full, trim the last entry
--        else if (lastWasRecorded && !exhausted)
++        else if (shouldFetchExtraRow && !exhausted)
          {
              // We've asked for one more than necessary
              rows = discardLast(rows);
@@@ -136,7 -136,7 +135,7 @@@
          logger.debug("Remaining rows to page: {}", remaining);
  
          if (!isExhausted())
--            lastWasRecorded = recordLast(rows.get(rows.size() - 1));
++            shouldFetchExtraRow = recordLast(rows.get(rows.size() - 1));
  
          return rows;
      }
@@@ -161,10 -161,10 +160,10 @@@
          return result;
      }
  
--    protected void restoreState(int remaining, boolean lastWasRecorded)
++    protected void restoreState(int remaining, boolean shouldFetchExtraRow)
      {
          this.remaining = remaining;
--        this.lastWasRecorded = lastWasRecorded;
++        this.shouldFetchExtraRow = shouldFetchExtraRow;
      }
  
      public boolean isExhausted()
@@@ -184,7 -184,7 +183,7 @@@
  
      private int nextPageSize(int pageSize)
      {
--        return Math.min(remaining, pageSize) + (lastWasRecorded ? 1 : 0);
++        return Math.min(remaining, pageSize) + (shouldFetchExtraRow ? 1 : 0);
      }
  
      public ColumnCounter columnCounter()
@@@ -193,8 -193,8 +192,21 @@@
      }
  
      protected abstract List<Row> queryNextPage(int pageSize, ConsistencyLevel consistency,
boolean localQuery) throws RequestValidationException, RequestExecutionException;
++
++    /**
++     * Checks to see if the first row of a new page contains the last row from the previous
page.
++     * @param first the first row of the new page
++     * @return true if <code>first</code> contains the last from from the previous
page and it is live, false otherwise
++     */
      protected abstract boolean containsPreviousLast(Row first);
++
++    /**
++     * Saves the paging state by recording the last seen partition key and cell name (where
applicable).
++     * @param last the last row in the current page
++     * @return true if an extra row should be fetched in the next page,false otherwise
++     */
      protected abstract boolean recordLast(Row last);
++
      protected abstract boolean isReversed();
  
      private List<Row> discardFirst(List<Row> rows)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed7eed83/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
index 8108098,cdad0a5..cd1caf3
--- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
@@@ -22,7 -22,6 +22,8 @@@ import java.util.Collections
  import java.util.List;
  
  import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.composites.CellName;
++import org.apache.cassandra.db.composites.Composite;
  import org.apache.cassandra.db.filter.SliceQueryFilter;
  import org.apache.cassandra.exceptions.RequestValidationException;
  import org.apache.cassandra.exceptions.RequestExecutionException;
@@@ -39,7 -38,7 +40,7 @@@ public class SliceQueryPager extends Ab
  
      private final SliceFromReadCommand command;
  
-     private volatile CellName lastReturned;
 -    private volatile ByteBuffer lastReturned;
++    private volatile Composite lastReturned;
  
      // Don't use directly, use QueryPagers method instead
      SliceQueryPager(SliceFromReadCommand command, ConsistencyLevel consistencyLevel, boolean
localQuery)
@@@ -54,7 -53,7 +55,7 @@@
  
          if (state != null)
          {
-             lastReturned = cfm.comparator.cellFromByteBuffer(state.cellName);
 -            lastReturned = state.cellName;
++            lastReturned = cfm.comparator.fromByteBuffer(state.cellName);
              restoreState(state.remaining, true);
          }
      }


Mime
View raw message