Thrift removal patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11115
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4881d9c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4881d9c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4881d9c3 Branch: refs/heads/trunk Commit: 4881d9c308ccd6b5ca70925bf6ebedb70e7705fc Parents: e8b8a90 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Nov 21 17:55:12 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Dec 13 10:27:12 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 22 +- NOTICE.txt | 7 - bin/cassandra.bat | 2 +- bin/cassandra.in.bat | 2 +- bin/cassandra.in.sh | 1 - bin/cassandra.ps1 | 3 +- bin/cqlsh.py | 6 +- build.xml | 165 - conf/cassandra-env.ps1 | 2 +- conf/cassandra.yaml | 119 +- conf/jvm.options | 6 - conf/logback.xml | 1 - debian/nodetool-completion | 3 - debian/patches/001cassandra_yaml_dirs.dpatch | 2 +- debian/rules | 2 - doc/SASI.md | 3 +- doc/convert_yaml_to_rst.py | 1 - doc/source/cql/ddl.rst | 11 +- doc/source/cql/index.rst | 3 +- doc/source/faq/index.rst | 2 +- doc/source/operating/metrics.rst | 1 - examples/hadoop_cql3_word_count/README.txt | 51 - examples/hadoop_cql3_word_count/bin/word_count | 62 - .../bin/word_count_counters | 61 - .../hadoop_cql3_word_count/bin/word_count_setup | 61 - examples/hadoop_cql3_word_count/build.xml | 113 - .../hadoop_cql3_word_count/conf/logback.xml | 42 - examples/hadoop_cql3_word_count/ivy.xml | 24 - .../hadoop_cql3_word_count/src/WordCount.java | 259 - .../src/WordCountCounters.java | 168 - .../src/WordCountSetup.java | 181 - ide/idea-iml-file.xml | 1 - ide/idea/workspace.xml | 3 - interface/cassandra.thrift | 945 - .../thrift/AuthenticationException.java | 400 - .../cassandra/thrift/AuthenticationRequest.java | 465 - .../thrift/AuthorizationException.java | 413 - .../org/apache/cassandra/thrift/CASResult.java | 574 - .../org/apache/cassandra/thrift/Cassandra.java | 55794 ----------------- .../org/apache/cassandra/thrift/CfDef.java | 4927 -- .../org/apache/cassandra/thrift/CfSplit.java | 601 - .../org/apache/cassandra/thrift/Column.java | 743 - .../org/apache/cassandra/thrift/ColumnDef.java | 903 - .../cassandra/thrift/ColumnOrSuperColumn.java | 758 - .../apache/cassandra/thrift/ColumnParent.java | 538 - .../org/apache/cassandra/thrift/ColumnPath.java | 648 - .../apache/cassandra/thrift/ColumnSlice.java | 551 - .../apache/cassandra/thrift/Compression.java | 69 - .../cassandra/thrift/ConsistencyLevel.java | 137 - .../apache/cassandra/thrift/CounterColumn.java | 520 - .../cassandra/thrift/CounterSuperColumn.java | 576 - .../apache/cassandra/thrift/CqlMetadata.java | 817 - .../cassandra/thrift/CqlPreparedResult.java | 821 - .../org/apache/cassandra/thrift/CqlResult.java | 807 - .../apache/cassandra/thrift/CqlResultType.java | 69 - .../org/apache/cassandra/thrift/CqlRow.java | 584 - .../org/apache/cassandra/thrift/Deletion.java | 645 - .../cassandra/thrift/EndpointDetails.java | 630 - .../apache/cassandra/thrift/IndexClause.java | 681 - .../cassandra/thrift/IndexExpression.java | 650 - .../apache/cassandra/thrift/IndexOperator.java | 75 - .../org/apache/cassandra/thrift/IndexType.java | 69 - .../thrift/InvalidRequestException.java | 414 - .../org/apache/cassandra/thrift/KeyCount.java | 521 - .../org/apache/cassandra/thrift/KeyRange.java | 1034 - .../org/apache/cassandra/thrift/KeySlice.java | 583 - .../org/apache/cassandra/thrift/KsDef.java | 1047 - .../cassandra/thrift/MultiSliceRequest.java | 1042 - .../org/apache/cassandra/thrift/Mutation.java | 537 - .../cassandra/thrift/NotFoundException.java | 307 - .../thrift/SchemaDisagreementException.java | 310 - .../apache/cassandra/thrift/SlicePredicate.java | 588 - .../org/apache/cassandra/thrift/SliceRange.java | 749 - .../apache/cassandra/thrift/SuperColumn.java | 582 - .../cassandra/thrift/TimedOutException.java | 671 - .../org/apache/cassandra/thrift/TokenRange.java | 990 - .../org/apache/cassandra/thrift/TriggerDef.java | 568 - .../cassandra/thrift/UnavailableException.java | 307 - .../cassandra/thrift/cassandraConstants.java | 61 - lib/disruptor-3.0.1.jar | Bin 66843 -> 0 bytes lib/libthrift-0.9.2.jar | Bin 227712 -> 0 bytes lib/licenses/disruptor-3.0.1.txt | 201 - lib/licenses/libthrift-0.9.2.txt | 202 - lib/licenses/thrift-server-0.3.7.txt | 202 - lib/thrift-server-0.3.7.jar | Bin 39988 -> 0 bytes pylib/cqlshlib/test/test_cql_parsing.py | 2 +- pylib/cqlshlib/test/test_cqlsh_commands.py | 2 +- pylib/cqlshlib/test/test_cqlsh_completion.py | 2 +- pylib/cqlshlib/test/test_cqlsh_invocation.py | 2 +- pylib/cqlshlib/test/test_cqlsh_output.py | 2 +- pylib/cqlshlib/test/test_cqlsh_parsing.py | 2 +- .../apache/cassandra/auth/IAuthenticator.java | 10 +- .../apache/cassandra/cache/CounterCacheKey.java | 94 +- .../org/apache/cassandra/client/RingCache.java | 121 - .../org/apache/cassandra/config/CFMetaData.java | 97 +- .../cassandra/config/ColumnDefinition.java | 42 +- .../org/apache/cassandra/config/Config.java | 27 - .../cassandra/config/DatabaseDescriptor.java | 150 - .../config/RequestSchedulerOptions.java | 33 - .../org/apache/cassandra/cql3/CQL3Type.java | 2 +- .../CustomPayloadMirroringQueryHandler.java | 5 - .../org/apache/cassandra/cql3/QueryHandler.java | 2 - .../org/apache/cassandra/cql3/QueryOptions.java | 8 +- .../apache/cassandra/cql3/QueryProcessor.java | 114 +- .../org/apache/cassandra/cql3/ResultSet.java | 43 - .../apache/cassandra/cql3/UpdateParameters.java | 8 +- .../org/apache/cassandra/cql3/Validation.java | 117 + .../cql3/statements/AlterTableStatement.java | 13 +- .../cql3/statements/AlterViewStatement.java | 5 +- .../cql3/statements/BatchStatement.java | 5 +- .../statements/CreateAggregateStatement.java | 3 +- .../statements/CreateFunctionStatement.java | 4 +- .../cql3/statements/CreateIndexStatement.java | 4 +- .../statements/CreateKeyspaceStatement.java | 4 +- .../cql3/statements/CreateTableStatement.java | 8 +- .../cql3/statements/CreateTriggerStatement.java | 4 +- .../cql3/statements/CreateViewStatement.java | 3 +- .../cql3/statements/DropAggregateStatement.java | 4 +- .../cql3/statements/DropFunctionStatement.java | 4 +- .../cql3/statements/DropKeyspaceStatement.java | 4 +- .../cql3/statements/DropTriggerStatement.java | 4 +- .../cql3/statements/ModificationStatement.java | 9 +- .../cql3/statements/SelectStatement.java | 3 +- .../cql3/statements/TruncateStatement.java | 3 +- .../cql3/statements/UpdateStatement.java | 9 +- .../apache/cassandra/db/BufferClustering.java | 5 +- .../apache/cassandra/db/ColumnFamilyStore.java | 4 +- .../org/apache/cassandra/db/CompactTables.java | 36 +- .../org/apache/cassandra/db/EmptyIterators.java | 13 +- .../org/apache/cassandra/db/LegacyLayout.java | 1911 - src/java/org/apache/cassandra/db/Memtable.java | 13 +- .../cassandra/db/PartitionRangeReadCommand.java | 22 +- .../org/apache/cassandra/db/ReadCommand.java | 41 +- src/java/org/apache/cassandra/db/ReadQuery.java | 2 +- .../org/apache/cassandra/db/ReadResponse.java | 24 +- .../org/apache/cassandra/db/RowIndexEntry.java | 65 +- .../db/SinglePartitionReadCommand.java | 65 +- .../cassandra/db/SizeEstimatesRecorder.java | 3 +- .../org/apache/cassandra/db/StorageHook.java | 19 +- .../org/apache/cassandra/db/SystemKeyspace.java | 11 +- .../columniterator/AbstractSSTableIterator.java | 7 +- .../db/columniterator/SSTableIterator.java | 3 +- .../columniterator/SSTableReversedIterator.java | 3 +- .../db/compaction/CompactionIterator.java | 14 +- .../compaction/LeveledCompactionStrategy.java | 6 - .../apache/cassandra/db/filter/DataLimits.java | 285 +- .../apache/cassandra/db/filter/RowFilter.java | 143 +- .../cassandra/db/marshal/CollectionType.java | 3 +- .../db/marshal/ColumnToCollectionType.java | 154 - .../cassandra/db/marshal/CompositeType.java | 168 +- .../db/partitions/CachedBTreePartition.java | 49 +- .../db/partitions/CachedPartition.java | 20 - .../cassandra/db/partitions/PurgeFunction.java | 6 +- .../SingletonUnfilteredPartitionIterator.java | 9 +- .../partitions/UnfilteredPartitionIterator.java | 11 - .../UnfilteredPartitionIterators.java | 24 +- .../UnfilteredRowIteratorWithLowerBound.java | 18 +- .../apache/cassandra/db/transform/Filter.java | 2 +- .../db/transform/FilteredPartitions.java | 2 +- .../db/transform/UnfilteredPartitions.java | 8 - .../apache/cassandra/hadoop/ConfigHelper.java | 227 +- .../cassandra/hadoop/cql3/CqlInputFormat.java | 26 +- .../index/internal/CassandraIndexFunctions.java | 2 +- .../cassandra/index/internal/IndexEntry.java | 2 +- .../internal/composites/CompositesSearcher.java | 5 - .../index/internal/keys/KeysSearcher.java | 74 +- .../index/sasi/plan/QueryController.java | 8 +- .../cassandra/index/sasi/plan/QueryPlan.java | 5 - .../io/sstable/format/SSTableReader.java | 6 +- .../io/sstable/format/big/BigFormat.java | 3 +- .../io/sstable/format/big/BigTableReader.java | 14 +- .../io/sstable/format/big/BigTableScanner.java | 28 +- .../cassandra/scheduler/IRequestScheduler.java | 41 - .../apache/cassandra/scheduler/NoScheduler.java | 37 - .../scheduler/RoundRobinScheduler.java | 159 - .../cassandra/scheduler/WeightedQueue.java | 71 - .../apache/cassandra/service/CacheService.java | 51 +- .../cassandra/service/CassandraDaemon.java | 16 - .../apache/cassandra/service/ClientState.java | 6 +- .../service/EmbeddedCassandraService.java | 3 +- .../apache/cassandra/service/StorageProxy.java | 7 +- .../cassandra/service/StorageService.java | 68 +- .../cassandra/service/StorageServiceMBean.java | 11 +- .../apache/cassandra/service/TokenRange.java | 119 + .../cassandra/service/pager/PagingState.java | 83 +- .../service/pager/PartitionRangeQueryPager.java | 3 - .../cassandra/service/pager/QueryPagers.java | 66 - .../service/pager/SinglePartitionPager.java | 5 +- .../cassandra/thrift/CassandraServer.java | 2648 - .../thrift/CustomTNonBlockingServer.java | 93 - .../thrift/CustomTThreadPoolServer.java | 289 - .../cassandra/thrift/ITransportFactory.java | 64 - .../cassandra/thrift/SSLTransportFactory.java | 88 - .../thrift/TCustomNonblockingServerSocket.java | 87 - .../cassandra/thrift/TCustomServerSocket.java | 189 - .../apache/cassandra/thrift/TCustomSocket.java | 246 - .../thrift/TFramedTransportFactory.java | 56 - .../cassandra/thrift/THsHaDisruptorServer.java | 109 - .../cassandra/thrift/TServerCustomFactory.java | 74 - .../apache/cassandra/thrift/TServerFactory.java | 44 - .../cassandra/thrift/ThriftClientState.java | 56 - .../cassandra/thrift/ThriftConversion.java | 726 - .../cassandra/thrift/ThriftResultsMerger.java | 294 - .../apache/cassandra/thrift/ThriftServer.java | 150 - .../cassandra/thrift/ThriftSessionManager.java | 84 - .../cassandra/thrift/ThriftValidation.java | 671 - .../org/apache/cassandra/tools/NodeProbe.java | 15 - .../org/apache/cassandra/tools/NodeTool.java | 3 - .../cassandra/tools/nodetool/DisableThrift.java | 33 - .../cassandra/tools/nodetool/EnableThrift.java | 33 - .../apache/cassandra/tools/nodetool/Info.java | 1 - .../cassandra/tools/nodetool/StatusThrift.java | 36 - .../transport/messages/ResultMessage.java | 57 +- .../cassandra/utils/BatchRemoveIterator.java | 32 - .../apache/cassandra/utils/ByteBufferUtil.java | 9 + test/conf/cassandra-murmur.yaml | 3 - test/conf/cassandra.yaml | 3 - test/resources/functions/configure_cassandra.sh | 43 +- .../OffsetAwareConfigurationLoader.java | 1 - test/unit/org/apache/cassandra/Util.java | 1 - .../apache/cassandra/client/TestRingCache.java | 121 - .../apache/cassandra/config/CFMetaDataTest.java | 72 - .../cassandra/config/ColumnDefinitionTest.java | 62 - .../config/DatabaseDescriptorRefTest.java | 5 - .../config/DatabaseDescriptorTest.java | 29 - .../org/apache/cassandra/cql3/CQLTester.java | 2 +- .../cassandra/cql3/PstmtPersistenceTest.java | 12 +- .../cassandra/cql3/ThriftCompatibilityTest.java | 110 - .../validation/entities/SecondaryIndexTest.java | 10 +- .../cql3/validation/entities/UFTest.java | 20 +- .../validation/operations/AggregationTest.java | 4 +- .../cql3/validation/operations/CreateTest.java | 7 - .../cassandra/db/ColumnFamilyStoreTest.java | 87 - .../apache/cassandra/db/LegacyCellNameTest.java | 89 - .../cassandra/db/PartitionRangeReadTest.java | 206 - .../apache/cassandra/db/RowIndexEntryTest.java | 2 +- .../db/SinglePartitionSliceCommandTest.java | 4 +- .../db/compaction/CompactionIteratorTest.java | 6 - .../cassandra/db/compaction/TTLExpiryTest.java | 2 +- .../cassandra/db/composites/CTypeTest.java | 80 +- .../cassandra/db/marshal/CompositeTypeTest.java | 10 +- .../hadoop/ColumnFamilyInputFormatTest.java | 52 - .../cassandra/index/sasi/SASIIndexTest.java | 16 +- .../sstable/SSTableCorruptionDetectionTest.java | 2 +- .../io/sstable/SSTableScannerTest.java | 2 +- .../cassandra/io/sstable/SSTableWriterTest.java | 2 +- .../cassandra/schema/SchemaKeyspaceTest.java | 62 - .../cassandra/service/DataResolverTest.java | 10 +- .../service/EmbeddedCassandraServiceTest.java | 129 - .../cassandra/transport/MessagePayloadTest.java | 5 - .../apache/cassandra/triggers/TriggersTest.java | 131 - tools/bin/cassandra.in.bat | 2 +- tools/bin/cassandra.in.sh | 1 - tools/stress/README.txt | 2 +- .../org/apache/cassandra/stress/Operation.java | 11 +- .../apache/cassandra/stress/StressAction.java | 10 +- .../apache/cassandra/stress/StressProfile.java | 65 +- .../stress/generate/PartitionIterator.java | 6 - .../operations/predefined/CqlOperation.java | 147 +- .../predefined/PredefinedOperation.java | 71 +- .../predefined/ThriftCounterAdder.java | 94 - .../predefined/ThriftCounterGetter.java | 67 - .../operations/predefined/ThriftInserter.java | 104 - .../operations/predefined/ThriftReader.java | 78 - .../operations/userdefined/SchemaInsert.java | 40 +- .../operations/userdefined/SchemaQuery.java | 52 +- .../operations/userdefined/SchemaStatement.java | 9 +- .../operations/userdefined/TokenRangeQuery.java | 23 - .../userdefined/ValidatingSchemaQuery.java | 85 +- .../cassandra/stress/settings/CliOption.java | 2 +- .../stress/settings/ConnectionAPI.java | 2 +- .../stress/settings/ConnectionStyle.java | 12 +- .../cassandra/stress/settings/Legacy.java | 12 +- .../stress/settings/SettingsColumn.java | 1 - .../stress/settings/SettingsCommand.java | 2 +- .../cassandra/stress/settings/SettingsMode.java | 46 +- .../cassandra/stress/settings/SettingsNode.java | 2 - .../cassandra/stress/settings/SettingsPort.java | 6 +- .../stress/settings/SettingsSchema.java | 84 +- .../stress/settings/SettingsTransport.java | 64 +- .../stress/settings/StressSettings.java | 83 - .../stress/util/SimpleThriftClient.java | 111 - .../stress/util/SmartThriftClient.java | 282 - .../cassandra/stress/util/ThriftClient.java | 57 - 285 files changed, 940 insertions(+), 101292 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d1135bb..46543fc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Thrift removal (CASSANDRA-11115) * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) * Add column definition kind to dropped columns in schema (CASSANDRA-12705) * Add (automate) Nodetool Documentation (CASSANDRA-12672) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index 0075acc..81b45c7 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -21,14 +21,20 @@ New features Upgrading --------- - - Cassandra 4.0 removed support for any pre-3.0 format. This means you cannot upgrade from a 2.x version to 4.0 - directly, you have to upgrade to a 3.0.x/3.x version first (and run upgradesstable). In particular, this mean - Cassandra 4.0 cannot load or read pre-3.0 sstables in any way: you will need to upgrade those sstable in 3.0.x/3.x - first. - - Cassandra will no longer allow invalid keyspace replication options, such as invalid datacenter names for - NetworkTopologyStrategy. Operators MUST add new nodes to a datacenter before they can set set ALTER or - CREATE keyspace replication policies using that datacenter. Existing keyspaces will continue to operate, - but CREATE and ALTER will validate that all datacenters specified exist in the cluster. + - Cassandra 4.0 removed support for the deprecated Thrift interface. Amongst + Tother things, this imply the removal of all yaml option related to thrift + ('start_rpc', rpc_port, ...). + - Cassandra 4.0 removed support for any pre-3.0 format. This means you + cannot upgrade from a 2.x version to 4.0 directly, you have to upgrade to + a 3.0.x/3.x version first (and run upgradesstable). In particular, this + mean Cassandra 4.0 cannot load or read pre-3.0 sstables in any way: you + will need to upgrade those sstable in 3.0.x/3.x first. + - Cassandra will no longer allow invalid keyspace replication options, such + as invalid datacenter names for NetworkTopologyStrategy. Operators MUST + add new nodes to a datacenter before they can set set ALTER or CREATE + keyspace replication policies using that datacenter. Existing keyspaces + will continue to operate, but CREATE and ALTER will validate that all + datacenters specified exist in the cluster. 3.11 ==== http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index dcdf03d..c949b4e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -46,13 +46,6 @@ Written by Adrien Grand. Contains bindings to the C LZ4 implementation (http://code.google.com/p/lz4/) Copyright (C) 2011-2012, Yann Collet. -Alternative Disruptor backed thrift server from https://github.com/xedin/disruptor_thrift_server -Written by Pavel Yaskevich. - -LMAX Disruptor -(http://lmax-exchange.github.io/disruptor/) -Copyright 2011 LMAX Ltd. - Airline (https://github.com/airlift/airline) Copyright 2011, Dain Sundstrom d...@iq80.com http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/bin/cassandra.bat ---------------------------------------------------------------------- diff --git a/bin/cassandra.bat b/bin/cassandra.bat index 0d207cd..a653142 100644 --- a/bin/cassandra.bat +++ b/bin/cassandra.bat @@ -112,7 +112,7 @@ if EXIST "%CASSANDRA_HOME%\lib\jsr223\scala\scala-compiler.jar" ( ) REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift" +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main" set CASSANDRA_PARAMS=-Dcassandra -Dcassandra-foreground=yes set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% -Dcassandra.logdir="%CASSANDRA_HOME%\logs" set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% -Dcassandra.storagedir="%CASSANDRA_HOME%\data" http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/bin/cassandra.in.bat ---------------------------------------------------------------------- diff --git a/bin/cassandra.in.bat b/bin/cassandra.in.bat index 5682f9d..0e760a0 100644 --- a/bin/cassandra.in.bat +++ b/bin/cassandra.in.bat @@ -44,7 +44,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";%CASSANDRA_CONF%;"%CASSANDRA_HOME%\build\classes\thrift" +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";%CASSANDRA_CONF% REM Add the default storage location. Can be overridden in conf\cassandra.yaml set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% "-Dcassandra.storagedir=%CASSANDRA_HOME%\data" http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/bin/cassandra.in.sh ---------------------------------------------------------------------- diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh index 92f79c7..228cef7 100644 --- a/bin/cassandra.in.sh +++ b/bin/cassandra.in.sh @@ -27,7 +27,6 @@ fi # compiled classes. NOTE: This isn't needed by the startup script, # it's just used here in constructing the classpath. cassandra_bin="$CASSANDRA_HOME/build/classes/main" -cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift" #cassandra_bin="$CASSANDRA_HOME/build/cassandra.jar" # the default location for commitlogs, sstables, and saved caches http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/bin/cassandra.ps1 ---------------------------------------------------------------------- diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1 index 5d10994..d968793 100644 --- a/bin/cassandra.ps1 +++ b/bin/cassandra.ps1 @@ -298,9 +298,8 @@ Function VerifyPortsAreAvailable # storage_port # ssl_storage_port # native_transport_port - # rpc_port, which we'll match to rpc_address # and from env: JMX_PORT which we cache in our environment during SetCassandraEnvironment for this check - $yamlRegex = "storage_port:|ssl_storage_port:|native_transport_port:|rpc_port" + $yamlRegex = "storage_port:|ssl_storage_port:|native_transport_port:" $yaml = Get-Content "$env:CASSANDRA_CONF\cassandra.yaml" $portRegex = ":$env:JMX_PORT |" http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 2387342..bd62072 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -104,7 +104,7 @@ elif webbrowser._tryorder[0] == 'xdg-open' and os.environ.get('XDG_DATA_DIRS', ' webbrowser._tryorder.remove('xdg-open') webbrowser._tryorder.append('xdg-open') -# use bundled libs for python-cql and thrift, if available. if there +# use bundled lib for python-cql if available. if there # is a ../lib dir, use bundled libs there preferentially. ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')] myplatform = platform.system() @@ -1691,8 +1691,8 @@ class Shell(cmd.Cmd): SHOW VERSION Shows the version and build of the connected Cassandra instance, as - well as the versions of the CQL spec and the Thrift protocol that - the connected Cassandra instance understands. + well as the version of the CQL spec that the connected Cassandra + instance understands. SHOW HOST http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 884394c..d1ffb7a 100644 --- a/build.xml +++ b/build.xml @@ -44,12 +44,9 @@ <property name="build.test.dir" value="${build.dir}/test"/> <property name="build.classes" value="${build.dir}/classes"/> <property name="build.classes.main" value="${build.classes}/main" /> - <property name="build.classes.thrift" value="${build.classes}/thrift" /> <property name="javadoc.dir" value="${build.dir}/javadoc"/> <property name="javadoc.jars.dir" value="${build.dir}/javadocs"/> <property name="interface.dir" value="${basedir}/interface"/> - <property name="interface.thrift.dir" value="${interface.dir}/thrift"/> - <property name="interface.thrift.gen-java" value="${interface.thrift.dir}/gen-java"/> <property name="test.dir" value="${basedir}/test"/> <property name="test.resources" value="${test.dir}/resources"/> <property name="test.lib" value="${build.dir}/test/lib"/> @@ -154,7 +151,6 @@ <path id="maven-ant-tasks.classpath" path="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" /> <path id="cassandra.classpath"> <pathelement location="${build.classes.main}" /> - <pathelement location="${build.classes.thrift}" /> <fileset dir="${build.lib}"> <include name="**/*.jar" /> <exclude name="**/*-sources.jar"/> @@ -186,7 +182,6 @@ <fail unless="is.source.artifact" message="Not a source artifact, stopping here." /> <mkdir dir="${build.classes.main}"/> - <mkdir dir="${build.classes.thrift}"/> <mkdir dir="${test.lib}"/> <mkdir dir="${test.classes}"/> <mkdir dir="${stress.test.classes}"/> @@ -387,14 +382,7 @@ <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/> <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.3.0"/> - <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7"> - <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> - <exclusion groupId="junit" artifactId="junit"/> - </dependency> <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/> - <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.2"> - <exclusion groupId="commons-logging" artifactId="commons-logging"/> - </dependency> <dependency groupId="junit" artifactId="junit" version="4.6" /> <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10"> <exclusion groupId="commons-lang" artifactId="commons-lang"/> @@ -423,7 +411,6 @@ <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.13"/> <dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" /> - <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" /> <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core" version="3.1.0" /> <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm" version="3.1.0" /> <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.3" /> @@ -585,15 +572,11 @@ <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core"/> <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm"/> <dependency groupId="com.addthis.metrics" artifactId="reporter-config3"/> - <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server"/> <dependency groupId="com.clearspring.analytics" artifactId="stream"/> <dependency groupId="ch.qos.logback" artifactId="logback-core"/> <dependency groupId="ch.qos.logback" artifactId="logback-classic"/> - <dependency groupId="org.apache.thrift" artifactId="libthrift"/> - <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift"/> - <!-- don't need hadoop classes to run, but if you use the hadoop stuff --> <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" optional="true"/> <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" optional="true"/> @@ -620,25 +603,6 @@ <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" /> <dependency groupId="org.jctools" artifactId="jctools-core"/> </artifact:pom> - <artifact:pom id="thrift-pom" - artifactId="cassandra-thrift" - url="http://cassandra.apache.org"; - name="Apache Cassandra"> - <parent groupId="org.apache.cassandra" - artifactId="cassandra-parent" - version="${version}"/> - <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/> - <dependency groupId="org.apache.commons" artifactId="commons-lang3"/> - <dependency groupId="org.slf4j" artifactId="slf4j-api"/> - <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"/> - <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j"/> - <dependency groupId="org.apache.thrift" artifactId="libthrift"/> - <dependency groupId="com.carrotsearch" artifactId="hppc" version="0.5.4" /> - <dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" /> - <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" /> - <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" /> - - </artifact:pom> <artifact:pom id="dist-pom" artifactId="apache-cassandra" packaging="pom" @@ -720,54 +684,6 @@ <echo message="${base.version}" /> </target> - <!-- - Generate thrift code. We have targets to build java because - Cassandra depends on it, and python because that is what the system - tests run. - --> - <target name="check-gen-thrift-java"> - <uptodate property="thriftUpToDate" srcfile="${interface.dir}/cassandra.thrift" - targetfile="${interface.thrift.gen-java}/org/apache/cassandra/thrift/Cassandra.java" /> - </target> - <target name="gen-thrift-java" unless="thriftUpToDate" depends="check-gen-thrift-java" - description="Generate Thrift Java artifacts"> - <echo>Generating Thrift Java code from ${basedir}/interface/cassandra.thrift...</echo> - <exec executable="thrift" dir="${basedir}/interface" failonerror="true"> - <arg line="--gen java:hashcode" /> - <arg line="-o ${interface.thrift.dir}" /> - <arg line="cassandra.thrift" /> - </exec> - <antcall target="write-java-license-headers" /> - </target> - - <target name="_write-java-license-headers" depends="rat-init"> - <java classname="org.apache.rat.Report" fork="true" - output="${build.dir}/rat-report.log"> - <classpath refid="rat.classpath" /> - <arg value="-a" /> - <arg value="--force" /> - <arg value="interface/thrift" /> - </java> - </target> - - <target name="write-java-license-headers" unless="without.rat" description="Add missing java license headers"> - <antcall target="_write-java-license-headers" /> - </target> - - <target name="gen-thrift-py" description="Generate Thrift Python artifacts"> - <echo>Generating Thrift Python code from ${basedir}/interface/cassandra.thrift...</echo> - <exec executable="thrift" dir="${basedir}/interface" failonerror="true"> - <arg line="--gen py" /> - <arg line="-o ${interface.thrift.dir}" /> - <arg line="cassandra.thrift" /> - </exec> - <exec executable="thrift" dir="${basedir}/interface" failonerror="true"> - <arg line="--gen py:twisted" /> - <arg line="-o ${interface.thrift.dir}" /> - <arg line="cassandra.thrift" /> - </exec> - </target> - <!-- create properties file with C version --> <target name="createVersionPropFile"> <taskdef name="propertyfile" classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"/> @@ -803,13 +719,6 @@ <!-- Order matters! --> <javac fork="true" debug="true" debuglevel="${debuglevel}" encoding="utf-8" - destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}" - memorymaximumsize="512M"> - <src path="${interface.thrift.dir}/gen-java"/> - <classpath refid="cassandra.classpath"/> - </javac> - <javac fork="true" - debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}" memorymaximumsize="512M"> <src path="${build.src.java}"/> @@ -833,7 +742,6 @@ <property name="stress.manifest" value="${stress.build.classes}/MANIFEST.MF" /> <path id="cassandra.classes"> <pathelement location="${basedir}/build/classes/main" /> - <pathelement location="${basedir}/build/classes/thrift" /> </path> <target name="stress-build-test" depends="stress-build" description="Compile stress tests"> @@ -876,8 +784,6 @@ <target name="_write-poms" depends="maven-declare-dependencies"> <artifact:writepom pomRefId="parent-pom" file="${build.dir}/${final.name}-parent.pom"/> - <artifact:writepom pomRefId="thrift-pom" - file="${build.dir}/${ant.project.name}-thrift-${version}.pom"/> <artifact:writepom pomRefId="all-pom" file="${build.dir}/${final.name}.pom"/> </target> @@ -892,35 +798,14 @@ depends="build, build-test, stress-build, write-poms" description="Assemble Cassandra JAR files"> <mkdir dir="${build.classes.main}/META-INF" /> - <mkdir dir="${build.classes.thrift}/META-INF" /> <copy file="LICENSE.txt" tofile="${build.classes.main}/META-INF/LICENSE.txt"/> - <copy file="LICENSE.txt" - tofile="${build.classes.thrift}/META-INF/LICENSE.txt"/> <copy file="NOTICE.txt" tofile="${build.classes.main}/META-INF/NOTICE.txt"/> - <copy file="NOTICE.txt" - tofile="${build.classes.thrift}/META-INF/NOTICE.txt"/> - - <!-- Thrift Jar --> - <jar jarfile="${build.dir}/${ant.project.name}-thrift-${version}.jar" - basedir="${build.classes.thrift}"> - <fileset dir="${build.classes.main}"> - <include name="org/apache/cassandra/thrift/ITransportFactory*.class" /> - <include name="org/apache/cassandra/thrift/TFramedTransportFactory*.class" /> - </fileset> - <manifest> - <attribute name="Implementation-Title" value="Cassandra"/> - <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Implementation-Vendor" value="Apache"/> - </manifest> - </jar> <!-- Main Jar --> <jar jarfile="${build.dir}/${final.name}.jar"> <fileset dir="${build.classes.main}"> - <exclude name="org/apache/cassandra/thrift/ITransportFactory*.class" /> - <exclude name="org/apache/cassandra/thrift/TFramedTransportFactory*.class" /> </fileset> <manifest> <!-- <section name="org/apache/cassandra/infrastructure"> --> @@ -929,8 +814,6 @@ <attribute name="Implementation-Vendor" value="Apache"/> <attribute name="Premain-Class" value="org.apache.cassandra.infrastructure.continuations.CAgent"/> - <attribute name="Class-Path" - value="${ant.project.name}-thrift-${version}.jar" /> <!-- </section> --> </manifest> </jar> @@ -952,16 +835,6 @@ --> <target name="javadoc-jar" description="Assemble Cassandra JavaDoc JAR file"> <mkdir dir="${javadoc.jars.dir}"/> - <create-javadoc destdir="${javadoc.jars.dir}/thrift"> - <filesets> - <fileset dir="${interface.thrift.dir}/gen-java" defaultexcludes="yes"> - <include name="org/apache/**/*.java"/> - </fileset> - </filesets> - </create-javadoc> - <jar jarfile="${build.dir}/${ant.project.name}-thrift-${version}-javadoc.jar" - basedir="${javadoc.jars.dir}/thrift"/> - <create-javadoc destdir="${javadoc.jars.dir}/main"> <filesets> <fileset dir="${build.src.java}" defaultexcludes="yes"> @@ -984,11 +857,6 @@ The sources-jar target makes cassandra-sources.jar output required for publishing to Maven central repository. --> <target name="sources-jar" depends="init" description="Assemble Cassandra Sources JAR file"> - <jar jarfile="${build.dir}/${ant.project.name}-thrift-${version}-sources.jar"> - <fileset dir="${interface.thrift.dir}/gen-java" defaultexcludes="yes"> - <include name="org/apache/**/*.java"/> - </fileset> - </jar> <jar jarfile="${build.dir}/${final.name}-sources.jar"> <fileset dir="${build.src.java}" defaultexcludes="yes"> <include name="org/apache/**/*.java"/> @@ -1011,7 +879,6 @@ <fileset dir="${build.lib}"/> <fileset dir="${build.dir}"> <include name="${final.name}.jar" /> - <include name="${ant.project.name}-thrift-${version}.jar" /> </fileset> </copy> <copy todir="${dist.dir}/javadoc"> @@ -1034,11 +901,6 @@ <copy todir="${dist.dir}/conf"> <fileset dir="conf"/> </copy> - <copy todir="${dist.dir}/interface"> - <fileset dir="interface"> - <include name="**/*.thrift" /> - </fileset> - </copy> <copy todir="${dist.dir}/pylib"> <fileset dir="pylib"> <include name="**" /> @@ -1594,14 +1456,9 @@ <target name="javadoc" depends="init" description="Create javadoc" unless="no-javadoc"> <create-javadoc destdir="${javadoc.dir}"> - <filesets> <fileset dir="${build.src.java}" defaultexcludes="yes"> <include name="org/apache/**/*.java"/> </fileset> - <fileset dir="${interface.thrift.gen-java}" defaultexcludes="yes"> - <include name="org/apache/**/*.java"/> - </fileset> - </filesets> </create-javadoc> </target> @@ -1779,7 +1636,6 @@ <classpathentry kind="src" path="src/resources"/> <classpathentry kind="src" path="src/gen-java"/> <classpathentry kind="src" path="conf" including="hotspot_compiler"/> - <classpathentry kind="src" path="interface/thrift/gen-java"/> <classpathentry kind="src" output="build/test/classes" path="test/unit"/> <classpathentry kind="src" output="build/test/classes" path="test/long"/> <classpathentry kind="src" output="build/test/classes" path="test/resources" /> @@ -1787,7 +1643,6 @@ <classpathentry kind="src" output="build/test/stress-classes" path="tools/stress/test/unit" /> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="build/classes/eclipse"/> - <classpathentry kind="lib" path="build/classes/thrift" sourcepath="interface/thrift/gen-java/"/> <classpathentry kind="lib" path="test/conf"/> <classpathentry kind="lib" path="${java.home}/../lib/tools.jar"/> ]]> @@ -1900,16 +1755,6 @@ packaging="tar.gz" classifier="src"/> - <!-- the cassandra-thrift jar --> - <install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom" - file="${build.dir}/${ant.project.name}-thrift-${version}.jar"/> - <install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom" - file="${build.dir}/${ant.project.name}-thrift-${version}-sources.jar" - classifier="sources"/> - <install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom" - file="${build.dir}/${ant.project.name}-thrift-${version}-javadoc.jar" - classifier="javadoc"/> - <!-- the cassandra-all jar --> <install pomFile="${build.dir}/${final.name}.pom" file="${build.dir}/${final.name}.jar"/> @@ -1944,16 +1789,6 @@ packaging="tar.gz" classifier="src"/> - <!-- the cassandra-thrift jar --> - <deploy pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom" - file="${build.dir}/${ant.project.name}-thrift-${version}.jar"/> - <deploy pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom" - file="${build.dir}/${ant.project.name}-thrift-${version}-sources.jar" - classifier="sources"/> - <deploy pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom" - file="${build.dir}/${ant.project.name}-thrift-${version}-javadoc.jar" - classifier="javadoc"/> - <!-- the cassandra-all jar --> <deploy pomFile="${build.dir}/${final.name}.pom" file="${build.dir}/${final.name}.jar"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/conf/cassandra-env.ps1 ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1 index 9e2f50d..d6b4f34 100644 --- a/conf/cassandra-env.ps1 +++ b/conf/cassandra-env.ps1 @@ -47,7 +47,7 @@ Function BuildClassPath } # Add build/classes/main so it works in development - $cp = $cp + ";" + """$env:CASSANDRA_HOME\build\classes\main"";""$env:CASSANDRA_HOME\build\classes\thrift""" + $cp = $cp + ";" + """$env:CASSANDRA_HOME\build\classes\main""" $env:CLASSPATH=$cp } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 4436a02..4891706 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -232,10 +232,10 @@ disk_failure_policy: stop # Policy for commit disk failures: # # die -# shut down gossip and Thrift and kill the JVM, so the node can be replaced. +# shut down the node and kill the JVM, so the node can be replaced. # # stop -# shut down gossip and Thrift, leaving the node effectively dead, but +# shut down the node, leaving the node effectively dead, but # can still be inspected via JMX. # # stop_commit @@ -265,15 +265,6 @@ commit_failure_policy: stop # Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater prepared_statements_cache_size_mb: -# Maximum size of the Thrift prepared statement cache -# -# If you do not use Thrift at all, it is safe to leave this value at "auto". -# -# See description of 'prepared_statements_cache_size_mb' above for more information. -# -# Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater -thrift_prepared_statements_cache_size_mb: - # Maximum size of the key cache in memory. # # Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the @@ -624,8 +615,7 @@ listen_address: localhost # internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator # Whether to start the native transport server. -# Please note that the address on which the native transport is bound is the -# same as the rpc_address. The port however is different and specified below. +# The address on which the native transport is bound is defined by rpc_address. start_native_transport: true # port for the CQL native transport to listen for clients on # For security reasons, you should not expose this port to the internet. Firewall it if needed. @@ -638,10 +628,8 @@ native_transport_port: 9042 # from native_transport_port will use encryption for native_transport_port_ssl while # keeping native_transport_port unencrypted. # native_transport_port_ssl: 9142 -# The maximum threads for handling requests when the native transport is used. -# This is similar to rpc_max_threads though the default differs slightly (and -# there is no native_transport_min_threads, idle threads will always be stopped -# after 30 seconds). +# The maximum threads for handling requests (note that idle threads are stopped +# after 30 seconds so there is not corresponding minimum setting). # native_transport_max_threads: 128 # # The maximum size of allowed frame. Frame (requests) larger than this will @@ -657,11 +645,7 @@ native_transport_port: 9042 # The default is -1, which means unlimited. # native_transport_max_concurrent_connections_per_ip: -1 -# Whether to start the thrift rpc server. -start_rpc: false - -# The address or interface to bind the Thrift RPC service and native transport -# server to. +# The address or interface to bind the native transport server to. # # Set rpc_address OR rpc_interface, not both. # @@ -684,9 +668,6 @@ rpc_address: localhost # ipv4. If there is only one address it will be selected regardless of ipv4/ipv6. # rpc_interface_prefer_ipv6: false -# port for Thrift to listen for clients on -rpc_port: 9160 - # RPC address to broadcast to drivers and other Cassandra nodes. This cannot # be set to 0.0.0.0. If left blank, this will be set to the value of # rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must @@ -696,45 +677,6 @@ rpc_port: 9160 # enable or disable keepalive on rpc/native connections rpc_keepalive: true -# Cassandra provides two out-of-the-box options for the RPC Server: -# -# sync -# One thread per thrift connection. For a very large number of clients, memory -# will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size -# per thread, and that will correspond to your use of virtual memory (but physical memory -# may be limited depending on use of stack space). -# -# hsha -# Stands for "half synchronous, half asynchronous." All thrift clients are handled -# asynchronously using a small number of threads that does not vary with the amount -# of thrift clients (and thus scales well to many clients). The rpc requests are still -# synchronous (one thread per active request). If hsha is selected then it is essential -# that rpc_max_threads is changed from the default value of unlimited. -# -# The default is sync because on Windows hsha is about 30% slower. On Linux, -# sync/hsha performance is about the same, with hsha of course using less memory. -# -# Alternatively, can provide your own RPC server by providing the fully-qualified class name -# of an o.a.c.t.TServerFactory that can create an instance of it. -rpc_server_type: sync - -# Uncomment rpc_min|max_thread to set request pool size limits. -# -# Regardless of your choice of RPC server (see above), the number of maximum requests in the -# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync -# RPC server, it also dictates the number of clients that can be connected at all). -# -# The default is unlimited and thus provides no protection against clients overwhelming the server. You are -# encouraged to set a maximum that makes sense for you in production, but do keep in mind that -# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. -# -# rpc_min_threads: 16 -# rpc_max_threads: 2048 - -# uncomment to set socket buffer sizes on rpc connections -# rpc_send_buff_size_in_bytes: -# rpc_recv_buff_size_in_bytes: - # Uncomment to set socket buffer size for internode communication # Note that when setting this, the buffer size is limited by net.core.wmem_max # and when not setting it it is defined by net.ipv4.tcp_wmem @@ -751,9 +693,6 @@ rpc_server_type: sync # and when not setting it it is defined by net.ipv4.tcp_wmem # internode_recv_buff_size_in_bytes: -# Frame size for thrift (maximum message length). -thrift_framed_transport_size_in_mb: 15 - # Set to true to have Cassandra create a hard link to each sstable # flushed or streamed locally in a backups/ subdirectory of the # keyspace data. Removing these links is the operator's @@ -962,52 +901,6 @@ dynamic_snitch_reset_interval_in_ms: 600000 # until the pinned host was 20% worse than the fastest. dynamic_snitch_badness_threshold: 0.1 -# request_scheduler -- Set this to a class that implements -# RequestScheduler, which will schedule incoming client requests -# according to the specific policy. This is useful for multi-tenancy -# with a single Cassandra cluster. -# NOTE: This is specifically for requests from the client and does -# not affect inter node communication. -# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place -# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of -# client requests to a node with a separate queue for each -# request_scheduler_id. The scheduler is further customized by -# request_scheduler_options as described below. -request_scheduler: org.apache.cassandra.scheduler.NoScheduler - -# Scheduler Options vary based on the type of scheduler -# -# NoScheduler -# Has no options -# -# RoundRobin -# throttle_limit -# The throttle_limit is the number of in-flight -# requests per client. Requests beyond -# that limit are queued up until -# running requests can complete. -# The value of 80 here is twice the number of -# concurrent_reads + concurrent_writes. -# default_weight -# default_weight is optional and allows for -# overriding the default which is 1. -# weights -# Weights are optional and will default to 1 or the -# overridden default_weight. The weight translates into how -# many requests are handled during each turn of the -# RoundRobin, based on the scheduler id. -# -# request_scheduler_options: -# throttle_limit: 80 -# default_weight: 5 -# weights: -# Keyspace1: 1 -# Keyspace2: 5 - -# request_scheduler_id -- An identifier based on which to perform -# the request scheduling. Currently the only valid option is keyspace. -# request_scheduler_id: keyspace - # Enable or disable inter-node encryption # JVM defaults for supported SSL socket protocols and cipher suites can # be replaced using custom encryption options. This is not recommended http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/conf/jvm.options ---------------------------------------------------------------------- diff --git a/conf/jvm.options b/conf/jvm.options index 0e329d6..678ac3c 100644 --- a/conf/jvm.options +++ b/conf/jvm.options @@ -53,18 +53,12 @@ # before joining the ring. #-Dcassandra.ring_delay_ms=ms -# Set the port for the Thrift RPC service, which is used for client connections. (Default: 9160) -#-Dcassandra.rpc_port=port - # Set the SSL port for encrypted communication. (Default: 7001) #-Dcassandra.ssl_storage_port=port # Enable or disable the native transport server. See start_native_transport in cassandra.yaml. # cassandra.start_native_transport=true|false -# Enable or disable the Thrift RPC server. (Default: true) -#-Dcassandra.start_rpc=true/false - # Set the port for inter-node communication. (Default: 7000) #-Dcassandra.storage_port=port http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/conf/logback.xml ---------------------------------------------------------------------- diff --git a/conf/logback.xml b/conf/logback.xml index 7bd1c6d..a22f131 100644 --- a/conf/logback.xml +++ b/conf/logback.xml @@ -98,5 +98,4 @@ appender reference in the root level section below. </root> <logger name="org.apache.cassandra" level="DEBUG"/> - <logger name="com.thinkaurelius.thrift" level="ERROR"/> </configuration> http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/debian/nodetool-completion ---------------------------------------------------------------------- diff --git a/debian/nodetool-completion b/debian/nodetool-completion index 7dc35de..d6e4bbe 100644 --- a/debian/nodetool-completion +++ b/debian/nodetool-completion @@ -62,13 +62,11 @@ have nodetool && have cqlsh && disablebinary disablegossip disablehandoff - disablethrift drain enablebackup enablebinary enablegossip enablehandoff - enablethrift getcompactionthroughput getlogginglevels getstreamthroughput @@ -89,7 +87,6 @@ have nodetool && have cqlsh && setlogginglevel status statusbinary - statusthrift stopdaemon tpstats version http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/debian/patches/001cassandra_yaml_dirs.dpatch ---------------------------------------------------------------------- diff --git a/debian/patches/001cassandra_yaml_dirs.dpatch b/debian/patches/001cassandra_yaml_dirs.dpatch index 3d545e5..72580a3 100644 --- a/debian/patches/001cassandra_yaml_dirs.dpatch +++ b/debian/patches/001cassandra_yaml_dirs.dpatch @@ -24,7 +24,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' +commitlog_directory: /var/lib/cassandra/commitlog # policy for data disk failures: - # stop_paranoid: shut down gossip and Thrift even for single-sstable errors. + # stop_paranoid: shut down gossip even for single-sstable errors. @@ -203,7 +203,7 @@ # saved caches http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index 35f5a51..0147e9b 100755 --- a/debian/rules +++ b/debian/rules @@ -45,8 +45,6 @@ install: build # Copy in the jar and symlink to something stable dh_install build/apache-cassandra-$(VERSION).jar \ usr/share/cassandra - dh_install build/apache-cassandra-thrift-$(VERSION).jar \ - usr/share/cassandra # Copy stress jars dh_install build/tools/lib/stress.jar \ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/doc/SASI.md ---------------------------------------------------------------------- diff --git a/doc/SASI.md b/doc/SASI.md index a4762c9..7c530b1 100644 --- a/doc/SASI.md +++ b/doc/SASI.md @@ -19,8 +19,7 @@ implementation. ## Using SASI The examples below walk through creating a table and indexes on its -columns, and performing queries on some inserted data. The patchset in -this repository includes support for the Thrift and CQL3 interfaces. +columns, and performing queries on some inserted data. The examples below assume the `demo` keyspace has been created and is in use. http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/doc/convert_yaml_to_rst.py ---------------------------------------------------------------------- diff --git a/doc/convert_yaml_to_rst.py b/doc/convert_yaml_to_rst.py index c17bbbb..4bdcf5b 100644 --- a/doc/convert_yaml_to_rst.py +++ b/doc/convert_yaml_to_rst.py @@ -41,7 +41,6 @@ commented_re = re.compile(r"^# ?(.*)") # that these can be commented out (making it useless to use a yaml parser). COMPLEX_OPTIONS = ( 'seed_provider', - 'request_scheduler_options', 'data_file_directories', 'commitlog_compression', 'hints_compression', http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/doc/source/cql/ddl.rst ---------------------------------------------------------------------- diff --git a/doc/source/cql/ddl.rst b/doc/source/cql/ddl.rst index 029c1cb..8db4c84 100644 --- a/doc/source/cql/ddl.rst +++ b/doc/source/cql/ddl.rst @@ -396,15 +396,14 @@ Compact tables .. warning:: Since Cassandra 3.0, compact tables have the exact same layout internally than non compact ones (for the same schema obviously), and declaring a table compact **only** creates artificial limitations on the table definition - and usage that are necessary to ensure backward compatibility with the deprecated Thrift API. And as ``COMPACT + and usage. It only exists for historical reason and is preserved for backward compatibility And as ``COMPACT STORAGE`` cannot, as of Cassandra |version|, be removed, it is strongly discouraged to create new table with the ``COMPACT STORAGE`` option. -A *compact* table is one defined with the ``COMPACT STORAGE`` option. This option is mainly targeted towards backward -compatibility for definitions created before CQL version 3 (see `www.datastax.com/dev/blog/thrift-to-cql3 -<http://www.datastax.com/dev/blog/thrift-to-cql3>`__ for more details) and shouldn't be used for new tables. Declaring a -table with this option creates limitations for the table which are largely arbitrary but necessary for backward -compatibility with the (deprecated) Thrift API. Amongst those limitation: +A *compact* table is one defined with the ``COMPACT STORAGE`` option. This option is only maintained for backward +compatibility for definitions created before CQL version 3 and shouldn't be used for new tables. Declaring a +table with this option creates limitations for the table which are largely arbitrary (and exists for historical +reasons). Amongst those limitation: - a compact table cannot use collections nor static columns. - if a compact table has at least one clustering column, then it must have *exactly* one column outside of the primary http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/doc/source/cql/index.rst ---------------------------------------------------------------------- diff --git a/doc/source/cql/index.rst b/doc/source/cql/index.rst index 6fa8135..b4c21cf 100644 --- a/doc/source/cql/index.rst +++ b/doc/source/cql/index.rst @@ -24,8 +24,7 @@ the languages. However, the `changes <#changes>`_ section provides the diff betw CQL offers a model close to SQL in the sense that data is put in *tables* containing *rows* of *columns*. For that reason, when used in this document, these terms (tables, rows and columns) have the same definition than they have -in SQL. But please note that as such, they do **not** refer to the concept of rows and columns found in the deprecated -thrift API (and earlier version 1 and 2 of CQL). +in SQL. .. toctree:: :maxdepth: 2 http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/doc/source/faq/index.rst ---------------------------------------------------------------------- diff --git a/doc/source/faq/index.rst b/doc/source/faq/index.rst index d985e37..24575a4 100644 --- a/doc/source/faq/index.rst +++ b/doc/source/faq/index.rst @@ -58,7 +58,7 @@ What ports does Cassandra use? ------------------------------ By default, Cassandra uses 7000 for cluster communication (7001 if SSL is enabled), 9042 for native protocol clients, -and 7199 for JMX (and 9160 for the deprecated Thrift interface). The internode communication and native protocol ports +and 7199 for JMX. The internode communication and native protocol ports are configurable in the :ref:`cassandra-yaml`. The JMX port is configurable in ``cassandra-env.sh`` (through JVM options). All ports are TCP. http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/doc/source/operating/metrics.rst ---------------------------------------------------------------------- diff --git a/doc/source/operating/metrics.rst b/doc/source/operating/metrics.rst index ef43128..373d4d2 100644 --- a/doc/source/operating/metrics.rst +++ b/doc/source/operating/metrics.rst @@ -584,7 +584,6 @@ Reported name format: Name Type Description =========================== ============== =========== connectedNativeClients Counter Number of clients connected to this nodes native protocol server -connectedThriftClients Counter Number of clients connected to this nodes thrift protocol server =========================== ============== =========== http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/examples/hadoop_cql3_word_count/README.txt ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/README.txt b/examples/hadoop_cql3_word_count/README.txt deleted file mode 100644 index b6ee33f..0000000 --- a/examples/hadoop_cql3_word_count/README.txt +++ /dev/null @@ -1,51 +0,0 @@ -Introduction -============ - -WordCount hadoop example: Inserts a bunch of words across multiple rows, -and counts them, with RandomPartitioner. The word_count_counters example sums -the value of counter columns for a key. - -The scripts in bin/ assume you are running with cwd of examples/word_count. - - -Running -======= - -First build and start a Cassandra server with the default configuration*. Ensure that the Thrift -interface is enabled, either by setting start_rpc:true in cassandra.yaml or by running -`nodetool enablethrift` after startup. -Once Cassandra has started and the Thrift interface is available, run - -contrib/word_count$ ant -contrib/word_count$ bin/word_count_setup -contrib/word_count$ bin/word_count -contrib/word_count$ bin/word_count_counters - -In order to view the results in Cassandra, one can use bin/cqlsh and -perform the following operations: -$ bin/cqlsh localhost -> use cql3_wordcount; -> select * from output_words; - -The output of the word count can now be configured. In the bin/word_count -file, you can specify the OUTPUT_REDUCER. The two options are 'filesystem' -and 'cassandra'. The filesystem option outputs to the /tmp/word_count* -directories. The cassandra option outputs to the 'output_words' column family -in the 'cql3_wordcount' keyspace. 'cassandra' is the default. - -Read the code in src/ for more details. - -The word_count_counters example sums the counter columns for a row. The output -is written to a text file in /tmp/word_count_counters. - -*It is recommended to turn off vnodes when running Cassandra with hadoop. -This is done by setting "num_tokens: 1" in cassandra.yaml. If you want to -point wordcount at a real cluster, modify the seed and listenaddress -settings accordingly. - - -Troubleshooting -=============== - -word_count uses conf/logback.xml to log to wc.out. - http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/examples/hadoop_cql3_word_count/bin/word_count ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/bin/word_count b/examples/hadoop_cql3_word_count/bin/word_count deleted file mode 100755 index 76cca7d..0000000 --- a/examples/hadoop_cql3_word_count/bin/word_count +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -# 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. - -cwd=`dirname $0` - -# Cassandra class files. -if [ ! -d $cwd/../../../build/classes/main ]; then - echo "Unable to locate cassandra class files" >&2 - exit 1 -fi - -# word_count Jar. -if [ ! -e $cwd/../build/word_count.jar ]; then - echo "Unable to locate word_count jar" >&2 - exit 1 -fi - -CLASSPATH=$CLASSPATH:$cwd/../conf -CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar -CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/main -CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/thrift -for jar in $cwd/../build/lib/jars/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done -for jar in $cwd/../../../lib/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done -for jar in $cwd/../../../build/lib/jars/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done - -if [ -x $JAVA_HOME/bin/java ]; then - JAVA=$JAVA_HOME/bin/java -else - JAVA=`which java` -fi - -if [ "x$JAVA" = "x" ]; then - echo "Java executable not found (hint: set JAVA_HOME)" >&2 - exit 1 -fi - -OUTPUT_REDUCER=cassandra -INPUT_MAPPER=native - -#echo $CLASSPATH -"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCount output_reducer=$OUTPUT_REDUCER input_mapper=$INPUT_MAPPER http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/examples/hadoop_cql3_word_count/bin/word_count_counters ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/bin/word_count_counters b/examples/hadoop_cql3_word_count/bin/word_count_counters deleted file mode 100755 index cc1243f..0000000 --- a/examples/hadoop_cql3_word_count/bin/word_count_counters +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -# 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. - -cwd=`dirname $0` - -# Cassandra class files. -if [ ! -d $cwd/../../../build/classes/main ]; then - echo "Unable to locate cassandra class files" >&2 - exit 1 -fi - -# word_count Jar. -if [ ! -e $cwd/../build/word_count.jar ]; then - echo "Unable to locate word_count jar" >&2 - exit 1 -fi - -CLASSPATH=$CLASSPATH:$cwd/../conf -CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar -CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/main -CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/thrift -for jar in $cwd/../build/lib/jars/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done -for jar in $cwd/../../../lib/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done -for jar in $cwd/../../../build/lib/jars/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done - -if [ -x $JAVA_HOME/bin/java ]; then - JAVA=$JAVA_HOME/bin/java -else - JAVA=`which java` -fi - -if [ "x$JAVA" = "x" ]; then - echo "Java executable not found (hint: set JAVA_HOME)" >&2 - exit 1 -fi - -INPUT_MAPPER=native - -#echo $CLASSPATH -"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCountCounters input_mapper=$INPUT_MAPPER http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/examples/hadoop_cql3_word_count/bin/word_count_setup ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/bin/word_count_setup b/examples/hadoop_cql3_word_count/bin/word_count_setup deleted file mode 100755 index 6e5650f..0000000 --- a/examples/hadoop_cql3_word_count/bin/word_count_setup +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -# 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. - -cwd=`dirname $0` - -# Cassandra class files. -if [ ! -d $cwd/../../../build/classes/main ]; then - echo "Unable to locate cassandra class files" >&2 - exit 1 -fi - -# word_count Jar. -if [ ! -e $cwd/../build/word_count.jar ]; then - echo "Unable to locate word_count jar" >&2 - exit 1 -fi - -CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar -CLASSPATH=$CLASSPATH:.:$cwd/../../../build/classes/main -CLASSPATH=$CLASSPATH:.:$cwd/../../../build/classes/thrift -for jar in $cwd/../build/lib/jars/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done -for jar in $cwd/../../../lib/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done -for jar in $cwd/../../../build/lib/jars/*.jar; do - CLASSPATH=$CLASSPATH:$jar -done - -if [ -x $JAVA_HOME/bin/java ]; then - JAVA=$JAVA_HOME/bin/java -else - JAVA=`which java` -fi - -if [ "x$JAVA" = "x" ]; then - echo "Java executable not found (hint: set JAVA_HOME)" >&2 - exit 1 -fi - -HOST=localhost -PORT=9160 -FRAMED=true - -"$JAVA" -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp "$CLASSPATH" WordCountSetup http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/examples/hadoop_cql3_word_count/build.xml ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/build.xml b/examples/hadoop_cql3_word_count/build.xml deleted file mode 100644 index 939e1b3..0000000 --- a/examples/hadoop_cql3_word_count/build.xml +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ 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. - --> -<project default="jar" name="word_count" xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="cassandra.dir" value="../.." /> - <property name="cassandra.dir.lib" value="${cassandra.dir}/lib" /> - <property name="cassandra.classes" value="${cassandra.dir}/build/classes" /> - <property name="build.src" value="${basedir}/src" /> - <property name="build.dir" value="${basedir}/build" /> - <property name="ivy.lib.dir" value="${build.dir}/lib" /> - <property name="build.classes" value="${build.dir}/classes" /> - <property name="final.name" value="word_count" /> - <property name="ivy.version" value="2.1.0" /> - <property name="ivy.url" - value="http://repo2.maven.org/maven2/org/apache/ivy/ivy"; /> - - <condition property="ivy.jar.exists"> - <available file="${build.dir}/ivy-${ivy.version}.jar" /> - </condition> - - <path id="autoivy.classpath"> - <fileset dir="${ivy.lib.dir}"> - <include name="**/*.jar" /> - </fileset> - <pathelement location="${build.dir}/ivy-${ivy.version}.jar"/> - </path> - - <path id="wordcount.build.classpath"> - <fileset dir="${ivy.lib.dir}"> - <include name="**/*.jar" /> - </fileset> - <!-- cassandra dependencies --> - <fileset dir="${cassandra.dir.lib}"> - <include name="**/*.jar" /> - </fileset> - <fileset dir="${cassandra.dir}/build/lib/jars"> - <include name="**/*.jar" /> - </fileset> - <pathelement location="${cassandra.classes}/main" /> - <pathelement location="${cassandra.classes}/thrift" /> - </path> - - <target name="init"> - <mkdir dir="${build.classes}" /> - </target> - - <target depends="init,ivy-retrieve-build" name="build"> - <javac destdir="${build.classes}"> - <src path="${build.src}" /> - <classpath refid="wordcount.build.classpath" /> - </javac> - </target> - - <target name="jar" depends="build"> - <mkdir dir="${build.classes}/META-INF" /> - <jar jarfile="${build.dir}/${final.name}.jar"> - <fileset dir="${build.classes}" /> - <fileset dir="${cassandra.classes}/main" /> - <fileset dir="${cassandra.classes}/thrift" /> - <fileset dir="${cassandra.dir}"> - <include name="lib/**/*.jar" /> - </fileset> - <zipfileset dir="${cassandra.dir}/build/lib/jars/" prefix="lib"> - <include name="**/*.jar" /> - </zipfileset> - <fileset file="${basedir}/cassandra.yaml" /> - </jar> - </target> - - <target name="clean"> - <delete dir="${build.dir}" /> - </target> - - <!-- - Ivy Specific targets - to fetch Ivy and this project's dependencies - --> - <target name="ivy-download" unless="ivy.jar.exists"> - <echo>Downloading Ivy...</echo> - <mkdir dir="${build.dir}" /> - <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar" - dest="${build.dir}/ivy-${ivy.version}.jar" usetimestamp="true" /> - </target> - - <target name="ivy-init" depends="ivy-download" unless="ivy.initialized"> - <mkdir dir="${ivy.lib.dir}"/> - <taskdef resource="org/apache/ivy/ant/antlib.xml" - uri="antlib:org.apache.ivy.ant" - classpathref="autoivy.classpath"/> - <property name="ivy.initialized" value="true"/> - </target> - - <target name="ivy-retrieve-build" depends="ivy-init"> - <ivy:retrieve type="jar,source" sync="true" - pattern="${ivy.lib.dir}/[type]s/[artifact]-[revision].[ext]" /> - </target> -</project> http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/examples/hadoop_cql3_word_count/conf/logback.xml ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/conf/logback.xml b/examples/hadoop_cql3_word_count/conf/logback.xml deleted file mode 100644 index 443bd1c..0000000 --- a/examples/hadoop_cql3_word_count/conf/logback.xml +++ /dev/null @@ -1,42 +0,0 @@ -<!-- - 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. ---> - -<configuration scan="true"> - - <jmxConfigurator /> - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>wc.out</file> - <encoder> - <pattern>%-5level [%thread] %date{ISO8601} %F:%L - %msg%n</pattern> - </encoder> - </appender> - - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%-5level %date{HH:mm:ss,SSS} %msg%n</pattern> - </encoder> - </appender> - - <root level="INFO"> - <appender-ref ref="FILE" /> - <appender-ref ref="STDOUT" /> - </root> - -</configuration> http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/examples/hadoop_cql3_word_count/ivy.xml ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/ivy.xml b/examples/hadoop_cql3_word_count/ivy.xml deleted file mode 100644 index 2016eb8..0000000 --- a/examples/hadoop_cql3_word_count/ivy.xml +++ /dev/null @@ -1,24 +0,0 @@ -<!-- - ~ 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. - --> -<ivy-module version="2.0"> - <info organisation="apache-cassandra" module="word-count"/> - <dependencies> - <dependency org="org.apache.hadoop" name="hadoop-core" rev="1.0.3"/> - </dependencies> -</ivy-module>
