Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4068ef0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4068ef0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4068ef0 Branch: refs/heads/trunk Commit: b4068ef00e9566ac5ecba9c67ddcf419fcd673a2 Parents: 6f1ce68 e0adc16 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Mon Oct 31 21:16:40 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Mon Oct 31 21:16:40 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/native_protocol_v5.spec | 13 +- ...driver-internal-only-3.7.0.post0-2481531.zip | Bin 0 -> 252057 bytes ...driver-internal-only-3.7.0.post0-70f41b5.zip | Bin 252036 -> 0 bytes .../org/apache/cassandra/cql3/CQL3Type.java | 20 +-- .../apache/cassandra/cql3/ColumnCondition.java | 14 +- .../org/apache/cassandra/cql3/Constants.java | 3 +- src/java/org/apache/cassandra/cql3/Lists.java | 8 +- src/java/org/apache/cassandra/cql3/Maps.java | 8 +- .../org/apache/cassandra/cql3/QueryOptions.java | 46 +++--- .../apache/cassandra/cql3/QueryProcessor.java | 5 +- .../org/apache/cassandra/cql3/ResultSet.java | 61 ++++++-- src/java/org/apache/cassandra/cql3/Sets.java | 8 +- src/java/org/apache/cassandra/cql3/Term.java | 3 +- src/java/org/apache/cassandra/cql3/Tuples.java | 5 +- .../apache/cassandra/cql3/UntypedResultSet.java | 4 +- .../org/apache/cassandra/cql3/UserTypes.java | 3 +- .../cassandra/cql3/functions/AggregateFcts.java | 81 +++++----- .../cql3/functions/AggregateFunction.java | 8 +- .../cql3/functions/BytesConversionFcts.java | 9 +- .../cassandra/cql3/functions/CastFcts.java | 8 +- .../cassandra/cql3/functions/FromJsonFct.java | 3 +- .../cassandra/cql3/functions/FunctionCall.java | 5 +- .../cql3/functions/JavaBasedUDFunction.java | 5 +- .../cassandra/cql3/functions/JavaUDF.java | 23 +-- .../cql3/functions/ScalarFunction.java | 3 +- .../cql3/functions/ScriptBasedUDFunction.java | 7 +- .../cassandra/cql3/functions/TimeFcts.java | 25 +-- .../cassandra/cql3/functions/ToJsonFct.java | 3 +- .../cassandra/cql3/functions/TokenFct.java | 3 +- .../cassandra/cql3/functions/UDAggregate.java | 5 +- .../cql3/functions/UDFByteCodeVerifier.java | 8 +- .../cassandra/cql3/functions/UDFunction.java | 28 ++-- .../cassandra/cql3/functions/UDHelper.java | 15 +- .../cassandra/cql3/functions/UuidFcts.java | 3 +- .../selection/AggregateFunctionSelector.java | 5 +- .../cassandra/cql3/selection/FieldSelector.java | 5 +- .../cql3/selection/ScalarFunctionSelector.java | 5 +- .../cassandra/cql3/selection/Selection.java | 18 ++- .../cassandra/cql3/selection/Selector.java | 5 +- .../cql3/selection/SimpleSelector.java | 5 +- .../cassandra/cql3/selection/TermSelector.java | 5 +- .../cql3/selection/WritetimeOrTTLSelector.java | 5 +- .../statements/CreateAggregateStatement.java | 4 +- .../cql3/statements/SelectStatement.java | 5 +- .../cassandra/db/PartitionRangeReadCommand.java | 3 +- src/java/org/apache/cassandra/db/ReadQuery.java | 5 +- .../db/SinglePartitionReadCommand.java | 7 +- .../org/apache/cassandra/db/SystemKeyspace.java | 4 +- .../db/marshal/AbstractCompositeType.java | 3 +- .../cassandra/db/marshal/AbstractType.java | 3 +- .../apache/cassandra/db/marshal/AsciiType.java | 3 +- .../cassandra/db/marshal/BooleanType.java | 3 +- .../apache/cassandra/db/marshal/ByteType.java | 3 +- .../apache/cassandra/db/marshal/BytesType.java | 3 +- .../cassandra/db/marshal/CollectionType.java | 3 +- .../db/marshal/ColumnToCollectionType.java | 3 +- .../cassandra/db/marshal/CounterColumnType.java | 3 +- .../apache/cassandra/db/marshal/DateType.java | 3 +- .../cassandra/db/marshal/DecimalType.java | 3 +- .../apache/cassandra/db/marshal/DoubleType.java | 3 +- .../cassandra/db/marshal/DurationType.java | 3 +- .../db/marshal/DynamicCompositeType.java | 3 +- .../apache/cassandra/db/marshal/FloatType.java | 3 +- .../apache/cassandra/db/marshal/FrozenType.java | 3 +- .../cassandra/db/marshal/InetAddressType.java | 3 +- .../apache/cassandra/db/marshal/Int32Type.java | 3 +- .../cassandra/db/marshal/IntegerType.java | 3 +- .../apache/cassandra/db/marshal/ListType.java | 13 +- .../apache/cassandra/db/marshal/LongType.java | 3 +- .../apache/cassandra/db/marshal/MapType.java | 6 +- .../db/marshal/PartitionerDefinedOrder.java | 3 +- .../cassandra/db/marshal/ReversedType.java | 3 +- .../apache/cassandra/db/marshal/SetType.java | 3 +- .../apache/cassandra/db/marshal/ShortType.java | 3 +- .../cassandra/db/marshal/SimpleDateType.java | 3 +- .../apache/cassandra/db/marshal/TimeType.java | 3 +- .../cassandra/db/marshal/TimestampType.java | 3 +- .../apache/cassandra/db/marshal/TupleType.java | 3 +- .../apache/cassandra/db/marshal/UTF8Type.java | 3 +- .../apache/cassandra/db/marshal/UserType.java | 5 +- .../apache/cassandra/schema/SchemaKeyspace.java | 4 +- .../serializers/CollectionSerializer.java | 26 ++-- .../cassandra/serializers/ListSerializer.java | 10 +- .../cassandra/serializers/MapSerializer.java | 12 +- .../cassandra/serializers/SetSerializer.java | 6 +- .../cassandra/service/StorageService.java | 5 +- .../service/pager/AbstractQueryPager.java | 5 +- .../service/pager/MultiPartitionPager.java | 3 +- .../cassandra/service/pager/PagingState.java | 24 +-- .../service/pager/PartitionRangeQueryPager.java | 5 +- .../cassandra/service/pager/QueryPagers.java | 4 +- .../service/pager/SinglePartitionPager.java | 5 +- .../org/apache/cassandra/transport/CBCodec.java | 6 +- .../org/apache/cassandra/transport/CBUtil.java | 8 +- .../org/apache/cassandra/transport/Client.java | 6 +- .../apache/cassandra/transport/Connection.java | 8 +- .../apache/cassandra/transport/DataType.java | 80 +++++----- .../org/apache/cassandra/transport/Event.java | 58 +++---- .../org/apache/cassandra/transport/Frame.java | 42 ++--- .../org/apache/cassandra/transport/Message.java | 23 +-- .../apache/cassandra/transport/OptionCodec.java | 26 ++-- .../cassandra/transport/ProtocolException.java | 17 +-- .../cassandra/transport/ProtocolVersion.java | 153 +++++++++++++++++++ .../org/apache/cassandra/transport/Server.java | 9 +- .../cassandra/transport/ServerConnection.java | 6 +- .../cassandra/transport/SimpleClient.java | 14 +- .../transport/messages/AuthChallenge.java | 7 +- .../transport/messages/AuthResponse.java | 8 +- .../transport/messages/AuthSuccess.java | 7 +- .../transport/messages/AuthenticateMessage.java | 7 +- .../transport/messages/BatchMessage.java | 10 +- .../transport/messages/CredentialsMessage.java | 9 +- .../transport/messages/ErrorMessage.java | 26 ++-- .../transport/messages/EventMessage.java | 7 +- .../transport/messages/ExecuteMessage.java | 10 +- .../transport/messages/OptionsMessage.java | 8 +- .../transport/messages/PrepareMessage.java | 6 +- .../transport/messages/QueryMessage.java | 11 +- .../transport/messages/ReadyMessage.java | 7 +- .../transport/messages/RegisterMessage.java | 8 +- .../transport/messages/ResultMessage.java | 42 ++--- .../transport/messages/StartupMessage.java | 9 +- .../transport/messages/SupportedMessage.java | 7 +- .../cassandra/cql3/functions/JavaSourceUDF.txt | 5 +- .../org/apache/cassandra/cql3/ViewLongTest.java | 3 +- test/unit/org/apache/cassandra/Util.java | 23 +++ .../cassandra/cql3/CQL3TypeLiteralTest.java | 26 ++-- .../org/apache/cassandra/cql3/CQLTester.java | 70 +++++---- .../cassandra/cql3/ViewFilteringTest.java | 3 +- .../apache/cassandra/cql3/ViewSchemaTest.java | 3 +- .../org/apache/cassandra/cql3/ViewTest.java | 3 +- .../cassandra/cql3/functions/TimeFctsTest.java | 4 +- .../validation/entities/UFPureScriptTest.java | 5 +- .../UFPureScriptTupleCollectionTest.java | 6 +- .../cql3/validation/entities/UFTest.java | 25 +-- .../entities/udfverify/CallClone.java | 5 +- .../entities/udfverify/CallComDatastax.java | 5 +- .../entities/udfverify/CallFinalize.java | 5 +- .../entities/udfverify/CallOrgApache.java | 5 +- .../entities/udfverify/ClassWithField.java | 5 +- .../udfverify/ClassWithInitializer.java | 5 +- .../udfverify/ClassWithInitializer2.java | 5 +- .../udfverify/ClassWithInitializer3.java | 5 +- .../entities/udfverify/ClassWithInnerClass.java | 5 +- .../udfverify/ClassWithInnerClass2.java | 5 +- .../udfverify/ClassWithStaticInitializer.java | 5 +- .../udfverify/ClassWithStaticInnerClass.java | 5 +- .../entities/udfverify/GoodClass.java | 5 +- .../entities/udfverify/UseOfSynchronized.java | 5 +- .../udfverify/UseOfSynchronizedWithNotify.java | 5 +- .../UseOfSynchronizedWithNotifyAll.java | 5 +- .../udfverify/UseOfSynchronizedWithWait.java | 5 +- .../udfverify/UseOfSynchronizedWithWaitL.java | 5 +- .../udfverify/UseOfSynchronizedWithWaitLI.java | 5 +- .../entities/udfverify/UsingMapEntry.java | 5 +- .../validation/operations/AggregationTest.java | 10 +- .../cql3/validation/operations/AlterTest.java | 6 +- .../apache/cassandra/index/CustomIndexTest.java | 24 +-- .../cassandra/service/ClientWarningsTest.java | 10 +- .../service/ProtocolBetaVersionTest.java | 40 ++++- .../cassandra/service/QueryPagerTest.java | 58 +++---- .../service/pager/PagingStateTest.java | 47 ++---- .../cassandra/transport/DataTypeTest.java | 14 +- .../cassandra/transport/ErrorMessageTest.java | 6 +- .../cassandra/transport/MessagePayloadTest.java | 2 +- .../cassandra/transport/ProtocolErrorTest.java | 13 +- .../transport/ProtocolVersionTest.java | 97 ++++++++++++ .../cassandra/transport/SerDeserTest.java | 138 +++++++++++++---- .../cassandra/utils/CassandraVersionTest.java | 14 +- 170 files changed, 1324 insertions(+), 821 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4068ef0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 264f8d5,1b16518..a1462a6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +4.0 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + + 3.10 + * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838) * Set JOINING mode when running pre-join tasks (CASSANDRA-12836) * remove net.mintern.primitive library due to license issue (CASSANDRA-12845) * Properly format IPv6 addresses when logging JMX service URL (CASSANDRA-12454) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4068ef0/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4068ef0/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4068ef0/test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java ----------------------------------------------------------------------
