diff options
| author | Harald Musum <musum@yahooinc.com> | 2021-10-13 07:31:29 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2021-10-13 07:31:29 +0200 |
| commit | 77bda8e21e3b4cd04eb68cd68590ce02176f253b (patch) | |
| tree | e0a7a9e66fcc81db14e9f24b9c3848e8bc47b2d5 /config | |
| parent | a5e37d9dfada0dbc346857b09be18779d2652adf (diff) | |
Cleanup, no functional changes
Diffstat (limited to 'config')
| -rwxr-xr-x | config/src/main/java/com/yahoo/vespa/config/RawConfig.java | 2 | ||||
| -rw-r--r-- | config/src/vespa/config/frt/frtconfigrequestv3.cpp | 4 | ||||
| -rw-r--r-- | config/src/vespa/config/frt/frtconfigrequestv3.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java index 71abaa9dc48..e2b2c9a1926 100755 --- a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java +++ b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java @@ -194,7 +194,7 @@ public class RawConfig extends ConfigInstance { } hash = 31 * hash + errorCode; if (! isError()) { - // configMd5 and generation only matter when the RawConfig is not an error. + // checksum and generation only matter when the RawConfig is not an error. hash = 31 * hash + (int)(generation ^(generation >>>32)); hash = 31 * hash + payloadChecksums.hashCode(); } diff --git a/config/src/vespa/config/frt/frtconfigrequestv3.cpp b/config/src/vespa/config/frt/frtconfigrequestv3.cpp index 6dde698c438..bcea529c802 100644 --- a/config/src/vespa/config/frt/frtconfigrequestv3.cpp +++ b/config/src/vespa/config/frt/frtconfigrequestv3.cpp @@ -11,14 +11,14 @@ namespace config { FRTConfigRequestV3::FRTConfigRequestV3(Connection * connection, const ConfigKey & key, - const vespalib::string & configMd5, + const vespalib::string & configXxhash64, int64_t currentGeneration, const vespalib::string & hostName, int64_t serverTimeout, const Trace & trace, const VespaVersion & vespaVersion, const CompressionType & compressionType) - : SlimeConfigRequest(connection, key, configMd5, currentGeneration, hostName, serverTimeout, trace, vespaVersion, 3, compressionType, "config.v3.getConfig") + : SlimeConfigRequest(connection, key, configXxhash64, currentGeneration, hostName, serverTimeout, trace, vespaVersion, 3, compressionType, "config.v3.getConfig") { } diff --git a/config/src/vespa/config/frt/frtconfigrequestv3.h b/config/src/vespa/config/frt/frtconfigrequestv3.h index 28fa84b7584..32f8b7203c3 100644 --- a/config/src/vespa/config/frt/frtconfigrequestv3.h +++ b/config/src/vespa/config/frt/frtconfigrequestv3.h @@ -17,7 +17,7 @@ class FRTConfigRequestV3 : public SlimeConfigRequest { public: FRTConfigRequestV3(Connection * connection, const ConfigKey & key, - const vespalib::string & configMd5, + const vespalib::string & configXxhash64, int64_t currentGeneration, const vespalib::string & hostName, int64_t serverTimeout, |