Merge pull request #31 from ryogrid/rest-server-interface-impl

Rest server interface impl
ryogrid · Oct 26, 2023 · d16991a · d16991a
2 parents e0a5c2f + 231c5e7
commit d16991a
Show file tree

Hide file tree

Showing 156 changed files with 1,579 additions and 688 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -3,7 +3,7 @@ name: testing
 on: [push]
 
 jobs:
-  # 共通処理
+  # for all tests
   setup:
     runs-on: ubuntu-latest
     steps:
@@ -15,7 +15,7 @@ jobs:
       - name: check out
         uses: actions/checkout@v2
 
-      # 処理を高速化するために環境をキャッシュ
+      # cache environment
       - name: Cache
         uses: actions/[email protected]
         with:
@@ -24,20 +24,20 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
-  # buildテスト
+  # build testing
   build:
     needs: setup
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: build
-        run: go build ./...
+        run: cd server; go build ./...
 
-  # testを通す
+  # exec unit tests
   test:
     needs: setup
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: test
-        run: go test ./... -v -short
+        run: cd lib; go test ./... -v -short
diff --git a/.idea/runConfigurations/go_test_SamehadaDB__short_.xml b/.idea/runConfigurations/go_test_SamehadaDB__short_.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/...og/catalog_interface/catalog_interface.go → ...og/catalog_interface/catalog_interface.go b/...og/catalog_interface/catalog_interface.go → ...og/catalog_interface/catalog_interface.go
@@ -1,9 +1,9 @@
 package catalog_interface
 
 import (
-	"github.com/ryogrid/SamehadaDB/storage/index"
-	"github.com/ryogrid/SamehadaDB/storage/tuple"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/storage/index"
+	"github.com/ryogrid/SamehadaDB/lib/storage/tuple"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 )
 
 type CatalogInterface interface {

diff --git a/...catalog_test/table_catalog_reload_test.go → ...catalog_test/table_catalog_reload_test.go b/...catalog_test/table_catalog_reload_test.go → ...catalog_test/table_catalog_reload_test.go
@@ -5,15 +5,15 @@ package catalog_test
 
 import (
 	"fmt"
-	"github.com/ryogrid/SamehadaDB/catalog"
-	"github.com/ryogrid/SamehadaDB/common"
-	"github.com/ryogrid/SamehadaDB/samehada"
-	"github.com/ryogrid/SamehadaDB/storage/buffer"
-	"github.com/ryogrid/SamehadaDB/storage/index/index_constants"
-	"github.com/ryogrid/SamehadaDB/storage/table/column"
-	"github.com/ryogrid/SamehadaDB/storage/table/schema"
-	testingpkg "github.com/ryogrid/SamehadaDB/testing/testing_assert"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/catalog"
+	"github.com/ryogrid/SamehadaDB/lib/common"
+	"github.com/ryogrid/SamehadaDB/lib/samehada"
+	"github.com/ryogrid/SamehadaDB/lib/storage/buffer"
+	"github.com/ryogrid/SamehadaDB/lib/storage/index/index_constants"
+	"github.com/ryogrid/SamehadaDB/lib/storage/table/column"
+	"github.com/ryogrid/SamehadaDB/lib/storage/table/schema"
+	testingpkg "github.com/ryogrid/SamehadaDB/lib/testing/testing_assert"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 	"os"
 	"testing"
 )

diff --git a/catalog/schemas.go → lib/catalog/schemas.go b/catalog/schemas.go → lib/catalog/schemas.go
@@ -4,10 +4,10 @@
 package catalog
 
 import (
-	"github.com/ryogrid/SamehadaDB/storage/index/index_constants"
-	"github.com/ryogrid/SamehadaDB/storage/table/column"
-	"github.com/ryogrid/SamehadaDB/storage/table/schema"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/storage/index/index_constants"
+	"github.com/ryogrid/SamehadaDB/lib/storage/table/column"
+	"github.com/ryogrid/SamehadaDB/lib/storage/table/schema"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 )
 
 func TableCatalogSchema() *schema.Schema {

diff --git a/catalog/statistics.go → lib/catalog/statistics.go b/catalog/statistics.go → lib/catalog/statistics.go
@@ -2,12 +2,12 @@ package catalog
 
 import (
 	"errors"
-	"github.com/ryogrid/SamehadaDB/common"
-	"github.com/ryogrid/SamehadaDB/execution/expression"
-	"github.com/ryogrid/SamehadaDB/samehada/samehada_util"
-	"github.com/ryogrid/SamehadaDB/storage/access"
-	"github.com/ryogrid/SamehadaDB/storage/table/schema"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/common"
+	"github.com/ryogrid/SamehadaDB/lib/execution/expression"
+	"github.com/ryogrid/SamehadaDB/lib/samehada/samehada_util"
+	"github.com/ryogrid/SamehadaDB/lib/storage/access"
+	"github.com/ryogrid/SamehadaDB/lib/storage/table/schema"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 	"math"
 )
 

diff --git a/catalog/table_catalog.go → lib/catalog/table_catalog.go b/catalog/table_catalog.go → lib/catalog/table_catalog.go
@@ -7,17 +7,17 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ryogrid/SamehadaDB/storage/index"
-	"github.com/ryogrid/SamehadaDB/storage/index/index_constants"
+	"github.com/ryogrid/SamehadaDB/lib/storage/index"
+	"github.com/ryogrid/SamehadaDB/lib/storage/index/index_constants"
 	"sync/atomic"
 
-	"github.com/ryogrid/SamehadaDB/recovery"
-	"github.com/ryogrid/SamehadaDB/storage/access"
-	"github.com/ryogrid/SamehadaDB/storage/buffer"
-	"github.com/ryogrid/SamehadaDB/storage/table/column"
-	"github.com/ryogrid/SamehadaDB/storage/table/schema"
-	"github.com/ryogrid/SamehadaDB/storage/tuple"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/recovery"
+	"github.com/ryogrid/SamehadaDB/lib/storage/access"
+	"github.com/ryogrid/SamehadaDB/lib/storage/buffer"
+	"github.com/ryogrid/SamehadaDB/lib/storage/table/column"
+	"github.com/ryogrid/SamehadaDB/lib/storage/table/schema"
+	"github.com/ryogrid/SamehadaDB/lib/storage/tuple"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 )
 
 // TableCatalogPageId indicates the page where the table catalog can be found

diff --git a/catalog/table_metadata.go → lib/catalog/table_metadata.go b/catalog/table_metadata.go → lib/catalog/table_metadata.go
@@ -4,11 +4,11 @@
 package catalog
 
 import (
-	"github.com/ryogrid/SamehadaDB/common"
-	"github.com/ryogrid/SamehadaDB/storage/access"
-	"github.com/ryogrid/SamehadaDB/storage/index"
-	"github.com/ryogrid/SamehadaDB/storage/index/index_constants"
-	"github.com/ryogrid/SamehadaDB/storage/table/schema"
+	"github.com/ryogrid/SamehadaDB/lib/common"
+	"github.com/ryogrid/SamehadaDB/lib/storage/access"
+	"github.com/ryogrid/SamehadaDB/lib/storage/index"
+	"github.com/ryogrid/SamehadaDB/lib/storage/index/index_constants"
+	"github.com/ryogrid/SamehadaDB/lib/storage/table/schema"
 )
 
 type TableMetadata struct {

diff --git a/common/assert.go → lib/common/assert.go b/common/assert.go → lib/common/assert.go
diff --git a/common/config.go → lib/common/config.go b/common/config.go → lib/common/config.go
diff --git a/common/logger.go → lib/common/logger.go b/common/logger.go → lib/common/logger.go
diff --git a/common/rwlatch.go → lib/common/rwlatch.go b/common/rwlatch.go → lib/common/rwlatch.go
@@ -5,7 +5,6 @@ package common
 
 import (
 	"fmt"
-	"github.com/sasha-s/go-deadlock"
 	"math"
 	"sync"
 	"sync/atomic"
@@ -153,34 +152,3 @@ func (l *readerWriterLatchDebug) RUnlock() {
 func (l *readerWriterLatchDebug) PrintDebugInfo() {
 	fmt.Printf("PrintDebugInfo: readerCnt=%d, writerCnt=%d\n", l.readerCnt, l.writerCnt)
 }
-
-type readerWriterLatchTrace struct {
-	mutex *deadlock.RWMutex
-}
-
-func NewRWLatchTrace() ReaderWriterLatch {
-	deadlock.Opts.DisableLockOrderDetection = true
-	latch := readerWriterLatchTrace{new(deadlock.RWMutex)}
-
-	return &latch
-}
-
-func (l *readerWriterLatchTrace) WLock() {
-	l.mutex.Lock()
-}
-
-func (l *readerWriterLatchTrace) WUnlock() {
-	l.mutex.Unlock()
-}
-
-func (l *readerWriterLatchTrace) RLock() {
-	l.mutex.RLock()
-}
-
-func (l *readerWriterLatchTrace) RUnlock() {
-	l.mutex.RUnlock()
-}
-
-func (l *readerWriterLatchTrace) PrintDebugInfo() {
-	// do nothing
-}
diff --git a/concurrency/checkpoint_manager.go → lib/concurrency/checkpoint_manager.go b/concurrency/checkpoint_manager.go → lib/concurrency/checkpoint_manager.go
@@ -2,9 +2,9 @@ package concurrency
 
 import (
 	"fmt"
-	"github.com/ryogrid/SamehadaDB/recovery"
-	"github.com/ryogrid/SamehadaDB/storage/access"
-	"github.com/ryogrid/SamehadaDB/storage/buffer"
+	"github.com/ryogrid/SamehadaDB/lib/recovery"
+	"github.com/ryogrid/SamehadaDB/lib/storage/access"
+	"github.com/ryogrid/SamehadaDB/lib/storage/buffer"
 	"time"
 )
 

diff --git a/concurrency/statistics_updater.go → lib/concurrency/statistics_updater.go b/concurrency/statistics_updater.go → lib/concurrency/statistics_updater.go
@@ -2,8 +2,8 @@ package concurrency
 
 import (
 	"fmt"
-	"github.com/ryogrid/SamehadaDB/catalog"
-	"github.com/ryogrid/SamehadaDB/storage/access"
+	"github.com/ryogrid/SamehadaDB/lib/catalog"
+	"github.com/ryogrid/SamehadaDB/lib/storage/access"
 	"time"
 )
 

diff --git a/container/hash/hash_table_page_test.go → lib/container/hash/hash_table_page_test.go b/container/hash/hash_table_page_test.go → lib/container/hash/hash_table_page_test.go
@@ -4,17 +4,17 @@
 package hash
 
 import (
-	"github.com/ryogrid/SamehadaDB/common"
-	"github.com/ryogrid/SamehadaDB/storage/page"
-	testingpkg "github.com/ryogrid/SamehadaDB/testing/testing_assert"
+	"github.com/ryogrid/SamehadaDB/lib/common"
+	"github.com/ryogrid/SamehadaDB/lib/storage/page"
+	testingpkg "github.com/ryogrid/SamehadaDB/lib/testing/testing_assert"
 	"os"
 	"testing"
 	"unsafe"
 
-	"github.com/ryogrid/SamehadaDB/recovery"
-	"github.com/ryogrid/SamehadaDB/storage/buffer"
-	"github.com/ryogrid/SamehadaDB/storage/disk"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/recovery"
+	"github.com/ryogrid/SamehadaDB/lib/storage/buffer"
+	"github.com/ryogrid/SamehadaDB/lib/storage/disk"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 )
 
 func TestHashTableHeaderPage(t *testing.T) {

diff --git a/container/hash/hash_table_test.go → lib/container/hash/hash_table_test.go b/container/hash/hash_table_test.go → lib/container/hash/hash_table_test.go
@@ -6,13 +6,13 @@ package hash
 import (
 	"bytes"
 	"encoding/binary"
-	testingpkg "github.com/ryogrid/SamehadaDB/testing/testing_assert"
-	"github.com/ryogrid/SamehadaDB/types"
+	testingpkg "github.com/ryogrid/SamehadaDB/lib/testing/testing_assert"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 	"testing"
 
-	"github.com/ryogrid/SamehadaDB/recovery"
-	"github.com/ryogrid/SamehadaDB/storage/buffer"
-	"github.com/ryogrid/SamehadaDB/storage/disk"
+	"github.com/ryogrid/SamehadaDB/lib/recovery"
+	"github.com/ryogrid/SamehadaDB/lib/storage/buffer"
+	"github.com/ryogrid/SamehadaDB/lib/storage/disk"
 )
 
 func IntToBytes(val int) []byte {

diff --git a/container/hash/hash_util.go → lib/container/hash/hash_util.go b/container/hash/hash_util.go → lib/container/hash/hash_util.go
@@ -4,7 +4,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 	"github.com/spaolacci/murmur3"
 )
 

diff --git a/container/hash/linear_probe_hash_table.go → ...container/hash/linear_probe_hash_table.go b/container/hash/linear_probe_hash_table.go → ...container/hash/linear_probe_hash_table.go
@@ -6,12 +6,12 @@ package hash
 import (
 	"encoding/binary"
 	"errors"
-	"github.com/ryogrid/SamehadaDB/storage/page"
+	"github.com/ryogrid/SamehadaDB/lib/storage/page"
 	"unsafe"
 
-	"github.com/ryogrid/SamehadaDB/common"
-	"github.com/ryogrid/SamehadaDB/storage/buffer"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/common"
+	"github.com/ryogrid/SamehadaDB/lib/storage/buffer"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 	"github.com/spaolacci/murmur3"
 )
 

diff --git a/.../hash/linear_probe_hash_table_iterator.go → .../hash/linear_probe_hash_table_iterator.go b/.../hash/linear_probe_hash_table_iterator.go → .../hash/linear_probe_hash_table_iterator.go
@@ -4,11 +4,11 @@
 package hash
 
 import (
-	"github.com/ryogrid/SamehadaDB/storage/page"
+	"github.com/ryogrid/SamehadaDB/lib/storage/page"
 	"unsafe"
 
-	"github.com/ryogrid/SamehadaDB/storage/buffer"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/storage/buffer"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 )
 
 type hashTableIterator struct {

diff --git a/container/hash/tmp_tuple.go → lib/container/hash/tmp_tuple.go b/container/hash/tmp_tuple.go → lib/container/hash/tmp_tuple.go
@@ -1,6 +1,6 @@
 package hash
 
-import "github.com/ryogrid/SamehadaDB/types"
+import "github.com/ryogrid/SamehadaDB/lib/types"
 
 // when doing hash join
 // we create a temp page to store all the tuple from left table which corresponds to the input key from right tuple

diff --git a/container/hash/tmp_tuple_page.go → lib/container/hash/tmp_tuple_page.go b/container/hash/tmp_tuple_page.go → lib/container/hash/tmp_tuple_page.go
@@ -5,9 +5,9 @@ import (
 	"encoding/binary"
 	"unsafe"
 
-	"github.com/ryogrid/SamehadaDB/storage/page"
-	"github.com/ryogrid/SamehadaDB/storage/tuple"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/storage/page"
+	"github.com/ryogrid/SamehadaDB/lib/storage/tuple"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 )
 
 const offsetFreeSpace = uint32(16)

diff --git a/container/skip_list/skip_list.go → lib/container/skip_list/skip_list.go b/container/skip_list/skip_list.go → lib/container/skip_list/skip_list.go
@@ -2,10 +2,10 @@ package skip_list
 
 import (
 	"fmt"
-	"github.com/ryogrid/SamehadaDB/common"
-	"github.com/ryogrid/SamehadaDB/storage/buffer"
-	"github.com/ryogrid/SamehadaDB/storage/page/skip_list_page"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/common"
+	"github.com/ryogrid/SamehadaDB/lib/storage/buffer"
+	"github.com/ryogrid/SamehadaDB/lib/storage/page/skip_list_page"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 	"math"
 	"math/rand"
 )

diff --git a/...t/skip_list_bench/skip_list_bench_test.go → ...t/skip_list_bench/skip_list_bench_test.go b/...t/skip_list_bench/skip_list_bench_test.go → ...t/skip_list_bench/skip_list_bench_test.go
@@ -2,10 +2,10 @@ package skip_list_bench
 
 import (
 	"fmt"
-	"github.com/ryogrid/SamehadaDB/container/skip_list"
-	"github.com/ryogrid/SamehadaDB/samehada"
-	"github.com/ryogrid/SamehadaDB/samehada/samehada_util"
-	"github.com/ryogrid/SamehadaDB/types"
+	"github.com/ryogrid/SamehadaDB/lib/container/skip_list"
+	"github.com/ryogrid/SamehadaDB/lib/samehada"
+	"github.com/ryogrid/SamehadaDB/lib/samehada/samehada_util"
+	"github.com/ryogrid/SamehadaDB/lib/types"
 	"math/rand"
 	"runtime"
 	"sync"