From b5216399a1cbd88b9caf633e21e5198f9a0147b2 Mon Sep 17 00:00:00 2001 From: Kuzu CI Date: Wed, 28 Feb 2024 15:33:17 -0500 Subject: [PATCH] fix --- src/binder/bind/bind_import_database.cpp | 2 - .../processor/operator/persistent/import_db.h | 1 - test/test_files/copy/export_import_db.test | 144 +++++++++--------- 3 files changed, 72 insertions(+), 75 deletions(-) diff --git a/src/binder/bind/bind_import_database.cpp b/src/binder/bind/bind_import_database.cpp index 7ab0fd2fe85..a5a58ad7c45 100644 --- a/src/binder/bind/bind_import_database.cpp +++ b/src/binder/bind/bind_import_database.cpp @@ -1,5 +1,3 @@ -#include - #include "binder/binder.h" #include "binder/copy/bound_import_database.h" #include "common/exception/binder.h" diff --git a/src/include/processor/operator/persistent/import_db.h b/src/include/processor/operator/persistent/import_db.h index 22982d5c20f..d9237278cc1 100644 --- a/src/include/processor/operator/persistent/import_db.h +++ b/src/include/processor/operator/persistent/import_db.h @@ -1,6 +1,5 @@ #pragma once -#include "common/copier_config/reader_config.h" #include "processor/operator/physical_operator.h" namespace kuzu { diff --git a/test/test_files/copy/export_import_db.test b/test/test_files/copy/export_import_db.test index 7c19aedf851..8b31b796717 100644 --- a/test/test_files/copy/export_import_db.test +++ b/test/test_files/copy/export_import_db.test @@ -3,83 +3,83 @@ -- -#-CASE ExportImportDatabaseDefault -# -#-STATEMENT create macro addWithDefault(a,b:=3) as a + b; -#---- ok -#-STATEMENT ALTER TABLE User ADD random MAP(STRING, INT64) DEFAULT map(['key1','key2'],[400,250]) -#---- ok -#-STATEMENT MATCH (p:User) WHERE p.name = 'Adam' return p.random -#---- 1 -#{key1=400, key2=250} -#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db" -#---- ok -#-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db" -#-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db" -#---- ok -#-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50 -#---- ok -#-LOG ReturnAge -#-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age -#---- 1 -#50 -#-STATEMENT return addWithDefault(2); -#---- 1 -#5 -# -#-CASE ExportImportDatabaseWithCSVOption -#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" (format="csv", header=true) -#---- ok -#-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" -#-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" -#---- ok -#-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50 -#---- ok -#-LOG ReturnAge -#-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age -#---- 1 -#50 -#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" (format='csv', header=true) -#---- error -#Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2 already exists. -# -#-CASE ExportImportDatabaseWithPARQUET -#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3" (format='parquet') -#---- ok -#-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3" -#-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3" -#---- ok -#-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50 -#---- ok -#-LOG ReturnAge -#-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age -#---- 1 -#50 +-CASE ExportImportDatabaseDefault + +-STATEMENT create macro addWithDefault(a,b:=3) as a + b; +---- ok +-STATEMENT ALTER TABLE User ADD random MAP(STRING, INT64) DEFAULT map(['key1','key2'],[400,250]) +---- ok +-STATEMENT MATCH (p:User) WHERE p.name = 'Adam' return p.random +---- 1 +{key1=400, key2=250} +-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db" +---- ok +-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db" +-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db" +---- ok +-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50 +---- ok +-LOG ReturnAge +-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age +---- 1 +50 +-STATEMENT return addWithDefault(2); +---- 1 +5 + +-CASE ExportImportDatabaseWithCSVOption +-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" (format="csv", header=true) +---- ok +-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" +-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" +---- ok +-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50 +---- ok +-LOG ReturnAge +-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age +---- 1 +50 +-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" (format='csv', header=true) +---- error +Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2 already exists. + +-CASE ExportImportDatabaseWithPARQUET +-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3" (format='parquet') +---- ok +-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3" +-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3" +---- ok +-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50 +---- ok +-LOG ReturnAge +-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age +---- 1 +50 -CASE ExportImportDatabaseError -#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='TURTLE') -#---- error -#Binder exception: Unsupported file type: TURTLE. -# -#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='npy') -#---- error -#Binder exception: Export database currently only supports csv and parquet files. -# -#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format=false) -#---- error -#Binder exception: The type of format option must be a string. -# -#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='PARQUET', header=true) -#---- error -#Binder exception: Only export to csv can have options. -# +-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='TURTLE') +---- error +Binder exception: Unsupported file type: TURTLE. + +-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='npy') +---- error +Binder exception: Export database currently only supports csv and parquet files. + +-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format=false) +---- error +Binder exception: The type of format option must be a string. + +-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='PARQUET', header=true) +---- error +Binder exception: Only export to csv can have options. + -STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (header=true) ---- ok -#-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5" -#-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5" -#---- error -#Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5 does not exist. +-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5" +-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5" +---- error +Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5 does not exist. -REMOVE_FILE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4/schema.cypher" -IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4"