Skip to content

Fix assignment operator issues in ByteArray #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noSTALKER wants to merge 4 commits into
base: main
Choose a base branch
from
+47 −74
Open

Fix assignment operator issues in ByteArray #51

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d381ecc
Fix assignment operator issues in ByteArray
noSTALKER May 24, 2019
54504c8
Revert formatting changes done to member initializer list
noSTALKER May 29, 2019
a019231
+ Remove the checks according to the review feedback
noSTALKER Jun 9, 2019
4f7dad2
Merge branch 'bytearray_fixes' of https://github.com/noSTALKER/SPTAG …
noSTALKER Jun 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions AnnService/inc/Core/CommonDataStructure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,42 @@ namespace SPTAG
class ByteArray
{
public:
ByteArray();
const static ByteArray c_empty;

ByteArray(ByteArray&& p_right);
static ByteArray Alloc(std::size_t p_length);

ByteArray(std::uint8_t* p_array, std::size_t p_length, bool p_transferOnwership);
ByteArray() noexcept;

ByteArray(std::uint8_t* p_array, std::size_t p_length, std::shared_ptr<std::uint8_t> p_dataHolder);
ByteArray(ByteArray&& p_right) noexcept;

ByteArray(const ByteArray& p_right);
ByteArray(std::uint8_t* p_array, std::size_t p_length, bool p_transferOnwership);

ByteArray& operator= (const ByteArray& p_right);
ByteArray(std::uint8_t* p_array, std::size_t p_length, std::shared_ptr<std::uint8_t> p_dataHolder) noexcept;

ByteArray& operator= (ByteArray&& p_right);
ByteArray(const ByteArray& p_right) noexcept;

~ByteArray();
ByteArray& operator=(const ByteArray& p_right) noexcept;

static ByteArray Alloc(std::size_t p_length);
ByteArray& operator=(ByteArray&& p_right) noexcept;

std::uint8_t* Data() const;
std::uint8_t* Data() const noexcept
{
return m_data;
}

std::size_t Length() const;

void SetData(std::uint8_t* p_array, std::size_t p_length);
std::size_t Length() const noexcept
{
return m_length;
}

std::shared_ptr<std::uint8_t> DataHolder() const;
std::shared_ptr<std::uint8_t> DataHolder() const noexcept
{
return m_dataHolder;
}

void Clear();
void SetData(std::uint8_t* p_array, std::size_t p_length) noexcept;

const static ByteArray c_empty;
void Clear() noexcept;

private:
std::uint8_t* m_data;
Expand Down
114 changes: 43 additions & 71 deletions AnnService/src/Core/CommonDataStructure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,130 +3,102 @@

#include "inc/Core/CommonDataStructure.h"

using namespace SPTAG;
namespace SPTAG
{

const ByteArray ByteArray::c_empty;

ByteArray::ByteArray()
: m_data(nullptr),
m_length(0)
ByteArray::ByteArray() noexcept
: m_data(nullptr)
, m_length(0)
Copy link
Copy Markdown
Contributor

@AlphardWang AlphardWang May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please keep original formatting.

Copy link
Copy Markdown
Contributor Author

@noSTALKER noSTALKER May 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have reverted the changes done in member initializer lists

{
}


ByteArray::ByteArray(ByteArray&& p_right)
: m_data(p_right.m_data),
m_length(p_right.m_length),
m_dataHolder(std::move(p_right.m_dataHolder))
ByteArray::ByteArray(ByteArray&& p_right) noexcept
: m_data(p_right.m_data)
, m_length(p_right.m_length)
, m_dataHolder(std::move(p_right.m_dataHolder))
{
p_right.m_data = nullptr;
p_right.m_length = 0;
}


ByteArray::ByteArray(std::uint8_t* p_array, std::size_t p_length, bool p_transferOnwership)
: m_data(p_array),
m_length(p_length)
: m_data(p_array)
, m_length(p_length)
{
if (p_transferOnwership)
{
m_dataHolder.reset(m_data, std::default_delete<std::uint8_t[]>());
}
}


ByteArray::ByteArray(std::uint8_t* p_array, std::size_t p_length, std::shared_ptr<std::uint8_t> p_dataHolder)
: m_data(p_array),
m_length(p_length),
m_dataHolder(std::move(p_dataHolder))
ByteArray::ByteArray(std::uint8_t* p_array, std::size_t p_length, std::shared_ptr<std::uint8_t> p_dataHolder) noexcept
: m_data(p_array)
, m_length(p_length)
, m_dataHolder(std::move(p_dataHolder))
{
}


ByteArray::ByteArray(const ByteArray& p_right)
ByteArray::ByteArray(const ByteArray& p_right) noexcept
: m_data(p_right.m_data),
m_length(p_right.m_length),
m_dataHolder(p_right.m_dataHolder)
{
}


ByteArray&
ByteArray::operator= (const ByteArray& p_right)
ByteArray::operator=(const ByteArray& p_right) noexcept
{
m_data = p_right.m_data;
m_length = p_right.m_length;
m_dataHolder = p_right.m_dataHolder;
if (this != std::addressof(p_right))
Copy link
Copy Markdown
Contributor

@AlphardWang AlphardWang May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think shared_ptr has already handled such case? Not sure if this is necessary.

Copy link
Copy Markdown
Contributor Author

@noSTALKER noSTALKER May 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't checked yet but it is just a recommended standard check in both copy constructor and move constructors

Copy link
Copy Markdown
Contributor

@AlphardWang AlphardWang Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I take some investigation and think this check is not necessary for std::shared_ptr and most other stl containers (it seems a popular implementation for shared_ptr assign function is to create a temp var and then swap it with this). So please remove this check.

Copy link
Copy Markdown
Contributor Author

@noSTALKER noSTALKER Jun 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have reverted back the checks

{
m_data = p_right.m_data;
m_length = p_right.m_length;
m_dataHolder = p_right.m_dataHolder;
}

return *this;
}


ByteArray&
ByteArray::operator= (ByteArray&& p_right)
ByteArray::operator=(ByteArray&& p_right) noexcept
{
m_data = p_right.m_data;
m_length = p_right.m_length;
m_dataHolder = std::move(p_right.m_dataHolder);
if (this != std::addressof(p_right))
{
m_data = p_right.m_data;
m_length = p_right.m_length;
m_dataHolder = std::move(p_right.m_dataHolder);
}

return *this;
}


ByteArray::~ByteArray()
{
}


ByteArray
ByteArray::Alloc(std::size_t p_length)
{
ByteArray byteArray;
if (0 == p_length)
{
return byteArray;
return ByteArray();
}
else {
auto array = new std::uint8_t[p_length];
return ByteArray(array, p_length, true);
}

byteArray.m_dataHolder.reset(new std::uint8_t[p_length],
std::default_delete<std::uint8_t[]>());

byteArray.m_length = p_length;
byteArray.m_data = byteArray.m_dataHolder.get();
return byteArray;
}


std::uint8_t*
ByteArray::Data() const
{
return m_data;
}


std::size_t
ByteArray::Length() const
{
return m_length;
}


void
ByteArray::SetData(std::uint8_t* p_array, std::size_t p_length)
ByteArray::SetData(std::uint8_t* p_array, std::size_t p_length) noexcept
{
m_data = p_array;
m_length = p_length;
}


std::shared_ptr<std::uint8_t>
ByteArray::DataHolder() const
{
return m_dataHolder;
m_length = p_length;
m_dataHolder.reset();
}


void
ByteArray::Clear()
ByteArray::Clear() noexcept
{
m_data = nullptr;
m_dataHolder.reset();
m_length = 0;
}
}
}