Merge pull request #26 from yuriy-glotanov/2020.1beta

fix rsync bugs

Author: interference-project

src/main/java/su/interference/persistent/Table.java

@@ -1711,6 +1711,7 @@ public synchronized void remove (ValueSet key, Object o, Session s, LLT llt) thr
 
     public synchronized void storeFrames(List<SyncFrame> frames, int sourceNodeId, LLT llt, Session s) throws Exception {
         for (SyncFrame b : frames) {
+            b.getBd().setStarted(0);
             if (b.isStarted()) {
                 ixstartfs.put(sourceNodeId, b.getBd().getFrameId());
                 b.getBd().setStarted(sourceNodeId);

src/main/java/su/interference/sql/SQLJoin.java

@@ -181,9 +181,9 @@ public ResultSet executeJoin(Session s, int mode, ArrayList<SQLSetValue> uset) t
 
                     gtemp.persist(oo, s);
 
-                    if (!((ResultSetImpl)gtemp).isPersistent()) {
-                        gtemp.persist(new ResultSetTerm(), s);
-                    }
+                }
+                if (!((ResultSetImpl)gtemp).isPersistent()) {
+                    gtemp.persist(new ResultSetTerm(), s);
                 }
 
                 ((ResultSetImpl)gtemp).release();

src/main/java/su/interference/transport/TransportContext.java

@@ -127,6 +127,7 @@ protected void onMessage(TransportMessage transportMessage, InetAddress inetAddr
             processCallback(transportMessage.getTransportCallback());
         } else {
             logger.debug("transport message received with UUID: " + transportMessage.getUuid() + ", type = " + transportMessage.getTransportEvent().getClass());
+            transportMessage.getTransportEvent().setCallbackNodeId(transportMessage.getSender());
             final EventResult result = transportMessage.getTransportEvent().process();
             TransportCallback transportCallback = new TransportCallback(Config.getConfig().LOCAL_NODE_ID, transportMessage.getUuid(), result);
             sendCallback(transportMessage.getSender(), new TransportMessage(TransportMessage.CALLBACK_MESSAGE, Config.getConfig().LOCAL_NODE_ID, null, transportCallback));

src/main/java/su/interference/transport/TransportEvent.java

@@ -39,6 +39,8 @@ public interface TransportEvent extends Serializable {
     void setMessageUUID(String uuid);
     CountDownLatch getLatch();
     void setLatch(CountDownLatch latch);
+    int getCallbackNodeId();
+    void setCallbackNodeId(int callbackNodeId);
     boolean isSent();
     void sent();
     boolean isFail();