cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 10 Oct 2014 13:57:17 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/CounterUpdateColumn.java


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

Branch: refs/heads/cassandra-2.1
Commit: e711929e74e70b669625c1dedc0406c3fcf45669
Parents: 1bae25a b7adf98
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Oct 10 16:57:08 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Oct 10 16:57:08 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                   | 1 +
 src/java/org/apache/cassandra/db/BufferCounterUpdateCell.java | 6 ++++++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e711929e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 688dc32,bc12402..5666a9d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,75 -1,5 +1,76 @@@
 -2.0.11:
 +2.1.1
 + * 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 counters in supercolumns during live upgrades from 1.2 (CASSANDRA-7188)
   * Notify DT subscribers when a column family is truncated (CASSANDRA-8088)
   * Add sanity check of $JAVA on startup (CASSANDRA-7676)
   * Schedule fat client schema pull on join (CASSANDRA-7993)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e711929e/src/java/org/apache/cassandra/db/BufferCounterUpdateCell.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/BufferCounterUpdateCell.java
index de62b17,0000000..f7df3ea
mode 100644,000000..100644
--- a/src/java/org/apache/cassandra/db/BufferCounterUpdateCell.java
+++ b/src/java/org/apache/cassandra/db/BufferCounterUpdateCell.java
@@@ -1,90 -1,0 +1,96 @@@
 +/*
 + * 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.db;
 +
 +import java.nio.ByteBuffer;
 +
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.db.composites.CellName;
 +import org.apache.cassandra.db.composites.CellNameType;
 +import org.apache.cassandra.utils.ByteBufferUtil;
 +import org.apache.cassandra.utils.concurrent.OpOrder;
 +import org.apache.cassandra.utils.memory.AbstractAllocator;
 +import org.apache.cassandra.utils.memory.MemtableAllocator;
 +
 +public class BufferCounterUpdateCell extends BufferCell implements CounterUpdateCell
 +{
 +    public BufferCounterUpdateCell(CellName name, long value, long timestamp)
 +    {
 +        this(name, ByteBufferUtil.bytes(value), timestamp);
 +    }
 +
 +    public BufferCounterUpdateCell(CellName name, ByteBuffer value, long timestamp)
 +    {
 +        super(name, value, timestamp);
 +    }
 +
++    @Override
++    public Cell withUpdatedName(CellName newName)
++    {
++        return new BufferCounterUpdateCell(newName, value, timestamp);
++    }
++
 +    public long delta()
 +    {
 +        return value().getLong(value.position());
 +    }
 +
 +    @Override
 +    public Cell diff(Cell cell)
 +    {
 +        // Diff is used during reads, but we should never read those columns
 +        throw new UnsupportedOperationException("This operation is unsupported on CounterUpdateCell.");
 +    }
 +
 +    @Override
 +    public Cell reconcile(Cell cell)
 +    {
 +        // No matter what the counter cell's timestamp is, a tombstone always takes precedence.
See CASSANDRA-7346.
 +        if (cell instanceof DeletedCell)
 +            return cell;
 +
 +        assert cell instanceof CounterUpdateCell : "Wrong class type.";
 +
 +        // The only time this could happen is if a batch ships two increments for the same
cell. Hence we simply sum the deltas.
 +        return new BufferCounterUpdateCell(name, delta() + ((CounterUpdateCell) cell).delta(),
Math.max(timestamp, cell.timestamp()));
 +    }
 +
 +    @Override
 +    public int serializationFlags()
 +    {
 +        return ColumnSerializer.COUNTER_UPDATE_MASK;
 +    }
 +
 +    @Override
 +    public Cell localCopy(CFMetaData metadata, AbstractAllocator allocator)
 +    {
 +        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    public Cell localCopy(CFMetaData metadata, MemtableAllocator allocator, OpOrder.Group
opGroup)
 +    {
 +        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    public String getString(CellNameType comparator)
 +    {
 +        return String.format("%s:%s@%d", comparator.getString(name()), ByteBufferUtil.toLong(value),
timestamp());
 +    }
 +}


Mime
View raw message