优化

Author: zhou-hao

src/main/java/org/jetlinks/reactor/ql/DefaultReactorQL.java

@@ -102,7 +102,7 @@ protected void prepare() {
                                                      )
                                              )
                                 ))
-                         .subscriberContext(context -> context.put(ReactorQLContext.class, context));
+                         .subscriberContext(context -> context.put(ReactorQLContext.class, ctx));
         } else {
             builder = ctx ->
                     limit.apply(ctx,
@@ -116,7 +116,7 @@ protected void prepare() {
                                                      )
                                              )
                                 )
-                    ).subscriberContext(context -> context.put(ReactorQLContext.class, context));
+                    ).subscriberContext(context -> context.put(ReactorQLContext.class, ctx));
         }
     }
 

src/main/java/org/jetlinks/reactor/ql/DefaultReactorQLRecord.java

@@ -14,20 +14,32 @@ public class DefaultReactorQLRecord implements ReactorQLRecord, Comparable<Defau
     @Getter
     private ReactorQLContext context;
 
-    private final Map<String, Object> records = new ConcurrentHashMap<>(32);
+    private final Map<String, Object> records;
 
-    private final Map<String, Object> results = new ConcurrentHashMap<>(32);
+    private final Map<String, Object> results;
 
     private final static String THIS_RECORD = "this";
 
     @Getter
     @Setter
     private String name;
 
+    public DefaultReactorQLRecord(
+            String name,
+            Map<String, Object> records,
+            Map<String, Object> results,
+            ReactorQLContext context) {
+        this.name = name;
+        this.records = records instanceof ConcurrentHashMap ? records : new ConcurrentHashMap<>(records);
+        this.results = results instanceof ConcurrentHashMap ? results : new ConcurrentHashMap<>(results);
+        this.context = context;
+    }
+
     public DefaultReactorQLRecord(
             String name,
             Object thisRecord,
             ReactorQLContext context) {
+        this();
         if (name != null) {
             records.put(name, thisRecord);
         }
@@ -39,6 +51,8 @@ public DefaultReactorQLRecord(
     }
 
     private DefaultReactorQLRecord() {
+        records = new ConcurrentHashMap<>(32);
+        results = new ConcurrentHashMap<>(32);
     }
 
     @Override
@@ -102,7 +116,7 @@ public ReactorQLRecord addRecords(Map<String, Object> records) {
     @Override
     public Map<String, Object> getRecords(boolean all) {
         if (all) {
-            return Collections.unmodifiableMap(records);
+            return records;
         }
         return Maps.filterKeys(records, (k) -> !Objects.equals(THIS_RECORD, k));
     }