wip

fixme-new/lib/Fixme/Run/Internal.hs

@@ -359,29 +359,42 @@ refchanExport = do
   let (pk,sk) = (view peerSignPk creds, view peerSignSk creds)
 
   withState do
-    what <- select_ @_ @FixmeExported [qc|select o,w,k,cast (v as text) from object order by o, k, v|]
+    -- FIXME: select-only-really-missed-records
+    --   сейчас всегда фуллскан. будет всё дольше и дольше
+    --   с ростом количества записей. Нужно отбирать
+    --   только такие элементы, которые реально отсутствуют
+    --   в рефчане
+    what <- select_ @_ @FixmeExported [qc|select distinct o,0,k,cast (v as text) from object order by o, k, v|]
 
     let chu  = chunksOf 1000 what
 
-    for_ chu $ \x -> do
+    flip runContT pure do
 
-      -- FIXME: encrypt-tree
+      for_ chu $ \x -> callCC \next -> do
-      h  <- writeAsMerkle sto (serialise x)
 
-      let tx = AnnotatedHashRef Nothing (HashRef h)
+        -- FIXME: encrypt-tree
+        h  <- writeAsMerkle sto (serialise x)
 
-      let lbs = serialise tx
+        already <- lift $ lift $ selectIsAlreadyScanned (HashRef h)
 
-      liftIO $ print (LBS.length lbs)
+        when already $ next ()
 
-      let box = makeSignedBox @'HBS2Basic @BS.ByteString pk sk (LBS.toStrict lbs)
+        let tx = AnnotatedHashRef Nothing (HashRef h)
 
-      warn $ "POST" <+> red "unencrypted!" <+> pretty (hashObject @HbSync (serialise box))
+        lift do
 
-      r <- callRpcWaitMay @RpcRefChanPropose (TimeoutSec 1) rchanAPI (chan, box)
+          let lbs = serialise tx
 
-      when (isNothing r) do
+          liftIO $ print (LBS.length lbs)
-        err $ red "hbs2-peer rpc calling timeout"
+
+          let box = makeSignedBox @'HBS2Basic @BS.ByteString pk sk (LBS.toStrict lbs)
+
+          warn $ "POST" <+> red "unencrypted!" <+> pretty (hashObject @HbSync (serialise box))
+
+          r <- callRpcWaitMay @RpcRefChanPropose (TimeoutSec 1) rchanAPI (chan, box)
+
+          when (isNothing r) do
+            err $ red "hbs2-peer rpc calling timeout"
 
 
 refchanImport :: FixmePerks m => FixmeM m ()
@@ -446,11 +459,13 @@ refchanImport = do
     for_ imported $ \(txh, h, href, i) -> do
       w <- readTVarIO ttsmap <&> fromMaybe (exportedWeight i) . HM.lookup h
       let item = i { exportedWeight = w }
-      notice $ "import" <+> pretty (exportedKey item) <+> pretty (exportedWeight item)
+
-      insertFixmeExported item
+      unless (exportedWeight item == 0) do
+        notice $ "import" <+> pretty (exportedKey item) <+> pretty (exportedWeight item)
+        insertFixmeExported item
+
       atx <- readTVarIO accepts <&> fromMaybe mempty . HM.lookup h
       insertScanned txh
       insertScanned href
       for_ atx insertScanned
 
-

fixme-new/lib/Fixme/State.hs

@@ -16,6 +16,7 @@ module Fixme.State
   , listAllScanned
   , selectFixmeKey
   , getFixme
+  , insertTree
   , FixmeExported(..)
   , HasPredicate(..)
   , SelectPredicate(..)
@@ -126,6 +127,13 @@ withState what = do
 createTables :: FixmePerks m => DBPipeM m ()
 createTables = do
 
+  ddl [qc| create table if not exists tree
+           ( hash text not null
+           , o    text not null
+           , k    text not null
+           , primary key (hash,o,k)
+           )
+         |]
 
   ddl [qc| create table if not exists scanned
            ( hash text not null primary key )
@@ -269,6 +277,14 @@ selectIsAlreadyScanned k = withState do
   what <- select @(Only Int) [qc|select 1 from scanned where hash = ? limit 1|] (Only k)
   pure $ not $ List.null what
 
+
+insertTree :: FixmePerks m => HashRef -> FixmeKey -> FixmeAttrName -> DBPipeM m ()
+insertTree h o k = do
+  insert [qc|  insert into tree (hash,o,k)
+               values (?,?,?)
+               on conflict (hash,o,k) do nothing
+         |] (h,o,k)
+
 listAllScanned :: (FixmePerks m, MonadReader FixmeEnv m) => m (HashSet HashRef)
 listAllScanned = withState do
   select_ [qc|select hash from scanned|] <&> HS.fromList . fmap ( fromSomeHash . fromOnly )