优化代码，去除不必要的 synchonized

TommyLemon · TommyLemon · commit b881541295e3 · 2022-03-26T23:56:50.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -1769,7 +1769,7 @@ public static String replaceArrayChildPath(String parentPath, String valuePath)
 	 * @param result 需要被关联的object
 	 */
 	@Override
-	public synchronized void putQueryResult(String path, Object result) {
+	public void putQueryResult(String path, Object result) {
 		Log.i(TAG, "\n putQueryResult  valuePath = " + path + "; result = " + result + "\n <<<<<<<<<<<<<<<<<<<<<<<");
 		//		if (queryResultMap.containsKey(valuePath)) {//只保存被关联的value
 		Log.d(TAG, "putQueryResult  queryResultMap.containsKey(valuePath) >> queryResultMap.put(path, result);");
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -2303,18 +2303,16 @@ public Object getWhere(String key, boolean exactMatch) {
 		if (key == null || where == null){
 			return null;
 		}
-		synchronized (where) {
-			if (where != null) {
-				int index;
-				for (Entry<String,Object> entry : where.entrySet()) {
-					String k = entry.getKey();
-					index = k.indexOf(key);
-					if (index >= 0 && StringUtil.isName(k.substring(index)) == false) {
-						return entry.getValue();
-					}
-				}
+		
+		int index;
+		for (Entry<String,Object> entry : where.entrySet()) {
+			String k = entry.getKey();
+			index = k.indexOf(key);
+			if (index >= 0 && StringUtil.isName(k.substring(index, index + 1)) == false) {
+				return entry.getValue();
 			}
 		}
+		
 		return null;
 	}
 	@Override
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
@@ -1120,26 +1120,30 @@ public void close() {
 
 	@Override
 	public ResultSet executeQuery(@NotNull SQLConfig config) throws Exception {
-		PreparedStatement s = getStatement(config);
-// 不准，getStatement 有时比 execute sql 更耗时		executedSQLStartTime = System.currentTimeMillis();
-		ResultSet rs = s.executeQuery();  //PreparedStatement 不用传 SQL
-//		executedSQLEndTime = System.currentTimeMillis();
+		PreparedStatement stt = getStatement(config);
+		// 不准，getStatement 有时比 execute sql 更耗时		executedSQLStartTime = System.currentTimeMillis();
+		ResultSet rs = stt.executeQuery();  //PreparedStatement 不用传 SQL
+		//		executedSQLEndTime = System.currentTimeMillis();
+		//		if (config.isExplain() && (config.isSQLServer() || config.isOracle())) {
+		// FIXME 返回的是 boolean 值			rs = stt.getMoreResults(Statement.CLOSE_CURRENT_RESULT);
+		//		}
+
 		return rs;
 	}
 
 	@Override
 	public int executeUpdate(@NotNull SQLConfig config) throws Exception {
-		PreparedStatement s = getStatement(config);
+		PreparedStatement stt = getStatement(config);
 // 不准，getStatement 有时比 execute sql 更耗时		executedSQLStartTime = System.currentTimeMillis();
-		int count = s.executeUpdate();  // PreparedStatement 不用传 SQL
+		int count = stt.executeUpdate();  // PreparedStatement 不用传 SQL
 //		executedSQLEndTime = System.currentTimeMillis();
 		
 		if (count <= 0 && config.isHive()) {
 			count = 1;
 		}
 		
 		if (config.getId() == null && config.getMethod() == RequestMethod.POST) {  // 自增id
-			ResultSet rs = s.getGeneratedKeys();
+			ResultSet rs = stt.getGeneratedKeys();
 			if (rs != null && rs.next()) {
 				config.setId(rs.getLong(1));  //返回插入的主键id  FIXME Oracle 拿不到
 			}
