Skip to content
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

Jump to bottom

Deprecated test code cleanup #1677

Merged
merged 1 commit into from
Jun 14, 2023
Merged

Deprecated test code cleanup #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file removed src/include/parser/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed src/include/parser/query/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed src/parser/.DS_Store
View file
Open in desktop
Binary file not shown.
14 changes: 0 additions & 14 deletions test/include/graph_test/graph_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,6 @@ class DBTest : public BaseGraphTest {
inline void runTest(const std::vector<std::unique_ptr<TestStatement>>& statements) {
TestRunner::runTest(statements, *conn);
}

// Deprecated
inline void runTest(const std::string& queryFile) {
auto queryConfigs = TestHelper::parseTestFile(queryFile);
ASSERT_TRUE(TestHelper::testQueries(queryConfigs, *conn));
}

inline void runTestAndCheckOrder(const std::string& queryFile) {
auto queryConfigs = TestHelper::parseTestFile(queryFile, true /* checkOutputOrder */);
for (auto& queryConfig : queryConfigs) {
queryConfig->checkOutputOrder = true;
}
ASSERT_TRUE(TestHelper::testQueries(queryConfigs, *conn));
}
};

} // namespace testing
Expand Down
16 changes: 6 additions & 10 deletions test/include/test_helper/test_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,20 @@ struct TestQueryConfig {

class TestHelper {
public:
static constexpr char E2E_TEST_FILES_DIRECTORY[] = "test/test_files";
static constexpr char SCHEMA_FILE_NAME[] = "schema.cypher";
static constexpr char COPY_FILE_NAME[] = "copy.cypher";
static constexpr char PARQUET_TEMP_DATASET_PATH[] = "dataset/parquet_temp_";
static constexpr char TMP_TEST_DIR[] = "test/unittest_temp_";

static std::vector<std::unique_ptr<TestQueryConfig>> parseTestFile(
const std::string& path, bool checkOutputOrder = false);

static bool testQueries(
std::vector<std::unique_ptr<TestQueryConfig>>& configs, Connection& conn);

static std::vector<std::string> convertResultToString(
QueryResult& queryResult, bool checkOutputOrder = false);

static void executeScript(const std::string& path, Connection& conn);

static constexpr char E2E_TEST_FILES_DIRECTORY[] = "test/test_files";
static constexpr char SCHEMA_FILE_NAME[] = "schema.cypher";
static constexpr char COPY_FILE_NAME[] = "copy.cypher";
static constexpr char PARQUET_TEMP_DATASET_PATH[] = "dataset/parquet_temp_";
static constexpr char TMP_TEST_DIR[] = "test/unittest_temp_";

static std::string getTestListFile() {
return appendKuzuRootPath(std::string(E2E_TEST_FILES_DIRECTORY) + "/test_list");
}
Expand All @@ -58,7 +55,6 @@ class TestHelper {

private:
static void initializeConnection(TestQueryConfig* config, Connection& conn);
static bool testQuery(TestQueryConfig* config, Connection& conn);
};

} // namespace testing
Expand Down
66 changes: 0 additions & 66 deletions test/test_helper/test_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,29 +57,6 @@ std::vector<std::unique_ptr<TestQueryConfig>> TestHelper::parseTestFile(
return result;
}

bool TestHelper::testQueries(
std::vector<std::unique_ptr<TestQueryConfig>>& configs, Connection& conn) {
spdlog::set_level(spdlog::level::info);
auto numPassedQueries = 0u;
std::vector<uint64_t> failedQueries;
for (auto i = 0u; i < configs.size(); i++) {
if (testQuery(configs[i].get(), conn)) {
numPassedQueries++;
} else {
failedQueries.push_back(i);
}
}
spdlog::info("SUMMARY:");
if (failedQueries.empty()) {
spdlog::info("ALL QUERIES PASSED.");
} else {
for (auto& idx : failedQueries) {
spdlog::info("QUERY {} NOT PASSED.", configs[idx]->name);
}
}
return numPassedQueries == configs.size();
}

std::vector<std::string> TestHelper::convertResultToString(
QueryResult& queryResult, bool checkOutputOrder) {
std::vector<std::string> actualOutput;
Expand All @@ -99,49 +76,6 @@ void TestHelper::initializeConnection(TestQueryConfig* config, Connection& conn)
conn.setMaxNumThreadForExec(config->numThreads);
}

bool TestHelper::testQuery(TestQueryConfig* config, Connection& conn) {
initializeConnection(config, conn);
std::unique_ptr<PreparedStatement> preparedStatement;
if (config->encodedJoin.empty()) {
preparedStatement = conn.prepareNoLock(config->query, config->enumerate);
} else {
preparedStatement =
conn.prepareNoLock(config->query, true /* enumerate*/, config->encodedJoin);
}
if (!preparedStatement->isSuccess()) {
spdlog::error(preparedStatement->getErrorMessage());
return false;
}
auto numPlans = preparedStatement->logicalPlans.size();
if (numPlans == 0) {
spdlog::error("Query {} has no plans" + config->name);
return false;
}
auto numPassedPlans = 0u;
for (auto i = 0u; i < numPlans; ++i) {
auto planStr = preparedStatement->logicalPlans[i]->toString();
auto result = conn.executeAndAutoCommitIfNecessaryNoLock(preparedStatement.get(), i);
assert(result->isSuccess());
std::vector<std::string> resultTuples =
convertResultToString(*result, config->checkOutputOrder);
if (resultTuples.size() == result->getNumTuples() &&
resultTuples == config->expectedTuples) {
spdlog::info(
"PLAN{} PASSED in {}ms.", i, result->getQuerySummary()->getExecutionTime());
numPassedPlans++;
} else {
spdlog::error("PLAN{} NOT PASSED.", i);
spdlog::info("PLAN: \n{}", planStr);
spdlog::info("RESULT: \n");
for (auto& tuple : resultTuples) {
spdlog::info(tuple);
}
}
}
spdlog::info("{}/{} plans passed.", numPassedPlans, numPlans);
return numPassedPlans == numPlans;
}

std::string TestHelper::getMillisecondsSuffix() {
uint64_t ms = duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch())
Expand Down
Binary file removed third_party/antlr4_runtime/src/.DS_Store
View file
Open in desktop
Binary file not shown.