cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Mon, 31 Jul 2017 22:32:09 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 99196cb72c15aa540f4cb78d5fd8aa9faa645dd9
Parents: d47d87c 9dc896f
Author: Jeff Jirsa <jjirsa@apple.com>
Authored: Mon Jul 31 15:29:21 2017 -0700
Committer: Jeff Jirsa <jjirsa@apple.com>
Committed: Mon Jul 31 15:30:02 2017 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +-
 .../cassandra/cql3/selection/Selection.java     |  6 ++++
 .../cql3/validation/entities/TimestampTest.java | 29 ++++++++++++++++++++
 .../cql3/validation/operations/SelectTest.java  | 28 +++++++++++++++++++
 4 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/99196cb7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5be7e1f,e3f5fe6..9c595fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,8 +1,12 @@@
 -3.0.15
 +3.11.1
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
- 3.0.15
+  * Fix invalid writetime for null cells (CASSANDRA-13711)
   * Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
   * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
 - * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize (Backport CASSANDRA-13329)
   * Fix Digest mismatch Exception if hints file has UnknownColumnFamily (CASSANDRA-13696)
   * Purge tombstones created by expired cells (CASSANDRA-13643)
   * Make concat work with iterators that have different subsets of columns (CASSANDRA-13482)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99196cb7/src/java/org/apache/cassandra/cql3/selection/Selection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/selection/Selection.java
index 4ea1071,425ae52..428634c
--- a/src/java/org/apache/cassandra/cql3/selection/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java
@@@ -404,12 -346,15 +404,18 @@@ public abstract class Selectio
                  }
              }
              current = new ArrayList<>(columns.size());
+ 
 -            // Timestamps and TTLs are arrays per row, we must null them out between row
++            // Timestamps and TTLs are arrays per row, we must null them out between rows
+             if (timestamps != null)
+                 Arrays.fill(timestamps, Long.MIN_VALUE);
+             if (ttls != null)
+                 Arrays.fill(ttls, -1);
          }
  
 -        public ResultSet build(int protocolVersion) throws InvalidRequestException
 +        /**
 +         * Builds the <code>ResultSet</code>
 +         */
 +        public ResultSet build()
          {
              if (current != null)
              {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99196cb7/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message