Merge branch 'haoyetian' of https://github.com/SerVal-DTF/fixminer_source into haoyetian

This commit is contained in:
ANIL KOYUNCU
2020-01-20 12:39:30 +01:00
@@ -328,7 +328,7 @@ public class EDiffHelper {
} }
public static String getTreeString(String prefix, String fn, JedisPool outerPool, HashMap<String, String> filenames, String treeType) { public static Map<String, String> getTreeString(String prefix, String fn, JedisPool outerPool, HashMap<String, String> filenames) {
try (Jedis outer = outerPool.getResource()) { try (Jedis outer = outerPool.getResource()) {
try { try {
while (!outer.ping().equals("PONG")) { while (!outer.ping().equals("PONG")) {
@@ -340,8 +340,8 @@ public class EDiffHelper {
String[] split = prefix.split("-"); String[] split = prefix.split("-");
String key = split[0] + "/" + split[1] + "/" + dist2load; String key = split[0] + "/" + split[1] + "/" + dist2load;
String treeString = outer.hget(key, treeType); Map<String, String> treeMap = outer.hgetAll(key);
return treeString; return treeMap;
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }