cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] git commit: Remove deprecated strings-as-blob for trunk
Date Mon, 04 Feb 2013 09:49:37 GMT
Updated Branches:
  refs/heads/trunk f56f08c9e -> 2dd226875


Remove deprecated strings-as-blob for trunk


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

Branch: refs/heads/trunk
Commit: 2dd226875282ada1e99e3e0d0bb384da26488185
Parents: 8724834
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Feb 4 10:49:26 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Feb 4 10:49:26 2013 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/Term.java |   22 ---------------------
 1 files changed, 0 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd22687/src/java/org/apache/cassandra/cql3/Term.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Term.java b/src/java/org/apache/cassandra/cql3/Term.java
index fb797d5..b3c312e 100644
--- a/src/java/org/apache/cassandra/cql3/Term.java
+++ b/src/java/org/apache/cassandra/cql3/Term.java
@@ -22,9 +22,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.MarshalException;
@@ -33,8 +30,6 @@ import org.apache.cassandra.exceptions.InvalidRequestException;
 /** A term parsed from a CQL statement. */
 public class Term
 {
-    private static final Logger logger = LoggerFactory.getLogger(Term.class);
-
     public enum Type
     {
         STRING, INTEGER, UUID, FLOAT, BOOLEAN, HEX, QMARK;
@@ -65,9 +60,6 @@ public class Term
     public final int bindIndex;
     public final boolean isToken;
 
-    // For transition post-5198, see below
-    private static volatile boolean stringAsBlobWarningLogged = false;
-
     // This is a hack for the timeuuid functions (minTimeuuid, maxTimeuuid, now) because
instead of handling them as
     // true function we let the TimeUUID.fromString() method handle it. We should probably
clean that up someday
     private final boolean skipTypeValidation;
@@ -176,20 +168,6 @@ public class Term
 
         if (!supported.contains(type))
         {
-            // Blobs should now be inputed as hexadecimal constants. However, to allow people
to upgrade, we still allow
-            // blob-as-strings, even though it is deprecated (see #5198).
-            if (type == Type.STRING && validator instanceof BytesType)
-            {
-                if (!stringAsBlobWarningLogged)
-                {
-                    stringAsBlobWarningLogged = true;
-                    logger.warn("Inputing CLQ3 blobs as strings (like %s = '%s') is now deprecated
and will be removed in a future version. "
-                              + "You should convert client code to use a blob constant (%s
= %s) instead (see http://cassandra.apache.org/doc/cql3/CQL.html changelog section for more
info).",
-                              identifier, text, identifier, "0x" + text);
-                }
-                return;
-            }
-
             // TODO: Ideallly we'd keep the declared CQL3 type of columns and use that in
the following message, instead of the AbstracType class name.
             throw new InvalidRequestException(String.format("Invalid %s constant for %s of
type %s", type, identifier, validator.asCQL3Type()));
         }


Mime
View raw message