Author: jbellis
Date: Fri Aug 19 22:59:04 2011
New Revision: 1159814
URL: http://svn.apache.org/viewvc?rev=1159814&view=rev
Log:
merge from 0.8
Modified:
cassandra/trunk/ (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/contrib/ (props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
(props changed)
cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g
cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
cassandra/trunk/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java
Propchange: cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 19 22:59:04 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7:1026516-1151306
+/cassandra/branches/cassandra-0.7:1026516-1159807
/cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1159473
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1159811
/cassandra/branches/cassandra-0.8.0:1125021-1130369
/cassandra/branches/cassandra-0.8.1:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Fri Aug 19 22:59:04 2011
@@ -53,6 +53,13 @@
on create/update of the ColumnFamily and CQL 'ALTER' statement
(CASSANDRA-3036)
* return an InvalidRequestException if an indexed column is assigned
a value larger than 64KB (CASSANDRA-3057)
+ * fix of numeric-only and string column names handling in CLI "drop index"
(CASSANDRA-3054)
+ * prune index scan resultset back to original request for lazy
+ resultset expansion case (CASSANDRA-2964)
+ * (Hadoop) fail jobs when Cassandra node has failed but TaskTracker
+ has not (CASSANDRA-2388)
+ * fix dynamic snitch ignoring nodes when read_repair_chance is zero
+ (CASSANDRA-2662)
0.8.4
@@ -94,14 +101,16 @@
(CASSANDRA-2960)
* fix assertion error during compaction of counter CFs (CASSANDRA-2968)
* avoid trying to create index names, when no index exists (CASSANDRA-2867)
- * fix dynamic snitch ignoring nodes when read_repair_chance is zero
- (CASSANDRA-2662)
* don't sample the system table when choosing a bootstrap token
(CASSANDRA-2825)
* gossiper notifies of local state changes (CASSANDRA-2948)
* add asynchronous and half-sync/half-async thrift servers (CASSANDRA-1405)
* fix potential use of free'd native memory in SerializingCache
(CASSANDRA-2951)
+ * prune index scan resultset back to original request for lazy
+ resultset expansion case (CASSANDRA-2964)
+ * (Hadoop) fail jobs when Cassandra node has failed but TaskTracker
+ has not (CASSANDRA-2388)
0.8.2
Propchange: cassandra/trunk/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 19 22:59:04 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1151306
+/cassandra/branches/cassandra-0.7/contrib:1026516-1159807
/cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1159473
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1159811
/cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
/cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 19 22:59:04 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1151306
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1159807
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1159473
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1159811
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 19 22:59:04 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1151306
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1159807
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1159473
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1159811
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 19 22:59:04 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1151306
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1159807
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1159473
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1159811
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 19 22:59:04 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1151306
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1159807
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1159473
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1159811
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 19 22:59:04 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1151306
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1159807
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1159473
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1159811
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689
Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g Fri Aug 19 22:59:04
2011
@@ -428,7 +428,7 @@ keyRangeExpr
;
columnName
- : Identifier
+ : (StringLiteral | Identifier | IntegerPositiveLiteral |
IntegerNegativeLiteral)
;
attr_name
Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Fri Aug 19
22:59:04 2011
@@ -1387,7 +1387,7 @@ public class CliClient
// getColumnFamily will check if CF exists for us
String columnFamily = CliCompiler.getColumnFamily(statement,
keyspacesMap.get(keySpace).cf_defs);
- String rawColumName = statement.getChild(1).getText();
+ String rawColumName =
CliUtils.unescapeSQLString(statement.getChild(1).getText());
CfDef cfDef = getCfDef(columnFamily);
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri
Aug 19 22:59:04 2011
@@ -1397,13 +1397,13 @@ public class ColumnFamilyStore implement
return rows;
// skip first one
- if(range instanceof Bounds || !first ||
!key.equals(startWith))
+ if (range instanceof Bounds || !first ||
!key.equals(startWith))
{
// TODO this is necessary because when we collate
supercolumns together, we don't check
// their subcolumns for relevance, so we need to do a
second prune post facto here.
rows.add(current.cf != null && current.cf.isSuper()
- ? new Row(current.key,
ColumnFamilyStore.removeDeleted(current.cf, gcBefore))
- : current);
+ ? new Row(current.key,
ColumnFamilyStore.removeDeleted(current.cf, gcBefore))
+ : current);
if (logger.isDebugEnabled())
logger.debug("scanned " + key);
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
Fri Aug 19 22:59:04 2011
@@ -47,17 +47,17 @@ public abstract class SecondaryIndexSear
this.baseCfs = indexManager.baseCfs;
}
- public static boolean satisfies(ColumnFamily data, List<IndexExpression>
expressions)
+ public static boolean satisfies(ColumnFamily data, IndexClause clause,
IndexExpression first)
{
// We enforces even the primary clause because reads are not
synchronized with writes and it is thus possible to have a race
- // where the index returned a row which doesn't have the primary
column when we actually read it
- for (IndexExpression expression : expressions)
+ // where the index returned a row which doesn't have the primarycolumn
when we actually read it
+ for (IndexExpression expression : clause.expressions)
{
// check column data vs expression
IColumn column = data.getColumn(expression.column_name);
if (column == null)
return false;
- int v = data.getComparator().compare(column.value(),
expression.value);
+ int v =
data.metadata().getValueValidator(expression.column_name).compare(column.value(),
expression.value);
if (!satisfies(v, expression.op))
return false;
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
Fri Aug 19 22:59:04 2011
@@ -81,22 +81,6 @@ public class KeysSearcher extends Second
return best;
}
- private static boolean satisfies(ColumnFamily data, IndexClause clause,
IndexExpression first)
- {
- // We enforces even the primary clause because reads are not
synchronized with writes and it is thus possible to have a race
- // where the index returned a row which doesn't have the primarycolumn
when we actually read it
- for (IndexExpression expression : clause.expressions)
- {
- // check column data vs expression
- IColumn column = data.getColumn(expression.column_name);
- if (column == null)
- return false;
- int v =
data.metadata().getValueValidator(expression.column_name).compare(column.value(),
expression.value);
- if (!satisfies(v, expression.op))
- return false;
- }
- return true;
- }
private String expressionString(IndexExpression expr)
{
return String.format("'%s.%s %s %s'",
@@ -221,6 +205,7 @@ public class KeysSearcher extends Second
if (data == null)
data = ColumnFamily.create(baseCfs.metadata);
logger.debug("fetched data row {}", data);
+ NamesQueryFilter extraFilter = null;
if (dataFilter instanceof SliceQueryFilter &&
!isIdentityFilter((SliceQueryFilter)dataFilter))
{
// we might have gotten the expression columns in with the
main data slice, but
@@ -241,7 +226,7 @@ public class KeysSearcher extends Second
{
// Note: for counters we must be careful to not add a
column that was already there (to avoid overcount). That is
// why we do the dance of avoiding to query any column
we already have (it's also more efficient anyway)
- NamesQueryFilter extraFilter = getExtraFilter(clause);
+ extraFilter = getExtraFilter(clause);
for (IndexExpression expr : clause.expressions)
{
if (data.getColumn(expr.column_name) != null)
@@ -255,11 +240,11 @@ public class KeysSearcher extends Second
}
- if (satisfies(data, clause, primary))
+ if (SecondaryIndexSearcher.satisfies(data, clause, primary))
{
logger.debug("row {} satisfies all clauses", data);
// cut the resultset back to what was requested, if
necessary
- if (firstFilter != dataFilter)
+ if (firstFilter != dataFilter || extraFilter != null)
{
ColumnFamily expandedData = data;
data = expandedData.cloneMeShallow();
Modified:
cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
Fri Aug 19 22:59:04 2011
@@ -143,8 +143,6 @@ public class ColumnFamilyRecordReader ex
return true;
}
- // we don't use endpointsnitch since we are trying to support hadoop nodes
that are
- // not necessarily on Cassandra machines, too. This should be adequate
for single-DC clusters, at least.
private String getLocation()
{
InetAddress[] localAddresses;
@@ -175,7 +173,7 @@ public class ColumnFamilyRecordReader ex
}
}
}
- return split.getLocations()[0];
+ throw new UnsupportedOperationException("no local connection
available");
}
private class RowIterator extends AbstractIterator<Pair<ByteBuffer,
SortedMap<ByteBuffer, IColumn>>>
Modified:
cassandra/trunk/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
Fri Aug 19 22:59:04 2011
@@ -178,8 +178,20 @@ public class DynamicEndpointSnitch exten
{
Double scored1 = scores.get(a1);
Double scored2 = scores.get(a2);
+
+ if (scored1 == null)
+ {
+ scored1 = 0.0;
+ receiveTiming(a1, 0.0);
+ }
+
+ if (scored2 == null)
+ {
+ scored2 = 0.0;
+ receiveTiming(a2, 0.0);
+ }
- if (scored1 == null || scored2 == null || scored1.equals(scored2))
+ if (scored1.equals(scored2))
return subsnitch.compareEndpoints(target, a1, a2);
if (scored1 < scored2)
return -1;
Modified: cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java?rev=1159814&r1=1159813&r2=1159814&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java Fri Aug 19
22:59:04 2011
@@ -39,7 +39,10 @@ public class CliTest extends CleanupHelp
// please add new statements here so they could be auto-runned by this
test.
private String[] statements = {
"use TestKeySpace;",
- "create column family CF1 with comparator=UTF8Type and
column_metadata=[{ column_name:world, validation_class:IntegerType,
index_type:0, index_name:IdxName }, { column_name:world2,
validation_class:LongType, index_type:KEYS, index_name:LongIdxName}];",
+ "create column family CF1 with comparator=UTF8Type and
column_metadata=[{ column_name:world, validation_class:IntegerType,
index_type:0, index_name:IdxName }, " +
+
"{ column_name:world2, validation_class:LongType, index_type:KEYS,
index_name:LongIdxName}, " +
+
"{ column_name:617070, validation_class:UTF8Type, index_type:KEYS }, " +
+
"{ column_name:'-617071', validation_class:UTF8Type, index_type:KEYS }];",
"assume CF1 keys as utf8;",
"set CF1[hello][world] = 123848374878933948398384;",
"set CF1[hello][test_quote] = 'value\\'';",
@@ -115,6 +118,8 @@ public class CliTest extends CleanupHelp
"get Counter1['hello'];",
"truncate CF1;",
"drop index on CF1.world2;",
+ "drop index on CF1.617070;",
+ "drop index on CF1.'-617071';",
"update keyspace TestKeySpace with
placement_strategy='org.apache.cassandra.locator.LocalStrategy' and
durable_writes = false;",
"update keyspace TestKeySpace with strategy_options=[{DC1:3, DC2:4,
DC5:1}];",
"assume CF1 comparator as utf8;",
