Skip to content
Snippets Groups Projects
Commit 6622ea34 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

Removed storage.base_url field

parent 9ec6b154
No related branches found
No related tags found
No related merge requests found
Pipeline #11899 passed
......@@ -35,7 +35,7 @@ public class LocationDAO {
public Optional<Location> getNodeLocation(String vosPath) {
String sql = "SELECT l.location_id, location_type, storage_src_id, storage_dest_id,\n"
+ "storage_id, storage_type, base_path, base_url, hostname\n"
+ "storage_id, storage_type, base_path, hostname\n"
+ "FROM location l\n"
+ "JOIN storage s ON l.storage_src_id = s.storage_id OR l.storage_dest_id = s.storage_id\n"
+ "JOIN node n ON n.location_id = l.location_id\n"
......@@ -85,7 +85,6 @@ public class LocationDAO {
storage.setType(StorageType.parse(rs.getString("storage_type")));
storage.setBasePath(rs.getString("base_path"));
storage.setBaseUrl(rs.getString("base_url"));
storage.setHostname(rs.getString("hostname"));
Storage storageSrc = storagesMap.get(rs.getInt("storage_src_id"));
......
......@@ -10,7 +10,6 @@ public class Storage {
private int id;
private StorageType type;
private String basePath;
private String baseUrl;
private String hostname;
public int getId() {
......@@ -37,14 +36,6 @@ public class Storage {
this.basePath = basePath;
}
public String getBaseUrl() {
return baseUrl;
}
public void setBaseUrl(String baseUrl) {
this.baseUrl = baseUrl;
}
public String getHostname() {
return hostname;
}
......
INSERT INTO linked_service(service_base_url) VALUES ('http://archives.ia2.inaf.it/files/aao');
INSERT INTO storage (storage_type, base_path, base_url, hostname) VALUES ('cold', '/ia2_tape/users', NULL, 'tape-server');
INSERT INTO storage (storage_type, base_path, base_url, hostname) VALUES ('hot', '/mnt/hot_storage/users', NULL, 'server');
INSERT INTO storage (storage_type, base_path, base_url, hostname) VALUES ('local', '/home', NULL, 'localhost');
INSERT INTO storage (storage_type, base_path, base_url, hostname) VALUES ('local', '/home/vospace/upload', NULL, 'localhost');
INSERT INTO storage (storage_type, base_path, hostname) VALUES ('cold', '/ia2_tape/users', 'tape-server');
INSERT INTO storage (storage_type, base_path, hostname) VALUES ('hot', '/mnt/hot_storage/users', 'server');
INSERT INTO storage (storage_type, base_path, hostname) VALUES ('local', '/home', 'localhost');
INSERT INTO storage (storage_type, base_path, hostname) VALUES ('local', '/home/vospace/upload', 'localhost');
INSERT INTO location (location_type, storage_src_id, storage_dest_id) VALUES ('async', 1, 3);
INSERT INTO location (location_type, storage_src_id, storage_dest_id) VALUES ('async', 2, 3);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment