Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xxdk-wasm
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
xxdk-wasm
Commits
b2defd2a
Commit
b2defd2a
authored
Jan 6, 2023
by
Jono Wenger
Browse files
Options
Downloads
Patches
Plain Diff
Move database name saving out of v1Upgrade
parent
32f2d7ae
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!67
fix for latest client release
,
!52
XX-4382 / Move indexedDb databases to web workers
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indexedDb/channels/init.go
+7
-7
7 additions, 7 deletions
indexedDb/channels/init.go
indexedDb/dm/init.go
+9
-9
9 additions, 9 deletions
indexedDb/dm/init.go
with
16 additions
and
16 deletions
indexedDb/channels/init.go
+
7
−
7
View file @
b2defd2a
...
@@ -89,6 +89,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
...
@@ -89,6 +89,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
return
nil
,
err
return
nil
,
err
}
}
// Get the database name and save it to storage
if
dbName
,
err2
:=
db
.
Name
();
err2
!=
nil
{
return
nil
,
err2
}
else
if
err
=
storeDatabaseName
(
dbName
);
err
!=
nil
{
return
nil
,
err
}
// Save the encryption status to storage
// Save the encryption status to storage
encryptionStatus
:=
encryption
!=
nil
encryptionStatus
:=
encryption
!=
nil
loadedEncryptionStatus
,
err
:=
loadedEncryptionStatus
,
err
:=
...
@@ -165,13 +172,6 @@ func v1Upgrade(db *idb.Database) error {
...
@@ -165,13 +172,6 @@ func v1Upgrade(db *idb.Database) error {
return
err
return
err
}
}
// Get the database name and save it to storage
if
databaseName
,
err2
:=
db
.
Name
();
err2
!=
nil
{
return
err2
}
else
if
err
=
storeDatabaseName
(
databaseName
);
err
!=
nil
{
return
err
}
return
nil
return
nil
}
}
...
...
This diff is collapsed.
Click to expand it.
indexedDb/dm/init.go
+
9
−
9
View file @
b2defd2a
...
@@ -63,8 +63,7 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
...
@@ -63,8 +63,7 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
openRequest
,
err
:=
idb
.
Global
()
.
Open
(
ctx
,
databaseName
,
currentVersion
,
openRequest
,
err
:=
idb
.
Global
()
.
Open
(
ctx
,
databaseName
,
currentVersion
,
func
(
db
*
idb
.
Database
,
oldVersion
,
newVersion
uint
)
error
{
func
(
db
*
idb
.
Database
,
oldVersion
,
newVersion
uint
)
error
{
if
oldVersion
==
newVersion
{
if
oldVersion
==
newVersion
{
jww
.
INFO
.
Printf
(
"IndexDb version is current: v%d"
,
jww
.
INFO
.
Printf
(
"IndexDb version is current: v%d"
,
newVersion
)
newVersion
)
return
nil
return
nil
}
}
...
@@ -92,6 +91,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
...
@@ -92,6 +91,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
return
nil
,
err
return
nil
,
err
}
}
// Get the database name and save it to storage
if
dbName
,
err2
:=
db
.
Name
();
err2
!=
nil
{
return
nil
,
err2
}
else
if
err
=
storeDatabaseName
(
dbName
);
err
!=
nil
{
return
nil
,
err
}
// Save the encryption status to storage
// Save the encryption status to storage
encryptionStatus
:=
encryption
!=
nil
encryptionStatus
:=
encryption
!=
nil
loadedEncryptionStatus
,
err
:=
loadedEncryptionStatus
,
err
:=
...
@@ -167,13 +173,6 @@ func v1Upgrade(db *idb.Database) error {
...
@@ -167,13 +173,6 @@ func v1Upgrade(db *idb.Database) error {
return
err
return
err
}
}
// Get the database name and save it to storage
if
databaseName
,
err2
:=
db
.
Name
();
err2
!=
nil
{
return
err2
}
else
if
err
=
storeDatabaseName
(
databaseName
);
err
!=
nil
{
return
err
}
return
nil
return
nil
}
}
...
@@ -213,6 +212,7 @@ func RegisterDatabaseNameStore(m *manager) {
...
@@ -213,6 +212,7 @@ func RegisterDatabaseNameStore(m *manager) {
"response about storing the database name in local "
+
"response about storing the database name in local "
+
"storage in the main thread"
,
indexedDbWorker
.
ResponseTimeout
)
"storage in the main thread"
,
indexedDbWorker
.
ResponseTimeout
)
}
}
return
nil
return
nil
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment