deep-stack/ipld-eth-server
6
0
Fork 0
forked from cerc-io/ipld-eth-server
Code Pull Requests Activity

Merge pull request #103 from vulcanize/remove-queued-storage-duplicates

Browse Source 
Don't duplicate queued storage diffs
This commit is contained in:
Rob Mulholand 2019-06-17 15:55:35 -05:00 committed by GitHub
commit f0a7a7d999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/migrations/00024_create_queued_storage.sql
View File

@ -5,7 +5,8 @@ CREATE TABLE public.queued_storage (
block_hash BYTEA, block_hash BYTEA,
contract BYTEA, contract BYTEA,
storage_key BYTEA, storage_key BYTEA,
storage_value BYTEA storage_value BYTEA,
UNIQUE (block_height, block_hash, contract, storage_key, storage_value)
); );
-- +goose Down -- +goose Down

13
db/schema.sql
View File

@ -2,8 +2,8 @@
-- PostgreSQL database dump -- PostgreSQL database dump
-- --
-- Dumped from database version 11.2 -- Dumped from database version 11.3
-- Dumped by pg_dump version 11.2 -- Dumped by pg_dump version 11.3
SET statement_timeout = 0; SET statement_timeout = 0;
SET lock_timeout = 0; SET lock_timeout = 0;
@ -12,6 +12,7 @@ SET client_encoding = 'UTF8';
SET standard_conforming_strings = on; SET standard_conforming_strings = on;
SELECT pg_catalog.set_config('search_path', '', false); SELECT pg_catalog.set_config('search_path', '', false);
SET check_function_bodies = false; SET check_function_bodies = false;
SET xmloption = content;
SET client_min_messages = warning; SET client_min_messages = warning;
SET row_security = off; SET row_security = off;
@ -789,6 +790,14 @@ ALTER TABLE ONLY public.eth_nodes
ADD CONSTRAINT nodes_pkey PRIMARY KEY (id); ADD CONSTRAINT nodes_pkey PRIMARY KEY (id);
--
-- Name: queued_storage queued_storage_block_height_block_hash_contract_storage_key_key; Type: CONSTRAINT; Schema: public; Owner: -
--
ALTER TABLE ONLY public.queued_storage
ADD CONSTRAINT queued_storage_block_height_block_hash_contract_storage_key_key UNIQUE (block_height, block_hash, contract, storage_key, storage_value);
-- --
-- Name: queued_storage queued_storage_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- Name: queued_storage queued_storage_pkey; Type: CONSTRAINT; Schema: public; Owner: -
-- --

2
libraries/shared/storage/storage_queue.go
View File

@ -38,7 +38,7 @@ func NewStorageQueue(db *postgres.DB) StorageQueue {
func (queue StorageQueue) Add(row utils.StorageDiffRow) error { func (queue StorageQueue) Add(row utils.StorageDiffRow) error {
_, err := queue.db.Exec(`INSERT INTO public.queued_storage (contract, _, err := queue.db.Exec(`INSERT INTO public.queued_storage (contract,
block_hash, block_height, storage_key, storage_value) VALUES block_hash, block_height, storage_key, storage_value) VALUES
($1, $2, $3, $4, $5)`, row.Contract.Bytes(), row.BlockHash.Bytes(), ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING`, row.Contract.Bytes(), row.BlockHash.Bytes(),
row.BlockHeight, row.StorageKey.Bytes(), row.StorageValue.Bytes()) row.BlockHeight, row.StorageKey.Bytes(), row.StorageValue.Bytes())
return err return err
} }

11
libraries/shared/storage/storage_queue_test.go
View File

@ -49,6 +49,7 @@ var _ = Describe("Storage queue", func() {
Expect(addErr).NotTo(HaveOccurred()) Expect(addErr).NotTo(HaveOccurred())
}) })
Describe("Add", func() {
It("adds a storage row to the db", func() { It("adds a storage row to the db", func() {
var result utils.StorageDiffRow var result utils.StorageDiffRow
getErr := db.Get(&result, `SELECT contract, block_hash, block_height, storage_key, storage_value FROM public.queued_storage`) getErr := db.Get(&result, `SELECT contract, block_hash, block_height, storage_key, storage_value FROM public.queued_storage`)
@ -56,6 +57,16 @@ var _ = Describe("Storage queue", func() {
Expect(result).To(Equal(row)) Expect(result).To(Equal(row))
}) })
It("does not duplicate storage rows", func() {
addErr := queue.Add(row)
Expect(addErr).NotTo(HaveOccurred())
var count int
getErr := db.Get(&count, `SELECT count(*) FROM public.queued_storage`)
Expect(getErr).NotTo(HaveOccurred())
Expect(count).To(Equal(1))
})
})
It("deletes storage row from db", func() { It("deletes storage row from db", func() {
rows, getErr := queue.GetAll() rows, getErr := queue.GetAll()
Expect(getErr).NotTo(HaveOccurred()) Expect(getErr).NotTo(HaveOccurred())