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

Support Dictionary::GLUE_OBJECTS to serve OBJECT_TYPE, CREATED metadata #924

Merged
merged 15 commits into from
Oct 27, 2022
Merged

Support Dictionary::GLUE_OBJECTS to serve OBJECT_TYPE, CREATED metadata #924

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
078d15d
feat: implement GLUE_OBJECTS base
devgony Oct 11, 2022
f839a39
refactor: remove duplicated between table_rows and index_rows
devgony Oct 11, 2022
049afd0
feat: implement table created
devgony Oct 11, 2022
7a8c434
feat: implement index created
devgony Oct 11, 2022
e44ba46
test: move a case to dictionary_index
devgony Oct 22, 2022
790cbb0
style: thanks clippy
devgony Oct 25, 2022
1bc55be
style: merge imports
devgony Oct 25, 2022
939e429
fix: alter should not mutate created
devgony Oct 25, 2022
7543c42
temp: should solve test case
devgony Oct 26, 2022
dc2e03b
test: recover a case for showIndexes
devgony Oct 26, 2022
34e862f
refactor: showindexes with select
devgony Oct 26, 2022
b5437fe
refactor: remove redundant showIndexes on cli
devgony Oct 26, 2022
b71e226
refactor: remove redundant Payload::ShowIndexes on js
devgony Oct 26, 2022
708f8f0
test: remove wrong case
devgony Oct 26, 2022
f9ea24b
style: thanks clippy
devgony Oct 26, 2022
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
fix: alter should not mutate created
  • Loading branch information
@devgony
devgony committed Oct 25, 2022
commit 939e4294f64a3ce7911ed261d0397f52d18b86f7
13 changes: 8 additions & 5 deletions storages/sled-storage/src/alter_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use {
async_trait::async_trait,
gluesql_core::{
ast::ColumnDef,
chrono::Utc,
data::{
schema::{ColumnDefExt, Schema},
Row, Value,
Expand Down Expand Up @@ -54,6 +53,7 @@ impl AlterTable for SledStorage {
let Schema {
column_defs,
indexes,
created,
..
} = old_schema
.ok_or_else(|| AlterTableError::TableNotFound(table_name.to_owned()).into())
Expand All @@ -63,7 +63,7 @@ impl AlterTable for SledStorage {
table_name: new_table_name.to_owned(),
column_defs,
indexes,
created: Utc::now().naive_utc(),
created,
};

bincode::serialize(&old_snapshot)
Expand Down Expand Up @@ -160,6 +160,7 @@ impl AlterTable for SledStorage {
let Schema {
column_defs,
indexes,
created,
..
} = snapshot
.get(txid, None)
Expand Down Expand Up @@ -187,7 +188,7 @@ impl AlterTable for SledStorage {
table_name: table_name.to_owned(),
column_defs,
indexes,
created: Utc::now().naive_utc(),
created,
};
let (snapshot, _) = snapshot.update(txid, schema);
let value = bincode::serialize(&snapshot)
Expand Down Expand Up @@ -238,6 +239,7 @@ impl AlterTable for SledStorage {
table_name,
column_defs,
indexes,
created,
..
} = schema_snapshot
.get(txid, None)
Expand Down Expand Up @@ -312,7 +314,7 @@ impl AlterTable for SledStorage {
table_name,
column_defs,
indexes,
created: Utc::now().naive_utc(),
created,
};
let (schema_snapshot, _) = schema_snapshot.update(txid, schema);
let schema_value = bincode::serialize(&schema_snapshot)
Expand Down Expand Up @@ -367,6 +369,7 @@ impl AlterTable for SledStorage {
table_name,
column_defs,
indexes,
created,
..
} = schema_snapshot
.get(txid, None)
Expand Down Expand Up @@ -434,7 +437,7 @@ impl AlterTable for SledStorage {
table_name,
column_defs,
indexes,
created: Utc::now().naive_utc(),
created,
};
let (schema_snapshot, _) = schema_snapshot.update(txid, schema);
let schema_value = bincode::serialize(&schema_snapshot)
Expand Down
6 changes: 4 additions & 2 deletions storages/sled-storage/src/index_mut.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ impl IndexMut for SledStorage {
let Schema {
column_defs,
indexes,
created,
..
} = schema
.ok_or_else(|| IndexError::ConflictTableNotFound(table_name.to_owned()).into())
Expand All @@ -94,7 +95,7 @@ impl IndexMut for SledStorage {
table_name: table_name.to_owned(),
column_defs,
indexes,
created: Utc::now().naive_utc(),
created,
};

let index_sync = IndexSync::from_schema(tree, txid, &schema);
Expand Down Expand Up @@ -147,6 +148,7 @@ impl IndexMut for SledStorage {
let Schema {
column_defs,
indexes,
created,
..
} = schema
.ok_or_else(|| IndexError::ConflictTableNotFound(table_name.to_owned()).into())
Expand All @@ -168,7 +170,7 @@ impl IndexMut for SledStorage {
table_name: table_name.to_owned(),
column_defs,
indexes,
created: Utc::now().naive_utc(),
created,
};

let index_sync = IndexSync::from_schema(tree, txid, &schema);
Expand Down