Merge pull request #626 from Mishail/issues-600

ref #600
hector-client · Jun 29, 2013 · 4e82e25 · 4e82e25
2 parents 1453892 + 5c1aa6a
commit 4e82e25
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/core/src/main/java/me/prettyprint/cassandra/model/CqlQuery.java b/core/src/main/java/me/prettyprint/cassandra/model/CqlQuery.java
@@ -109,11 +109,8 @@ public QueryResult<CqlRows<K, N, V>> execute() {
           public CqlRows<K, N, V> execute(Client cassandra) throws HectorException {
             CqlRows<K, N, V> rows = null;
             try {
-              if (cqlVersion != null){
-                if (! cqlVersion.equals(keyspace.cqlVersion)){
+              if (cqlVersion != null) {
                   cassandra.set_cql_version(cqlVersion);
-                  keyspace.setCqlVersion(cqlVersion);
-                }
               }
               CqlResult result = cassandra.execute_cql_query(query, 
                   useCompression ? Compression.GZIP : Compression.NONE);

diff --git a/core/src/main/java/me/prettyprint/cassandra/model/ExecutingKeyspace.java b/core/src/main/java/me/prettyprint/cassandra/model/ExecutingKeyspace.java
@@ -81,17 +81,6 @@ public long createClock() {
     return connectionManager.createClock();
   }
 
-  public String getCqlVersion() {
-    return cqlVersion;
-  }
-
-  @Override
-  public void setCqlVersion(String cqlVersion) {
-    this.cqlVersion = cqlVersion;
-  }
-
-
-
   public <T> ExecutionResult<T> doExecute(KeyspaceOperationCallback<T> koc)
       throws HectorException {
     KeyspaceService ks = null;

diff --git a/core/src/main/java/me/prettyprint/hector/api/Keyspace.java b/core/src/main/java/me/prettyprint/hector/api/Keyspace.java
@@ -15,7 +15,4 @@ public interface Keyspace {
   String getKeyspaceName();
 
   long createClock();
-
-  void setCqlVersion(String version);
-
 }