[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt NEWS.txt build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/233308f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/233308f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/233308f0 Branch: refs/heads/cassandra-2.0 Commit: 233308f0245ebffdb6b9c77560c1914d3f2a1572 Parents: 11351e3 0d90b03 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Jul 10 16:17:39 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Jul 10 16:17:39 2014 -0500 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/transport/Message.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/233308f0/CHANGES.txt -- diff --cc CHANGES.txt index 6b4e44b,2951fed..d39cf63 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,49 -1,12 +1,51 @@@ -1.2.19 +2.0.10 + * Warn when SSL certificates have expired (CASSANDRA-7528) + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254) + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM + operations to incorrect become full QUORUM (CASSANDRA-7345) + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) + * Make sure high level sstables get compacted (CASSANDRA-7414) + * Fix AssertionError when using empty clustering columns and static columns + (CASSANDRA-7455) + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596) + * Add option to disable STCS in L0 (CASSANDRA-6621) + * Fix error when doing reversed queries with static columns (CASSANDRA-7490) +Merged from 1.2: + * Set correct stream ID on responses when non-Exception Throwables +are thrown while handling native protocol messages (CASSANDRA-7470) -1.2.18 - * Support Thrift tables clustering columns on CqlPagingInputFormat (CASSANDRA-7445) - * Fix compilation with java 6 broke by CASSANDRA-7147 -1.2.17 +2.0.9 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) + * Fix native protocol CAS batches (CASSANDRA-7337) + * Add per-CF range read request latency metrics (CASSANDRA-7338) + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) + * Add conditional CREATE/DROP USER support (CASSANDRA-7264) + * Swap local and global default read repair chances (CASSANDRA-7320) + * Add missing iso8601 patterns for date strings (CASSANDRA-6973) + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325) + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) + * Fix infinite loop on exception while streaming (CASSANDRA-7330) + * Reference sstables before populating key cache (CASSANDRA-7234) + * Account for range tombstones in min/max column names (CASSANDRA-7235) + * Improve sub range repair validation (CASSANDRA-7317) + * Accept subtypes for function results, type casts (CASSANDRA-6766) + * Support DISTINCT for static columns and fix behaviour when DISTINC is + not use (CASSANDRA-7305). + * Refuse range queries with strict bounds on compact tables since they + are broken (CASSANDRA-7059) +Merged from 1.2: + * Expose global ColumnFamily metrics (CASSANDRA-7273) * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399) * Expose global ColumnFamily metrics (CASSANDRA-7273) * Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373) http://git-wip-us.apache.org/repos/asf/cassandra/blob/233308f0/src/java/org/apache/cassandra/transport/Message.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/utils/ByteBufferUtil.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34252003 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34252003 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34252003 Branch: refs/heads/cassandra-2.0 Commit: 34252003bfbcad4f216e40d3ba6a54a2e6eca155 Parents: 4112a7f 04250f2 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Jul 2 10:29:10 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Jul 2 10:29:10 2014 +0200 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/34252003/CHANGES.txt -- diff --cc CHANGES.txt index ff8a7a2,1a79e8d..6b93631 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,44 -1,8 +1,45 @@@ -1.2.18 - * Support Thrift tables clustering columns on CqlPagingInputFormat (CASSANDRA-7445) - * Fix compilation with java 6 broke by CASSANDRA-7147 +2.0.10 + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM + operations to incorrect become full QUORUM (CASSANDRA-7345) + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) + * Make sure high level sstables get compacted (CASSANDRA-7414) + * Fix AssertionError when using empty clustering columns and static columns + (CASSANDRA-7455) + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596) ++Merged from 1.2: -1.2.17 + +2.0.9 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) + * Fix native protocol CAS batches (CASSANDRA-7337) + * Add per-CF range read request latency metrics (CASSANDRA-7338) + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) + * Add conditional CREATE/DROP USER support (CASSANDRA-7264) + * Swap local and global default read repair chances (CASSANDRA-7320) + * Add missing iso8601 patterns for date strings (CASSANDRA-6973) + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325) + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) + * Fix infinite loop on exception while streaming (CASSANDRA-7330) + * Reference sstables before populating key cache (CASSANDRA-7234) + * Account for range tombstones in min/max column names (CASSANDRA-7235) + * Improve sub range repair validation (CASSANDRA-7317) + * Accept subtypes for function results, type casts (CASSANDRA-6766) + * Support DISTINCT for static columns and fix behaviour when DISTINC is + not use (CASSANDRA-7305). + * Refuse range queries with strict bounds on compact tables since they + are broken (CASSANDRA-7059) +Merged from 1.2: + * Expose global ColumnFamily metrics (CASSANDRA-7273) * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399) * Expose global ColumnFamily metrics (CASSANDRA-7273) * Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 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/5d25a16e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d25a16e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d25a16e Branch: refs/heads/cassandra-2.0 Commit: 5d25a16efb1793ca8e7883f0840fd4a595f02379 Parents: 4b3a17c 20fffa9 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Jun 18 14:07:50 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Jun 18 14:07:50 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d25a16e/CHANGES.txt -- diff --cc CHANGES.txt index 8af4b3e,25ea22b..501e740 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ -1.2.17 +2.0.9 + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) + * Fix native protocol CAS batches (CASSANDRA-7337) + * Add per-CF range read request latency metrics (CASSANDRA-7338) + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) + * Add conditional CREATE/DROP USER support (CASSANDRA-7264) + * Swap local and global default read repair chances (CASSANDRA-7320) + * Add missing iso8601 patterns for date strings (CASSANDRA-6973) + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325) + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) + * Fix infinite loop on exception while streaming (CASSANDRA-7330) + * Reference sstables before populating key cache (CASSANDRA-7234) +Merged from 1.2: + * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318) * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268) * Track metrics at a keyspace level (CASSANDRA-6539) * Add replace_address_first_boot flag to only replace if not bootstrapped http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d25a16e/src/java/org/apache/cassandra/gms/Gossiper.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0dbb4e02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dbb4e02 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0dbb4e02 Branch: refs/heads/cassandra-2.0 Commit: 0dbb4e0283de93a60817aed123ad47dc9596f06a Parents: c54958a f727381 Author: Jonathan Ellis jbel...@apache.org Authored: Sat Jun 7 08:21:44 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Sat Jun 7 08:21:44 2014 -0500 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/service/StorageProxy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8aaffa1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8aaffa1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8aaffa1 Branch: refs/heads/cassandra-2.0 Commit: e8aaffa1b75f48d8aa230909ae0fe77aa1de723c Parents: 2800c7f 12a7a7e Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Jun 3 19:03:16 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Jun 3 19:03:16 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CounterMutation.java | 3 ++- .../org/apache/cassandra/service/StorageProxy.java| 14 -- 3 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8aaffa1/CHANGES.txt -- diff --cc CHANGES.txt index 37105f3,8014170..91cac4f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,61 -1,7 +1,62 @@@ -1.2.17 - * Fix handling of empty counter replication mutations (CASSANDRA-7144) +2.0.9 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) + * Add conditional CREATE/DROP USER support (CASSANDRA-7264) + * Swap local and global default read repair chances (CASSANDRA-7320) + * Add missing iso8601 patterns for date strings (CASSANDRA-6973) + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325) + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) + * Fix infinite loop on exception while streaming (CASSANDRA-7330) +Merged from 1.2: + * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319) * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328) - * Set keepalive on MessagingService connections (CASSANDRA-7170) ++ * Fix handling of empty counter replication mutations (CASSANDRA-7144) + + +2.0.8 + * Always reallocate buffers in HSHA (CASSANDRA-6285) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) + * Correctly delete scheduled range xfers (CASSANDRA-7143) + * Make batchlog replica selection rack-aware (CASSANDRA-6551) + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) + * Re-add parameter columns to tracing session (CASSANDRA-6942) + * Fix writetime/ttl functions for static columns (CASSANDRA-7081) + * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) + * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d4dc6d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d4dc6d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d4dc6d5 Branch: refs/heads/cassandra-2.0 Commit: 8d4dc6d5f2db5d19476d79c8b56e7e3d2f61e2d5 Parents: 0a09edc c7e472e Author: Jonathan Ellis jbel...@apache.org Authored: Tue May 6 22:41:30 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue May 6 22:41:30 2014 -0500 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3dad8ca6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dad8ca6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dad8ca6 Branch: refs/heads/cassandra-2.0 Commit: 3dad8ca60c14a6c57a1a2830310b14d50d36b0c0 Parents: de720b4 0547d16 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Apr 22 09:17:31 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Apr 22 09:17:31 2014 -0500 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f122f999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f122f999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f122f999
Branch: refs/heads/cassandra-2.0
Commit: f122f9994e92e4a1d7de32ff9f6bc116a4a65d2a
Parents: 22b9453 8c52cc0
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Mar 14 14:47:31 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Mar 14 14:47:31 2014 -0500
--
test/pig/org/apache/cassandra/pig/CqlTableTest.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f122f999/test/pig/org/apache/cassandra/pig/CqlTableTest.java
--
diff --cc test/pig/org/apache/cassandra/pig/CqlTableTest.java
index e33364f,000..3bbc3d1
mode 100644,00..100644
--- a/test/pig/org/apache/cassandra/pig/CqlTableTest.java
+++ b/test/pig/org/apache/cassandra/pig/CqlTableTest.java
@@@ -1,257 -1,0 +1,257 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cassandra.pig;
+
+import java.io.IOException;
+import java.nio.charset.CharacterCodingException;
+import java.util.Iterator;
+
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.thrift.AuthenticationException;
+import org.apache.cassandra.thrift.AuthorizationException;
+import org.apache.cassandra.thrift.InvalidRequestException;
+import org.apache.cassandra.thrift.NotFoundException;
+import org.apache.cassandra.thrift.SchemaDisagreementException;
+import org.apache.cassandra.thrift.TimedOutException;
+import org.apache.cassandra.thrift.UnavailableException;
+import org.apache.pig.data.DataBag;
+import org.apache.pig.data.Tuple;
+import org.apache.thrift.TException;
+import org.apache.thrift.transport.TTransportException;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class CqlTableTest extends PigTestBase
+{
+private static String[] statements = {
+CREATE KEYSPACE cql3ks WITH replication = {'class':
'SimpleStrategy', 'replication_factor' : 1},
+USE cql3ks;,
+
+CREATE TABLE cqltable (key1 text, key2 int, column1 int, column2
float, primary key(key1, key2)),
+INSERT INTO cqltable (key1, key2, column1, column2) values
('key1', 111, 100, 10.1),
+CREATE TABLE compactcqltable (key1 text, column1 int, column2
float, primary key(key1)) WITH COMPACT STORAGE,
+INSERT INTO compactcqltable (key1, column1, column2) values
('key1', 100, 10.1),
+
+CREATE TABLE test (a int PRIMARY KEY, b int);,
+CREATE INDEX test_b on test (b);,
+
+CREATE TABLE moredata (x int PRIMARY KEY, y int);,
+INSERT INTO test (a,b) VALUES (1,1);,
+INSERT INTO test (a,b) VALUES (2,2);,
+INSERT INTO test (a,b) VALUES (3,3);,
+INSERT INTO moredata (x, y) VALUES (4,4);,
+INSERT INTO moredata (x, y) VALUES (5,5);,
+INSERT INTO moredata (x, y) VALUES (6,6);,
+
+CREATE TABLE compotable (a int, b int, c text, d text, PRIMARY
KEY (a,b,c));,
+INSERT INTO compotable (a, b , c , d ) VALUES (
1,1,'One','match');,
+INSERT INTO compotable (a, b , c , d ) VALUES (
2,2,'Two','match');,
+INSERT INTO compotable (a, b , c , d ) VALUES (
3,3,'Three','match');,
+INSERT INTO compotable (a, b , c , d ) VALUES (
4,4,'Four','match');,
+
+create table compmore (id int PRIMARY KEY, x int, y int, z text,
data text);,
+INSERT INTO compmore (id, x, y, z,data) VALUES
(1,5,6,'Fix','nomatch');,
+INSERT INTO compmore (id, x, y, z,data) VALUES
(2,6,5,'Sive','nomatch');,
+INSERT INTO
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55d8da44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55d8da44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55d8da44 Branch: refs/heads/cassandra-2.0 Commit: 55d8da44bc270c1dcaef013dec287e9cb9b6865f Parents: 0520aeb c92b20b Author: Jonathan Ellis jbel...@apache.org Authored: Wed Feb 19 08:33:25 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Feb 19 08:33:25 2014 -0600 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java test/unit/org/apache/cassandra/db/CleanupTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0e4f00c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0e4f00c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0e4f00c Branch: refs/heads/cassandra-2.0 Commit: b0e4f00c8c3986c0702f2b08b0d2cd4dd18b1dbf Parents: 662f546 7787dea Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Feb 12 01:51:09 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Feb 12 01:51:09 2014 +0300 -- CHANGES.txt | 1 + .../cql3/statements/ModificationStatement.java | 28 +++- 2 files changed, 28 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0e4f00c/CHANGES.txt -- diff --cc CHANGES.txt index 16cbd0a,56059a1..aec6f5e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -16,33 -3,24 +16,34 @@@ Merged from 1.2 * Fix partition and range deletes not triggering flush (CASSANDRA-6655) * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) * Compact hints after partial replay to clean out tombstones (CASSANDRA-) + * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649) - -1.2.15 - * Move handling of migration event source to solve bootstrap race (CASSANDRA-6648) - * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647) - - -1.2.14 - * Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592) - * add cassandra.default_messaging_version property to allow easier - upgrading from 1.1 (CASSANDRA-6619) - * Allow executing CREATE statements multiple times (CASSANDRA-6471) - * Don't send confusing info with timeouts (CASSANDRA-6491) - * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) - * Don't drop local mutations without a hint (CASSANDRA-6510) - * Don't allow null max_hint_window_in_ms (CASSANDRA-6419) - * Validate SliceRange start and finish lengths (CASSANDRA-6521) +2.0.5 + * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) + * Add ks.cf names to tombstone logging (CASSANDRA-6597) + * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) + * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) + * Delete unfinished compaction incrementally (CASSANDRA-6086) + * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) + * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485) + * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584) + * Don't special case received counts in CAS timeout exceptions (CASSANDRA-6595) + * Add support for 2.1 global counter shards (CASSANDRA-6505) + * Fix NPE when streaming connection is not yet established (CASSANDRA-6210) + * Avoid rare duplicate read repair triggering (CASSANDRA-6606) + * Fix paging discardFirst (CASSANDRA-6555) + * Fix ArrayIndexOutOfBoundsException in 2ndary index query (CASSANDRA-6470) + * Release sstables upon rebuilding 2i (CASSANDRA-6635) + * Add AbstractCompactionStrategy.startup() method (CASSANDRA-6637) + * SSTableScanner may skip rows during cleanup (CASSANDRA-6638) + * sstables from stalled repair sessions can resurrect deleted data (CASSANDRA-6503) + * Switch stress to use ITransportFactory (CASSANDRA-6641) + * Fix IllegalArgumentException during prepare (CASSANDRA-6592) + * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517) + * Fix direct Memory on architectures that do not support unaligned long access + (CASSANDRA-6628) + * Let scrub optionally skip broken counter partitions (CASSANDRA-5930) +Merged from 1.2: * fsync compression metadata (CASSANDRA-6531) * Validate CF existence on execution for prepared statement (CASSANDRA-6535) * Add ability to throttle batchlog replay (CASSANDRA-6550) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0e4f00c/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java -- diff --cc src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index 2567043,1b4dc37..676286c --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@@ -20,10 -20,10 +20,12 @@@ package org.apache.cassandra.cql3.state import java.nio.ByteBuffer; import java.util.*; +import org.github.jamm.MemoryMeter; + import
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: .rat-excludes build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d70cf3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d70cf3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d70cf3b Branch: refs/heads/cassandra-2.0 Commit: 9d70cf3b90e703865b4015bb19d171349953d5c7 Parents: 1141cdb 4cb045a Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Jan 31 13:25:45 2014 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Jan 31 13:25:45 2014 +0100 -- .rat-excludes | 2 +- doc/cql3/CQL.textile | 10 +- .../apache/cassandra/db/BatchlogManagerTest.java | 17 + 3 files changed, 23 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/.rat-excludes -- diff --cc .rat-excludes index cf618c0,112aec0..871f5df --- a/.rat-excludes +++ b/.rat-excludes @@@ -20,12 -18,18 +20,12 @@@ lib/licenses/*.tx .externalToolBuilders/** test/data/serialization/*/* **/*.wpr -conf/schema-sample.txt -drivers/txpy/txcql/cassandra/* -drivers/py/cql/cassandra/* doc/** build.properties.default -test/data/legacy-sstables/** +test/data/** examples/pig/** +examples/triggers/build.xml +examples/triggers/conf/* examples/hadoop_word_count/conf/log4j.properties pylib/cqlshlib/test/** - src/resources/org/apache/cassandra/config/version.properties + src/resources/org/apache/cassandra/config/version.properties http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/doc/cql3/CQL.textile -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64a3e726 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3e726 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64a3e726 Branch: refs/heads/cassandra-2.0 Commit: 64a3e7265b77c41408f8eafaccc3ef093c39eadd Parents: f6a7a5b 52e1def Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jan 31 06:47:28 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jan 31 06:47:28 2014 -0600 -- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3e726/src/java/org/apache/cassandra/service/StorageService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23e86ee1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23e86ee1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23e86ee1
Branch: refs/heads/cassandra-2.0
Commit: 23e86ee15c88068385ca9bb4b14b4501fc0ef231
Parents: 0191b35 9a024b8
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jan 31 12:20:41 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jan 31 12:20:41 2014 -0600
--
build.xml | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23e86ee1/build.xml
--
diff --cc build.xml
index 65d6b8c,667dbe2..a1498b8
--- a/build.xml
+++ b/build.xml
@@@ -1075,10 -1110,9 +1075,10 @@@
/target
target name=test depends=build-test description=Execute unit tests
- testmacro suitename=unit inputdir=${test.unit.src} timeout=6
+ testmacro suitename=unit inputdir=${test.unit.src}
timeout=${test.timeout}
jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/
+ jvmarg
value=-Dmigration-sstable-root=${test.data}/migration-sstables/
jvmarg value=-Dcassandra.ring_delay_ms=1000/
jvmarg value=-Dcassandra.tolerate_sstable_size=true/
/testmacro
@@@ -1085,10 -1122,9 +1088,10 @@@
/target
target name=test-compression depends=build-test description=Execute
unit tests with sstable compression enabled
- testmacro suitename=unit inputdir=${test.unit.src} timeout=6
+ testmacro suitename=unit inputdir=${test.unit.src}
timeout=${test.timeout}
jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/
+ jvmarg
value=-Dmigration-sstable-root=${test.data}/migration-sstables/
jvmarg value=-Dcassandra.test.compression=true/
jvmarg value=-Dcassandra.ring_delay_ms=1000/
jvmarg value=-Dcassandra.tolerate_sstable_size=true/
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ecc6f11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ecc6f11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ecc6f11
Branch: refs/heads/cassandra-2.0
Commit: 8ecc6f1118e49bdfd350321df9ace36b32e734b0
Parents: 23e86ee 3f9875c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jan 31 14:08:15 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jan 31 14:08:15 2014 -0600
--
build.xml | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ecc6f11/build.xml
--
diff --cc build.xml
index a1498b8,150e2fe..6804a1b
--- a/build.xml
+++ b/build.xml
@@@ -1074,24 -1110,19 +1075,21 @@@
/junit
/target
- target name=test depends=build-test description=Execute unit tests
- testmacro suitename=unit inputdir=${test.unit.src}
timeout=${test.timeout}
+ target name=test depends=build-test description=Execute unit tests
+ testmacro suitename=unit inputdir=${test.unit.src}
exclude=**/pig/*.java timeout=${test.timeout}
jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/
+ jvmarg
value=-Dmigration-sstable-root=${test.data}/migration-sstables/
jvmarg value=-Dcassandra.ring_delay_ms=1000/
jvmarg value=-Dcassandra.tolerate_sstable_size=true/
/testmacro
/target
target name=test-compression depends=build-test description=Execute
unit tests with sstable compression enabled
- testmacro suitename=unit inputdir=${test.unit.src}
timeout=${test.timeout}
+ testmacro suitename=unit inputdir=${test.unit.src}
exclude=**/pig/*.java timeout=${test.timeout}
jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/
+ jvmarg
value=-Dmigration-sstable-root=${test.data}/migration-sstables/
jvmarg value=-Dcassandra.test.compression=true/
jvmarg value=-Dcassandra.ring_delay_ms=1000/
jvmarg value=-Dcassandra.tolerate_sstable_size=true/
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd91cf97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd91cf97 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd91cf97 Branch: refs/heads/cassandra-2.0 Commit: cd91cf9746adf93788aa2cca76f8430e33216300 Parents: 39bdb2b 852e27f Author: Jonathan Ellis jbel...@apache.org Authored: Thu Jan 30 10:16:27 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Jan 30 10:16:27 2014 -0600 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9a57fba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9a57fba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9a57fba Branch: refs/heads/cassandra-2.0 Commit: e9a57fbaa4ae206c818657a5cc8e06d8fc2b6f57 Parents: 66a8a55 3575fdc Author: Sylvain Lebresne sylv...@datastax.com Authored: Sun Jan 19 19:35:50 2014 -0800 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Sun Jan 19 19:35:50 2014 -0800 -- CHANGES.txt| 1 + .../apache/cassandra/db/marshal/CompositeType.java | 17 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9a57fba/CHANGES.txt -- diff --cc CHANGES.txt index d165c8b,639e17c..b08f04b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -17,29 -13,10 +17,30 @@@ Merged from 1.2 * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589) * Paginate batchlog replay (CASSANDRA-6569) * skip blocking on streaming during drain (CASSANDRA-6603) + * Improve error message when schema doesn't match loaded sstable (CASSANDRA-6262) -1.2.13 +2.0.4 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418) + * add StorageService.stopDaemon() (CASSANDRA-4268) + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701) + * add client encryption support to sstableloader (CASSANDRA-6378) + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468) + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496) + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483) + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008) + * Fix cleanup ClassCastException (CASSANDRA-6462) + * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410) + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218) + * Fix divide-by-zero in PCI (CASSANDRA-6403) + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395) + * Expose a total memtable size metric for a CF (CASSANDRA-6391) + * cqlsh: handle symlinks properly (CASSANDRA-6425) + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464) + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447) + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527) +Merged from 1.2: * Improved error message on bad properties in DDL queries (CASSANDRA-6453) * Randomize batchlog candidates selection (CASSANDRA-6481) * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9a57fba/src/java/org/apache/cassandra/db/marshal/CompositeType.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24af3525 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24af3525 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24af3525 Branch: refs/heads/cassandra-2.0 Commit: 24af3525f2f036ba116941cee94a56f1d0e46e07 Parents: 886ac6a 3de8454 Author: Jason Brown jasedbr...@gmail.com Authored: Fri Jan 17 15:12:22 2014 -0800 Committer: Jason Brown jasedbr...@gmail.com Committed: Fri Jan 17 15:12:22 2014 -0800 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24af3525/CHANGES.txt -- diff --cc CHANGES.txt index 80bc626,0b49665..d165c8b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -16,29 -12,10 +16,30 @@@ Merged from 1.2 * Avoid StackOverflow when using large IN queries (CASSANDRA-6567) * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589) * Paginate batchlog replay (CASSANDRA-6569) + * skip blocking on streaming during drain (CASSANDRA-6603) -1.2.13 +2.0.4 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418) + * add StorageService.stopDaemon() (CASSANDRA-4268) + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701) + * add client encryption support to sstableloader (CASSANDRA-6378) + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468) + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496) + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483) + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008) + * Fix cleanup ClassCastException (CASSANDRA-6462) + * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410) + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218) + * Fix divide-by-zero in PCI (CASSANDRA-6403) + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395) + * Expose a total memtable size metric for a CF (CASSANDRA-6391) + * cqlsh: handle symlinks properly (CASSANDRA-6425) + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464) + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447) + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527) +Merged from 1.2: * Improved error message on bad properties in DDL queries (CASSANDRA-6453) * Randomize batchlog candidates selection (CASSANDRA-6481) * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71a5127a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71a5127a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71a5127a
Branch: refs/heads/cassandra-2.0
Commit: 71a5127ae530ae2dd436db1b93b3d8e88ba42a46
Parents: 5c86f36 3405878
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Jan 13 10:33:24 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Jan 13 10:33:24 2014 +0100
--
CHANGES.txt | 1 +
.../cassandra/cql3/statements/SelectStatement.java| 11 +++
.../cassandra/service/LeaveAndBootstrapTest.java | 14 +++---
3 files changed, 15 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a5127a/CHANGES.txt
--
diff --cc CHANGES.txt
index e96a8e0,25c105c..1bf5615
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,29 -9,10 +7,30 @@@ Merged from 1.2
* Validate CF existence on execution for prepared statement (CASSANDRA-6535)
* Add ability to throttle batchlog replay (CASSANDRA-6550)
* Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
+ * Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
-1.2.13
+2.0.4
+ * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
+ * add StorageService.stopDaemon() (CASSANDRA-4268)
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
+ * add client encryption support to sstableloader (CASSANDRA-6378)
+ * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
+ * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
+ * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+ * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
+ * Fix cleanup ClassCastException (CASSANDRA-6462)
+ * Reduce gossip memory use by interning VersionedValue strings
(CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: handle symlinks properly (CASSANDRA-6425)
+ * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
+ * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
+ * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
+Merged from 1.2:
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
* Randomize batchlog candidates selection (CASSANDRA-6481)
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a5127a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 133444a,001c77a..c3671be
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -798,32 -710,33 +798,35 @@@ public class SelectStatement implement
ColumnNameBuilder builder = cfDef.getColumnNameBuilder();
for (int i = 0; i columnRestrictions.length - 1; i++)
-
builder.add(columnRestrictions[i].eqValues.get(0).bindAndGet(variables));
+builder.add(columnRestrictions[i].values(variables).get(0));
+
-final ListByteBuffer requested = new
ArrayListByteBuffer(last.eqValues.size());
-IteratorTerm iter = last.eqValues.iterator();
+ListByteBuffer values = last.values(variables);
+final ListByteBuffer requested = new
ArrayListByteBuffer(values.size());
+IteratorByteBuffer iter = values.iterator();
while (iter.hasNext())
{
-Term t = iter.next();
+ByteBuffer t = iter.next();
ColumnNameBuilder b = iter.hasNext() ? builder.copy() : builder;
-requested.add(b.add(t.bindAndGet(variables)).build());
+requested.add(b.add(t).build());
}
-return new IterableIColumn()
+return new IterableColumn()
{
-public IteratorIColumn iterator()
+public IteratorColumn iterator()
{
-return new AbstractIteratorIColumn()
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: NEWS.txt build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5526d54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5526d54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5526d54 Branch: refs/heads/cassandra-2.0 Commit: f5526d5405630a6b7af3ce9e24e102f38d1c268e Parents: c99734c f7f7598 Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Dec 12 20:56:30 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Dec 12 20:56:30 2013 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5526d54/CHANGES.txt -- diff --cc CHANGES.txt index e0338db,fa48a27..30f863e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -22,45 -16,10 +22,46 @@@ Merged from 1.2 (CASSANDRA-6413) * (Hadoop) add describe_local_ring (CASSANDRA-6268) * Fix handling of concurrent directory creation failure (CASSANDRA-6459) + * Randomize batchlog candidates selection (CASSANDRA-6481) -1.2.12 +2.0.3 + * Fix FD leak on slice read path (CASSANDRA-6275) + * Cancel read meter task when closing SSTR (CASSANDRA-6358) + * free off-heap IndexSummary during bulk (CASSANDRA-6359) + * Recover from IOException in accept() thread (CASSANDRA-6349) + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) + * Fix trying to hint timed out counter writes (CASSANDRA-6322) + * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) + * Avoid flushing compaction_history after each operation (CASSANDRA-6287) + * Fix repair assertion error when tombstones expire (CASSANDRA-6277) + * Skip loading corrupt key cache (CASSANDRA-6260) + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) + * Compact hottest sstables first and optionally omit coldest from + compaction entirely (CASSANDRA-6109) + * Fix modifying column_metadata from thrift (CASSANDRA-6182) + * cqlsh: fix LIST USERS output (CASSANDRA-6242) + * Add IRequestSink interface (CASSANDRA-6248) + * Update memtable size while flushing (CASSANDRA-6249) + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252) + * Require Permission.SELECT for CAS updates (CASSANDRA-6247) + * New CQL-aware SSTableWriter (CASSANDRA-5894) + * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270) + * Correctly throw error when frame too large (CASSANDRA-5981) + * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299) + * Fix CQL3 table validation in Thrift (CASSANDRA-6140) + * Fix bug missing results with IN clauses (CASSANDRA-6327) + * Fix paging with reversed slices (CASSANDRA-6343) + * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337) + * Support NaN and Infinity as float literals (CASSANDRA-6003) + * Remove RF from nodetool ring output (CASSANDRA-6289) + * Fix attempting to flush empty rows (CASSANDRA-6374) + * Fix potential out of bounds exception when paging (CASSANDRA-6333) +Merged from 1.2: + * Optimize FD phi calculation (CASSANDRA-6386) + * Improve initial FD phi estimate when starting up (CASSANDRA-6385) + * Don't list CQL3 table in CLI describe even if named explicitely + (CASSANDRA-5750) * Invalidate row cache when dropping CF (CASSANDRA-6351) * add non-jamm path for cached statements (CASSANDRA-6293) * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5526d54/src/java/org/apache/cassandra/service/StorageProxy.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb7eb868 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb7eb868 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb7eb868 Branch: refs/heads/cassandra-2.0 Commit: cb7eb8687d332debf1d1aa1fab9cba9c68638763 Parents: fcb2c65 5f79f53 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Nov 20 11:54:57 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Nov 20 11:54:57 2013 -0600 -- examples/pig/example-script-cql.pig | 11 ++ examples/pig/example-script.pig | 14 + .../cassandra/pig/CqlTableDataTypeTest.java | 21 .../pig/ThriftColumnFamilyDataTypeTest.java | 21 4 files changed, 54 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb7eb868/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java -- diff --cc test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java index 352b2e2,c81ff07..1ae9806 --- a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java +++ b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java @@@ -1,22 -1,25 +1,43 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.cassandra.pig; + /* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.io.IOException; import java.nio.charset.CharacterCodingException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb7eb868/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java -- diff --cc test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java index cc54620,2cf1c89..7bccc23 --- a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java +++ b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java @@@ -1,22 -1,25 +1,43 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.cassandra.pig; + /* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/tools/SSTableImport.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6af75a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6af75a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6af75a1
Branch: refs/heads/cassandra-2.0
Commit: c6af75a19b3d19fdb3aa6040b655793b58b0db97
Parents: 2cc4670 3cb5854
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 12 19:13:00 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 12 19:13:00 2013 +0100
--
CHANGES.txt | 2 ++
.../cql3/statements/SelectStatement.java | 2 +-
.../org/apache/cassandra/tools/SSTableImport.java | 18 +++---
3 files changed, 18 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6af75a1/CHANGES.txt
--
diff --cc CHANGES.txt
index cc5fb9e,7abf5d8..424a9f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,42 -14,11 +34,44 @@@ Merged from 1.2
* Fix potential socket leak in connectionpool creation (CASSANDRA-6308)
* Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy (CASSANDRA-6238)
* cqlsh: handle 'null' as session duration (CASSANDRA-6317)
+ * Fix json2sstable handling of range tombstones (CASSANDRA-6316)
+ * Fix missing one row in reverse query (CASSANDRA-6330)
-1.2.11
+2.0.2
+ * Update FailureDetector to use nanontime (CASSANDRA-4925)
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows
(CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full
startup (CASSANDRA-6166)
+ * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
+ * Add reloadtriggers command to nodetool (CASSANDRA-4949)
+ * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
+ * Fix sstable loader (CASSANDRA-6205)
+ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
+ * Fix NPE while loading paxos state (CASSANDRA-6211)
+ * cqlsh: add SHOW SESSION tracing-session command (CASSANDRA-6228)
+Merged from 1.2:
+ * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
* Add a warning for small LCS sstable size (CASSANDRA-6191)
* Add ability to list specific KS/CF combinations in nodetool cfstats
(CASSANDRA-4191)
* Mark CF clean if a mutation raced the drop and got it marked dirty
(CASSANDRA-5946)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6af75a1/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 14400d5,c1c88ba..4b9a334
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -405,35 -374,17 +405,35 @@@ public class SelectStatement implement
}
}
-private int getLimit()
+private int getLimit(ListByteBuffer variables) throws
InvalidRequestException
{
-// Internally, we don't support exclusive bounds for COMPACT slices.
Instead, when we know we have an exlcusive
-// slice on a COMPACT table,
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72f47a4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72f47a4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72f47a4e Branch: refs/heads/cassandra-2.0 Commit: 72f47a4e59beb4f8fa8cc4533425871434f0690a Parents: 58014d3 9afac24 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sun Oct 20 21:56:52 2013 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sun Oct 20 21:56:52 2013 -0400 -- src/java/org/apache/cassandra/cli/CliMain.java | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/72f47a4e/src/java/org/apache/cassandra/cli/CliMain.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3ad2e82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3ad2e82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3ad2e82
Branch: refs/heads/cassandra-2.0
Commit: a3ad2e82249b88d4a05f24140948cdbc809d14f3
Parents: 8a506e6 639c01a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 11 15:30:27 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 11 15:30:27 2013 -0500
--
.../hadoop/pig/AbstractCassandraStorage.java| 97 ++--
.../cassandra/hadoop/pig/CassandraStorage.java | 55 +++
.../apache/cassandra/hadoop/pig/CqlStorage.java | 8 +-
3 files changed, 109 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3ad2e82/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
index c881734,dbebfb5..486c781
--- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
@@@ -127,14 -128,36 +128,37 @@@ public abstract class AbstractCassandra
setTupleValue(pair, 0, cassandraToObj(comparator, col.name()));
// value
-if (col instanceof Column)
+MapByteBuffer,AbstractType validators = getValidatorMap(cfDef);
+if (validators.get(col.name()) == null)
{
- MapMarshallerType, AbstractType marshallers =
getDefaultMarshallers(cfDef);
- setTupleValue(pair, 1,
cassandraToObj(marshallers.get(MarshallerType.DEFAULT_VALIDATOR), col.value()));
+ // standard
+ MapByteBuffer,AbstractType validators = getValidatorMap(cfDef);
+ ByteBuffer colName;
+ if (cfInfo.cql3Table !cfInfo.compactCqlTable)
+ {
+ ByteBuffer[] names = ((AbstractCompositeType)
parseType(cfDef.comparator_type)).split(col.name());
+ colName = names[names.length-1];
+ }
+ else
+ colName = col.name();
+ if (validators.get(colName) == null)
+ {
+ MapMarshallerType, AbstractType marshallers =
getDefaultMarshallers(cfDef);
+ setTupleValue(pair, 1,
cassandraToObj(marshallers.get(MarshallerType.DEFAULT_VALIDATOR), col.value()));
+ }
+ else
+ setTupleValue(pair, 1,
cassandraToObj(validators.get(colName), col.value()));
+ return pair;
}
else
- setTupleValue(pair, 1, cassandraToObj(validators.get(col.name()),
col.value()));
+ {
+ // super
+ ArrayListTuple subcols = new ArrayListTuple();
+ for (IColumn subcol : col.getSubColumns())
+ subcols.add(columnToTuple(subcol, cfInfo,
parseType(cfDef.getSubcomparator_type(;
+
+ pair.set(1, new DefaultDataBag(subcols));
+ }
return pair;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3ad2e82/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index 4083236,a7cc1ad..d9c55a1
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -124,9 -123,9 +125,9 @@@ public class CassandraStorage extends A
key = (ByteBuffer)reader.getCurrentKey();
tuple = keyToTuple(key, cfDef,
parseType(cfDef.getKey_validation_class()));
}
-for (Map.EntryByteBuffer, IColumn entry :
lastRow.entrySet())
+for (Map.EntryByteBuffer, Column entry :
lastRow.entrySet())
{
- bag.add(columnToTuple(entry.getValue(), cfDef,
parseType(cfDef.getComparator_type(;
+ bag.add(columnToTuple(entry.getValue(), cfInfo,
parseType(cfDef.getComparator_type(;
}
lastKey = null;
lastRow = null;
@@@ -162,9 -161,9 +163,9 @@@
tuple = keyToTuple(lastKey, cfDef,
parseType(cfDef.getKey_validation_class()));
else
addKeyToTuple(tuple, lastKey, cfDef,
parseType(cfDef.getKey_validation_class()));
-
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b557f7e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b557f7e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b557f7e3 Branch: refs/heads/cassandra-2.0 Commit: b557f7e3756e18591e78d791178288e463f17669 Parents: 21ab8f8 102c3c1 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Oct 8 12:04:56 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Oct 8 12:04:56 2013 -0500 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d245c35c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d245c35c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d245c35c Branch: refs/heads/cassandra-2.0 Commit: d245c35c8787342bfd1874d63fe360647c9c13e9 Parents: 518c0df cf38e9e Author: Jonathan Ellis jbel...@apache.org Authored: Fri Oct 4 16:32:27 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Oct 4 16:32:27 2013 -0500 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: NEWS.txt build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c316afb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c316afb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c316afb Branch: refs/heads/cassandra-2.0 Commit: 2c316afb2160de703f79d1c163413c7d801b3f1e Parents: 6e3a241 9375363 Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Sep 19 12:28:04 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Sep 19 12:28:04 2013 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 15 ++- .../org/apache/cassandra/tools/SSTableImport.java| 7 ++- 3 files changed, 21 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c316afb/CHANGES.txt -- diff --cc CHANGES.txt index c218af5,f853cce..6003ed2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -49,54 -21,14 +49,55 @@@ Merged from 1.2 * Fix snapshots in use get deleted during snapshot repair (CASSANDRA-6011) * Move hints and exception count to o.a.c.metrics (CASSANDRA-6017) * Fix memory leak in snapshot repair (CASSANDRA-6047) + * Fix sstable2sjon for CQL3 tables (CASSANDRA-5852) -1.2.9 +2.0.0 + * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) + * Fix periodic memtable flushing behavior with clean memtables (CASSANDRA-5931) + * Fix dateOf() function for pre-2.0 timestamp columns (CASSANDRA-5928) + * Fix SSTable unintentionally loads BF when opened for batch (CASSANDRA-5938) + * Add stream session progress to JMX (CASSANDRA-4757) + * Fix NPE during CAS operation (CASSANDRA-5925) +Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases - (CASSANDRA-5800) - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831) + * Don't announce schema version until we've loaded the changes locally + (CASSANDRA-5904) + * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903) + * Properly handle parsing huge map and set literals (CASSANDRA-5893) + + +2.0.0-rc2 + * enable vnodes by default (CASSANDRA-5869) + * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) + * Fix (some) 2i on composite components omissions (CASSANDRA-5851) + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880) +Merged from 1.2: + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) + * cqlsh: add support for multiline comments (CASSANDRA-5798) + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns + (CASSANDRA-5856) + + +2.0.0-rc1 + * improve DecimalSerializer performance (CASSANDRA-5837) + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819) + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822) + * Fix buffer underflow on socket close (CASSANDRA-5792) +Merged from 1.2: + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) + * cqlsh: add collections support to COPY (CASSANDRA-5698) + * retry important messages for any IOException (CASSANDRA-5804) + * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626) + * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812) * fix bulk-loading compressed sstables (CASSANDRA-5820) * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c316afb/src/java/org/apache/cassandra/config/CFMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c316afb/src/java/org/apache/cassandra/tools/SSTableImport.java -- diff --cc src/java/org/apache/cassandra/tools/SSTableImport.java index bd74541,68d4397..79584c5 --- a/src/java/org/apache/cassandra/tools/SSTableImport.java +++ b/src/java/org/apache/cassandra/tools/SSTableImport.java @@@ -245,12 -243,16
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c84b140
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c84b140
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c84b140
Branch: refs/heads/cassandra-2.0
Commit: 2c84b1403f9bfdaf563f62c6d1751f80627e9915
Parents: f6fda9c 8bedb57
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Sep 11 08:35:24 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Sep 11 08:35:24 2013 +0200
--
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/cql3/Cql.g| 2 +-
.../cassandra/cql3/functions/TimeuuidFcts.java | 24
.../cassandra/cql3/functions/TokenFct.java | 7 +-
4 files changed, 29 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c84b140/CHANGES.txt
--
diff --cc CHANGES.txt
index 808c558,e420a7b..68829d8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -27,54 -11,15 +27,56 @@@ Merged from 1.2
* Correctly handle limits in CompositesSearcher (CASSANDRA-5975)
* Pig: handle CQL collections (CASSANDRA-5867)
* Pass the updated cf to the PRSI index() method (CASSANDRA-5999)
+ * Allow empty CQL3 batches (as no-op) (CASSANDRA-5994)
+ * Support null in CQL3 functions (CASSANDRA-5910)
-1.2.9
+2.0.0
+ * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138)
+ * Fix periodic memtable flushing behavior with clean memtables
(CASSANDRA-5931)
+ * Fix dateOf() function for pre-2.0 timestamp columns (CASSANDRA-5928)
+ * Fix SSTable unintentionally loads BF when opened for batch (CASSANDRA-5938)
+ * Add stream session progress to JMX (CASSANDRA-4757)
+ * Fix NPE during CAS operation (CASSANDRA-5925)
+Merged from 1.2:
* Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900)
- * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
- (CASSANDRA-5800)
- * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
+ * Don't announce schema version until we've loaded the changes locally
+ (CASSANDRA-5904)
+ * Fix to support off heap bloom filters size greater than 2 GB
(CASSANDRA-5903)
+ * Properly handle parsing huge map and set literals (CASSANDRA-5893)
+
+
+2.0.0-rc2
+ * enable vnodes by default (CASSANDRA-5869)
+ * fix CAS contention timeout (CASSANDRA-5830)
+ * fix HsHa to respect max frame size (CASSANDRA-4573)
+ * Fix (some) 2i on composite components omissions (CASSANDRA-5851)
+ * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880)
+Merged from 1.2:
+ * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
+ * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
+ * cqlsh: add support for multiline comments (CASSANDRA-5798)
+ * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
+ (CASSANDRA-5856)
+
+
+2.0.0-rc1
+ * improve DecimalSerializer performance (CASSANDRA-5837)
+ * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
+ * fix schema-related trigger issues (CASSANDRA-5774)
+ * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
+ * Fix assertion error during repair (CASSANDRA-5801)
+ * Fix range tombstone bug (CASSANDRA-5805)
+ * DC-local CAS (CASSANDRA-5797)
+ * Add a native_protocol_version column to the system.local table
(CASSANRDA-5819)
+ * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
+ * Fix buffer underflow on socket close (CASSANDRA-5792)
+Merged from 1.2:
+ * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
+ * cqlsh: add collections support to COPY (CASSANDRA-5698)
+ * retry important messages for any IOException (CASSANDRA-5804)
+ * Allow empty IN relations in SELECT/UPDATE/DELETE statements
(CASSANDRA-5626)
+ * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
* fix bulk-loading compressed sstables (CASSANDRA-5820)
* (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter
(CASSANDRA-5824)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c84b140/src/java/org/apache/cassandra/cql3/Cql.g
--
diff --cc src/java/org/apache/cassandra/cql3/Cql.g
index 0e1be34,2445bf2..61bf3c8
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@@ -419,10 -386,10 +419,10 @@@ batchStatement returns [BatchStatement.
: K_BEGIN
( K_UNLOGGED { type = BatchStatement.Type.UNLOGGED; } | K_COUNTER {
type =
