[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

[tylerhobbs]

Merge branch 'cassandra-2.1' into trunk

Conflicts:
        test/unit/org/apache/cassandra/cql3/CQLTester.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acf427e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acf427e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acf427e4

Branch: refs/heads/trunk
Commit: acf427e4b140d4322917d782e951bcab8b35576d
Parents: 8b3221a aaee407
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Mar 31 11:36:29 2015 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Mar 31 11:36:29 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/cql3/AlterTableTest.java   | 20 ++++++++++++++++++++
 .../org/apache/cassandra/cql3/CQLTester.java    |  3 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/acf427e4/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/acf427e4/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java
index 0fe323e,e994f01..98a696c
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@@ -339,43 -194,14 +339,44 @@@ public abstract class CQLTeste
          return typeName;
      }
  
 +    protected String createFunction(String keyspace, String argTypes, String 
query) throws Throwable
 +    {
 +        String functionName = keyspace + ".function_" + 
seqNumber.getAndIncrement();
 +        createFunctionOverload(functionName, argTypes, query);
 +        return functionName;
 +    }
 +
 +    protected void createFunctionOverload(String functionName, String 
argTypes, String query) throws Throwable
 +    {
 +        String fullQuery = String.format(query, functionName);
 +        functions.add(functionName + '(' + argTypes + ')');
 +        logger.info(fullQuery);
 +        schemaChange(fullQuery);
 +    }
 +
 +    protected String createAggregate(String keyspace, String argTypes, String 
query) throws Throwable
 +    {
 +        String aggregateName = keyspace + "." + "aggregate_" + 
seqNumber.getAndIncrement();
 +        createAggregateOverload(aggregateName, argTypes, query);
 +        return aggregateName;
 +    }
 +
 +    protected void createAggregateOverload(String aggregateName, String 
argTypes, String query) throws Throwable
 +    {
 +        String fullQuery = String.format(query, aggregateName);
 +        aggregates.add(aggregateName + '(' + argTypes + ')');
 +        logger.info(fullQuery);
 +        schemaChange(fullQuery);
 +    }
 +
-     protected void createTable(String query)
+     protected String createTable(String query)
      {
          String currentTable = "table_" + seqNumber.getAndIncrement();
          tables.add(currentTable);
 -        String fullQuery = String.format(query, KEYSPACE + "." + 
currentTable);
 +        String fullQuery = formatQuery(query);
          logger.info(fullQuery);
          schemaChange(fullQuery);
+         return currentTable;
      }
  
      protected void createTableMayThrow(String query) throws Throwable