From 06c130e3cb85577041b475084400c08c505d8f9e Mon Sep 17 00:00:00 2001 From: Sam Tunnicliffe Date: Mon, 10 Aug 2015 16:09:15 +0100 Subject: [PATCH] Move 2i metadata out of system_schema.columns and ColumnDefinition Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko and Robert Stupp for CASSANDRA-6717 --- build.xml | 4 +- ...-3.0.0-alpha2-188d996-SNAPSHOT-shaded.jar} | Bin 2163939 -> 2204619 bytes ...r-internal-only-3.0.0a1.post0-90a797e.zip} | Bin 200621 -> 201086 bytes .../apache/cassandra/config/CFMetaData.java | 155 ++++--------- .../cassandra/config/ColumnDefinition.java | 116 +--------- .../apache/cassandra/config/IndexType.java | 25 --- .../cql3/functions/JavaBasedUDFunction.java | 2 +- .../cassandra/cql3/functions/JavaUDF.java | 16 +- .../cql3/functions/ScriptBasedUDFunction.java | 2 +- .../cassandra/cql3/functions/UDFunction.java | 12 +- .../cassandra/cql3/functions/UDHelper.java | 34 ++- .../cql3/statements/AlterTableStatement.java | 19 +- .../cql3/statements/CreateIndexStatement.java | 77 +++++-- .../cql3/statements/DropIndexStatement.java | 77 +++---- .../cql3/statements/IndexTarget.java | 23 +- .../cassandra/db/ColumnFamilyStore.java | 19 +- ...AbstractSimplePerColumnSecondaryIndex.java | 2 +- .../cassandra/db/index/SecondaryIndex.java | 92 ++++---- .../db/index/SecondaryIndexManager.java | 27 +-- .../db/index/composites/CompositesIndex.java | 19 +- .../cassandra/db/index/keys/KeysIndex.java | 5 +- .../hadoop/cql3/CqlRecordReader.java | 38 ++++ .../io/sstable/format/SSTableReader.java | 6 +- .../cassandra/schema/IndexMetadata.java | 167 ++++++++++++++ .../org/apache/cassandra/schema/Indexes.java | 208 ++++++++++++++++++ .../cassandra/schema/KeyspaceMetadata.java | 23 ++ .../schema/LegacySchemaMigrator.java | 106 +++++++-- .../cassandra/schema/SchemaKeyspace.java | 196 ++++++++++++++--- .../cassandra/thrift/CassandraServer.java | 3 - .../cassandra/thrift/ThriftConversion.java | 74 ++++++- .../utils/NativeSSTableLoaderClient.java | 2 +- .../org/apache/cassandra/SchemaLoader.java | 42 ++-- .../config/ColumnDefinitionTest.java | 6 +- .../org/apache/cassandra/cql3/CQLTester.java | 21 +- .../cassandra/cql3/IndexQueryPagingTest.java | 2 +- .../validation/entities/UFPureScriptTest.java | 13 +- .../cql3/validation/entities/UFTest.java | 14 +- .../cassandra/db/BatchlogManagerTest.java | 4 +- .../apache/cassandra/db/DirectoriesTest.java | 12 +- .../cassandra/db/RangeTombstoneTest.java | 106 +++++---- .../cassandra/db/SecondaryIndexTest.java | 21 +- .../db/index/PerRowSecondaryIndexTest.java | 3 +- .../org/apache/cassandra/schema/DefsTest.java | 39 +++- .../schema/LegacySchemaMigratorTest.java | 36 ++- .../stress/util/JavaDriverClient.java | 2 +- 45 files changed, 1257 insertions(+), 613 deletions(-) rename lib/{cassandra-driver-core-2.2.0-rc2-SNAPSHOT-shaded.jar => cassandra-driver-core-3.0.0-alpha2-188d996-SNAPSHOT-shaded.jar} (68%) rename lib/{cassandra-driver-internal-only-2.6.0rc2.post0-1a480f1.zip => cassandra-driver-internal-only-3.0.0a1.post0-90a797e.zip} (76%) delete mode 100644 src/java/org/apache/cassandra/config/IndexType.java create mode 100644 src/java/org/apache/cassandra/schema/IndexMetadata.java create mode 100644 src/java/org/apache/cassandra/schema/Indexes.java diff --git a/build.xml b/build.xml index 06638f6974..8df738ced2 100644 --- a/build.xml +++ b/build.xml @@ -134,13 +134,11 @@