[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/107f141e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/107f141e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/107f141e Branch: refs/heads/trunk Commit: 107f141e0964ea305cc3ffbdbfcbc3d9bfc58ba1 Parents: 05a5fb4 9dc8c21 Author: T Jake Luciani j...@apache.org Authored: Fri Jul 17 13:03:19 2015 -0400 Committer: T Jake Luciani j...@apache.org Committed: Fri Jul 17 13:03:19 2015 -0400 -- CHANGES.txt |1 + bin/cqlsh | 2632 + bin/cqlsh.bat |2 +- bin/cqlsh.py| 2668 ++ pylib/cqlshlib/formatting.py|4 + .../serializers/TimestampSerializer.java| 24 +- 6 files changed, 2698 insertions(+), 2633 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/107f141e/CHANGES.txt -- diff --cc CHANGES.txt index b2abd10,616a387..e3eb5ff --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +3.0 + * Metrics should use up to date nomenclature (CASSANDRA-9448) + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384) + * Cleanup crc and adler code for java 8 (CASSANDRA-9650) + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 9825) + * Update Guava to 18.0 (CASSANDRA-9653) + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413) + * New option for cassandra-stress to leave a ratio of columns null (CASSANDRA-9522) + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035) + * Add algorithmic token allocation (CASSANDRA-7032) + * Add nodetool command to replay batchlog (CASSANDRA-9547) + * Make file buffer cache independent of paths being read (CASSANDRA-8897) + * Remove deprecated legacy Hadoop code (CASSANDRA-9353) + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + * Change default garbage collector to G1 (CASSANDRA-7486) + * Populate TokenMetadata early during startup (CASSANDRA-9317) + * undeprecate cache recentHitRate (CASSANDRA-6591) + * Add support for selectively varint encoding fields (CASSANDRA-9499) + + 2.2.0-rc3 + * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797) * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671) * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk
Conflicts:
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b5ab3a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b5ab3a4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b5ab3a4
Branch: refs/heads/trunk
Commit: 3b5ab3a473543e9daa0534a4088d0545920e3286
Parents: 1f9d74c 5a090cc
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Jul 13 19:28:12 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Jul 13 19:28:12 2015 +0200
--
CHANGES.txt | 1 +
conf/cassandra.yaml | 9 +--
.../io/sstable/format/SSTableReader.java| 68
.../org/apache/cassandra/io/util/FileUtils.java | 23 +++
.../apache/cassandra/io/util/SegmentedFile.java | 13 +++-
.../cassandra/service/CassandraDaemon.java | 9 +++
.../cassandra/service/StorageService.java | 7 ++
.../cassandra/utils/JVMStabilityInspector.java | 17 -
8 files changed, 127 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/CHANGES.txt
--
diff --cc CHANGES.txt
index 590084f,3046ceb..bdc30d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,11 +1,30 @@@
+3.0
+ * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
+ * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
+ * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759)
+ * Update Guava to 18.0 (CASSANDRA-9653)
+ * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
+ * New option for cassandra-stress to leave a ratio of columns null
(CASSANDRA-9522)
+ * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
+ * Add algorithmic token allocation (CASSANDRA-7032)
+ * Add nodetool command to replay batchlog (CASSANDRA-9547)
+ * Make file buffer cache independent of paths being read (CASSANDRA-8897)
+ * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
+ * Populate TokenMetadata early during startup (CASSANDRA-9317)
+ * undeprecate cache recentHitRate (CASSANDRA-6591)
+ * Add support for selectively varint encoding fields (CASSANDRA-9499)
+
+
2.2.0-rc3
- * sum() and avg() functions missing for smallint and tinyint types
(CASSANDRA-9671)
* Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
Merged from 2.1:
+ * Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
* (cqlsh) Allow the SSL protocol version to be specified through the
- config file or environment variables (CASSANDRA-9544)
+config file or environment variables (CASSANDRA-9544)
Merged from 2.0:
* Can't transition from write survey to normal mode (CASSANDRA-9740)
* Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/conf/cassandra.yaml
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index 555140f,822a213..81ec24b
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -454,28 -441,29 +455,36 @@@ public abstract class SSTableReader ext
}
logger.info(Opening {} ({} bytes), descriptor, new
File(descriptor.filenameFor(Component.DATA)).length());
-SSTableReader sstable = internalOpen(descriptor, components,
metadata, partitioner, System.currentTimeMillis(),
- statsMetadata,
OpenReason.NORMAL);
+SSTableReader sstable = internalOpen(descriptor,
+ components,
+ metadata,
+ partitioner,
+ System.currentTimeMillis(),
+ statsMetadata,
+ OpenReason.NORMAL,
+ header == null ? null :
header.toHeader(metadata));
+
- // load index and
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/418c7936
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/418c7936
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/418c7936
Branch: refs/heads/trunk
Commit: 418c7936fb61ca3e385326bddb55ee4a81e97d53
Parents: c734cb8 fc202a7
Author: Robert Stupp sn...@snazy.de
Authored: Sun Jul 12 10:54:36 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Sun Jul 12 10:54:36 2015 +0200
--
doc/cql3/CQL.textile| 4 +-
.../statements/CreateAggregateStatement.java| 13 ++
.../cassandra/schema/LegacySchemaMigrator.java | 21 +
.../apache/cassandra/schema/SchemaKeyspace.java | 16 ++-
.../validation/operations/AggregationTest.java | 49
.../schema/LegacySchemaMigratorTest.java| 4 +-
6 files changed, 13 insertions(+), 94 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/418c7936/src/java/org/apache/cassandra/cql3/statements/CreateAggregateStatement.java
--
diff --cc
src/java/org/apache/cassandra/cql3/statements/CreateAggregateStatement.java
index 16d9fc5,1d73e3f..0bb13e5
---
a/src/java/org/apache/cassandra/cql3/statements/CreateAggregateStatement.java
+++
b/src/java/org/apache/cassandra/cql3/statements/CreateAggregateStatement.java
@@@ -88,9 -88,9 +88,9 @@@ public final class CreateAggregateState
AbstractType? stateType = prepareType(state type, stateTypeRaw);
ListAbstractType? stateArgs = stateArguments(stateType, argTypes);
- stateFunc = validateFunctionKeyspace(stateFunc, stateArgs);
+ stateFunc = validateFunctionKeyspace(stateFunc);
-Function f = Functions.find(stateFunc, stateArgs);
+Function f = Schema.instance.findFunction(stateFunc,
stateArgs).orElse(null);
if (!(f instanceof ScalarFunction))
throw new InvalidRequestException(State function +
stateFuncSig(stateFunc, stateTypeRaw, argRawTypes) + does not exist or is not
a scalar function);
stateFunction = (ScalarFunction)f;
@@@ -102,8 -102,8 +102,8 @@@
if (finalFunc != null)
{
ListAbstractType? finalArgs =
Collections.AbstractType?singletonList(stateType);
- finalFunc = validateFunctionKeyspace(finalFunc, finalArgs);
+ finalFunc = validateFunctionKeyspace(finalFunc);
-f = Functions.find(finalFunc, finalArgs);
+f = Schema.instance.findFunction(finalFunc,
finalArgs).orElse(null);
if (!(f instanceof ScalarFunction))
throw new InvalidRequestException(Final function +
finalFunc + '(' + stateTypeRaw + ) does not exist or is not a scalar
function);
finalFunction = (ScalarFunction) f;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/418c7936/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
--
diff --cc src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
index 996b5ff,000..dc9e168
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
+++ b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
@@@ -1,806 -1,0 +1,789 @@@
+/*
+ * 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.schema;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.cache.CachingOptions;
+import org.apache.cassandra.config.*;
+import org.apache.cassandra.cql3.*;
+import org.apache.cassandra.cql3.functions.FunctionName;
+import org.apache.cassandra.cql3.functions.UDAggregate;
+import
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5c97393 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5c97393 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5c97393 Branch: refs/heads/trunk Commit: c5c97393921dc2d339c6e216e1076564ba0963b1 Parents: 2530868 ff74eaf Author: T Jake Luciani j...@apache.org Authored: Mon Jul 6 12:26:32 2015 -0400 Committer: T Jake Luciani j...@apache.org Committed: Mon Jul 6 12:26:32 2015 -0400 -- CHANGES.txt | 2 ++ ...assandra-driver-internal-only-2.6.0c2.post.zip | Bin 0 - 198346 bytes lib/cassandra-driver-internal-only-2.6.0c2.zip| Bin 199328 - 0 bytes 3 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5c97393/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/543efe92 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/543efe92 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/543efe92 Branch: refs/heads/trunk Commit: 543efe9243692cee2a06dce37e06eb87d1df8a57 Parents: 3566843 5892732 Author: Benedict Elliott Smith bened...@apache.org Authored: Tue Jun 30 13:22:55 2015 +0100 Committer: Benedict Elliott Smith bened...@apache.org Committed: Tue Jun 30 13:22:55 2015 +0100 -- --
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4129c0b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4129c0b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4129c0b0 Branch: refs/heads/trunk Commit: 4129c0b00b28121afb8b90450d6578dd710404be Parents: 3671082 75e85b9 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Jun 29 09:32:12 2015 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Jun 29 09:32:12 2015 +0200 -- CHANGES.txt | 1 + .../cql3/statements/ModificationStatement.java | 4 +--- .../apache/cassandra/service/ClientState.java| 19 ++- .../apache/cassandra/service/StorageProxy.java | 19 +++ src/java/org/apache/cassandra/utils/UUIDGen.java | 7 +++ 5 files changed, 26 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4129c0b0/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e27e9741 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e27e9741 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e27e9741 Branch: refs/heads/trunk Commit: e27e974139d371c00c49ad70504f0283caaba356 Parents: ae2daea 4cfb17f Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Jun 2 08:43:33 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Jun 2 08:43:33 2015 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 16 -- .../cassandra/service/StorageService.java | 54 +--- 3 files changed, 26 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e27e9741/CHANGES.txt -- diff --cc CHANGES.txt index 474476f,42846d7..4597175 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.0: + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + * Change default garbage collector to G1 (CASSANDRA-7486) + + 2.2 + * Clean up gossiper logic for old versions (CASSANDRA-9370) * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515) * ant test-all results incomplete when parsed (CASSANDRA-9463) * Disallow frozen types in function arguments and return types for http://git-wip-us.apache.org/repos/asf/cassandra/blob/e27e9741/src/java/org/apache/cassandra/service/StorageService.java --
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1d175fb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1d175fb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1d175fb Branch: refs/heads/trunk Commit: f1d175fba16b24ecdea125c6a4b3d077b681c0db Parents: cc6d142 3b85ea7 Author: Benedict Elliott Smith bened...@apache.org Authored: Mon Jun 1 16:44:28 2015 +0100 Committer: Benedict Elliott Smith bened...@apache.org Committed: Mon Jun 1 16:44:28 2015 +0100 -- .../io/sstable/format/SSTableReader.java| 4 +- test/unit/org/apache/cassandra/MockSchema.java | 16 .../cassandra/db/lifecycle/TrackerTest.java | 94 3 files changed, 73 insertions(+), 41 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk Conflicts: debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8825dee9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8825dee9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8825dee9 Branch: refs/heads/trunk Commit: 8825dee9dbf1b78e6acbc38bfec41ff3d3a75671 Parents: 003925a 1735249 Author: T Jake Luciani j...@apache.org Authored: Sun May 17 22:38:06 2015 -0400 Committer: T Jake Luciani j...@apache.org Committed: Sun May 17 22:38:06 2015 -0400 -- debian/cassandra.install | 1 - debian/changelog | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/081b0de6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/081b0de6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/081b0de6 Branch: refs/heads/trunk Commit: 081b0de67d50404f53f89d627faef8ba11b1b34c Parents: ccebac5 1937bed Author: Robert Stupp sn...@snazy.de Authored: Fri May 15 19:36:23 2015 +0200 Committer: Robert Stupp sn...@snazy.de Committed: Fri May 15 19:36:23 2015 +0200 -- CHANGES.txt | 3 +- doc/cql3/CQL.textile| 26 +- pylib/cqlshlib/cql3handling.py | 1 + src/java/org/apache/cassandra/cql3/Cql.g| 9 +- .../cql3/functions/JavaSourceUDFFactory.java| 14 +- .../cql3/functions/NativeScalarFunction.java| 5 + .../cql3/functions/ScalarFunction.java | 2 + .../cql3/functions/ScriptBasedUDF.java | 5 +- .../cassandra/cql3/functions/UDAggregate.java | 20 +- .../cassandra/cql3/functions/UDFunction.java| 68 ++- .../cassandra/cql3/functions/UDHelper.java | 39 +- .../statements/CreateAggregateStatement.java| 5 +- .../statements/CreateFunctionStatement.java | 8 +- .../cassandra/schema/LegacySchemaTables.java| 7 +- .../cassandra/cql3/functions/JavaSourceUDF.txt | 6 +- .../apache/cassandra/cql3/AggregationTest.java | 196 ++- .../org/apache/cassandra/cql3/JsonTest.java | 4 +- .../org/apache/cassandra/cql3/PgStringTest.java | 4 +- .../org/apache/cassandra/cql3/UFAuthTest.java | 6 + .../cassandra/cql3/UFIdentificationTest.java| 1 + test/unit/org/apache/cassandra/cql3/UFTest.java | 527 --- 21 files changed, 821 insertions(+), 135 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/081b0de6/CHANGES.txt -- diff --cc CHANGES.txt index d670571,c5c505a..c08d322 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,6 +1,6 @@@ -2.2.0-beta1 +2.2 - * Use ecj instead of javassist for UDFs + * Better support of null for UDF (CASSANDRA-8374) + * Use ecj instead of javassist for UDFs (CASSANDRA-8241) * faster async logback configuration for tests (CASSANDRA-9376) * Add `smallint` and `tinyint` data types (CASSANDRA-8951) * Avoid thrift schema creation when native driver is used in stress tool (CASSANDRA-9374)
