From 5fb4ab5b13f4d09392dc2960c68d98977fe6ba45 Mon Sep 17 00:00:00 2001 From: Yang <1580680232@qq.com> Date: Wed, 29 Dec 2021 19:39:13 +0800 Subject: [PATCH] fix --- src/storage/test/IndexScanTopNTest.cpp | 160 ++++++++++++------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/src/storage/test/IndexScanTopNTest.cpp b/src/storage/test/IndexScanTopNTest.cpp index a7a308c01e3..25325fd933b 100644 --- a/src/storage/test/IndexScanTopNTest.cpp +++ b/src/storage/test/IndexScanTopNTest.cpp @@ -265,12 +265,12 @@ TEST_F(IndexScanTopNTest, LookupTagIndexTopN) { nebula::DataSet expected; expected.colNames = {kVid, "col1", "col2"}; - expected.rows.emplace_back(std::move(nebula::Row({"10", 10, "row_10"}))); - expected.rows.emplace_back(std::move(nebula::Row({"20", 20, "row_20"}))); - expected.rows.emplace_back(std::move(nebula::Row({"30", 30, "row_30"}))); - expected.rows.emplace_back(std::move(nebula::Row({"40", 40, "row_40"}))); - expected.rows.emplace_back(std::move(nebula::Row({"50", 50, "row_50"}))); - expected.rows.emplace_back(std::move(nebula::Row({"60", 60, "row_60"}))); + expected.rows.emplace_back(nebula::Row({"10", 10, "row_10"})); + expected.rows.emplace_back(nebula::Row({"20", 20, "row_20"})); + expected.rows.emplace_back(nebula::Row({"30", 30, "row_30"})); + expected.rows.emplace_back(nebula::Row({"40", 40, "row_40"})); + expected.rows.emplace_back(nebula::Row({"50", 50, "row_50"})); + expected.rows.emplace_back(nebula::Row({"60", 60, "row_60"})); verifyResult(expected, *resp.get_data()); } @@ -301,24 +301,24 @@ TEST_F(IndexScanTopNTest, LookupTagIndexTopN) { nebula::DataSet expected; expected.colNames = {kVid, "col1", "col2"}; - expected.rows.emplace_back(std::move(nebula::Row({"17", 17, "row_17"}))); - expected.rows.emplace_back(std::move(nebula::Row({"15", 15, "row_15"}))); - expected.rows.emplace_back(std::move(nebula::Row({"16", 16, "row_16"}))); - expected.rows.emplace_back(std::move(nebula::Row({"22", 22, "row_22"}))); - expected.rows.emplace_back(std::move(nebula::Row({"20", 20, "row_20"}))); - expected.rows.emplace_back(std::move(nebula::Row({"21", 21, "row_21"}))); - expected.rows.emplace_back(std::move(nebula::Row({"32", 32, "row_32"}))); - expected.rows.emplace_back(std::move(nebula::Row({"30", 30, "row_30"}))); - expected.rows.emplace_back(std::move(nebula::Row({"31", 31, "row_31"}))); - expected.rows.emplace_back(std::move(nebula::Row({"42", 42, "row_42"}))); - expected.rows.emplace_back(std::move(nebula::Row({"40", 40, "row_40"}))); - expected.rows.emplace_back(std::move(nebula::Row({"41", 41, "row_41"}))); - expected.rows.emplace_back(std::move(nebula::Row({"52", 52, "row_52"}))); - expected.rows.emplace_back(std::move(nebula::Row({"50", 50, "row_50"}))); - expected.rows.emplace_back(std::move(nebula::Row({"51", 51, "row_51"}))); - expected.rows.emplace_back(std::move(nebula::Row({"62", 62, "row_62"}))); - expected.rows.emplace_back(std::move(nebula::Row({"60", 60, "row_60"}))); - expected.rows.emplace_back(std::move(nebula::Row({"61", 61, "row_61"}))); + expected.rows.emplace_back(nebula::Row({"17", 17, "row_17"})); + expected.rows.emplace_back(nebula::Row({"15", 15, "row_15"})); + expected.rows.emplace_back(nebula::Row({"16", 16, "row_16"})); + expected.rows.emplace_back(nebula::Row({"22", 22, "row_22"})); + expected.rows.emplace_back(nebula::Row({"20", 20, "row_20"})); + expected.rows.emplace_back(nebula::Row({"21", 21, "row_21"})); + expected.rows.emplace_back(nebula::Row({"32", 32, "row_32"})); + expected.rows.emplace_back(nebula::Row({"30", 30, "row_30"})); + expected.rows.emplace_back(nebula::Row({"31", 31, "row_31"})); + expected.rows.emplace_back(nebula::Row({"42", 42, "row_42"})); + expected.rows.emplace_back(nebula::Row({"40", 40, "row_40"})); + expected.rows.emplace_back(nebula::Row({"41", 41, "row_41"})); + expected.rows.emplace_back(nebula::Row({"52", 52, "row_52"})); + expected.rows.emplace_back(nebula::Row({"50", 50, "row_50"})); + expected.rows.emplace_back(nebula::Row({"51", 51, "row_51"})); + expected.rows.emplace_back(nebula::Row({"62", 62, "row_62"})); + expected.rows.emplace_back(nebula::Row({"60", 60, "row_60"})); + expected.rows.emplace_back(nebula::Row({"61", 61, "row_61"})); verifyResult(expected, *resp.get_data()); } @@ -357,22 +357,22 @@ TEST_F(IndexScanTopNTest, LookupTagIndexTopN) { nebula::DataSet expected; expected.colNames = {kVid, "col1", "col2"}; - expected.rows.emplace_back(std::move(nebula::Row({"18", 18, "row_18"}))); - expected.rows.emplace_back(std::move(nebula::Row({"16", 16, "row_16"}))); - expected.rows.emplace_back(std::move(nebula::Row({"24", 24, "row_24"}))); - expected.rows.emplace_back(std::move(nebula::Row({"20", 20, "row_20"}))); - expected.rows.emplace_back(std::move(nebula::Row({"22", 22, "row_22"}))); - expected.rows.emplace_back(std::move(nebula::Row({"34", 34, "row_34"}))); - expected.rows.emplace_back(std::move(nebula::Row({"30", 30, "row_30"}))); - expected.rows.emplace_back(std::move(nebula::Row({"32", 32, "row_32"}))); - expected.rows.emplace_back(std::move(nebula::Row({"44", 44, "row_44"}))); - expected.rows.emplace_back(std::move(nebula::Row({"40", 40, "row_40"}))); - expected.rows.emplace_back(std::move(nebula::Row({"42", 42, "row_42"}))); - expected.rows.emplace_back(std::move(nebula::Row({"54", 54, "row_54"}))); - expected.rows.emplace_back(std::move(nebula::Row({"50", 50, "row_50"}))); - expected.rows.emplace_back(std::move(nebula::Row({"52", 52, "row_52"}))); - expected.rows.emplace_back(std::move(nebula::Row({"62", 62, "row_62"}))); - expected.rows.emplace_back(std::move(nebula::Row({"60", 60, "row_60"}))); + expected.rows.emplace_back(nebula::Row({"18", 18, "row_18"})); + expected.rows.emplace_back(nebula::Row({"16", 16, "row_16"})); + expected.rows.emplace_back(nebula::Row({"24", 24, "row_24"})); + expected.rows.emplace_back(nebula::Row({"20", 20, "row_20"})); + expected.rows.emplace_back(nebula::Row({"22", 22, "row_22"})); + expected.rows.emplace_back(nebula::Row({"34", 34, "row_34"})); + expected.rows.emplace_back(nebula::Row({"30", 30, "row_30"})); + expected.rows.emplace_back(nebula::Row({"32", 32, "row_32"})); + expected.rows.emplace_back(nebula::Row({"44", 44, "row_44"})); + expected.rows.emplace_back(nebula::Row({"40", 40, "row_40"})); + expected.rows.emplace_back(nebula::Row({"42", 42, "row_42"})); + expected.rows.emplace_back(nebula::Row({"54", 54, "row_54"})); + expected.rows.emplace_back(nebula::Row({"50", 50, "row_50"})); + expected.rows.emplace_back(nebula::Row({"52", 52, "row_52"})); + expected.rows.emplace_back(nebula::Row({"62", 62, "row_62"})); + expected.rows.emplace_back(nebula::Row({"60", 60, "row_60"})); verifyResult(expected, *resp.get_data()); } } @@ -442,12 +442,12 @@ TEST_F(IndexScanTopNTest, LookupEdgeIndexTopN) { nebula::DataSet expected; expected.colNames = {kSrc, "col1", "col2"}; - expected.rows.emplace_back(std::move(nebula::Row({"10", 10, "row_10"}))); - expected.rows.emplace_back(std::move(nebula::Row({"20", 20, "row_20"}))); - expected.rows.emplace_back(std::move(nebula::Row({"30", 30, "row_30"}))); - expected.rows.emplace_back(std::move(nebula::Row({"40", 40, "row_40"}))); - expected.rows.emplace_back(std::move(nebula::Row({"50", 50, "row_50"}))); - expected.rows.emplace_back(std::move(nebula::Row({"60", 60, "row_60"}))); + expected.rows.emplace_back(nebula::Row({"10", 10, "row_10"})); + expected.rows.emplace_back(nebula::Row({"20", 20, "row_20"})); + expected.rows.emplace_back(nebula::Row({"30", 30, "row_30"})); + expected.rows.emplace_back(nebula::Row({"40", 40, "row_40"})); + expected.rows.emplace_back(nebula::Row({"50", 50, "row_50"})); + expected.rows.emplace_back(nebula::Row({"60", 60, "row_60"})); verifyResult(expected, *resp.get_data()); } @@ -478,24 +478,24 @@ TEST_F(IndexScanTopNTest, LookupEdgeIndexTopN) { nebula::DataSet expected; expected.colNames = {kSrc, "col1", "col2"}; - expected.rows.emplace_back(std::move(nebula::Row({"17", 17, "row_17"}))); - expected.rows.emplace_back(std::move(nebula::Row({"15", 15, "row_15"}))); - expected.rows.emplace_back(std::move(nebula::Row({"16", 16, "row_16"}))); - expected.rows.emplace_back(std::move(nebula::Row({"22", 22, "row_22"}))); - expected.rows.emplace_back(std::move(nebula::Row({"20", 20, "row_20"}))); - expected.rows.emplace_back(std::move(nebula::Row({"21", 21, "row_21"}))); - expected.rows.emplace_back(std::move(nebula::Row({"32", 32, "row_32"}))); - expected.rows.emplace_back(std::move(nebula::Row({"30", 30, "row_30"}))); - expected.rows.emplace_back(std::move(nebula::Row({"31", 31, "row_31"}))); - expected.rows.emplace_back(std::move(nebula::Row({"42", 42, "row_42"}))); - expected.rows.emplace_back(std::move(nebula::Row({"40", 40, "row_40"}))); - expected.rows.emplace_back(std::move(nebula::Row({"41", 41, "row_41"}))); - expected.rows.emplace_back(std::move(nebula::Row({"52", 52, "row_52"}))); - expected.rows.emplace_back(std::move(nebula::Row({"50", 50, "row_50"}))); - expected.rows.emplace_back(std::move(nebula::Row({"51", 51, "row_51"}))); - expected.rows.emplace_back(std::move(nebula::Row({"62", 62, "row_62"}))); - expected.rows.emplace_back(std::move(nebula::Row({"60", 60, "row_60"}))); - expected.rows.emplace_back(std::move(nebula::Row({"61", 61, "row_61"}))); + expected.rows.emplace_back(nebula::Row({"17", 17, "row_17"})); + expected.rows.emplace_back(nebula::Row({"15", 15, "row_15"})); + expected.rows.emplace_back(nebula::Row({"16", 16, "row_16"})); + expected.rows.emplace_back(nebula::Row({"22", 22, "row_22"})); + expected.rows.emplace_back(nebula::Row({"20", 20, "row_20"})); + expected.rows.emplace_back(nebula::Row({"21", 21, "row_21"})); + expected.rows.emplace_back(nebula::Row({"32", 32, "row_32"})); + expected.rows.emplace_back(nebula::Row({"30", 30, "row_30"})); + expected.rows.emplace_back(nebula::Row({"31", 31, "row_31"})); + expected.rows.emplace_back(nebula::Row({"42", 42, "row_42"})); + expected.rows.emplace_back(nebula::Row({"40", 40, "row_40"})); + expected.rows.emplace_back(nebula::Row({"41", 41, "row_41"})); + expected.rows.emplace_back(nebula::Row({"52", 52, "row_52"})); + expected.rows.emplace_back(nebula::Row({"50", 50, "row_50"})); + expected.rows.emplace_back(nebula::Row({"51", 51, "row_51"})); + expected.rows.emplace_back(nebula::Row({"62", 62, "row_62"})); + expected.rows.emplace_back(nebula::Row({"60", 60, "row_60"})); + expected.rows.emplace_back(nebula::Row({"61", 61, "row_61"})); verifyResult(expected, *resp.get_data()); } @@ -534,22 +534,22 @@ TEST_F(IndexScanTopNTest, LookupEdgeIndexTopN) { nebula::DataSet expected; expected.colNames = {kSrc, "col1", "col2"}; - expected.rows.emplace_back(std::move(nebula::Row({"18", 18, "row_18"}))); - expected.rows.emplace_back(std::move(nebula::Row({"16", 16, "row_16"}))); - expected.rows.emplace_back(std::move(nebula::Row({"24", 24, "row_24"}))); - expected.rows.emplace_back(std::move(nebula::Row({"20", 20, "row_20"}))); - expected.rows.emplace_back(std::move(nebula::Row({"22", 22, "row_22"}))); - expected.rows.emplace_back(std::move(nebula::Row({"34", 34, "row_34"}))); - expected.rows.emplace_back(std::move(nebula::Row({"30", 30, "row_30"}))); - expected.rows.emplace_back(std::move(nebula::Row({"32", 32, "row_32"}))); - expected.rows.emplace_back(std::move(nebula::Row({"44", 44, "row_44"}))); - expected.rows.emplace_back(std::move(nebula::Row({"40", 40, "row_40"}))); - expected.rows.emplace_back(std::move(nebula::Row({"42", 42, "row_42"}))); - expected.rows.emplace_back(std::move(nebula::Row({"54", 54, "row_54"}))); - expected.rows.emplace_back(std::move(nebula::Row({"50", 50, "row_50"}))); - expected.rows.emplace_back(std::move(nebula::Row({"52", 52, "row_52"}))); - expected.rows.emplace_back(std::move(nebula::Row({"62", 62, "row_62"}))); - expected.rows.emplace_back(std::move(nebula::Row({"60", 60, "row_60"}))); + expected.rows.emplace_back(nebula::Row({"18", 18, "row_18"})); + expected.rows.emplace_back(nebula::Row({"16", 16, "row_16"})); + expected.rows.emplace_back(nebula::Row({"24", 24, "row_24"})); + expected.rows.emplace_back(nebula::Row({"20", 20, "row_20"})); + expected.rows.emplace_back(nebula::Row({"22", 22, "row_22"})); + expected.rows.emplace_back(nebula::Row({"34", 34, "row_34"})); + expected.rows.emplace_back(nebula::Row({"30", 30, "row_30"})); + expected.rows.emplace_back(nebula::Row({"32", 32, "row_32"})); + expected.rows.emplace_back(nebula::Row({"44", 44, "row_44"})); + expected.rows.emplace_back(nebula::Row({"40", 40, "row_40"})); + expected.rows.emplace_back(nebula::Row({"42", 42, "row_42"})); + expected.rows.emplace_back(nebula::Row({"54", 54, "row_54"})); + expected.rows.emplace_back(nebula::Row({"50", 50, "row_50"})); + expected.rows.emplace_back(nebula::Row({"52", 52, "row_52"})); + expected.rows.emplace_back(nebula::Row({"62", 62, "row_62"})); + expected.rows.emplace_back(nebula::Row({"60", 60, "row_60"})); verifyResult(expected, *resp.get_data()); } }