Fixed panic on concurrent context key map write (#1284)

ClickHouse · Apr 25, 2024 · ff97cb8 · ff97cb8
1 parent 4a3adc4
commit ff97cb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/conn_http.go b/conn_http.go
@@ -372,11 +372,10 @@ func (h *httpConnect) writeData(block *proto.Block) error {
 	return nil
 }
 
-func (h *httpConnect) readData(ctx context.Context, reader *chproto.Reader) (*proto.Block, error) {
-	opts := queryOptions(ctx)
+func (h *httpConnect) readData(reader *chproto.Reader, timezone *time.Location) (*proto.Block, error) {
 	location := h.location
-	if opts.userLocation != nil {
-		location = opts.userLocation
+	if timezone != nil {
+		location = timezone
 	}
 
 	block := proto.Block{Timezone: location}

diff --git a/conn_http_query.go b/conn_http_query.go
@@ -73,7 +73,7 @@ func (h *httpConnect) query(ctx context.Context, release func(*connect, error),
 		return nil, err
 	}
 	chReader := chproto.NewReader(reader)
-	block, err := h.readData(ctx, chReader)
+	block, err := h.readData(chReader, options.userLocation)
 	if err != nil && !errors.Is(err, io.EOF) {
 		res.Body.Close()
 		h.compressionPool.Put(rw)
@@ -91,7 +91,7 @@ func (h *httpConnect) query(ctx context.Context, release func(*connect, error),
 	)
 	go func() {
 		for {
-			block, err := h.readData(ctx, chReader)
+			block, err := h.readData(chReader, options.userLocation)
 			if err != nil {
 				// ch-go wraps EOF errors
 				if !errors.Is(err, io.EOF) {