Merge pull request #36 from picoded/mongodb-support

Mongodb support

Author: PicoCreator

src/main/java/picoded/dstack/mongodb/MongoDBStack.java

@@ -59,7 +59,8 @@ public static String getFullConnectionURL(GenericConvertMap<String, Object> conf
 		int port = config.getInt("port", 27017);
 		String opts = config.getString("opt_str", "w=majority&retryWrites=true&retryReads=true"
 			+ "&maxPoolSize=10&compressors=zstd");
-		// "&readPreference=nearest&readConcernLevel=linearizable"
+			// "&readPreference=master&readConcernLevel=majority"
+		  // "&readPreference=nearest&readConcernLevel=linearizable"
 
 		// Lets do a logging, for missing read concern if its not configured
 		if (opts.indexOf("readConcernLevel") < 0) {
@@ -74,9 +75,10 @@ public static String getFullConnectionURL(GenericConvertMap<String, Object> conf
 			// Unless you know what your doing from a performance standpoint, it is strongly recommended to use 
 			// `readConcernLevel=linearizable`
 			//
-			LOGGER.warning("MongoDB is configured without readConcernLevel, "
-				+ "this is alright for a single node, but `readConcernLevel=linearizable`"
-				+ "is highly recommended for replica clusters to ensure read after write consistency.");
+			LOGGER.warning("MongoDB is configured without readConcernLevel, "+
+			"this is alright for a single node, but `readConcernLevel=linearizable`"+
+			"or `readPreference=master&readConcernLevel=majority`"+
+			"is highly recommended for replica clusters to ensure read after write consistency.");
 		}
 
 		// In the future we may want to support opt_map

src/main/java/picoded/dstack/mongodb/MongoDB_DataObjectMap.java

@@ -1,6 +1,7 @@
 package picoded.dstack.mongodb;
 
 // Java imports
+import java.util.regex.Pattern;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -361,13 +362,14 @@ static protected Bson queryObjToBsonFilter(Query inQuery) {
 			if (type == QueryType.LIKE) {
 				// Because the LIKE operator does not natively exists,
 				// we will generates its REGEX equivalent
-				
 				String val = GenericConvert.toString(inQuery.defaultArgumentValue());
-				val = val.replaceAll("*", "\\*");
-				val = val.replaceAll("%", ".*");
-				val = val.replaceAll("_", ".+");
+
+				// val = val.replaceAll("*", "*");
+				val = val.replaceAll("\\*", "*");
+				val = val.replaceAll("\\%", ".*");
+				val = val.replaceAll("\\_", "[.]");
 
-				return Filters.regex(inQuery.fieldName(), val);
+				return Filters.regex(inQuery.fieldName(), "^"+val+"$");
 			}
 		}
 

src/test/java/picoded/dstack/struct/simple/StructSimple_DataObjectMap_test.java

@@ -984,6 +984,30 @@ public void nestedDataTest() {
 
 	}
 
+	// Query where bug checks
+	//-----------------------------------------------
+	
+	@Test
+	public void queryWithLikeClause() {
+		
+		// Lets just rescycle old test for the names
+		mtObj.newEntry(genNumStrObj(1, "this", 5));
+		mtObj.newEntry(genNumStrObj(2, "is", 4));
+		mtObj.newEntry(genNumStrObj(3, "hello", 3));
+		mtObj.newEntry(genNumStrObj(4, "world", 2));
+		mtObj.newEntry(genNumStrObj(5, "program", 1));
+		mtObj.newEntry(genNumStrObj(6, "in", 6));
+		mtObj.newEntry(genNumStrObj(7, "this", 7));
+		
+		// Query with like clause
+		DataObject[] qRes = mtObj.query("str_val LIKE ?", new String[] { "%his" });
+		assertEquals(qRes.length, 2);
+		
+		qRes = mtObj.query("str_val LIKE ?", new String[] { "%ell%" });
+		assertEquals(qRes.length, 1);
+		
+	}
+	
 	// Random object, and iteration support
 	//-----------------------------------------------