[2/5] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da94781a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da94781a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da94781a Branch: refs/heads/trunk Commit: da94781a2c20394c1fc4f3d488a694ddad45228f Parents: 6bd402d 9a5aef0 Author: Benjamin Lerer Authored: Mon Dec 12 13:26:35 2016 +0100 Committer: Benjamin Lerer Committed: Mon Dec 12 13:46:24 2016 +0100 -- CHANGES.txt | 1 + .../operations/InsertUpdateIfConditionTest.java | 126 +++ 2 files changed, 76 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/da94781a/CHANGES.txt -- diff --cc CHANGES.txt index 266849a,134a37d..bbd47c1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ -2.2.9 +3.0.11 + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * CQL often queries static columns unnecessarily (CASSANDRA-12768) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) http://git-wip-us.apache.org/repos/asf/cassandra/blob/da94781a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java index ec81cf2,4a209e6..f1dc9a2 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java @@@ -23,11 -23,8 +23,10 @@@ import org.junit.Test import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.SyntaxException; +import org.apache.cassandra.schema.SchemaKeyspace; +import static java.lang.String.format; import static org.junit.Assert.assertEquals; - import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; public class InsertUpdateIfConditionTest extends CQLTester @@@ -111,13 -111,8 +113,13 @@@ // Shouldn't apply assertRows(execute("UPDATE %s SET v1 = 3, v2 = 'bar' WHERE k = 0 IF EXISTS"), row(false)); - // Shouldn't apply + // Should apply +assertEmpty(execute("SELECT * FROM %s WHERE k = 0")); - assertRows(execute("DELETE FROM %s WHERE k = 0 IF v1 IN (null)"), row(true)); + assertRows(execute("DELETE FROM %s WHERE k = 0 IF v1 IN (?)", (Integer) null), row(true)); + +createTable(" CREATE TABLE %s (k int, c int, v1 text, PRIMARY KEY(k, c))"); +assertInvalidMessage("IN on the clustering key columns is not supported with conditional updates", + "UPDATE %s SET v1 = 'A' WHERE k = 0 AND c IN (1, 2) IF EXISTS"); } /** @@@ -194,58 -191,33 +209,61 @@@ assertRows(execute("DELETE FROM %s WHERE k='k' AND i=0 IF EXISTS"), row(false)); // CASSANDRA-6430 -assertInvalidMessage("DELETE statements must restrict all PRIMARY KEY columns with equality relations in order to use IF conditions, but column 'i' is not restricted", +assertInvalidMessage("DELETE statements must restrict all PRIMARY KEY columns with equality relations in order to delete non static columns", "DELETE FROM %s WHERE k = 'k' IF EXISTS"); -assertInvalidMessage("DELETE statements must restrict all PRIMARY KEY columns with equality relations in order to use IF conditions, but column 'i' is not restricted", +assertInvalidMessage("DELETE statements must restrict all PRIMARY KEY columns with equality relations in order to delete non static colum
[2/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/752f5d56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/752f5d56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/752f5d56 Branch: refs/heads/cassandra-3.X Commit: 752f5d566a5fd01518071943beda9945e0703cef Parents: d9b06e8 dd41526 Author: Paulo Motta Authored: Thu Dec 8 17:24:22 2016 -0200 Committer: Paulo Motta Committed: Thu Dec 8 17:24:22 2016 -0200 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/config/Config.java | 6 +- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 + .../org/apache/cassandra/net/OutboundTcpConnectionPool.java| 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/CHANGES.txt -- diff --cc CHANGES.txt index 21cf5be,6b2a9c0..1da48bd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -2.2.9 +3.0.11 + * CQL often queries static columns unnecessarily (CASSANDRA-12768) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[2/5] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/472f6161 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/472f6161 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/472f6161 Branch: refs/heads/trunk Commit: 472f61613e4bf2a2f492f49300e6e3d06c5ad728 Parents: 92594d8 3de6e9d Author: Benjamin Lerer Authored: Tue Nov 8 18:01:55 2016 +0100 Committer: Benjamin Lerer Committed: Tue Nov 8 18:01:55 2016 +0100 -- CHANGES.txt | 1 + test/unit/org/apache/cassandra/Util.java | 6 -- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/472f6161/CHANGES.txt -- diff --cc CHANGES.txt index d3043b8,b550885..cc5b003 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,5 +1,36 @@@ -2.2.9 +3.0.10 + * Batch with multiple conditional updates for the same partition causes AssertionError (CASSANDRA-12867) + * Make AbstractReplicationStrategy extendable from outside its package (CASSANDRA-12788) + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854) + * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296) + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689) + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801) + * Include SSTable filename in compacting large row message (CASSANDRA-12384) + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330) + * Fix ViewTest.testCompaction (CASSANDRA-12789) + * Improve avg aggregate functions (CASSANDRA-12417) + * Preserve quoted reserved keyword column names in MV creation (CASSANDRA-11803) + * nodetool stopdaemon errors out (CASSANDRA-12646) + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268) + * mx4j does not work in 3.0.8 (CASSANDRA-12274) + * Abort cqlsh copy-from in case of no answer after prolonged period of time (CASSANDRA-12740) + * Avoid sstable corrupt exception due to dropped static column (CASSANDRA-12582) + * Make stress use client mode to avoid checking commit log size on startup (CASSANDRA-12478) + * Fix exceptions with new vnode allocation (CASSANDRA-12715) + * Unify drain and shutdown processes (CASSANDRA-12509) + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706) + * Fix failure in LogTransactionTest (CASSANDRA-12632) + * Fix potentially incomplete non-frozen UDT values when querying with the + full primary key specified (CASSANDRA-12605) + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670) + * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060) + * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516) + * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472) + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) + * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) + * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) +Merged from 2.2: + * Fix Util.spinAssertEquals (CASSANDRA-12283) * Fix potential NPE for compactionstats (CASSANDRA-12462) * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) http://git-wip-us.apache.org/repos/asf/cassandra/blob/472f6161/test/unit/org/apache/cassandra/Util.java -- diff --cc test/unit/org/apache/cassandra/Util.java index d04ca9b,f6b4771..e8b42bc --- a/test/unit/org/apache/cassandra/Util.java +++ b/test/unit/org/apache/cassandra/Util.java @@@ -28,29 -27,21 +28,31 @@@ import java.nio.ByteBuffer import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Supplier; -import com.google.common.base.Supplier; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; +import org.apache.commons.lang3.StringUtils; + +import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.ColumnIdentifier; + import org.apache.cassandra.db.*; -import org.apache.cassandra.db.composites.*; +import or
[2/5] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22d6f649 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22d6f649 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22d6f649 Branch: refs/heads/trunk Commit: 22d6f649ffae901f2893dc973c324e8fbb8eea69 Parents: 3e37b4a fa2fa60 Author: Benjamin Lerer Authored: Wed Jan 27 17:29:33 2016 +0100 Committer: Benjamin Lerer Committed: Wed Jan 27 17:29:51 2016 +0100 -- --
[2/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f785f8b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f785f8b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f785f8b5 Branch: refs/heads/trunk Commit: f785f8b5c1702a41e27b6217b2cf2dea8c316c19 Parents: ccb20ad a320737 Author: T Jake Luciani Authored: Tue Dec 1 22:39:39 2015 -0500 Committer: T Jake Luciani Committed: Tue Dec 1 22:39:39 2015 -0500 -- --
[2/5] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b430eee/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java index d30937f,b8f6b9f..e8bf1fd --- a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java @@@ -17,38 -17,35 +17,44 @@@ */ package org.apache.cassandra.cql3.validation.entities; - import java.nio.ByteBuffer; - import java.util.*; - - import org.apache.cassandra.db.DeletionTime; - import org.apache.cassandra.utils.Pair; - import org.apache.commons.lang3.StringUtils; +import org.junit.Before; +import org.junit.Test; ++import static org.apache.cassandra.Util.throwAssert; ++import static org.junit.Assert.assertEquals; ++import static org.junit.Assert.assertFalse; ++import static org.junit.Assert.assertNotNull; + import static org.junit.Assert.assertTrue; + import static org.junit.Assert.fail; + + import java.nio.ByteBuffer; + import java.util.HashMap; -import java.util.List; + import java.util.Locale; + import java.util.Map; -import java.util.Set; + import java.util.UUID; ++import java.util.concurrent.Callable; + import java.util.concurrent.CountDownLatch; +import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.db.ColumnFamily; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.statements.IndexTarget; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.IndexExpression; -import org.apache.cassandra.db.composites.CellName; -import org.apache.cassandra.db.index.IndexNotAvailableException; -import org.apache.cassandra.db.index.PerRowSecondaryIndex; -import org.apache.cassandra.db.index.SecondaryIndexSearcher; -import org.apache.cassandra.db.index.composites.CompositesSearcher; ++import org.apache.cassandra.db.DeletionTime; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.rows.Cell; +import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.SyntaxException; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.concurrent.OpOrder.Group; ++import org.apache.cassandra.index.IndexNotAvailableException; +import org.apache.cassandra.index.SecondaryIndexManager; +import org.apache.cassandra.index.StubIndex; ++import org.apache.cassandra.index.internal.CustomCassandraIndex; +import org.apache.cassandra.schema.IndexMetadata; +import org.apache.cassandra.utils.ByteBufferUtil; - - import static org.apache.cassandra.Util.throwAssert; - import static org.junit.Assert.assertEquals; - import static org.junit.Assert.assertFalse; - import static org.junit.Assert.assertNotNull; - import static org.junit.Assert.assertTrue; - import static org.junit.Assert.fail; ++import org.apache.cassandra.utils.Pair; + import org.apache.commons.lang3.StringUtils; -import org.junit.Test; public class SecondaryIndexTest extends CQLTester { @@@ -668,16 -575,9 +674,16 @@@ { createTable("CREATE TABLE %s(a int, b frozen>, PRIMARY KEY (a))"); createIndex("CREATE INDEX ON %s(full(b))"); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(0, ByteBuffer.allocate(1024 * 65)); failInsert("INSERT INTO %s (a, b) VALUES (0, ?)", map); +failInsert("INSERT INTO %s (a, b) VALUES (0, ?) IF NOT EXISTS", map); +failInsert("BEGIN BATCH\n" + + "INSERT INTO %s (a, b) VALUES (0, ?);\n" + + "APPLY BATCH", map); +failInsert("BEGIN BATCH\n" + + "INSERT INTO %s (a, b) VALUES (0, ?) IF NOT EXISTS;\n" + + "APPLY BATCH", map); } public void failInsert(String insertCQL, Object...args) throws Throwable @@@ -755,180 -655,134 +761,234 @@@ } @Test +public void testMultipleIndexesOnOneColumn() throws Throwable +{ +String indexClassName = StubIndex.class.getName(); +createTable("CREATE TABLE %s (a int, b int, c int, PRIMARY KEY ((a), b))"); +// uses different options otherwise the two indexes are considered duplicates +createIndex(String.format("CREATE CUSTOM INDEX c_idx_1 ON %%s(c) USING '%s' WITH OPTIONS = {'foo':'a'}", indexClassName)); +createIndex(String.format("CREATE CUSTOM INDEX c_idx_2 ON %%s(c) USING '%s' WITH OPTIONS = {'foo':'b'}", indexClassName)); +
[2/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e42164b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e42164b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e42164b6 Branch: refs/heads/trunk Commit: e42164b63baf7c86ac64078f68e61097c4741711 Parents: 1e64a9d 177f607 Author: Aleksey Yeschenko Authored: Tue Nov 10 14:39:16 2015 + Committer: Aleksey Yeschenko Committed: Tue Nov 10 14:39:16 2015 + -- CHANGES.txt | 2 + .../cassandra/hadoop/cql3/CqlRecordWriter.java | 94 ++-- 2 files changed, 50 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e42164b6/CHANGES.txt -- diff --cc CHANGES.txt index 33adefb,81ceb25..24e42c0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,45 -1,5 +1,47 @@@ -2.2.4 +3.0.1 ++Merged from 2.2: + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) +Merged from 2.1: + * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258) + * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605) + + +3.0 + * Fix AssertionError while flushing memtable due to materialized views + incorrectly inserting empty rows (CASSANDRA-10614) + * Store UDA initcond as CQL literal in the schema table, instead of a blob (CASSANDRA-10650) + * Don't use -1 for the position of partition key in schema (CASSANDRA-10491) + * Fix distinct queries in mixed version cluster (CASSANDRA-10573) + * Skip sstable on clustering in names query (CASSANDRA-10571) + * Remove value skipping as it breaks read-repair (CASSANDRA-10655) + * Fix bootstrapping with MVs (CASSANDRA-10621) + * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584) + * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634) + * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600) + * Fix reading of legacy sstables (CASSANDRA-10590) + * Use CQL type names in schema metadata tables (CASSANDRA-10365) + * Guard batchlog replay against integer division by zero (CASSANDRA-9223) + * Fix bug when adding a column to thrift with the same name than a primary key (CASSANDRA-10608) + * Add client address argument to IAuthenticator::newSaslNegotiator (CASSANDRA-8068) + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602) + * Don't use 'names query' read path for counters (CASSANDRA-10572) + * Fix backward compatibility for counters (CASSANDRA-10470) + * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581,10628) + * Execute the metadata reload task of all registered indexes on CFS::reload (CASSANDRA-10604) + * Fix thrift cas operations with defined columns (CASSANDRA-10576) + * Fix PartitionUpdate.operationCount()for updates with static column operations (CASSANDRA-10606) + * Fix thrift get() queries with defined columns (CASSANDRA-10586) + * Fix marking of indexes as built and removed (CASSANDRA-10601) + * Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595) + * Fix batches on multiple tables (CASSANDRA-10554) + * Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569) + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975) + * Remove token generator (CASSANDRA-5261) + * RolesCache should not be created for any authenticator that does not requireAuthentication (CASSANDRA-10562) + * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421) + * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360) + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367) +Merged from 2.2: * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) * Use most up-to-date version of schema for system tables (CASSANDRA-10652) * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e42164b6/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java -- diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java index 6b4caa5,14e24fb..23beba3 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java @@@ -108,31 -109,29 +108,29 @@@ class CqlRecordWriter extends RecordWri CqlRecordWriter(Configuration conf) { this.conf = conf; -this.queueSize = conf.getInt(ColumnFamilyOutputFormat.QUEUE_SIZE, 32 * FBUtilities.getAvailable
[2/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56d83513 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56d83513 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56d83513 Branch: refs/heads/cassandra-3.0 Commit: 56d835135bc4fd75aa715d9afd24746d52fb564a Parents: e1fb18a def5803 Author: Aleksey Yeschenko Authored: Fri Oct 16 13:18:37 2015 +0100 Committer: Aleksey Yeschenko Committed: Fri Oct 16 13:18:37 2015 +0100 -- NEWS.txt | 5 + src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 +- src/java/org/apache/cassandra/hadoop/pig/StorageHelper.java| 1 + 3 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d83513/NEWS.txt --