Changeset 32979 for branches/haf_add201112/ippTools

Timestamp:

Dec 20, 2011, 10:01:41 AM (15 years ago)

Author:

heather

Message:

making a branch for addstar changes

Location:

branches/haf_add201112

Files:

• . (copied) (copied from trunk )
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (3 diffs)
• ippTools/src/Makefile.am (modified) (5 diffs)

branches/haf_add201112/ippTools/share/Makefile.am

@@ -310 +310 @@
         minidvodbtool_queue_minidvodb_id.sql \
         minidvodbtool_revertminidvodbcopy.sql \
+        mergetool_find_minidvodb_id.sql \
+        mergetool_find_pendingmergeprocess.sql \
+        mergetool_find_pending_merge.sql \
+        mergetool_find_processed.sql \
+        mergetool_queue_merge_id.sql \
+        mergetool_revertmergedvodbprocessed.sql \
         pstamptool_completedreq.sql \
         pstamptool_datastore.sql \

branches/haf_add201112/ippTools/share/pxadmin_create_tables.sql

@@ -535 +535 @@
     stage VARCHAR(64),
     stage_id BIGINT,
+    stage_extra1 INT,
     state VARCHAR(64),
     workdir VARCHAR(255),
@@ -1985 +1986 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
-
 CREATE TABLE minidvodbCopy (
     minidvodbcopy_id     BIGINT AUTO_INCREMENT,
@@ -1999 +1999 @@
     FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE mergedvodbRun (
+       merge_id BIGINT AUTO_INCREMENT,
+       minidvodb_id BIGINT,
+       minidvodb_group VARCHAR(64) NOT NULL,
+       minidvodb_path VARCHAR(255) NOT NULL,
+       mergedvodb_path VARCHAR(255) NOT NULL,
+       state VARCHAR(64) NOT NULL,
+       creation_date TIMESTAMP,
+       PRIMARY KEY(merge_id), KEY(minidvodb_id), KEY(minidvodb_group), INDEX(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE mergedvodbProcessed (
+      merge_id BIGINT,
+      merge_order BIGINT,
+      dtime_verify FLOAT,
+      dtime_merge FLOAT,
+      dtime_script FLOAT,
+      epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+      fault SMALLINT NOT NULL,
+      UNIQUE KEY (merge_id),
+      KEY(merge_id),
+      FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE mergedvodbCopy (
+    mergedvodbcopy_id     BIGINT AUTO_INCREMENT,
+    merge_id     BIGINT,
+    mergedvodb_rsync_path VARCHAR(255) NOT NULL,
+    destination_host VARCHAR(255) NOT NULL,
+    fault  SMALLINT NOT NULL,
+    state   VARCHAR(64) NOT NULL,
+    epoch TIMESTAMP,
+    dtime FLOAT,
+    PRIMARY KEY(mergedvodbcopy_id),
+    KEY(merge_id),
+    FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+
+
 CREATE TABLE vpRun (
     vp_id BIGINT AUTO_INCREMENT,

branches/haf_add201112/ippTools/src/Makefile.am

@@ -29 +29 @@
         diffphottool \
         minidvodbtool \
+        mergetool \
         laptool \
         vptool
@@ -43 +44 @@
         pxmagic.h \
         pxminidvodb.h \
+        pxmerge.h \
         pxregister.h \
         pxspace.h \
@@ -79 +81 @@
         diffphottool.h \
         minidvodbtool.h \
+        mergetool.h \
         laptool.h \
         vptool.h
@@ -98 +101 @@
         pxmagic.c \
         pxminidvodb.c \
+        pxmerge.c \
         pxregister.c \
         pxspace.c \
@@ -294 +298 @@
     minidvodbtoolConfig.c
 
+mergetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+mergetool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+mergetool_SOURCES = \
+    mergetool.c \
+    mergetoolConfig.c
+
+
+
+
 laptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 laptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la