8000 Feature/arangosearch link version by gnusi · Pull Request #14717 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content
8000

Feature/arangosearch link version #14717

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

Merged
merged 18 commits into from
Sep 2, 2021
Merged

Feature/arangosearch link version #14717

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
42802ae
backport changes from iresearch upstream
gnusi Aug 30, 2021
9f05be2
use frozen maps
gnusi Aug 30, 2021
83677b7
cleanup
gnusi Aug 30, 2021
fb3f9f5
add request context for views
gnusi Aug 31, 2021
9998365
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
gnusi Aug 31, 2021
4462900
wip
gnusi Aug 31, 2021
897e885
wip
gnusi Sep 1, 2021
f15b4ba
add some tests
gnusi Sep 1, 2021
ea32861
fix properties deserialization for arangosearch view on coordinator
gnusi Sep 1, 2021
917f059
adjust tests
gnusi Sep 1, 2021
4b46384
wip
gnusi Sep 1, 2021
cbad0ab
more tests
gnusi Sep 1, 2021
2f91ad0
more tests
gnusi Sep 2, 2021
0850b5c
adjust tests
gnusi Sep 2, 2021
27985bc
wip
gnusi Sep 2, 2021
34c9f2c
wip
gnusi Sep 2, 2021
a2b8555
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
gnusi Sep 2, 2021
cac3615
fix tests
gnusi Sep 2, 2021
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
Prev Previous commit
Next Next commit
more tests
  • Loading branch information
@gnusi
gnusi committed Sep 1, 2021
commit cbad0abd4ba55daf171a38b97d40d96dbd54600f
265 changes: 265 additions & 0 deletions tests/IResearch/IResearchView-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7788,6 +7788,29 @@ TEST_F(IResearchViewTest, test_update_partial) {
EXPECT_TRUE((true == tmpSlice.isArray() && 1 == tmpSlice.length()));
EXPECT_TRUE((false == slice.hasKey("links")));
}

// inventory
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Inventory);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(15, slice.length());
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE(slice.hasKey("links"));
auto linksSlice = slice.get("links");
ASSERT_TRUE(linksSlice.isObject());
auto linkSlice = linksSlice.get("testCollection");
ASSERT_TRUE(linkSlice.isObject());
auto versionSlice = linkSlice.get("version");
ASSERT_TRUE(versionSlice.isNumber());
ASSERT_EQ(1, versionSlice.getNumber<uint32_t>());
}
}

// update link
Expand Down Expand Up @@ -7838,6 +7861,248 @@ TEST_F(IResearchViewTest, test_update_partial) {
EXPECT_TRUE((true == tmpSlice.isArray() && 1 == tmpSlice.length()));
EXPECT_TRUE((false == slice.hasKey("links")));
}

// inventory
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Inventory);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(15, slice.length());
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE(slice.hasKey("links"));
auto linksSlice = slice.get("links");
ASSERT_TRUE(linksSlice.isObject());
auto linkSlice = linksSlice.get("testCollection");
ASSERT_TRUE(linkSlice.isObject());
auto versionSlice = linkSlice.get("version");
ASSERT_TRUE(versionSlice.isNumber());
ASSERT_EQ(1, versionSlice.getNumber<uint32_t>());
}
}

// update link (internal request)
{
auto updateJson = arangodb::velocypack::Parser::fromJson(
"{ \"links\": { \"testCollection\": { } } }"
);
EXPECT_TRUE((view->properties(updateJson->slice(), false, true).ok()));

// not for persistence
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Properties);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(15, slice.length());
EXPECT_TRUE((slice.hasKey("globallyUniqueId") && slice.get("globallyUniqueId").isString() && false == slice.get("globallyUniqueId").copyString().empty()));
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE(slice.get("deleted").isNone()); // no system properties
auto tmpSlice = slice.get("links");
EXPECT_TRUE((true == tmpSlice.isObject() && 1 == tmpSlice.length()));
tmpSlice = tmpSlice.get("testCollection");
EXPECT_TRUE((true == tmpSlice.isObject()));
tmpSlice = tmpSlice.get("includeAllFields");
EXPECT_TRUE((true == tmpSlice.isBoolean() && false == tmpSlice.getBoolean()));
}

// for persistence
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Persistence);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(19, slice.length());
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE((slice.hasKey("deleted") && slice.get("deleted").isBoolean() && false == slice.get("deleted").getBoolean())); // has system properties
auto tmpSlice = slice.get("collections");
EXPECT_TRUE((true == tmpSlice.isArray() && 1 == tmpSlice.length()));
EXPECT_TRUE((false == slice.hasKey("links")));
}

// inventory
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Inventory);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(15, slice.length());
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE(slice.hasKey("links"));
auto linksSlice = slice.get("links");
ASSERT_TRUE(linksSlice.isObject());
auto linkSlice = linksSlice.get("testCollection");
ASSERT_TRUE(linkSlice.isObject());
auto versionSlice = linkSlice.get("version");
ASSERT_TRUE(versionSlice.isNumber());
ASSERT_EQ(0, versionSlice.getNumber<uint32_t>());
}
}

// update link (internal request, explicit version)
{
auto updateJson = arangodb::velocypack::Parser::fromJson(
"{ \"links\": { \"testCollection\": { \"version\":1 } } }"
);
EXPECT_TRUE((view->properties(updateJson->slice(), false, true).ok()));

// not for persistence
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Properties);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(15, slice.length());
EXPECT_TRUE((slice.hasKey("globallyUniqueId") && slice.get("globallyUniqueId").isString() && false == slice.get("globallyUniqueId").copyString().empty()));
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE(slice.get("deleted").isNone()); // no system properties
auto tmpSlice = slice.get("links");
EXPECT_TRUE((true == tmpSlice.isObject() && 1 == tmpSlice.length()));
tmpSlice = tmpSlice.get("testCollection");
EXPECT_TRUE((true == tmpSlice.isObject()));
tmpSlice = tmpSlice.get("includeAllFields");
EXPECT_TRUE((true == tmpSlice.isBoolean() && false == tmpSlice.getBoolean()));
}

// for persistence
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Persistence);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(19, slice.length());
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE((slice.hasKey("deleted") && slice.get("deleted").isBoolean() && false == slice.get("deleted").getBoolean())); // has system properties
auto tmpSlice = slice.get("collections");
EXPECT_TRUE((true == tmpSlice.isArray() && 1 == tmpSlice.length()));
EXPECT_TRUE((false == slice.hasKey("links")));
}

// inventory
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Inventory);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(15, slice.length());
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE(slice.hasKey("links"));
auto linksSlice = slice.get("links");
ASSERT_TRUE(linksSlice.isObject());
auto linkSlice = linksSlice.get("testCollection");
ASSERT_TRUE(linkSlice.isObject());
auto versionSlice = linkSlice.get("version");
ASSERT_TRUE(versionSlice.isNumber());
ASSERT_EQ(1, versionSlice.getNumber<uint32_t>());
}
}

// update link (user request, explicit version)
{
auto updateJson = arangodb::velocypack::Parser::fromJson(
"{ \"links\": { \"testCollection\": { \"version\":0 } } }"
);
EXPECT_TRUE((view->properties(updateJson->slice(), true, true).ok()));

// not for persistence
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Properties);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(15, slice.length());
EXPECT_TRUE((slice.hasKey("globallyUniqueId") && slice.get("globallyUniqueId").isString() && false == slice.get("globallyUniqueId").copyString().empty()));
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE(slice.get("deleted").isNone()); // no system properties
auto tmpSlice = slice.get("links");
EXPECT_TRUE((true == tmpSlice.isObject() && 1 == tmpSlice.length()));
tmpSlice = tmpSlice.get("testCollection");
EXPECT_TRUE((true == tmpSlice.isObject()));
tmpSlice = tmpSlice.get("includeAllFields");
EXPECT_TRUE((true == tmpSlice.isBoolean() && false == tmpSlice.getBoolean()));
}

// for persistence
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Persistence);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(19, slice.length());
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE((slice.hasKey("deleted") && slice.get("deleted").isBoolean() && false == slice.get("deleted").getBoolean())); // has system properties
auto tmpSlice = slice.get("collections");
EXPECT_TRUE((true == tmpSlice.isArray() && 1 == tmpSlice.length()));
EXPECT_TRUE((false == slice.hasKey("links")));
}

// inventory
{
arangodb::velocypack::Builder builder;

builder.openObject();
view->properties(builder, arangodb::LogicalDataSource::Serialization::Inventory);
builder.close();

auto slice = builder.slice();
EXPECT_TRUE(slice.isObject());
EXPECT_EQ(15, slice.length());
EXPECT_TRUE(slice.get("name").copyString() == "testView");
EXPECT_TRUE(slice.get("type").copyString() == arangodb::iresearch::DATA_SOURCE_TYPE.name());
EXPECT_TRUE(slice.hasKey("links"));
auto linksSlice = slice.get("links");
ASSERT_TRUE(linksSlice.isObject());
auto linkSlice = linksSlice.get("testCollection");
ASSERT_TRUE(linkSlice.isObject());
auto versionSlice = linkSlice.get("version");
ASSERT_TRUE(versionSlice.isNumber());
ASSERT_EQ(0, versionSlice.getNumber<uint32_t>());
}
}
}

Expand Down
0