mirror of
https://github.com/NexVeridian/wikidata-to-surrealdb.git
synced 2025-09-02 09:59:13 +00:00
fix: file path, swap from ws to http
This commit is contained in:
parent
acef3f8f3b
commit
53e3ffe0dd
12 changed files with 29 additions and 15 deletions
|
@ -1,7 +1,7 @@
|
|||
use anyhow::{Error, Ok, Result};
|
||||
use lazy_static::lazy_static;
|
||||
use std::env;
|
||||
use surrealdb::{engine::remote::ws::Client, Surreal};
|
||||
use surrealdb::{engine::remote::http::Client, Surreal};
|
||||
use tokio::time::{sleep, Duration};
|
||||
|
||||
mod utils;
|
||||
|
@ -30,6 +30,10 @@ async fn main() -> Result<(), Error> {
|
|||
let pb = init_progress_bar::create_pb().await;
|
||||
let reader = File_Format::new(&WIKIDATA_FILE_FORMAT).reader(&WIKIDATA_FILE_NAME)?;
|
||||
|
||||
tokio::fs::create_dir_all("data/temp").await?;
|
||||
tokio::fs::remove_dir_all("data/temp").await?;
|
||||
tokio::fs::create_dir_all("data/temp").await?;
|
||||
|
||||
CREATE_VERSION
|
||||
.run(
|
||||
None::<Surreal<Client>>,
|
||||
|
|
12
src/utils.rs
12
src/utils.rs
|
@ -1,4 +1,5 @@
|
|||
use anyhow::{Error, Result};
|
||||
use core::panic;
|
||||
use futures::future::join_all;
|
||||
use indicatif::ProgressBar;
|
||||
use lazy_static::lazy_static;
|
||||
|
@ -21,7 +22,7 @@ lazy_static! {
|
|||
.parse()
|
||||
.expect("Failed to parse OVERWRITE_DB");
|
||||
static ref FILTER_PATH: String =
|
||||
env::var("FILTER_PATH").unwrap_or("../filter.surql".to_string());
|
||||
env::var("FILTER_PATH").unwrap_or("data/filter.surql".to_string());
|
||||
}
|
||||
|
||||
pub async fn create_entity(db: &Surreal<impl Connection>, line: &str) -> Result<(), Error> {
|
||||
|
@ -108,7 +109,7 @@ impl CreateVersion {
|
|||
}
|
||||
}
|
||||
None => {
|
||||
let db = match init_db::create_db_ws().await {
|
||||
let db = match init_db::create_db_remote().await {
|
||||
Ok(db) => db,
|
||||
Err(_) => continue,
|
||||
};
|
||||
|
@ -141,6 +142,12 @@ impl CreateVersion {
|
|||
.create_bulk_filter(db, chunk, pb, batch_size)
|
||||
.await
|
||||
.is_ok(),
|
||||
// CreateVersion::BulkFilter => {
|
||||
// if let Err(err) = self.create_bulk_filter(db, chunk, pb, batch_size).await {
|
||||
// panic!("Failed to create entities: {}", err);
|
||||
// }
|
||||
// true
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -233,7 +240,6 @@ impl CreateVersion {
|
|||
.collect();
|
||||
|
||||
let file_path = format!("data/temp/{}.surql", file_name);
|
||||
tokio::fs::create_dir_all("data/temp").await?;
|
||||
|
||||
db_mem.export(&file_path).await?;
|
||||
db.import(&file_path).await?;
|
||||
|
|
|
@ -5,7 +5,7 @@ use std::env;
|
|||
use surrealdb::{
|
||||
engine::{
|
||||
local::{Db, Mem},
|
||||
remote::ws::{Client, Ws},
|
||||
remote::http::{Client, Http},
|
||||
},
|
||||
opt::auth::Root,
|
||||
Surreal,
|
||||
|
@ -18,8 +18,8 @@ lazy_static! {
|
|||
env::var("WIKIDATA_DB_PORT").expect("WIKIDATA_DB_PORT not set");
|
||||
}
|
||||
|
||||
pub async fn create_db_ws() -> Result<Surreal<Client>, Error> {
|
||||
let db = Surreal::new::<Ws>(WIKIDATA_DB_PORT.as_str()).await?;
|
||||
pub async fn create_db_remote() -> Result<Surreal<Client>, Error> {
|
||||
let db = Surreal::new::<Http>(WIKIDATA_DB_PORT.as_str()).await?;
|
||||
|
||||
db.signin(Root {
|
||||
username: &DB_USER,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use indicatif::{ProgressBar, ProgressState, ProgressStyle};
|
||||
|
||||
pub async fn create_pb() -> ProgressBar {
|
||||
let total_size = 110_000_000;
|
||||
let total_size = 112_500_000;
|
||||
let pb = ProgressBar::new(total_size);
|
||||
pb.set_style(
|
||||
ProgressStyle::with_template(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue