Changeset 33949 for branches/eam_branches/ipp-20120405/Nebulous-Server

Timestamp:

May 29, 2012, 5:08:07 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405/Nebulous-Server

Files:

• bin/neb-admin (modified) (1 diff)
• lib/Nebulous/Server/SQL.pm (modified) (1 diff)

branches/eam_branches/ipp-20120405/Nebulous-Server/bin/neb-admin

@@ -625 +625 @@
 #   OFFSET $offset
 # ");
-    my $query = $dbh->prepare(
-        "
-SELECT Z.so_id,ext_id,Z.ins_id,Z.uri,substr(Z.uri,-10,5) AS class_id,Z.vol_id,vol_name,vol_host,
-       instance.vol_id AS  second_vol_id,volume.name AS second_name,volume.host AS second_host FROM (
-  SELECT S.so_id,ext_id,ins_id,uri,substr(uri,-10,5) AS class_id,vol_id,name AS vol_name,host AS vol_host,MAXins_id FROM (
-    select * FROM (
-      select MAX(ins_id) AS MAXins_id, MIN(ins_id) AS MINins_id, so_id,ext_id FROM storage_object
-        JOIN storage_object_xattr USING(so_id)
-        RIGHT JOIN instance USING(so_id)
-         WHERE name = 'user.copies'
-         AND value >= 2
-         AND ext_id LIKE '%ota%fits'
-         AND so_id >= $so_id_start
-         AND so_id <  $so_id_end
-         GROUP BY so_id
-      ) AS V
-      WHERE MAXins_id != MINins_id
-    ) AS S
-    JOIN instance ON (S.MINins_id = instance.ins_id AND S.so_id = instance.so_id)
-    JOIN volume USING(vol_id) WHERE volume.available = 1
-    AND volume.name AS $requested_source
-  ) AS Z
-JOIN instance ON (MAXins_id = instance.ins_id AND Z.so_id = instance.so_id)
-JOIN volume ON(instance.vol_id = volume.vol_id) WHERE volume.available = 1
-LIMIT $limit
-OFFSET $offset
-");
+    
+    print STDERR "This query is broken so I have disabled it to get the MHPCC->ATRC shuffle going.\n";
+    exit 0;
+    my $query;
+#     my $query = $dbh->prepare(
+#       "
+# SELECT Z.so_id,ext_id,Z.ins_id,Z.uri,substr(Z.uri,-10,5) AS class_id,Z.vol_id,vol_name,vol_host,
+#        instance.vol_id AS  second_vol_id,volume.name AS second_name,volume.host AS second_host FROM (
+#   SELECT S.so_id,ext_id,ins_id,uri,substr(uri,-10,5) AS class_id,vol_id,name AS vol_name,host AS vol_host,MAXins_id FROM (
+#     select * FROM (
+#       select MAX(ins_id) AS MAXins_id, MIN(ins_id) AS MINins_id, so_id,ext_id FROM storage_object
+#         JOIN storage_object_xattr USING(so_id)
+#         RIGHT JOIN instance USING(so_id)
+#          WHERE name = 'user.copies'
+#          AND value >= 2
+#          AND ext_id LIKE '%ota%fits'
+#          AND so_id >= $so_id_start
+#          AND so_id <  $so_id_end
+#          GROUP BY so_id
+#       ) AS V
+#       WHERE MAXins_id != MINins_id
+#     ) AS S
+#     JOIN instance ON (S.MINins_id = instance.ins_id AND S.so_id = instance.so_id)
+#     JOIN volume USING(vol_id) WHERE volume.available = 1
+#     AND volume.name AS $requested_source
+#   ) AS Z
+# JOIN instance ON (MAXins_id = instance.ins_id AND Z.so_id = instance.so_id)
+# JOIN volume ON(instance.vol_id = volume.vol_id) WHERE volume.available = 1
+# LIMIT $limit
+# OFFSET $offset
+# ");
 
     $query->execute();

branches/eam_branches/ipp-20120405/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -750 +750 @@
 ###
 
+CREATE TABLE lost_instances (
+    id BIGINT NOT NULL AUTO_INCREMENT,
+    ins_id BIGINT NOT NULL DEFAULT -1,
+    so_id BIGINT NOT NULL DEFAULT -1,
+    vol_id INT NOT NULL DEFAULT -1,
+    uri CHAR(255) NOT NULL DEFAULT 'undefined',
+    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    mtime TIMESTAMP,
+    PRIMARY KEY(id),
+    KEY(so_id),
+    KEY(vol_id),
+    KEY(uri(40))
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+###
+
 CREATE TABLE log (
     timestamp TIMESTAMP,