markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ckdb/sql - add sharesummary accounting

master
kanoi 11 years ago
parent
9279c6843e
commit
592981bda9
3 changed files with 836 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 109
      sql/ckdb.sql
  2. 115
      sql/v0.2-v0.3.sql
  3. 727
      src/ckdb.c

109
sql/ckdb.sql
Unescape View File

@ -198,63 +198,80 @@ CREATE TABLE shareerrors ( -- not stored in the db - only in log files
); );
-- memory only?
CREATE TABLE sharesummary ( -- per workinfo for each user+worker CREATE TABLE sharesummary ( -- per workinfo for each user+worker
userid bigint NOT NULL, userid bigint NOT NULL,
workername character varying(256) NOT NULL, workername character varying(256) NOT NULL,
workinfoid bigint NOT NULL, workinfoid bigint NOT NULL,
diff_acc bigint NOT NULL, diffacc float NOT NULL,
diff_sta bigint NOT NULL, diffsta float NOT NULL,
diff_dup bigint NOT NULL, diffdup float NOT NULL,
diff_low bigint NOT NULL, diffhi float NOT NULL,
diff_rej bigint NOT NULL, diffrej float NOT NULL,
share_acc bigint NOT NULL, shareacc float NOT NULL,
share_sta bigint NOT NULL, sharesta float NOT NULL,
share_dup bigint NOT NULL, sharedup float NOT NULL,
share_low bigint NOT NULL, sharehi float NOT NULL,
share_rej bigint NOT NULL, sharerej float NOT NULL,
first_share timestamp with time zone NOT NULL, sharecount bigint NOT NULL,
last_share timestamp with time zone NOT NULL, errorcount bigint NOT NULL,
complete char DEFAULT ''::char NOT NULL, firstshare timestamp with time zone NOT NULL,
lastshare timestamp with time zone NOT NULL,
complete char NOT NULL,
createdate timestamp with time zone NOT NULL,
createby character varying(64) NOT NULL,
createcode character varying(128) NOT NULL,
createinet character varying(128) NOT NULL,
modifydate timestamp with time zone NOT NULL,
modifyby character varying(64) NOT NULL,
modifycode character varying(128) NOT NULL,
modifyinet character varying(128) NOT NULL,
PRIMARY KEY (userid, workername, workinfoid)
);
CREATE TABLE workmarkers ( -- range of workinfo for share accounting
markerid bigint NOT NULL,
workinfoidend bigint NOT NULL,
workinfoidstart bigint NOT NULL,
description character varying(256) DEFAULT ''::character varying NOT NULL,
createdate timestamp with time zone NOT NULL, createdate timestamp with time zone NOT NULL,
createby character varying(64) DEFAULT ''::character varying NOT NULL, createby character varying(64) DEFAULT ''::character varying NOT NULL,
createcode character varying(128) DEFAULT ''::character varying NOT NULL, createcode character varying(128) DEFAULT ''::character varying NOT NULL,
createinet character varying(128) DEFAULT ''::character varying NOT NULL, createinet character varying(128) DEFAULT ''::character varying NOT NULL,
modifydate timestamp with time zone DEFAULT '6666-06-06 06:06:06+00', expirydate timestamp with time zone DEFAULT '6666-06-06 06:06:06+00',
modifyby character varying(64) DEFAULT ''::character varying NOT NULL, PRIMARY KEY (workinfoidstart)
modifycode character varying(128) DEFAULT ''::character varying NOT NULL,
modifyinet character varying(128) DEFAULT ''::character varying NOT NULL,
PRIMARY KEY (userid, workername, workinfoid)
); );
CREATE UNIQUE INDEX workmarkersid ON workmarkers USING btree (markerid);
CREATE TABLE blocksummary ( -- summation of sharesummary per block found for each user+worker CREATE TABLE markersummary ( -- sum of sharesummary for a workinfo range
height integer not NULL, markerid bigint NOT NULL,
blockhash character varying(256) NOT NULL,
userid bigint NOT NULL, userid bigint NOT NULL,
workername character varying(256) NOT NULL, workername character varying(256) NOT NULL,
diff_acc bigint NOT NULL, diffacc float NOT NULL,
diff_sta bigint NOT NULL, diffsta float NOT NULL,
diff_dup bigint NOT NULL, diffdup float NOT NULL,
diff_low bigint NOT NULL, diffhi float NOT NULL,
diff_rej bigint NOT NULL, diffrej float NOT NULL,
share_acc bigint NOT NULL, shareacc float NOT NULL,
share_sta bigint NOT NULL, sharesta float NOT NULL,
share_dup bigint NOT NULL, sharedup float NOT NULL,
share_low bigint NOT NULL, sharehi float NOT NULL,
share_rej bigint NOT NULL, sharerej float NOT NULL,
first_share timestamp with time zone NOT NULL, sharecount bigint NOT NULL,
last_share timestamp with time zone NOT NULL, errorcount bigint NOT NULL,
complete char DEFAULT ''::char NOT NULL, firstshare timestamp with time zone NOT NULL,
lastshare timestamp with time zone NOT NULL,
complete char NOT NULL,
createdate timestamp with time zone NOT NULL, createdate timestamp with time zone NOT NULL,
createby character varying(64) DEFAULT ''::character varying NOT NULL, createby character varying(64) NOT NULL,
createcode character varying(128) DEFAULT ''::character varying NOT NULL, createcode character varying(128) NOT NULL,
createinet character varying(128) DEFAULT ''::character varying NOT NULL, createinet character varying(128) NOT NULL,
modifydate timestamp with time zone DEFAULT '6666-06-06 06:06:06+00', modifydate timestamp with time zone NOT NULL,
modifyby character varying(64) DEFAULT ''::character varying NOT NULL, modifyby character varying(64) NOT NULL,
modifycode character varying(128) DEFAULT ''::character varying NOT NULL, modifycode character varying(128) NOT NULL,
modifyinet character varying(128) DEFAULT ''::character varying NOT NULL, modifyinet character varying(128) NOT NULL,
PRIMARY KEY (userid, workername, height, blockhash) PRIMARY KEY (markerid, userid, workername)
); );
@ -302,6 +319,7 @@ CREATE UNIQUE INDEX minpayuserid ON miningpayouts USING btree (userid, blockhash
CREATE TABLE eventlog ( CREATE TABLE eventlog (
eventlogid bigint NOT NULL, eventlogid bigint NOT NULL,
poolinstance character varying(256) NOT NULL,
eventlogcode character varying(64) NOT NULL, eventlogcode character varying(64) NOT NULL,
eventlogdescription text NOT NULL, eventlogdescription text NOT NULL,
createdate timestamp with time zone NOT NULL, createdate timestamp with time zone NOT NULL,
@ -315,6 +333,7 @@ CREATE TABLE eventlog (
CREATE TABLE auths ( CREATE TABLE auths (
authid bigint NOT NULL, -- unique per record authid bigint NOT NULL, -- unique per record
poolinstance character varying(256) NOT NULL,
userid bigint NOT NULL, userid bigint NOT NULL,
workername character varying(256) NOT NULL, workername character varying(256) NOT NULL,
clientid integer NOT NULL, clientid integer NOT NULL,
@ -346,10 +365,10 @@ CREATE TABLE poolstats (
); );
-- memory only
CREATE TABLE userstats ( CREATE TABLE userstats (
poolinstance character varying(256) NOT NULL, poolinstance character varying(256) NOT NULL,
userid bigint NOT NULL, userid bigint NOT NULL,
workername character varying(256) NOT NULL,
elapsed bigint NOT NULL, elapsed bigint NOT NULL,
hashrate float NOT NULL, hashrate float NOT NULL,
hashrate5m float NOT NULL, hashrate5m float NOT NULL,
@ -369,4 +388,4 @@ CREATE TABLE version (
PRIMARY KEY (vlock) PRIMARY KEY (vlock)
); );
insert into version (vlock,version) values (1,'0.2'); insert into version (vlock,version) values (1,'0.3');

115
sql/v0.2-v0.3.sql
Unescape View File

@ -0,0 +1,115 @@
SET SESSION AUTHORIZATION 'postgres';
BEGIN transaction;
DO $$
DECLARE ver TEXT;
BEGIN
UPDATE version set version='0.3' where vlock=1 and version='0.2';
IF found THEN
RETURN;
END IF;
SELECT version into ver from version
WHERE vlock=1;
RAISE EXCEPTION 'Wrong DB version - expect "0.2" - found "%"', ver;
END $$;
DROP TABLE sharesummary;
CREATE TABLE sharesummary (
userid bigint NOT NULL,
workername character varying(256) NOT NULL,
workinfoid bigint NOT NULL,
diffacc float NOT NULL,
diffsta float NOT NULL,
diffdup float NOT NULL,
diffhi float NOT NULL,
diffrej float NOT NULL,
shareacc float NOT NULL,
sharesta float NOT NULL,
sharedup float NOT NULL,
sharehi float NOT NULL,
sharerej float NOT NULL,
sharecount bigint NOT NULL,
errorcount bigint NOT NULL,
firstshare timestamp with time zone NOT NULL,
lastshare timestamp with time zone NOT NULL,
complete char NOT NULL,
createdate timestamp with time zone NOT NULL,
createby character varying(64) NOT NULL,
createcode character varying(128) NOT NULL,
createinet character varying(128) NOT NULL,
modifydate timestamp with time zone NOT NULL,
modifyby character varying(64) NOT NULL,
modifycode character varying(128) NOT NULL,
modifyinet character varying(128) NOT NULL,
PRIMARY KEY (userid, workername, workinfoid)
);
DROP TABLE blocksummary;
CREATE TABLE workmarkers (
markerid bigint NOT NULL,
workinfoidend bigint NOT NULL,
workinfoidstart bigint NOT NULL,
description character varying(256) DEFAULT ''::character varying NOT NULL,
createdate timestamp with time zone NOT NULL,
createby character varying(64) DEFAULT ''::character varying NOT NULL,
createcode character varying(128) DEFAULT ''::character varying NOT NULL,
createinet character varying(128) DEFAULT ''::character varying NOT NULL,
expirydate timestamp with time zone DEFAULT '6666-06-06 06:06:06+00',
PRIMARY KEY (workinfoidstart)
);
CREATE UNIQUE INDEX workmarkersid ON workmarkers USING btree (markerid);
CREATE TABLE markersummary (
markerid bigint NOT NULL,
userid bigint NOT NULL,
workername character varying(256) NOT NULL,
diffacc float NOT NULL,
diffsta float NOT NULL,
diffdup float NOT NULL,
diffhi float NOT NULL,
diffrej float NOT NULL,
shareacc float NOT NULL,
sharesta float NOT NULL,
sharedup float NOT NULL,
sharehi float NOT NULL,
sharerej float NOT NULL,
sharecount bigint NOT NULL,
errorcount bigint NOT NULL,
firstshare timestamp with time zone NOT NULL,
lastshare timestamp with time zone NOT NULL,
complete char NOT NULL,
createdate timestamp with time zone NOT NULL,
createby character varying(64) NOT NULL,
createcode character varying(128) NOT NULL,
createinet character varying(128) NOT NULL,
modifydate timestamp with time zone NOT NULL,
modifyby character varying(64) NOT NULL,
modifycode character varying(128) NOT NULL,
modifyinet character varying(128) NOT NULL,
PRIMARY KEY (markerid, userid, workername)
);
ALTER TABLE ONLY eventlog
ADD COLUMN poolinstance character varying(256) NOT NULL;
ALTER TABLE ONLY auths
ADD COLUMN poolinstance character varying(256) DEFAULT ''::character varying NOT NULL;
ALTER TABLE ONLY auths
ALTER COLUMN poolinstance DROP DEFAULT;
ALTER TABLE ONLY userstats
ADD COLUMN workername character varying(256) NOT NULL;
ALTER TABLE ONLY poolstats
ALTER COLUMN elapsed DROP DEFAULT;
END transaction;

727
src/ckdb.c
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save