Skip to content

Commit

Permalink
Возвращаемся к internal-пакетам #57
Browse files Browse the repository at this point in the history
  • Loading branch information
@unhandled-exception
unhandled-exception committed Oct 30, 2022
1 parent a109b5e commit dbbbe10
Show file tree
Hide file tree
Showing 167 changed files with 305 additions and 304 deletions.
6 changes: 3 additions & 3 deletions pkg/buffers/buffer.go → internal/pkg/buffers/buffer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"sync"

"github.com/pkg/errors"
"github.com/unhandled-exception/sophiadb/pkg/storage"
"github.com/unhandled-exception/sophiadb/pkg/types"
"github.com/unhandled-exception/sophiadb/pkg/wal"
"github.com/unhandled-exception/sophiadb/internal/pkg/storage"
"github.com/unhandled-exception/sophiadb/internal/pkg/types"
"github.com/unhandled-exception/sophiadb/internal/pkg/wal"
)

// Buffer — страница в пуле буферов
Expand Down
2 changes: 1 addition & 1 deletion pkg/buffers/buffer_pool.go → internal/pkg/buffers/buffer_pool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"container/ring"
"sync"

"github.com/unhandled-exception/sophiadb/pkg/types"
"github.com/unhandled-exception/sophiadb/internal/pkg/types"
)

type BuffersPool struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/buffers/buffer_pool_test.go → internal/pkg/buffers/buffer_pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"testing"

"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/buffers"
"github.com/unhandled-exception/sophiadb/pkg/storage"
"github.com/unhandled-exception/sophiadb/pkg/testutil"
"github.com/unhandled-exception/sophiadb/pkg/types"
"github.com/unhandled-exception/sophiadb/pkg/wal"
"github.com/unhandled-exception/sophiadb/internal/pkg/buffers"
"github.com/unhandled-exception/sophiadb/internal/pkg/storage"
"github.com/unhandled-exception/sophiadb/internal/pkg/testutil"
"github.com/unhandled-exception/sophiadb/internal/pkg/types"
"github.com/unhandled-exception/sophiadb/internal/pkg/wal"
)

func TestBufferPoolTestSuite(t *testing.T) {
Expand Down
0 pkg/buffers/doc.go → internal/pkg/buffers/doc.go
View file
File renamed without changes.
0 pkg/buffers/errors.go → internal/pkg/buffers/errors.go
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions pkg/buffers/manager.go → internal/pkg/buffers/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/pkg/errors"

"github.com/unhandled-exception/sophiadb/pkg/storage"
"github.com/unhandled-exception/sophiadb/pkg/types"
"github.com/unhandled-exception/sophiadb/pkg/utils"
"github.com/unhandled-exception/sophiadb/pkg/wal"
"github.com/unhandled-exception/sophiadb/internal/pkg/storage"
"github.com/unhandled-exception/sophiadb/internal/pkg/types"
"github.com/unhandled-exception/sophiadb/internal/pkg/utils"
"github.com/unhandled-exception/sophiadb/internal/pkg/wal"
)

var defaultMaxPinTimeout time.Duration = 10 * time.Second
Expand Down
10 changes: 5 additions & 5 deletions pkg/buffers/manager_test.go → internal/pkg/buffers/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/buffers"
"github.com/unhandled-exception/sophiadb/pkg/storage"
"github.com/unhandled-exception/sophiadb/pkg/testutil"
"github.com/unhandled-exception/sophiadb/pkg/types"
"github.com/unhandled-exception/sophiadb/pkg/wal"
"github.com/unhandled-exception/sophiadb/internal/pkg/buffers"
"github.com/unhandled-exception/sophiadb/internal/pkg/storage"
"github.com/unhandled-exception/sophiadb/internal/pkg/testutil"
"github.com/unhandled-exception/sophiadb/internal/pkg/types"
"github.com/unhandled-exception/sophiadb/internal/pkg/wal"
)

const testFile = "test_file.dat"
Expand Down
2 changes: 1 addition & 1 deletion pkg/indexes/base_index.go → internal/pkg/indexes/base_index.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package indexes

import "github.com/unhandled-exception/sophiadb/pkg/records"
import "github.com/unhandled-exception/sophiadb/internal/pkg/records"

type BaseIndex struct {
idxType IndexType
Expand Down
4 changes: 2 additions & 2 deletions pkg/indexes/btree.go → internal/pkg/indexes/btree.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package indexes
import (
"math"

"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

type BTreeIndex struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/indexes/hash.go → internal/pkg/indexes/hash.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package indexes

import (
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

const hashBuckets = 100
Expand Down
2 changes: 1 addition & 1 deletion pkg/indexes/interfaces.go → internal/pkg/indexes/interfaces.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package indexes

import "github.com/unhandled-exception/sophiadb/pkg/records"
import "github.com/unhandled-exception/sophiadb/internal/pkg/records"

type IndexType int8

Expand Down
0 pkg/metadata/errors.go → internal/pkg/metadata/errors.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/metadata/index_info.go → internal/pkg/metadata/index_info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package metadata
import (
"fmt"

"github.com/unhandled-exception/sophiadb/pkg/indexes"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/indexes"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions pkg/metadata/index_info_test.go → internal/pkg/metadata/index_info_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/indexes"
"github.com/unhandled-exception/sophiadb/pkg/metadata"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/indexes"
"github.com/unhandled-exception/sophiadb/internal/pkg/metadata"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions pkg/metadata/indexes.go → internal/pkg/metadata/indexes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package metadata

import (
"github.com/pkg/errors"
"github.com/unhandled-exception/sophiadb/pkg/indexes"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/indexes"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions pkg/metadata/indexes_test.go → internal/pkg/metadata/indexes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/indexes"
"github.com/unhandled-exception/sophiadb/pkg/metadata"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/pkg/tx/transaction"
"github.com/unhandled-exception/sophiadb/internal/pkg/indexes"
"github.com/unhandled-exception/sophiadb/internal/pkg/metadata"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/tx/transaction"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/metadata/interfaces.go → internal/pkg/metadata/interfaces.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package metadata

import (
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

type TablesManager interface {
Expand Down
6 changes: 3 additions & 3 deletions pkg/metadata/manager.go → internal/pkg/metadata/manager.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package metadata

import (
"github.com/unhandled-exception/sophiadb/pkg/indexes"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/indexes"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

type Manager struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/metadata/manager_test.go → internal/pkg/metadata/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/indexes"
"github.com/unhandled-exception/sophiadb/pkg/metadata"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/tx/transaction"
"github.com/unhandled-exception/sophiadb/internal/pkg/indexes"
"github.com/unhandled-exception/sophiadb/internal/pkg/metadata"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/tx/transaction"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/metadata/stat_info.go → internal/pkg/metadata/stat_info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

"github.com/axiomhq/hyperloglog"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
)

type StatInfo struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/metadata/stats.go → internal/pkg/metadata/stats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"sync"

"github.com/pkg/errors"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/pkg/types"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/types"
)

const RefreshStatCalls = 100
Expand Down
8 changes: 4 additions & 4 deletions pkg/metadata/stats_test.go → internal/pkg/metadata/stats_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/metadata"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/pkg/tx/transaction"
"github.com/unhandled-exception/sophiadb/internal/pkg/metadata"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/tx/transaction"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/metadata/tables.go → internal/pkg/metadata/tables.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package metadata

import (
"github.com/pkg/errors"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/metadata/tables_test.go → internal/pkg/metadata/tables_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/metadata"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/pkg/tx/transaction"
"github.com/unhandled-exception/sophiadb/internal/pkg/metadata"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/tx/transaction"
)

type TablesTestSuite struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/metadata/testsuite_test.go → internal/pkg/metadata/testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"path/filepath"
"time"

"github.com/unhandled-exception/sophiadb/pkg/buffers"
"github.com/unhandled-exception/sophiadb/pkg/storage"
"github.com/unhandled-exception/sophiadb/pkg/testutil"
"github.com/unhandled-exception/sophiadb/pkg/tx/transaction"
"github.com/unhandled-exception/sophiadb/pkg/wal"
"github.com/unhandled-exception/sophiadb/internal/pkg/buffers"
"github.com/unhandled-exception/sophiadb/internal/pkg/storage"
"github.com/unhandled-exception/sophiadb/internal/pkg/testutil"
"github.com/unhandled-exception/sophiadb/internal/pkg/tx/transaction"
"github.com/unhandled-exception/sophiadb/internal/pkg/wal"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/metadata/views.go → internal/pkg/metadata/views.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package metadata

import (
"github.com/pkg/errors"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions pkg/metadata/views_test.go → internal/pkg/metadata/views_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/metadata"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/pkg/tx/transaction"
"github.com/unhandled-exception/sophiadb/internal/pkg/metadata"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/tx/transaction"
)

type ViewsTestSuite struct {
Expand Down
0 pkg/parse/errors.go → internal/pkg/parse/errors.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/parse/lexer.go → internal/pkg/parse/lexer.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//nolint:exhaustive
//nolint:exhaustive,typecheck
package parse

import (
Expand Down
3 changes: 2 additions & 1 deletion pkg/parse/lexer_test.go → internal/pkg/parse/lexer_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//nolint:typecheck
package parse_test

import (
Expand All @@ -6,7 +7,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/parse"
"github.com/unhandled-exception/sophiadb/internal/pkg/parse"
)

type SQLLexerTestSuite struct {
Expand Down
0 pkg/parse/parse_query.go → internal/pkg/parse/parse_query.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/parse/parse_query_test.go → internal/pkg/parse/parse_query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/parse"
"github.com/unhandled-exception/sophiadb/internal/pkg/parse"
)

type ParseQueryTestSuite struct {
Expand Down
0 pkg/parse/statement.go → internal/pkg/parse/statement.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/parse/statement_create_index.go → internal/pkg/parse/statement_create_index.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"

"github.com/pkg/errors"
"github.com/unhandled-exception/sophiadb/pkg/indexes"
"github.com/unhandled-exception/sophiadb/internal/pkg/indexes"
)

type CreateIndexStatement interface {
Expand Down
4 changes: 2 additions & 2 deletions pkg/parse/statement_create_index_test.go → .../pkg/parse/statement_create_index_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/indexes"
"github.com/unhandled-exception/sophiadb/pkg/parse"
"github.com/unhandled-exception/sophiadb/internal/pkg/indexes"
"github.com/unhandled-exception/sophiadb/internal/pkg/parse"
)

type SQLCreateIndexStatementTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/parse/statement_create_table.go → internal/pkg/parse/statement_create_table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package parse

import (
"github.com/pkg/errors"
"github.com/unhandled-exception/sophiadb/pkg/records"
"github.com/unhandled-exception/sophiadb/internal/pkg/records"
)

type CreateTableStatement interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/parse/statement_create_table_test.go → .../pkg/parse/statement_create_table_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/parse"
"github.com/unhandled-exception/sophiadb/internal/pkg/parse"
)

type SQLCreateTableStatementTestSuite struct {
Expand Down
0 pkg/parse/statement_create_view.go → internal/pkg/parse/statement_create_view.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/parse/statement_create_view_test.go → ...l/pkg/parse/statement_create_view_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/unhandled-exception/sophiadb/pkg/parse"
"github.com/unhandled-exception/sophiadb/internal/pkg/parse"
)

type SQLCreateViewStatementTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/parse/statement_delete.go → internal/pkg/parse/statement_delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package parse

import (
"github.com/pkg/errors"
"github.com/unhandled-exception/sophiadb/pkg/scan"
"github.com/unhandled-exception/sophiadb/internal/pkg/scan"
)

type DeleteStatement interface {
Expand Down
Loading

0 comments on commit dbbbe10

Please sign in to comment.