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/09/03 19:20:30 UTC
git commit: fix build including antlr
Updated Branches:
refs/heads/trunk 84b25f0b0 -> 94e4ace75
fix build including antlr
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94e4ace7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94e4ace7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94e4ace7
Branch: refs/heads/trunk
Commit: 94e4ace7570d8fbc6c2fd638d45ea5c946b85ffe
Parents: 84b25f0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 3 12:15:58 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 3 12:20:09 2012 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql/Cql.g | 2 +-
src/java/org/apache/cassandra/utils/Pair.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94e4ace7/src/java/org/apache/cassandra/cql/Cql.g
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/Cql.g b/src/java/org/apache/cassandra/cql/Cql.g
index 270a48b..0b7e3b6 100644
--- a/src/java/org/apache/cassandra/cql/Cql.g
+++ b/src/java/org/apache/cassandra/cql/Cql.g
@@ -492,7 +492,7 @@ relation returns [Relation rel]
// TRUNCATE <CF>;
truncateStatement returns [Pair<String,String> cf]
- : K_TRUNCATE (keyspace=( IDENT | STRING_LITERAL | INTEGER ) '.')? columnFamily=( IDENT | STRING_LITERAL | INTEGER ) { $cf = new Pair<String, String>($keyspace.text, $columnFamily.text); } endStmnt
+ : K_TRUNCATE (keyspace=( IDENT | STRING_LITERAL | INTEGER ) '.')? columnFamily=( IDENT | STRING_LITERAL | INTEGER ) { $cf = Pair.create($keyspace.text, $columnFamily.text); } endStmnt
;
endStmnt
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94e4ace7/src/java/org/apache/cassandra/utils/Pair.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/Pair.java b/src/java/org/apache/cassandra/utils/Pair.java
index a14a9b8..ea8b8fc 100644
--- a/src/java/org/apache/cassandra/utils/Pair.java
+++ b/src/java/org/apache/cassandra/utils/Pair.java
@@ -24,7 +24,7 @@ public class Pair<T1, T2>
public final T1 left;
public final T2 right;
- public Pair(T1 left, T2 right)
+ protected Pair(T1 left, T2 right)
{
this.left = left;
this.right = right;