Removed pointer-based InsertChunk from CAS store interface.

All code must now use the IoBuffer path

3 files changed, 5 insertions, 28 deletions

diff --git a/zenstore/CAS.cpp b/zenstore/CAS.cpp
index 8d81fc5cb..1f477cb17 100644
--- a/zenstore/CAS.cpp
+++ b/zenstore/CAS.cpp
@@ -38,7 +38,6 @@ public:
 	virtual ~CasImpl();
 
 	virtual void				   Initialize(const CasStoreConfiguration& InConfig) override;
-	virtual CasStore::InsertResult InsertChunk(const void* ChunkData, size_t ChunkSize, const IoHash& ChunkHash) override;
 	virtual CasStore::InsertResult InsertChunk(IoBuffer Chunk, const IoHash& ChunkHash) override;
 	virtual IoBuffer			   FindChunk(const IoHash& ChunkHash) override;
 
@@ -104,39 +103,22 @@ CasImpl::Initialize(const CasStoreConfiguration& InConfig)
 }
 
 CasStore::InsertResult
-CasImpl::InsertChunk(const void* ChunkData, size_t ChunkSize, const IoHash& ChunkHash)
-{
-	if (ChunkSize < m_Config.TinyValueThreshold)
-	{
-		return m_TinyStrategy.InsertChunk(ChunkData, ChunkSize, ChunkHash);
-	}
-	else if (ChunkSize >= m_Config.HugeValueThreshold)
-	{
-		return m_LargeStrategy.InsertChunk(ChunkData, ChunkSize, ChunkHash);
-	}
-	else
-	{
-		return m_SmallStrategy.InsertChunk(ChunkData, ChunkSize, ChunkHash);
-	}
-}
-
-CasStore::InsertResult
 CasImpl::InsertChunk(IoBuffer Chunk, const IoHash& ChunkHash)
 {
 	const uint64_t ChunkSize = Chunk.Size();
 
 	if (ChunkSize < m_Config.TinyValueThreshold)
 	{
+		ZEN_ASSERT(ChunkSize);
+
 		return m_TinyStrategy.InsertChunk(Chunk, ChunkHash);
 	}
-	else if (Chunk.Size() >= m_Config.HugeValueThreshold)
-	{
-		return m_LargeStrategy.InsertChunk(Chunk, ChunkHash);
-	}
-	else
+	else if (ChunkSize < m_Config.HugeValueThreshold)
 	{
 		return m_SmallStrategy.InsertChunk(Chunk, ChunkHash);
 	}
+
+	return m_LargeStrategy.InsertChunk(Chunk, ChunkHash);
 }
 
 IoBuffer
diff --git a/zenstore/filecas.cpp b/zenstore/filecas.cpp
index 1e9b50e63..4f5cf370e 100644
--- a/zenstore/filecas.cpp
+++ b/zenstore/filecas.cpp
@@ -331,10 +331,6 @@ public:
 		}
 	}
 
-	virtual CasStore::InsertResult InsertChunk(const void* chunkData, size_t chunkSize, const IoHash& chunkHash) override
-	{
-		return m_Strategy.InsertChunk(chunkData, chunkSize, chunkHash);
-	}
 	virtual CasStore::InsertResult InsertChunk(IoBuffer Chunk, const IoHash& chunkHash) override
 	{
 		return m_Strategy.InsertChunk(Chunk, chunkHash);
diff --git a/zenstore/include/zenstore/CAS.h b/zenstore/include/zenstore/CAS.h
index 9c569f2aa..3f3f3007d 100644
--- a/zenstore/include/zenstore/CAS.h
+++ b/zenstore/include/zenstore/CAS.h
@@ -50,7 +50,6 @@ public:
 	};
 
 	virtual void		 Initialize(const CasStoreConfiguration& Config)							   = 0;
-	virtual InsertResult InsertChunk(const void* ChunkData, size_t ChunkSize, const IoHash& ChunkHash) = 0;
 	virtual InsertResult InsertChunk(IoBuffer Data, const IoHash& ChunkHash)						   = 0;
 	virtual IoBuffer	 FindChunk(const IoHash& ChunkHash)											   = 0;