Skip to content

Commit e546207

Browse files
committed
fix: Replace removed protobuf stringpiece_internal with absl::string_view
protobuf v33 (bundled with gRPC v1.81.1) removed the stringpiece_internal namespace; JsonStringToMessage now takes absl::string_view. Also surface a JSON parse failure as an INTERNAL error instead of silently ignoring the returned status.
1 parent 4ddb678 commit e546207

1 file changed

Lines changed: 12 additions & 29 deletions

File tree

src/grpc/grpc_server.cc

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
1-
// Copyright 2019-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2-
//
3-
// Redistribution and use in source and binary forms, with or without
4-
// modification, are permitted provided that the following conditions
5-
// are met:
6-
// * Redistributions of source code must retain the above copyright
7-
// notice, this list of conditions and the following disclaimer.
8-
// * Redistributions in binary form must reproduce the above copyright
9-
// notice, this list of conditions and the following disclaimer in the
10-
// documentation and/or other materials provided with the distribution.
11-
// * Neither the name of NVIDIA CORPORATION nor the names of its
12-
// contributors may be used to endorse or promote products derived
13-
// from this software without specific prior written permission.
14-
//
15-
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
16-
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17-
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18-
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
19-
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20-
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21-
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
22-
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
23-
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24-
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25-
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
// SPDX-FileCopyrightText: Copyright (c) 2019-2026, NVIDIA CORPORATION &
2+
// AFFILIATES. All rights reserved.
3+
// SPDX-License-Identifier: BSD-3-Clause
264

275
#include "grpc_server.h"
286

@@ -866,10 +844,15 @@ CommonHandler::RegisterModelConfig()
866844
err = TRITONSERVER_MessageSerializeToJson(
867845
model_config_message, &buffer, &byte_size);
868846
if (err == nullptr) {
869-
::google::protobuf::util::JsonStringToMessage(
870-
::google::protobuf::stringpiece_internal::StringPiece(
871-
buffer, (int)byte_size),
872-
response->mutable_config());
847+
const auto parse_status =
848+
::google::protobuf::util::JsonStringToMessage(
849+
absl::string_view(buffer, byte_size),
850+
response->mutable_config());
851+
if (!parse_status.ok()) {
852+
err = TRITONSERVER_ErrorNew(
853+
TRITONSERVER_ERROR_INTERNAL,
854+
std::string(parse_status.message()).c_str());
855+
}
873856
}
874857
TRITONSERVER_MessageDelete(model_config_message);
875858
}

0 commit comments

Comments
 (0)