Merge pull request #11 from mzhangsfly/query_update

Query update

Author: Jeff Boone

src/main/java/com/aerospike/helper/query/Qualifier.java

@@ -67,7 +67,7 @@ public class Qualifier implements Map<String, Object>, Serializable {
 	protected Map<String, Object> internalMap;
 
 	public enum FilterOperation {
-		EQ, GT, GTEQ, LT, LTEQ, NOTEQ, BETWEEN, START_WITH, ENDS_WITH,
+		EQ, GT, GTEQ, LT, LTEQ, NOTEQ, BETWEEN, START_WITH, ENDS_WITH,CONTAINING,
 		LIST_CONTAINS, MAP_KEYS_CONTAINS, MAP_VALUES_CONTAINS,
 		LIST_BETWEEN, MAP_KEYS_BETWEEN, MAP_VALUES_BETWEEN, GEO_WITHIN
 	}
@@ -201,8 +201,9 @@ public String luaFilterString() {
 						luaFieldString(getField()),
 						value1,
 						value1);
+			case CONTAINING:
+				return String.format("string.find(%s, %s)", luaFieldString(getField()), value1);
 			case GEO_WITHIN:
-				System.out.println(value1);
 				return String.format("%s %d %s %s)", getField(), ParticleType.GEOJSON, value1, value1);
 		}
 		return "";

src/main/java/org/springframework/data/aerospike/convert/MappingAerospikeConverter.java

@@ -53,7 +53,6 @@
 import com.aerospike.client.Bin;
 import com.aerospike.client.Record;
 import com.aerospike.client.Value;
-import com.aerospike.client.Value.GeoJSONValue;
 import com.aerospike.client.Value.MapValue;
 
 /**

src/main/java/org/springframework/data/aerospike/example/CLRentPageRepository.java

@@ -4,7 +4,6 @@
 package org.springframework.data.aerospike.example;
 
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +12,6 @@
 import org.springframework.data.aerospike.core.AerospikeOperations;
 import org.springframework.data.aerospike.core.AerospikeTemplate;
 import org.springframework.data.aerospike.example.config.TestRepositoryConfig;
-import org.springframework.data.aerospike.example.data.CLRentPage;
 import org.springframework.data.aerospike.example.data.Person;
 
 import com.aerospike.client.AerospikeClient;
@@ -28,9 +26,6 @@
  */
 public class RepositoryExample {
 
-	@Autowired
-	protected CLRentPageRepository clrepository;
-
 	@Autowired
 	protected PersonRepository repository;
 
@@ -45,7 +40,6 @@ public class RepositoryExample {
 	 */
 	public RepositoryExample(ApplicationContext ctx) {
 		aerospikeOperations = ctx.getBean(AerospikeTemplate.class);
-		clrepository = (CLRentPageRepository) ctx.getBean("CLRentPageRepository");
 		repository = (PersonRepository) ctx.getBean("personRepository");
 		client = ctx.getBean(AerospikeClient.class);
 	}
@@ -87,25 +81,12 @@ protected void cleanUp() {
 	 * 
 	 */
 	protected void executeRepositoryCall() {
-//		System.out.println("Results for name startting with letter 'M'");
-//		List<Person> resultPartial = repository.findByNameStartsWith("M");
-//		for (Person person : resultPartial) {
-//			System.out.println(person.toString());
-//		}
-//
-		
-		
-
-		System.out.println("Querying by Location.....");
-		long t = new Date().getTime() - 10*3600*1000;//1484690036000L;
-//		List<CLRentPage> pages = clrepository.findByGeoLocationWithin( -122.429245, 37.705574 ,10000);
-//		List<CLRentPage> pages = clrepository.findByPostDateAfterAndGeoLocationWithin(t, -122.429245, 37.705574 ,10000);
-		List<CLRentPage> pages = clrepository.findByGeoLocationWithinAndPostDateAfter(-122.429245, 37.705574 ,10000, t);
-//		List<CLRentPage> pages = clrepository.findByPostDateAfter(t);
-		System.out.println("result count: " + pages.size());
-		for(CLRentPage p : pages){
-			System.out.println("......id=" + p.getId() + ", postTime=" + p.getPostDate());
+		System.out.println("Results for name startting with letter 'M'");
+		List<Person> resultPartial = repository.findByNameStartsWith("M");
+		for (Person person : resultPartial) {
+			System.out.println(person.toString());
 		}
+
 		List<Person> result = repository.findByName("Beauford");
 		System.out.println("Results for exact match of 'Beauford'");
 		for (Person person : result) {

src/main/java/org/springframework/data/aerospike/example/RepositoryExample.java

@@ -98,8 +98,9 @@ private Criteria from(Part part, AerospikePersistentProperty property, Criteria
 			case STARTING_WITH:
 				return criteria.startingWith(parameters.next(), fieldName);
 			case ENDING_WITH:
-			case CONTAINING:
 				return null;
+			case CONTAINING:
+				return criteria.containing(parameters.next(), fieldName);
 			case NOT_CONTAINING:
 				return null;
 			case REGEX: