You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/11/08 20:18:25 UTC
[2/2] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/566e2063
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/566e2063
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/566e2063
Branch: refs/heads/trunk
Commit: 566e20637d117c2907a4f81197fa59c8a19bc979
Parents: 08e2891
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Nov 8 10:19:41 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Nov 8 11:02:35 2012 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliClient.java | 8 +++-----
src/java/org/apache/cassandra/cli/Cql3CfDef.java | 5 +++++
.../org/apache/cassandra/cql3/CFDefinition.java | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/566e2063/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index 87361d4..9594525 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -2924,11 +2924,9 @@ public class CliClient
private boolean isCounterCF(CfDef cfdef)
{
String defaultValidator = cfdef.default_validation_class;
- if (defaultValidator != null && !defaultValidator.isEmpty())
- {
- return (getFormatType(defaultValidator) instanceof CounterColumnType);
- }
- return false;
+ return defaultValidator != null
+ && !defaultValidator.isEmpty()
+ && getFormatType(defaultValidator) instanceof CounterColumnType;
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/566e2063/src/java/org/apache/cassandra/cli/Cql3CfDef.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/Cql3CfDef.java b/src/java/org/apache/cassandra/cli/Cql3CfDef.java
new file mode 100644
index 0000000..6828e3d
--- /dev/null
+++ b/src/java/org/apache/cassandra/cli/Cql3CfDef.java
@@ -0,0 +1,5 @@
+package org.apache.cassandra.cli;
+
+public class Cql3CfDef
+{
+}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/566e2063/src/java/org/apache/cassandra/cql3/CFDefinition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/CFDefinition.java b/src/java/org/apache/cassandra/cql3/CFDefinition.java
index 980fb68..670fdb4 100644
--- a/src/java/org/apache/cassandra/cql3/CFDefinition.java
+++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java
@@ -99,7 +99,7 @@ public class CFDefinition implements Iterable<CFDefinition.Name>
int last = composite.types.size() - 1;
AbstractType<?> lastType = composite.types.get(last);
if (lastType instanceof ColumnToCollectionType
- || (cfm.getColumnAliases().size() == last && lastType instanceof UTF8Type))
+ || (cfm.getColumnAliases().size() == last && lastType instanceof UTF8Type))
{
// "sparse" composite
this.isCompact = false;