Diane Delgado's changes for a fixed table-locking order

[moira.git] / dbck / phase1.dc

diff --git a/dbck/phase1.dc b/dbck/phase1.dc
index f42942f45c59ee20f8b5d60e21df5f57acd73780..a937cebe9b474d319b34a15279dc4badfefe6db7 100644 (file)
--- a/dbck/phase1.dc
+++ b/dbck/phase1.dc
@@ -202,6 +202,7 @@ phase1()
 
     EXEC SQL DECLARE csr101 CURSOR FOR
       SELECT string_id, string FROM strings ORDER BY string_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr101;
     while(1) {
        EXEC SQL FETCH csr101 INTO :id, :buf;
@@ -232,6 +233,7 @@ phase1()
     EXEC SQL DECLARE csr102 CURSOR FOR 
       SELECT users_id, login, last, first, status, potype, pop_id, box_id,
          modby, fmodby, pmodby, comment, sigwho FROM users ORDER BY users_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr102;
     while(1) {
        EXEC SQL FETCH csr102 INTO :id, :name, :last, :first, :status,
@@ -285,6 +287,7 @@ phase1()
        EXEC SQL DECLARE csr103 CURSOR FOR 
            SELECT u1.users_id FROM users u1, users u2
            WHERE u1.login = u2.login and u1.tid != u2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr103;
        while(1) {
            EXEC SQL FETCH csr103 INTO :id;
@@ -303,10 +306,14 @@ phase1()
     sq = sq_create();
 
     EXEC SQL DECLARE csr104 CURSOR FOR
-       SELECT mach_id, name, modby FROM machine ORDER BY mach_id;
+       SELECT mach_id, name, snet_id, owner_type, owner_id,
+               acomment, ocomment, creator, modby
+       FROM machine ORDER BY mach_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr104;
     while(1) {
-       EXEC SQL FETCH csr104 INTO :id, :name, :sid;
+       EXEC SQL FETCH csr104 INTO :id, :name, :id2, :buf, :id3, :sid2,
+               :sid3, :sid4, :sid;
        if (sqlca.sqlcode != 0) {
          ingerr(&sqlca.sqlcode);
          break;
@@ -316,14 +323,19 @@ phase1()
        if (m == NULL)
          out_of_mem("storing machines");
        strcpy(m->name, strtrim(name));
+       m->owner_type = buf[0];
+       m->owner_id = id3;
+       m->snet_id = id2;
        m->mach_id = id;
        m->clucount = 0;
        if (hash_store(machines, id, m)) {
            sq_save_data(sq, hash_lookup(machines, id));
            sq_save_data(sq, m);
        }
-       if (sid < 0)
-         string_check(-sid);
+       if (sid2) string_check(sid2);
+       if (sid3) string_check(sid3);
+       if (sid4 < 0) string_check(-sid4);
+       if (sid < 0) string_check(-sid);
     }
     EXEC SQL CLOSE csr104; 
     generic_fix(sq, show_mach_id, "Change ID", fix_mach_id, 0);
@@ -334,6 +346,7 @@ phase1()
        EXEC SQL DECLARE csr105 CURSOR FOR
            SELECT m1.mach_id FROM machine m1, machine m2
                WHERE m1.name = m2.name AND m1.tid != m2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr105;
        while(1) {
            EXEC SQL FETCH csr105 INTO :id;
@@ -348,12 +361,32 @@ phase1()
        generic_fix(sq, show_mach_name, "Change name", cant_fix, 0);
     }  
 
+    dprintf("Loading subnets...\n");
+    subnets = create_hash(254);
+
+    EXEC SQL DECLARE csr115 CURSOR FOR
+      SELECT snet_id, name from subnet;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
+    EXEC SQL OPEN csr115;
+    while(1) {
+       EXEC SQL FETCH csr115 INTO :id, :name;
+       if (sqlca.sqlcode != 0) {
+         ingerr(&sqlca.sqlcode);
+         break;
+       } 
+       if (hash_store(subnets, id, name)) {
+           printf("Duplicate subnet ID: %d (%s)\n", id, name);
+       }
+    }
+    EXEC SQL CLOSE csr115;
+
     dprintf("Loading clusters...\n");
     sq = sq_create();
     clusters = create_hash(100);
 
     EXEC SQL DECLARE csr106 CURSOR FOR
        SELECT clu_id, name, modby FROM cluster;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr106;
     while(1) {
        EXEC SQL FETCH csr106 INTO :id, :name, :sid;
@@ -383,6 +416,7 @@ phase1()
        EXEC SQL DECLARE csr107 CURSOR FOR
            SELECT c1.clu_id FROM cluster c1, cluster c2
                WHERE c1.name=c2.name AND c1.tid != c2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr107;
        while(1) {
            EXEC SQL FETCH csr107 INTO :id;
@@ -404,6 +438,7 @@ phase1()
     EXEC SQL DECLARE csr108 CURSOR FOR
        SELECT list_id, name, acl_id, acl_type, modby  FROM list 
        ORDER BY list_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr108;
     while(1) {
        EXEC SQL FETCH csr108 INTO :id, :name, :aid, :buf, :sid;
@@ -435,6 +470,7 @@ phase1()
        EXEC SQL DECLARE csr109 CURSOR FOR
            SELECT l1.list_id FROM list l1, list l2
                WHERE l1.name=l2.name AND l1.tid != l2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr109;
        while(1) {
            EXEC SQL FETCH csr109 INTO :id;
@@ -456,6 +492,7 @@ phase1()
     EXEC SQL DECLARE csr110 CURSOR FOR
        SELECT filsys_id, label, owner, owners, phys_id, mach_id,
                type, name, modby FROM filesys ORDER BY filsys_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr110;
     while(1) {
        EXEC SQL FETCH csr110 INTO :id, :name, :aid, :aid2, :id2, :id3, 
@@ -493,6 +530,7 @@ phase1()
 
     EXEC SQL DECLARE csr111 CURSOR FOR
        SELECT nfsphys_id, dir, mach_id, allocated, modby FROM nfsphys;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr111;
     while(1) {
        EXEC SQL FETCH csr111 INTO :id, :name, :id2, :id3, :sid;
@@ -522,9 +560,11 @@ phase1()
 
     if (!fast) {
 
+       dprintf("Checking for duplicate strings...\n");
        EXEC SQL DECLARE csr112 CURSOR FOR
            SELECT s1.string_id, s1.string FROM strings s1, strings s2
                WHERE s1.string=s2.string AND s1.tid != s2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr112;
        while(1) {
            EXEC SQL FETCH csr112 INTO :id, :buf;
@@ -545,6 +585,7 @@ phase1()
        EXEC SQL DECLARE csr113 CURSOR FOR
            SELECT k1.users_id FROM krbmap k1, krbmap k2
                WHERE k1.users_id = k2.users_id AND k1.tid != k2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr113;
        while(1) {
            EXEC SQL FETCH csr113 INTO :id;
@@ -561,6 +602,7 @@ phase1()
        EXEC SQL DECLARE csr114 CURSOR FOR
            SELECT k1.string_id FROM krbmap k1, krbmap k2
                WHERE k1.string_id = k2.string_id AND k1.tid != k2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr114;
        while(1) {
            EXEC SQL FETCH csr114 INTO :id;