Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature]Sharding support 1 #18533

Merged
merged 37 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f1483b3
update 1
triump2020 Sep 4, 2024
e66cf65
Merge branch 'main' into sharding-1
triump2020 Sep 4, 2024
2393588
update
triump2020 Sep 4, 2024
af1a859
update
triump2020 Sep 7, 2024
2c23330
update
triump2020 Sep 7, 2024
5fdf1f8
Merge branch 'main' into sharding-1
triump2020 Sep 7, 2024
d9616e2
update
triump2020 Sep 7, 2024
3aa23e3
update
triump2020 Sep 9, 2024
579cf21
update
triump2020 Sep 9, 2024
80a42fd
update
triump2020 Sep 9, 2024
5ed91da
update
triump2020 Sep 10, 2024
1b8e2f5
Merge branch 'main' into sharding-1
triump2020 Sep 10, 2024
11b1245
update
triump2020 Sep 10, 2024
5b8df99
remove unused code
triump2020 Sep 10, 2024
a084f0e
update ut
triump2020 Sep 13, 2024
ab7ea65
Merge branch 'main' into sharding-1
triump2020 Sep 13, 2024
71f7c48
fix conflict
triump2020 Sep 13, 2024
3d33e14
update UT
triump2020 Sep 13, 2024
6839598
update
triump2020 Sep 13, 2024
d96d1ae
update
triump2020 Sep 13, 2024
dfe32c3
update ut
triump2020 Sep 14, 2024
5c86776
add bvt
triump2020 Sep 14, 2024
a5f8072
update
triump2020 Sep 14, 2024
73a7813
fix sca
triump2020 Sep 14, 2024
08b8ac9
remote bvt case
triump2020 Sep 14, 2024
591418e
remove bvt case
triump2020 Sep 14, 2024
898bd57
update
triump2020 Sep 14, 2024
a0d8a6d
Merge branch 'main' into sharding-1
triump2020 Sep 14, 2024
531662f
add ut
triump2020 Sep 14, 2024
2b6d93f
fix bugs
triump2020 Sep 14, 2024
08169d1
add bvt case
triump2020 Sep 14, 2024
62312b8
update for passing UT coverage check
triump2020 Sep 15, 2024
dc0041a
Merge branch 'main' into sharding-1
triump2020 Sep 15, 2024
e1706c2
fix conflicts
triump2020 Sep 15, 2024
e20b496
fix bugs and add UT
triump2020 Sep 15, 2024
5ceb153
Merge branch 'main' into sharding-1
zhangxu19830126 Sep 15, 2024
336f5fb
Merge branch 'main' into sharding-1
mergify[bot] Sep 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkg/cnservice/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import (

"github.com/fagongzi/goetty/v2"
"github.com/google/uuid"
"go.uber.org/zap"

"github.com/matrixorigin/matrixone/pkg/bootstrap"
"github.com/matrixorigin/matrixone/pkg/catalog"
"github.com/matrixorigin/matrixone/pkg/clusterservice"
Expand Down Expand Up @@ -66,7 +68,6 @@ import (
"github.com/matrixorigin/matrixone/pkg/vm/engine/disttae"
"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/blockio"
"github.com/matrixorigin/matrixone/pkg/vm/process"
"go.uber.org/zap"
)

func NewService(
Expand Down Expand Up @@ -764,10 +765,13 @@ func (s *service) initShardService() {
shardservice.ReadApproxObjectsNum: disttae.HandleShardingReadApproxObjectsNum,
shardservice.ReadRanges: disttae.HandleShardingReadRanges,
shardservice.ReadGetColumMetadataScanInfo: disttae.HandleShardingReadGetColumMetadataScanInfo,
shardservice.ReadReader: disttae.HandleShardingReadReader,
shardservice.ReadBuildReader: disttae.HandleShardingReadBuildReader,
shardservice.ReadPrimaryKeysMayBeModified: disttae.HandleShardingReadPrimaryKeysMayBeModified,
shardservice.ReadMergeObjects: disttae.HandleShardingReadMergeObjects,
shardservice.ReadVisibleObjectStats: disttae.HandleShardingReadVisibleObjectStats,
shardservice.ReadClose: disttae.HandleShardingReadClose,
shardservice.ReadNext: disttae.HandleShardingReadNext,
shardservice.ReadCollectTombstones: disttae.HandleShardingReadCollectTombstones,
},
s.storeEngine,
)
Expand Down
4 changes: 4 additions & 0 deletions pkg/common/morpc/buffer_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package morpc

import (
"github.com/fagongzi/goetty/v2/buf"

"github.com/matrixorigin/matrixone/pkg/common/reuse"
)

Expand Down Expand Up @@ -91,5 +92,8 @@ func (b *Buffer) Mark() {
}

func (b *Buffer) GetMarkedData() []byte {
if b.markIdx == b.buf.GetWriteIndex() {
return nil
}
return b.buf.RawSlice(b.markIdx, b.buf.GetWriteIndex())
}
136 changes: 115 additions & 21 deletions pkg/frontend/test/engine_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading