Repository: cassandra Updated Branches: refs/heads/trunk 105360cb1 -> ce2a99d43
don't declare throwing exceptions that aren't Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce2a99d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce2a99d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce2a99d4 Branch: refs/heads/trunk Commit: ce2a99d4332fca99ccec6f7769982ae536f17c6e Parents: 105360c Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Nov 15 15:14:30 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Nov 15 15:14:30 2014 -0500 ---------------------------------------------------------------------- .../apache/cassandra/cql3/selection/SimpleSelector.java | 12 +++++++++--- .../cql3/statements/DropFunctionStatement.java | 9 ++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce2a99d4/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java b/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java index cdd91b2..a5ff4cd 100644 --- a/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java @@ -21,7 +21,6 @@ import java.nio.ByteBuffer; import org.apache.cassandra.cql3.selection.Selection.ResultSetBuilder; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.exceptions.InvalidRequestException; public final class SimpleSelector extends Selector { @@ -34,16 +33,19 @@ public final class SimpleSelector extends Selector { return new Factory() { + @Override protected String getColumnName() { return columnName; } + @Override protected AbstractType<?> getReturnType() { return type; } + @Override public Selector newInstance() { return new SimpleSelector(columnName, idx, type); @@ -51,21 +53,25 @@ public final class SimpleSelector extends Selector }; } - public void addInput(ResultSetBuilder rs) throws InvalidRequestException + @Override + public void addInput(ResultSetBuilder rs) { current = rs.current.get(idx); } - public ByteBuffer getOutput() throws InvalidRequestException + @Override + public ByteBuffer getOutput() { return current; } + @Override public void reset() { current = null; } + @Override public AbstractType<?> getType() { return type; http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce2a99d4/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java index 5aaf9b1..4cd9460 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DropFunctionStatement.java @@ -53,6 +53,7 @@ public final class DropFunctionStatement extends SchemaAlteringStatement this.ifExists = ifExists; } + @Override public void prepareKeyspace(ClientState state) throws InvalidRequestException { if (!functionName.hasKeyspace() && state.getRawKeyspace() != null) @@ -64,6 +65,7 @@ public final class DropFunctionStatement extends SchemaAlteringStatement ThriftValidation.validateKeyspaceNotSystem(functionName.keyspace); } + @Override public void checkAccess(ClientState state) throws UnauthorizedException, InvalidRequestException { // TODO CASSANDRA-7557 (function DDL permission) @@ -75,18 +77,19 @@ public final class DropFunctionStatement extends SchemaAlteringStatement * The <code>CqlParser</code> only goes as far as extracting the keyword arguments * from these statements, so this method is responsible for processing and * validating. - * - * @throws org.apache.cassandra.exceptions.InvalidRequestException if arguments are missing or unacceptable */ - public void validate(ClientState state) throws RequestValidationException + @Override + public void validate(ClientState state) { } + @Override public Event.SchemaChange changeEvent() { return null; } + @Override public boolean announceMigration(boolean isLocalOnly) throws RequestValidationException { List<Function> olds = Functions.find(functionName);