From 6c40f1d751c71d3e2544d099dc5cafd0743678d7 Mon Sep 17 00:00:00 2001
From: Garet Halliday <me@garet.holiday>
Date: Tue, 9 May 2023 17:17:31 -0500
Subject: [PATCH] useless
---
cmd/cgat/main.go | 23 ++++++++++---------
lib/README.md | 3 ---
lib/backend/backends/v0/server.go | 3 ---
lib/router/handler.go | 9 --------
lib/router/router.go | 6 -----
lib/router/routers/v0/constraints.go | 18 ---------------
lib/router/routers/v0/handler.go | 23 -------------------
lib/router/routers/v0/router.go | 33 ----------------------------
lib/router/routers/v0/source.go | 23 -------------------
lib/router/source.go | 7 ------
10 files changed, 11 insertions(+), 137 deletions(-)
delete mode 100644 lib/router/handler.go
delete mode 100644 lib/router/router.go
delete mode 100644 lib/router/routers/v0/constraints.go
delete mode 100644 lib/router/routers/v0/handler.go
delete mode 100644 lib/router/routers/v0/router.go
delete mode 100644 lib/router/routers/v0/source.go
delete mode 100644 lib/router/source.go
diff --git a/cmd/cgat/main.go b/cmd/cgat/main.go
index b0751ea7..90590397 100644
--- a/cmd/cgat/main.go
+++ b/cmd/cgat/main.go
@@ -10,8 +10,8 @@ import (
"pggat2/lib/frontend/frontends/v0"
"pggat2/lib/pnet"
"pggat2/lib/pnet/packet"
- "pggat2/lib/router"
- "pggat2/lib/router/routers/v0"
+ "pggat2/lib/rob"
+ "pggat2/lib/rob/schedulers/v2"
)
type testPacket struct {
@@ -70,7 +70,7 @@ func (T *LogWriter) Write() packet.Out {
var _ pnet.Writer = (*LogWriter)(nil)
-func makeTestServer(r router.Router) {
+func testServer(r rob.Scheduler) {
conn, err := net.Dial("tcp", "localhost:5432")
if err != nil {
panic(err)
@@ -79,12 +79,11 @@ func makeTestServer(r router.Router) {
if server == nil {
panic("failed to connect to server")
}
- go func() {
- handler := r.NewHandler(true)
- for {
- server.Handle(handler.Next())
- }
- }()
+
+ sink := r.NewSink(0)
+ for {
+ server.Handle(sink.Read().(pnet.ReadWriter))
+ }
}
func main() {
@@ -92,8 +91,8 @@ func main() {
panic(http.ListenAndServe(":8080", nil))
}()
- r := routers.MakeRouter()
- makeTestServer(&r)
+ r := schedulers.MakeScheduler()
+ go testServer(&r)
listener, err := net.Listen("tcp", "0.0.0.0:6432") // TODO(garet) make this configurable
if err != nil {
@@ -108,7 +107,7 @@ func main() {
source := r.NewSource()
client := frontends.NewClient(conn)
for {
- source.Handle(client, false)
+ source.Schedule(client, 0)
}
}()
}
diff --git a/lib/README.md b/lib/README.md
index 382708b0..9a705505 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -24,8 +24,5 @@ Packet reading/writing helpers
## rob
A fair-share scheduler
-## router
-Routing between frontends and backends
-
## util
Project generic helper structures and functions
diff --git a/lib/backend/backends/v0/server.go b/lib/backend/backends/v0/server.go
index 617ad38f..ee09cb33 100644
--- a/lib/backend/backends/v0/server.go
+++ b/lib/backend/backends/v0/server.go
@@ -13,7 +13,6 @@ import (
"pggat2/lib/pnet"
"pggat2/lib/pnet/packet"
"pggat2/lib/pnet/packet/packets/v3.0"
- "pggat2/lib/util/decorator"
)
var ErrServerFailed = perror.New(
@@ -23,8 +22,6 @@ var ErrServerFailed = perror.New(
)
type Server struct {
- noCopy decorator.NoCopy
-
conn net.Conn
pnet.IOReader
diff --git a/lib/router/handler.go b/lib/router/handler.go
deleted file mode 100644
index dfff7210..00000000
--- a/lib/router/handler.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package router
-
-import (
- "pggat2/lib/pnet"
-)
-
-type Handler interface {
- Next() pnet.ReadWriter
-}
diff --git a/lib/router/router.go b/lib/router/router.go
deleted file mode 100644
index adc58c80..00000000
--- a/lib/router/router.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package router
-
-type Router interface {
- NewHandler(write bool) Handler
- NewSource() Source
-}
diff --git a/lib/router/routers/v0/constraints.go b/lib/router/routers/v0/constraints.go
deleted file mode 100644
index ef93ace4..00000000
--- a/lib/router/routers/v0/constraints.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package routers
-
-import "pggat2/lib/rob"
-
-const (
- writeConstraint rob.Constraints = 1 << iota
-)
-
-func constraints(write bool) rob.Constraints {
- var c rob.Constraints
- if write {
- c = rob.Constraints.All(
- c,
- writeConstraint,
- )
- }
- return c
-}
diff --git a/lib/router/routers/v0/handler.go b/lib/router/routers/v0/handler.go
deleted file mode 100644
index 8488a592..00000000
--- a/lib/router/routers/v0/handler.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package routers
-
-import (
- "pggat2/lib/pnet"
- "pggat2/lib/rob"
- "pggat2/lib/router"
-)
-
-type Handler struct {
- sink rob.Sink
-}
-
-func MakeHandler(sink rob.Sink) Handler {
- return Handler{
- sink: sink,
- }
-}
-
-func (T Handler) Next() pnet.ReadWriter {
- return T.sink.Read().(pnet.ReadWriter)
-}
-
-var _ router.Handler = Handler{}
diff --git a/lib/router/routers/v0/router.go b/lib/router/routers/v0/router.go
deleted file mode 100644
index 9dba7bc9..00000000
--- a/lib/router/routers/v0/router.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package routers
-
-import (
- "pggat2/lib/rob/schedulers/v2"
- "pggat2/lib/router"
-)
-
-type Router struct {
- scheduler schedulers.Scheduler
-}
-
-func MakeRouter() Router {
- return Router{
- scheduler: schedulers.MakeScheduler(),
- }
-}
-
-func NewRouter() *Router {
- r := MakeRouter()
- return &r
-}
-
-func (r *Router) NewHandler(write bool) router.Handler {
- sink := r.scheduler.NewSink(constraints(write))
- return MakeHandler(sink)
-}
-
-func (r *Router) NewSource() router.Source {
- source := r.scheduler.NewSource()
- return MakeSource(source)
-}
-
-var _ router.Router = (*Router)(nil)
diff --git a/lib/router/routers/v0/source.go b/lib/router/routers/v0/source.go
deleted file mode 100644
index 09fa6ab5..00000000
--- a/lib/router/routers/v0/source.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package routers
-
-import (
- "pggat2/lib/pnet"
- "pggat2/lib/rob"
- "pggat2/lib/router"
-)
-
-type Source struct {
- source rob.Source
-}
-
-func MakeSource(source rob.Source) Source {
- return Source{
- source: source,
- }
-}
-
-func (T Source) Handle(peer pnet.ReadWriter, write bool) {
- T.source.Schedule(peer, constraints(write))
-}
-
-var _ router.Source = Source{}
diff --git a/lib/router/source.go b/lib/router/source.go
deleted file mode 100644
index e542e51d..00000000
--- a/lib/router/source.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package router
-
-import "pggat2/lib/pnet"
-
-type Source interface {
- Handle(peer pnet.ReadWriter, write bool)
-}
--
GitLab