Executed first distributed command (Count)

BootServers.dyalog

@@ -2,17 +2,22 @@
 ⍝ Start a vecdb server process if VECDBSRV="config.json" PORT=nnnn
 ⍝         vecdb slave process if  VECDBSLAVE="file" SHARDS="n" PORT=nnnn
 
- getenv←{0=≢2 ⎕NQ'.' 'GetEnvironment'⍵:⍺}
+ getenv←{0=≢r←2 ⎕NQ'.' 'GetEnvironment'⍵:⍺ ⋄ r}
  getnum←{⊃2⊃⎕VFI ⍵}
  path←'file://',⊃⎕NPARTS ⎕WSID
 
- VECDBSRV←0≠⍴CONFIG←''getenv'VECDBSRV'
- VECDBSLAVE←0≠VECDB←''getenv'VECDBSLAVE'
+ VECDBSRV←0≠≢SRVDB←''getenv'VECDBSRV'
+ VECDBSLAVE←0≠≢VECDB←''getenv'VECDBSLAVE'
+ SHARDS←2⊃⎕VFI''getenv'SHARDS'
+ TOKEN←2⊃⎕VFI''getenv'TOKEN'
+
  port←getnum''getenv'PORT'
 
  2 ⎕FIX path,'APLProcess.dyalog'
  2 ⎕FIX path,'vecdb.dyalog'
+ 2 ⎕FIX path,'vecdbclt.dyalog'
  2 ⎕FIX path,'vecdbsrv.dyalog'
+ 2 ⎕FIX path,'vecdbslave.dyalog'
 
  :If 0=⎕NC'DRC' ⍝ Get conga if necessary
      'DRC'⎕CY'conga'getenv'CONGAWS'
@@ -24,10 +29,11 @@
      '      ',2 ⎕FIX path,'TestVecdbSrv.dyalog'
  :Else
 
+     AUTOSHUT←1
      {}1 ##.DRC.Init''
 
-     :If VECDBSRV ⋄ vecdbsrv.Start CONFIG port
-     :ElseIf VECDBSLAVE ⋄ vecdbslave.Start VECDB port
+     :If VECDBSRV ⋄ vecdbsrv.Start SRVDB port
+     :ElseIf VECDBSLAVE ⋄ vecdbslave.Start VECDB SHARDS port
      :Else
          ⎕←'Invalid configuration...'
      :EndIf

TestVecdbSrv.dyalog

@@ -11,7 +11,8 @@
       :Trap 6 ⋄ source←SALT_Data.SourceFile
       :Else ⋄ source←⎕WSID
       :EndTrap
-      path←{(-⌊/(⌽⍵)⍳'\/')↓⍵}source
+      path←{(-⌊/(⌽⍵)⍳'\/')↓⍵}source 
+      :If 0=⎕NC '#.DRC' ⋄ 'DRC' #.⎕CY 'conga' ⋄ :EndIf
       ⎕←ServerBasic
     ∇
 
@@ -24,28 +25,15 @@
       vecdbsrv.Users←,user
       db←⎕NS''
       db.Folder←folder
-      db.Slaves←,¨1 2 ⍝ Distribution of shards to slave processors
+      db.Slaves←⎕NS¨2⍴⊂''
+      db.Slaves.Shards←,¨1 2 ⍝ Distribution of shards to slave processors
       config←⎕NS''
       config.Server←vecdbsrv
       config.DBs←,db
       (toJson config)⎕NPUT filename
     ∇
-
-    ∇ z←ServerBasic;columns;data;options;params;folder;types;name;ix;users;srvproc;clt;TEST
-     ⍝ Test database with 2 shards
-     ⍝ Also acts as test for add/remove columns
-
-      folder←path,'/',(name←'srvtest'),'/'
-      ⎕←'Clearing: ',folder
-      :Trap 22 ⋄ #.vecdb.Delete folder ⋄ :EndTrap
-      ⎕MKDIR folder
-
-      ⍝ --- Create configuration file ---
-
-      CreateTestConfig folder,'config.json'
-
-      ⍝ --- Create database ---
-
+
+    ∇ (db params)←CreateTestDB;columns;types;data;options
       columns←'Name' 'BlockSize' 'Flag'
       types←,¨'C' 'F' 'C'
       data←('IBM' 'AAPL' 'MSFT' 'GOOG' 'DYALOG')(160.97 112.6 47.21 531.23 999.99)(5⍴'Buy' 'Sell')
@@ -56,25 +44,38 @@
       options.(ShardFn ShardCols)←'{2-2|⎕UCS ⊃¨⊃⍵}' 1
 
       params←name folder columns types options data
-      TEST←'Create sharded database'
       db←⎕NEW #.vecdb params
-      assert (≢data)=db.Count
+      assert (≢⊃data)=db.Count
+    ∇
+
+    ∇ z←ServerBasic;columns;data;options;params;folder;types;name;ix;users;srvproc;clt;TEST;config;db
+     ⍝ Test database with 2 shards
+     ⍝ Also acts as test for add/remove columns
+
+      folder←path,'/',(name←'srvtest'),'/'
+      ⎕←'Clearing: ',folder
+      :Trap 22 ⋄ {}#.vecdb.Delete folder ⋄ :EndTrap
+      ⎕MKDIR folder
+
+      ⍝ --- Create configuration file ---
+
+      config←CreateTestConfig folder,'config.json'
+      (db (name folder columns types options data))←CreateTestDB
 
       ⍝ --- Launch and connect to server, open database ---
 
-      srvproc←#.vecdbsrv.Launch folder 8100
-      assert 0=srvproc.HasExited
+      srvproc←#.vecdbsrv.Launch folder 8100      
+      #.vecdbclt.Connect '127.0.0.1' 8100 'mkrom'
+      db←#.vecdbclt.Open folder
 
-      clt←#.vecdbclt.Connect '127.0.0.1' 8100 'mkrom'
-      db←clt.Open folder
-
+      ∘∘∘
+      assert (≢⊃data)=db.Count
       ix←db.Query('Name'((columns⍳⊂'Name')⊃data))⍬ ⍝ Should find everything
       assert(1 2,⍪⍳¨4 1)≡ix
       TEST←'Read it all back'
       assert data≡db.Read time ix columns
 
-      z←db.Close
-      clt.ShutDown 'Shutting down now!'
+      z←db.Shutdown 'Shutting down now!'
       ⎕DL 3
       svrproc.Kill
       ⎕DL 3

dev.dyapp

@@ -1,6 +1,7 @@
 Load vecdb
 Load vecdbclt
 Load vecdbsrv
+Load vecdbslave
 Load MakeBoot
 Load BootServers
 Load APLProcess

vecdb.dyalog

@@ -52,7 +52,7 @@
     :Property Count
     :Access public
         ∇ r←get
-          r←⊃+/_Counts.counter
+          r←⊃+/_Counts[ShardSelected].counter
         ∇
     :EndProperty 
 

vecdbclt.dyalog

@@ -1,16 +1,31 @@
 :Namespace vecdbclt
 
-    (⎕IO ⎕ML ⎕WX)←1 0 3
+    (⎕IO ⎕ML)←1 1
     SERVER←''
 
-    ∇ r←Connect(address port user)
+    ∇ r←Clt(connection address port)
+      :If 1111=⊃r←##.DRC.Clt connection address port
+          {}⎕DL 0.5
+      :AndIf 1111=⊃r←##.DRC.Clt connection address port
+          {}⎕DL 1
+      :AndIf 1111=⊃r←##.DRC.Clt connection address port
+          {}⎕DL 3
+      :AndIf 1111=⊃r←##.DRC.Clt connection address port
+          {}⎕DL 5
+      :AndIf 1111=⊃r←##.DRC.Clt connection address port
+          (⍕r)⎕SIGNAL 11
+      :EndIf
+    ∇
+
+    ∇ {r}←{connection}Connect(address port user)
      ⍝ Connect to vecdb server process
 
+      :If 0=⎕NC'connection' ⋄ connection←'VECDB' ⋄ :EndIf
+
       :If 0=⊃r←##.DRC.Init''
-          {}##.DRC.Close CONNECTION←'VECDB'
-      :AndIf 0=⊃r←##.DRC.Clt CONNECTION address port
-      :AndIf 0=⊃r←SrvDo CONNECTION('CltSetUser'user)
-          r←SrvDo CONNECTION('CltSetUser'user)
+          :If 0≠⍴connection ⋄ {}##.DRC.Close connection ⋄ :EndIf
+      :AndIf 0=⊃r←Clt connection address port
+          CONNECTION←2⊃r
       :Else
           ('Error: ',,⍕r)⎕SIGNAL 11
       :EndIf
@@ -44,45 +59,66 @@
       :EndIf
     ∇
 
-    ∇ r←Open database
+    ∇ r←Open folder
      ⍝ Cover-function for call to Lock from a Client
 
-      :If 0=⊃r←SrvDo CONNECTION ('CltOpen' database) 
-          r←⎕NEW vecdbproxy (2⊃r)
-      :Else
-          (,⍕r) ⎕SIGNAL 11
-      :EndIf
-    ∇           
-
+      r←⎕NEW vecdbproxy(folder CONNECTION)
+    ∇
+
     :Class vecdbproxy
     ⍝ Produce a vecdb proxy object for a served vecdb
-
-     ∇Open (name connection)
-     :Access Public
-     :Implements Constructor
-     (NAME CONNECTION)←name connection
 
-     ∇
-
-     ∇Close
-     :Access Public
-
-     ∇
-
-     ∇r←Append args
-     :Access Public
-∇                                
-
-     ∇r←Query args
-     :Access Public
-     ∇
-
-     ∇r←Read args
-     :Access Public
-     ∇        
-
-     ∇r←Update args
-     ∇                                
+        ∇ Open(folder connection)
+          :Access Public
+          :Implements Constructor
+          (FOLDER CONNECTION)←folder connection
+          :If 0=⊃r←##.SrvDo CONNECTION('Open'folder)
+              ⎕DF'[vecdbclt: ',folder,']'
+          :Else
+              (⍕r)⎕SIGNAL 11
+          :EndIf
+        ∇
+
+        ∇ Shutdown msg
+          :Access Public
+          :If 0=⊃r←##.SrvDo CONNECTION('Shutdown' msg)
+              {}#.DRC.Close CONNECTION
+              CONNECTION←''
+          :EndIf
+        ∇
+
+        ∇ Close
+          :Access Public
+          :If 0=⊃r←##.SrvDo CONNECTION('Close' ⍬)
+              {}#.DRC.Close CONNECTION
+              CONNECTION←''
+          :EndIf
+        ∇
+
+        ∇ r←Count
+          :Access Public
+          :If 0≠⍴CONNECTION
+             r←##.SrvDo CONNECTION('Count' (FOLDER ⍬))
+             r←+/r
+          :Else
+              'CONNECTION CLOSED' ⎕SIGNAL 11
+          :EndIf
+        ∇
+
+        ∇ r←Append args
+          :Access Public
+        ∇
+
+        ∇ r←Query args
+          :Access Public
+        ∇
+
+        ∇ r←Read args
+          :Access Public
+        ∇
+
+        ∇ r←Update args
+        ∇
 
     :EndClass