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

*: fix drainer can't send request correctly to pump when set compressor=gzip (#1186) #1188

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions drainer/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@ import (
)

const (
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expected 'IDENT', found '<<' (and 10 more errors)

maxMsgSize = 1024 * 1024 * 1024
=======
maxKafkaMsgSize = 1 << 30
// max grpc message size, leave 4MB as buffer. Because when grpc decompresses messages, it will leave a few buffer
// for this, which overflows the int64: https://github.com/grpc/grpc-go/blob/v1.44.0/rpc_util.go#L742
maxGrpcMsgSize = int(^uint(0)>>1) - 4*1024*1024
>>>>>>> 9992784c (*: fix drainer can't send request correctly to pump when set compressor=gzip (#1186))
)

// taskGroup is a wrapper of `sync.WaitGroup`.
Expand Down
9 changes: 9 additions & 0 deletions pump/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,19 @@ import (
)

const (
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expected 'IDENT', found '<<' (and 10 more errors)

defaultEtcdDialTimeout = 5 * time.Second
defaultEtcdURLs = "http://127.0.0.1:2379"
defaultListenAddr = "127.0.0.1:8250"
defautMaxKafkaSize = 1024 * 1024 * 1024
=======
defaultEtcdDialTimeout = 5 * time.Second
defaultEtcdURLs = "http://127.0.0.1:2379"
defaultListenAddr = "127.0.0.1:8250"
// max grpc message size, leave 4MB as buffer. Because when grpc decompresses messages, it will leave a few buffer
// for this, which overflows the int64: https://github.com/grpc/grpc-go/blob/v1.44.0/rpc_util.go#L742
defaultMaxMsgSize = int(^uint(0)>>1) - 4*1024*1024
>>>>>>> 9992784c (*: fix drainer can't send request correctly to pump when set compressor=gzip (#1186))
defaultHeartbeatInterval = 2
defaultGC = "7"
defaultDataDir = "data.pump"
Expand Down
28 changes: 28 additions & 0 deletions tests/cache_table/run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/sh

set -e

cd "$(dirname "$0")"

run_drainer --compressor gzip &

sleep 3

run_sql 'CREATE DATABASE cache_test;'
run_sql 'CREATE TABLE cache_test.t1( a int, b varchar(128));'
run_sql "INSERT INTO cache_test.t1 (a,b) VALUES(1,'a'),(2,'b'),(3,'c'),(4,'d');"
run_sql "ALTER TABLE cache_test.t1 CACHE;"
run_sql "INSERT INTO cache_test.t1 (a,b) VALUES(5,'e'),(6,'f'),(7,'g'),(8,'h');"
run_sql "ALTER TABLE cache_test.t1 NOCACHE"

sleep 3

down_run_sql 'SELECT a, b FROM cache_test.t1 order by a'
check_contains 'a: 7'
check_contains 'b: g'
check_contains 'a: 8'
check_contains 'b: h'

run_sql 'DROP DATABASE cache_test'

killall drainer