Feature/to cql

pom.xml

@@ -51,24 +51,22 @@
             <version>2.5</version>
         </dependency>
 
-        <!-- Hector -->
         <dependency>
-            <groupId>org.hectorclient</groupId>
-            <artifactId>hector-core</artifactId>
-            <version>1.1-4</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.thrift</groupId>
-                    <artifactId>libthrift</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.22</version>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-            <version>0.9.3</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-core</artifactId>
+            <version>3.3.0</version>
         </dependency>
-
         <!-- Monitoring -->
         <dependency>
             <groupId>com.appmetr</groupId>
@@ -136,9 +134,6 @@
             </testResource>
         </testResources>
         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -167,6 +162,14 @@
                 <artifactId>maven-release-plugin</artifactId>
                 <version>2.5</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/appmetr/hercules/FieldFilter.java

@@ -4,5 +4,5 @@
 
 public interface FieldFilter {
 
-    public boolean accept(Field field);
+    boolean accept(Field field);
 }

src/main/java/com/appmetr/hercules/Hercules.java

@@ -35,16 +35,17 @@
 import com.appmetr.hercules.mutations.ExecutableMutation;
 import com.appmetr.hercules.mutations.MutationsQueue;
 import com.appmetr.hercules.partition.PartitioningStarter;
+import com.datastax.driver.core.AbstractTableMetadata;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.TableMetadata;
+import com.datastax.driver.core.TypeCodec;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
-import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.ddl.ColumnFamilyDefinition;
-import me.prettyprint.hector.api.ddl.ComparatorType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class Hercules {
 
@@ -54,14 +55,14 @@ public class Hercules {
 
     @Inject HerculesConfig config;
 
-    private Map<Class, EntityMetadata> entityClassMetadataCache = new HashMap<Class, EntityMetadata>();
-    private Map<Class, WideEntityMetadata> wideEntityClassMetadataCache = new HashMap<Class, WideEntityMetadata>();
+    private Map<Class, EntityMetadata> entityClassMetadataCache = new HashMap<>();
+    private Map<Class, WideEntityMetadata> wideEntityClassMetadataCache = new HashMap<>();
 
     @Inject EntityMetadataExtractor metadataExtractor;
     @Inject WideEntityMetadataExtractor wideMetadataExtractor;
 
     private Cluster cluster;
-    private Keyspace keyspace;
+    private String keyspace;
 
     @Inject private Injector injector;
     @Inject private DataDriver dataDriver;
@@ -73,9 +74,15 @@ public class Hercules {
 
 
     public void init() {
-        cluster = dataDriver.getOrCreateCluster(config.getClusterName(), config.getCassandraHost(),
-                config.getMaxActiveConnections(), config.getMaxConnectTimeMillis(),
-                config.getCassandraThriftSocketTimeout(), config.getMaxWaitTimeWhenExhausted());
+        cluster = dataDriver.getOrCreateCluster(
+                config.getClusterName(),
+                config.getCassandraHost(),
+                config.getMaxActiveConnections(),
+                config.getMaxConnectTimeMillis()
+        );
+        initCodecs();
+
+        cluster.connect();
         keyspace = dataDriver.getOrCreateKeyspace(config.getKeyspaceName(), config.getReplicationFactor(), cluster);
 
         initEntities();
@@ -84,6 +91,12 @@ public void init() {
         new Thread(partitioningStarter).start();
     }
 
+    private void initCodecs() {
+        for (TypeCodec typeCodec : config.getCodecs()) {
+            cluster.getConfiguration().getCodecRegistry().register(typeCodec);
+        }
+    }
+
     public void shutdown() {
         partitioningStarter.stop();
         mutationsQueue.stop();
@@ -92,22 +105,15 @@ public void shutdown() {
     }
 
     public Set<String> getColumnFamilies() {
-        List<ColumnFamilyDefinition> columnFamilies = cluster.describeKeyspace(getKeyspaceName()).getCfDefs();
-        Set<String> columnFamiliesNames = new HashSet<String>();
-
-        for (ColumnFamilyDefinition cf : columnFamilies) {
-            columnFamiliesNames.add(cf.getName());
-        }
-
-        return columnFamiliesNames;
+        Collection<TableMetadata> tables = cluster.getMetadata().getKeyspace(getKeyspaceName()).getTables();
+        return tables
+                .stream()
+                .map(AbstractTableMetadata::getName)
+                .collect(Collectors.toSet());
     }
 
     public boolean checkAndCreateColumnFamily(String cfName) {
-        return checkAndCreateColumnFamily(cfName, ComparatorType.UTF8TYPE);
-    }
-
-    public boolean checkAndCreateColumnFamily(String cfName, ComparatorType comparator) {
-        return dataDriver.checkAndCreateColumnFamily(cluster, config.getKeyspaceName(), cfName, comparator);
+        return dataDriver.checkAndCreateColumnFamily(cluster, config.getKeyspaceName(), cfName);
     }
 
     public boolean deleteColumnFamily(String cfName) {
@@ -130,7 +136,7 @@ private void initPlainEntities() {
             EntityMetadata metadata = metadataExtractor.extract(entityClass);
             entityClassMetadataCache.put(entityClass, metadata);
 
-            checkAndCreateColumnFamily(metadata.getColumnFamily(), metadata.getComparatorType());
+            checkAndCreateColumnFamily(metadata.getColumnFamily());
 
         }
         //We should have extracted metadata before create indexes
@@ -148,7 +154,7 @@ private void initiateWideEntities() {
             WideEntityMetadata metadata = wideMetadataExtractor.extract(wideEntityClass);
             wideEntityClassMetadataCache.put(wideEntityClass, metadata);
 
-            checkAndCreateColumnFamily(metadata.getColumnFamily(), metadata.getComparatorType());
+            checkAndCreateColumnFamily(metadata.getColumnFamily());
         }
     }
 
@@ -175,7 +181,7 @@ public WideEntityMetadata getWideMetadata(Class wideEntityClass) {
     public Set<ExecutableMutation> getPartitionMutations() {
         final Set<String> columnFamilies = getColumnFamilies();
 
-        Set<ExecutableMutation> mutations = new HashSet<ExecutableMutation>();
+        Set<ExecutableMutation> mutations = new HashSet<>();
 
         for (final Class partitionEntityClass : config.getWideEntityClasses()) {
             if (!partitionEntityClass.isAnnotationPresent(Partitioned.class)) {
@@ -188,7 +194,7 @@ public Set<ExecutableMutation> getPartitionMutations() {
                 if (!columnFamilies.contains(cfFullName)) {
                     mutations.add(new ExecutableMutation(ExecutableMutation.MutationType.CREATE, cfFullName) {
                         @Override public void execute() throws Exception {
-                            checkAndCreateColumnFamily(getCfName(), getWideMetadata(partitionEntityClass).getComparatorType());
+                            checkAndCreateColumnFamily(getCfName());
                             columnFamilies.add(getCfName());
                             logger.info("Created partition: " + getCfName());
                         }
@@ -208,7 +214,7 @@ public Set<ExecutableMutation> getPartitionMutations() {
 
     public Cluster getCluster() { return cluster; }
 
-    public Keyspace getKeyspace() { return keyspace; }
+    public String getKeyspace() { return keyspace; }
 
     public String getKeyspaceName() { return config.getKeyspaceName(); }
 
@@ -217,6 +223,7 @@ public Set<ExecutableMutation> getPartitionMutations() {
     public int getReplicationFactor() { return config.getReplicationFactor(); }
 
     public boolean isSchemaModificationEnabled() { return config.isSchemaModificationEnabled(); }
+    public boolean isSchemaModificationDisabled() { return !isSchemaModificationEnabled(); }
 
     public Injector getInjector() { return injector; }
 

src/main/java/com/appmetr/hercules/HerculesConfig.java

@@ -2,7 +2,9 @@
 
 import com.appmetr.hercules.annotations.Entity;
 import com.appmetr.hercules.annotations.WideEntity;
+import com.datastax.driver.core.TypeCodec;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -14,13 +16,14 @@ public class HerculesConfig {
     private int maxActiveConnections;
     private int replicationFactor;
     private Boolean schemaModificationEnabled;
-    private long maxConnectTimeMillis = -1;
+    private int maxConnectTimeMillis = 10_000;
     private int cassandraThriftSocketTimeout;
     private long maxWaitTimeWhenExhausted;
 
     /* Fields */
-    private Set<Class> entityClasses;
-    private Set<Class> wideEntityClasses;
+    private Set<Class> entityClasses = Collections.emptySet();
+    private Set<Class> wideEntityClasses = Collections.emptySet();
+    private Set<TypeCodec> codecs = Collections.emptySet();
 
     public HerculesConfig() {
     }
@@ -33,8 +36,8 @@ public HerculesConfig(String clusterName, String keyspaceName, String cassandraH
         this.replicationFactor = replicationFactor;
         this.schemaModificationEnabled = schemaModificationEnabled;
 
-        this.entityClasses = new HashSet<Class>();
-        this.wideEntityClasses = new HashSet<Class>();
+        this.entityClasses = new HashSet<>();
+        this.wideEntityClasses = new HashSet<>();
 
         for (Class entityClass : entityClasses) {
             if (entityClass.isAnnotationPresent(Entity.class)) {
@@ -93,6 +96,14 @@ public Set<Class> getEntityClasses() {
         return entityClasses;
     }
 
+    public Set<TypeCodec> getCodecs() {
+        return codecs;
+    }
+
+    public void setCodecs(Set<TypeCodec> codecs) {
+        this.codecs = codecs;
+    }
+
     public void setEntityClasses(Set<Class> entityClasses) {
         this.entityClasses = entityClasses;
     }
@@ -105,11 +116,11 @@ public void setWideEntityClasses(Set<Class> wideEntityClasses) {
         this.wideEntityClasses = wideEntityClasses;
     }
 
-    public long getMaxConnectTimeMillis() {
+    public int getMaxConnectTimeMillis() {
         return maxConnectTimeMillis;
     }
 
-    public void setMaxConnectTimeMillis(long maxConnectTimeMillis) {
+    public void setMaxConnectTimeMillis(int maxConnectTimeMillis) {
         this.maxConnectTimeMillis = maxConnectTimeMillis;
     }
 

src/main/java/com/appmetr/hercules/HerculesFactory.java

@@ -1,7 +1,7 @@
 package com.appmetr.hercules;
 
+import com.appmetr.hercules.driver.CqlDataDriver;
 import com.appmetr.hercules.driver.DataDriver;
-import com.appmetr.hercules.driver.ThriftDataDriver;
 import com.appmetr.hercules.manager.EntityManager;
 import com.appmetr.hercules.manager.IndexManager;
 import com.appmetr.hercules.manager.WideEntityManager;
@@ -18,7 +18,7 @@ public static Hercules create(final HerculesConfig config) {
             @Override protected void configure() {
                 bind(HerculesConfig.class).toInstance(config);
 
-                bind(DataDriver.class).to(ThriftDataDriver.class).in(Scopes.SINGLETON);
+                bind(DataDriver.class).to(CqlDataDriver.class).in(Scopes.SINGLETON);
                 bind(EntityManager.class).in(Scopes.SINGLETON);
                 bind(WideEntityManager.class).in(Scopes.SINGLETON);
                 bind(IndexManager.class).in(Scopes.SINGLETON);

src/main/java/com/appmetr/hercules/HerculesMonitoringGroup.java

@@ -1,11 +1,11 @@
 package com.appmetr.hercules;
 
 public interface HerculesMonitoringGroup {
-    public static final String HERCULES_EM = "hercules.em";
-    public static final String HERCULES_WM = "hercules.wm";
-    public static final String HERCULES_DD = "hercules.dd";
+    String HERCULES_EM = "hercules.em";
+    String HERCULES_WM = "hercules.wm";
+    String HERCULES_DD = "hercules.dd";
 
-    public static final String EM_SIMPLE = "em.simple";
-    public static final String EM_WIDE = "em.wide";
-    public static final String EM_PARTITION = "em.partition";
+    String EM_SIMPLE = "em.simple";
+    String EM_WIDE = "em.wide";
+    String EM_PARTITION = "em.partition";
 }

src/main/java/com/appmetr/hercules/annotations/Id.java

@@ -1,6 +1,6 @@
 package com.appmetr.hercules.annotations;
 
-import com.appmetr.hercules.serializers.AbstractHerculesSerializer;
+import com.datastax.driver.core.TypeCodec;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -10,8 +10,8 @@
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Id {
-    Class<? extends AbstractHerculesSerializer> value() default AbstractHerculesSerializer.class;
+    Class<? extends TypeCodec> value() default TypeCodec.class;
 
     Class keyClass() default Object.class;
-    Class<? extends AbstractHerculesSerializer> serializer() default AbstractHerculesSerializer.class;
+    Class<? extends TypeCodec> serializer() default TypeCodec.class;
 }

src/main/java/com/appmetr/hercules/annotations/Index.java

@@ -1,7 +1,7 @@
 package com.appmetr.hercules.annotations;
 
 import com.appmetr.hercules.keys.ForeignKey;
-import com.appmetr.hercules.serializers.AbstractHerculesSerializer;
+import com.datastax.driver.core.TypeCodec;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -13,5 +13,5 @@
 public @interface Index {
     Class<? extends ForeignKey> keyClass();
 
-    Class<? extends AbstractHerculesSerializer> serializer() default AbstractHerculesSerializer.class;
+    Class<? extends TypeCodec> serializer() default TypeCodec.class;
 }

src/main/java/com/appmetr/hercules/annotations/IndexedCollection.java

@@ -1,7 +1,7 @@
 package com.appmetr.hercules.annotations;
 
 import com.appmetr.hercules.keys.CollectionKeysExtractor;
-import com.appmetr.hercules.serializers.AbstractHerculesSerializer;
+import com.datastax.driver.core.TypeCodec;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -16,7 +16,7 @@
 
     Class itemClass() default Object.class;
 
-    Class<? extends AbstractHerculesSerializer> serializer() default AbstractHerculesSerializer.class;
+    Class<? extends TypeCodec> serializer() default TypeCodec.class;
 
     Class<? extends CollectionKeysExtractor> keyExtractorClass() default CollectionKeysExtractor.class;
 

src/main/java/com/appmetr/hercules/annotations/RowKey.java

@@ -1,6 +1,6 @@
 package com.appmetr.hercules.annotations;
 
-import com.appmetr.hercules.serializers.AbstractHerculesSerializer;
+import com.datastax.driver.core.TypeCodec;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -10,8 +10,8 @@
 @Target({ElementType.TYPE, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface RowKey {
-    Class<? extends AbstractHerculesSerializer> value() default AbstractHerculesSerializer.class;
+    Class<? extends TypeCodec> value() default TypeCodec.class;
 
     Class keyClass() default Object.class;
-    Class<? extends AbstractHerculesSerializer> serializer() default AbstractHerculesSerializer.class;
+    Class<? extends TypeCodec> serializer() default TypeCodec.class;
 }