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

Jump to bottom

Removed the "rnid" column from the lattice_membership table. #82

Merged
merged 1 commit into from
Aug 31, 2018
Merged

Removed the "rnid" column from the lattice_membership table. #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion factorbase/src/main/java/ca/sfu/cs/factorbase/lattice/short_rnid_LatticeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static void init() throws SQLException {
maxNumberOfMembers = firstSets.size();
Statement st = con2.createStatement();

st.execute("create table if not exists lattice_membership (name VARCHAR(398), member VARCHAR(398), rnid VARCHAR(199), PRIMARY KEY (name, member));");
st.execute("create table if not exists lattice_membership (name VARCHAR(398), member VARCHAR(398), PRIMARY KEY (name, member));");
st.execute("create table if not exists lattice_rel (parent VARCHAR(398), child VARCHAR(398), removed VARCHAR(199), rnid VARCHAR(199), PRIMARY KEY (parent, child));");
st.execute("create table if not exists lattice_set (name VARCHAR(199), length INT(11), PRIMARY KEY (name, length));");

Expand Down
4 changes: 2 additions & 2 deletions factorbase/src/main/resources/scripts/model_manager.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ SELECT DISTINCT lattice_membership.name AS Rchain, Fid AS node
lattice_membership,
RNodes_BN_Nodes
WHERE
RNodes_BN_Nodes.rnid = lattice_membership.rnid
RNodes_BN_Nodes.rnid = lattice_membership.member
ORDER BY lattice_membership.name;

ALTER TABLE Path_BN_nodes ADD INDEX `HashIndex` (`Rchain`,`node`); /* May 7*/
Expand Down Expand Up @@ -127,7 +127,7 @@ from
2Nodes,
lattice_membership
where
lattice_membership.rnid = RNodes.rnid
lattice_membership.member = RNodes.rnid
and RNodes.pvid1 = 2Nodes.pvid1
and RNodes.pvid2 = 2Nodes.pvid2
and RNodes.TABLE_NAME = 2Nodes.TABLE_NAME
Expand Down