From 8ff45dcce8013c5b2aba0c9c109354570fbf4b7a Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Tue, 31 May 2022 00:01:47 +0200 Subject: Remove namespace from HTTP URI style request in upstream until shared instances are deployed with version that support si --- zenserver/upstream/zen.cpp | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'zenserver/upstream/zen.cpp') diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp index efc75b5b4..354233472 100644 --- a/zenserver/upstream/zen.cpp +++ b/zenserver/upstream/zen.cpp @@ -412,10 +412,11 @@ ZenStructuredCacheSession::GetCacheRecord(std::string_view Namespace, std::strin { ExtendableStringBuilder<256> Uri; Uri << m_Client.ServiceUrl() << "/z$/"; - if (Namespace != ZenCacheStore::DefaultNamespace) - { - Uri << Namespace << "/"; - } + // TODO: DE20220530: Disable adding namespace into URL until we have updated the shared instances with namespace support + // if (Namespace != ZenCacheStore::DefaultNamespace) + // { + // Uri << Namespace << "/"; + // } Uri << BucketId << "/" << Key.ToHexString(); cpr::Session& Session = m_SessionState->GetSession(); @@ -444,10 +445,11 @@ ZenStructuredCacheSession::GetCacheValue(std::string_view Namespace, { ExtendableStringBuilder<256> Uri; Uri << m_Client.ServiceUrl() << "/z$/"; - if (Namespace != ZenCacheStore::DefaultNamespace) - { - Uri << Namespace << "/"; - } + // TODO: DE20220530: Disable adding namespace into URL until we have updated the shared instances with namespace support + // if (Namespace != ZenCacheStore::DefaultNamespace) + // { + // Uri << Namespace << "/"; + // } Uri << BucketId << "/" << Key.ToHexString() << "/" << ValueContentId.ToHexString(); cpr::Session& Session = m_SessionState->GetSession(); @@ -478,10 +480,11 @@ ZenStructuredCacheSession::PutCacheRecord(std::string_view Namespace, { ExtendableStringBuilder<256> Uri; Uri << m_Client.ServiceUrl() << "/z$/"; - if (Namespace != ZenCacheStore::DefaultNamespace) - { - Uri << Namespace << "/"; - } + // TODO: DE20220530: Disable adding namespace into URL until we have updated the shared instances with namespace support + // if (Namespace != ZenCacheStore::DefaultNamespace) + // { + // Uri << Namespace << "/"; + // } Uri << BucketId << "/" << Key.ToHexString(); cpr::Session& Session = m_SessionState->GetSession(); @@ -515,10 +518,11 @@ ZenStructuredCacheSession::PutCacheValue(std::string_view Namespace, { ExtendableStringBuilder<256> Uri; Uri << m_Client.ServiceUrl() << "/z$/"; - if (Namespace != ZenCacheStore::DefaultNamespace) - { - Uri << Namespace << "/"; - } + // TODO: DE20220530: Disable adding namespace into URL until we have updated the shared instances with namespace support + // if (Namespace != ZenCacheStore::DefaultNamespace) + // { + // Uri << Namespace << "/"; + // } Uri << BucketId << "/" << Key.ToHexString() << "/" << ValueContentId.ToHexString(); cpr::Session& Session = m_SessionState->GetSession(); -- cgit v1.2.3