Merge branch 'main' of github.com:drpcorg/chotki

drpcorg · Apr 24, 2024 · a3e198d · a3e198d
2 parents 5a33109 + 031c191
commit a3e198d
Show file tree

Hide file tree

Showing 35 changed files with 1,242 additions and 37 deletions.
diff --git a/chotki.go b/chotki.go
@@ -11,8 +11,8 @@ import (
 	"github.com/cockroachdb/pebble"
 	"github.com/cockroachdb/pebble/vfs"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toyqueue"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toyqueue"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 type Packet []byte

diff --git a/chotki_test.go b/chotki_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/cockroachdb/pebble"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toyqueue"
+	"github.com/drpcorg/chotki/toyqueue"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/counter.go b/counter.go
@@ -2,7 +2,7 @@ package chotki
 
 import (
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 type Counter64 int64

diff --git a/counter_test.go b/counter_test.go
@@ -2,7 +2,7 @@ package chotki
 
 import (
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

diff --git a/examples/object_example.go b/examples/object_example.go
@@ -4,7 +4,7 @@ import (
 	"github.com/cockroachdb/pebble"
 	"github.com/drpcorg/chotki"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 const ExampleName = 1

diff --git a/examples/object_example_test.go b/examples/object_example_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/drpcorg/chotki"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toyqueue"
+	"github.com/drpcorg/chotki/toyqueue"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/examples/objects_test.go b/examples/objects_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/drpcorg/chotki"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toyqueue"
+	"github.com/drpcorg/chotki/toyqueue"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/go.mod b/go.mod
@@ -5,8 +5,6 @@ go 1.21.4
 require (
 	github.com/cockroachdb/pebble v1.1.0
 	github.com/ergochat/readline v0.1.0
-	github.com/learn-decentralized-systems/toyqueue v0.1.5
-	github.com/learn-decentralized-systems/toytlv v0.2.1
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.4
 )

diff --git a/go.sum b/go.sum
@@ -177,10 +177,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/learn-decentralized-systems/toyqueue v0.1.5 h1:X2EQEWj2dyaE5BUkE58aXsMG7mq8Uv6CpiFCErAnCMQ=
-github.com/learn-decentralized-systems/toyqueue v0.1.5/go.mod h1:T5PrFDCcxA1O7hb2MAlHYYFA89ry8hvXUuwg+drS1UQ=
-github.com/learn-decentralized-systems/toytlv v0.2.1 h1:nk+gjjE9JZ659kkbxIlv/H/gF5Wtst1Dbn7KckqdFOQ=
-github.com/learn-decentralized-systems/toytlv v0.2.1/go.mod h1:+xzKS/La5vCkdyIdOFDb2NVPGF808tG5n5b3Ufxkorg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=

diff --git a/log0.go b/log0.go
@@ -2,8 +2,8 @@ package chotki
 
 import (
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toyqueue"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toyqueue"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 const id1 = rdx.ID0 + rdx.ProInc

diff --git a/objects.go b/objects.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"github.com/cockroachdb/pebble"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toyqueue"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toyqueue"
+	"github.com/drpcorg/chotki/toytlv"
 	"github.com/pkg/errors"
 	"unicode/utf8"
 )

diff --git a/op.go b/op.go
@@ -2,7 +2,7 @@ package chotki
 
 import (
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 func ParsePacket(pack []byte) (lit byte, id, ref rdx.ID, body []byte, err error) {

diff --git a/packets.go b/packets.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/cockroachdb/pebble"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 func (cho *Chotki) UpdateVTree(id, ref rdx.ID, pb *pebble.Batch) (err error) {

diff --git a/rdx/ELM.go b/rdx/ELM.go
@@ -3,7 +3,7 @@ package rdx
 import (
 	"bytes"
 	"errors"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 	"slices"
 	"sort"
 )

diff --git a/rdx/ELM_test.go b/rdx/ELM_test.go
@@ -1,8 +1,8 @@
 package rdx
 
 import (
-	"github.com/learn-decentralized-systems/toyqueue"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toyqueue"
+	"github.com/drpcorg/chotki/toytlv"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

diff --git a/rdx/FIRST.go b/rdx/FIRST.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/learn-decentralized-systems/toyqueue"
+	"github.com/drpcorg/chotki/toyqueue"
 
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 // Common LWW functions

diff --git a/rdx/FIRST_test.go b/rdx/FIRST_test.go
@@ -3,7 +3,7 @@ package rdx
 import (
 	"testing"
 
-	"github.com/learn-decentralized-systems/toyqueue"
+	"github.com/drpcorg/chotki/toyqueue"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/rdx/NZ.go b/rdx/NZ.go
@@ -2,7 +2,7 @@ package rdx
 
 import (
 	"fmt"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 // N is an increment-only uint64 counter

diff --git a/rdx/NZ_test.go b/rdx/NZ_test.go
@@ -1,7 +1,7 @@
 package rdx
 
 import (
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

diff --git a/rdx/X.go b/rdx/X.go
@@ -2,7 +2,7 @@ package rdx
 
 import (
 	hex2 "encoding/hex"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 func Xparse(rdt byte, val string) (tlv []byte) {

diff --git a/rdx/id.go b/rdx/id.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 /*

diff --git a/rdx/rdx.go b/rdx/rdx.go
@@ -2,7 +2,7 @@ package rdx
 
 import (
 	"errors"
-	"github.com/learn-decentralized-systems/toyqueue"
+	"github.com/drpcorg/chotki/toyqueue"
 )
 
 const (

diff --git a/rdx/vv.go b/rdx/vv.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"slices"
 
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 // VV is a version vector, max ids seen from each known replica.

diff --git a/repl/commands.go b/repl/commands.go
@@ -9,8 +9,8 @@ import (
 	"github.com/cockroachdb/pebble"
 	"github.com/drpcorg/chotki"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toyqueue"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toyqueue"
+	"github.com/drpcorg/chotki/toytlv"
 )
 
 var HelpCreate = errors.New("create zone/1 {Name:\"Name\",Description:\"long text\"}")

diff --git a/repl/repl.go b/repl/repl.go
@@ -7,7 +7,7 @@ import (
 	"github.com/drpcorg/chotki"
 	"github.com/drpcorg/chotki/rdx"
 	"github.com/ergochat/readline"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toytlv"
 	"io"
 	"os"
 	"strings"

diff --git a/sync.go b/sync.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"github.com/cockroachdb/pebble"
 	"github.com/drpcorg/chotki/rdx"
-	"github.com/learn-decentralized-systems/toyqueue"
-	"github.com/learn-decentralized-systems/toytlv"
+	"github.com/drpcorg/chotki/toyqueue"
+	"github.com/drpcorg/chotki/toytlv"
 	"io"
 	"os"
 	"sync"

diff --git a/toyqueue/drainfeed.go b/toyqueue/drainfeed.go
@@ -0,0 +1,65 @@
+package toyqueue
+
+import "io"
+
+// Records (a batch of) as a very universal primitive, especially
+// for database/network op/packet processing. Batching allows
+// for writev() and other performance optimizations. ALso, if
+// you have cryptography, blobs are way handier than structs.
+// Records converts easily to net.Buffers.
+type Records [][]byte
+
+type Feeder interface {
+	// Feed reads and returns records.
+	// The EoF convention follows that of io.Reader:
+	// can either return `records, EoF` or
+	// `records, nil` followed by `nil/{}, EoF`
+	Feed() (recs Records, err error)
+}
+
+type FeedCloser interface {
+	Feeder
+	io.Closer
+}
+
+type FeedSeeker interface {
+	Feeder
+	io.Seeker
+}
+
+type FeedSeekCloser interface {
+	Feeder
+	io.Seeker
+	io.Closer
+}
+
+type Drainer interface {
+	Drain(recs Records) error
+}
+
+type DrainSeeker interface {
+	Drainer
+	io.Seeker
+}
+
+type DrainCloser interface {
+	Drainer
+	io.Closer
+}
+
+type DrainSeekCloser interface {
+	Drainer
+	io.Seeker
+	io.Closer
+}
+
+type FeedDrainer interface {
+	Feeder
+	Drainer
+}
+
+type FeedDrainCloser interface {
+	Feeder
+	Drainer
+	io.Closer
+}