From 04ec42e1d0564feeb0de067af621ce7cc7198bf0 Mon Sep 17 00:00:00 2001 From: orbiter Date: Sun, 10 May 2009 21:00:39 +0000 Subject: [PATCH] removed index Transfer, because it does not make sense any more to do a complete index transfer using the DHT methods. It is far easier and faster to just copy the whole index files from the source to the target peer. To do this, copy all files from DATA/INDEX//TEXT/RICACHE and DATA/INDEX//TEXT/METADATA from the source to the destination peer. Future versions of YaCy will have different file structures than given here, because of the new index segment concept, where each peer may have several indexes (called segments) for each network definition. A copy from one peer to another will then create a new index segment. To track changes for this feature, see forum discussion at http://forum.yacy-websuche.de/viewtopic.php?p=14728#p14728 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5945 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/IndexTransfer_p.html | 83 ----------- htroot/IndexTransfer_p.java | 131 ------------------ .../templates/submenuIndexControl.template | 1 - 3 files changed, 215 deletions(-) delete mode 100644 htroot/IndexTransfer_p.html delete mode 100644 htroot/IndexTransfer_p.java diff --git a/htroot/IndexTransfer_p.html b/htroot/IndexTransfer_p.html deleted file mode 100644 index 7eeeaaf8e..000000000 --- a/htroot/IndexTransfer_p.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - YaCy '#[clientname]#': Index Transfer - #%env/templates/metas.template%# - - - - #%env/templates/header.template%# - #%env/templates/submenuIndexControl.template%# -

Index Transfer

- -
-

The local index currently consists of (at least) #[wcount]# reverse word indexes and #[ucount]# URL references.

- - - - - - - - - - #(running)#::#(/running)# - - - #(running)# - - - - - - - - - - - - :: - - - - - - - - - - - - - - - - - #(/running)# -
 StatusChunk Size
(Word Entries)		Words RangeTransfered WordsDelete
Index		Remote
Peer		Overwrite IP
(blank for defaultip)		Start/Stop Transfer
-#[status]#--- - - - - - - - -
Selection#[selection.status]##[selection.twchunk]# words#[selection.twrange]##[twEntityCount]# Entities (#[twEntityPercent]#%)
- #[twEntryCount]# Entries
- #[twPayloadSize]#
- #[twEntrySpeed]# entries/s		#(deleteIndex)#false::true#(/deleteIndex)##[peerName]##(stopped)#:: - #(/stopped)# -
Transfer#[transfer.status]##[transfer.twchunk]# words#[transfer.twrange]#
-
-

Last Refresh: #[date]#

- - #%env/templates/footer.template%# - - \ No newline at end of file diff --git a/htroot/IndexTransfer_p.java b/htroot/IndexTransfer_p.java deleted file mode 100644 index 566ae268f..000000000 --- a/htroot/IndexTransfer_p.java +++ /dev/null @@ -1,131 +0,0 @@ -//IndexTransfer_p.java -//----------------------- -//part of the AnomicHTTPD caching proxy -//(C) by Michael Peter Christen; mc@yacy.net -//first published on http://www.anomic.de -//Frankfurt, Germany, 2005 -// -//This file is contributed by Martin Thelian -// -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ -// -//This program is free software; you can redistribute it and/or modify -//it under the terms of the GNU General Public License as published by -//the Free Software Foundation; either version 2 of the License, or -//(at your option) any later version. -// -//This program is distributed in the hope that it will be useful, -//but WITHOUT ANY WARRANTY; without even the implied warranty of -//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -//GNU General Public License for more details. -// -//You should have received a copy of the GNU General Public License -//along with this program; if not, write to the Free Software -//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -//You must compile this file with -//javac -classpath .:../Classes IndexControl_p.java -//if the shell's current path is HTROOT - - -import de.anomic.http.httpRequestHeader; -import de.anomic.server.serverObjects; -import de.anomic.server.serverSwitch; - -public final class IndexTransfer_p { - - public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch env) { - // return variable that accumulates replacements - //final plasmaSwitchboard sb = (plasmaSwitchboard) env; - final serverObjects prop = new serverObjects(); - - /* - if (post != null) { - if (post.containsKey("startIndexTransfer")) { - final yacySeed seed = sb.webIndex.seedDB.getConnected(post.get("hostHash", "")); - if (seed == null) { - prop.put("running_status","Disconnected peer"); - } else { - final boolean deleteIndex = post.get("deleteIndex", "0").equals("1"); - if(prop.containsKey("overwriteIP") && ! (prop.get("overwriteIP")).equals("")){ - seed.setIP(prop.get("overwriteIP")); - } - sb.startTransferWholeIndex(seed,deleteIndex); - prop.put("LOCATION",""); - return prop; - } - } else if (post.containsKey("stopIndexTransfer")) { - sb.stopTransferWholeIndex(true); - prop.put("LOCATION",""); - return prop; - - } else if (post.containsKey("newIndexTransfer")) { - sb.abortTransferWholeIndex(true); - prop.put("LOCATION",""); - return prop; - } - } - - // insert constants - prop.putNum("wcount", sb.webIndex.size()); - prop.putNum("ucount", sb.webIndex.countURL()); - prop.put("running",(sb.transferIdxThread==null) ? "0" : "1"); - if (sb.transferIdxThread != null) { - final String[] status = sb.transferIdxThread.getStatus(); - final String[] range = sb.transferIdxThread.getRange(); - final int[] chunk = sb.transferIdxThread.getIndexCount(); - - prop.put("running_selection.status",status[0]); - prop.put("running_selection.twrange", range[0]); - prop.put("running_selection.twchunk", chunk[0]); - - prop.put("running_transfer.status",status[1]); - prop.put("running_transfer.twrange", range[1]); - prop.put("running_transfer.twchunk", chunk[1]); - - - prop.putNum("running_twEntityCount", sb.transferIdxThread.getTransferedContainerCount()); - prop.putNum("running_twEntryCount", sb.transferIdxThread.getTransferedEntryCount()); - prop.put("running_twPayloadSize", Formatter.bytesToString(sb.transferIdxThread.getTransferedBytes())); - prop.putNum("running_twEntityPercent", sb.transferIdxThread.getTransferedContainerPercent()); - prop.putNum("running_twEntrySpeed", sb.transferIdxThread.getTransferedEntrySpeed()); - - prop.put("running_deleteIndex", sb.transferIdxThread.deleteIndex() ? "1" : "0"); - prop.putHTML("running_peerName",sb.transferIdxThread.getSeed().getName()); - prop.put("running_stopped",(sb.transferIdxThread.isFinished()) || (!sb.transferIdxThread.isAlive()) ? "1" : "0"); - } else { - if (!prop.containsKey("running_status")) prop.put("running_status","Not running"); - } - - //List known hosts - yacySeed seed; - int hc = 0; - if ((sb.webIndex.seedDB != null) && (sb.webIndex.seedDB.sizeConnected() > 0)) { - final Iterator e = PeerSelection.getAcceptRemoteIndexSeeds(sb.webIndex.seedDB, null, sb.webIndex.seedDB.sizeConnected(), false); - final TreeMap hostList = new TreeMap(); - while (e.hasNext()) { - seed = e.next(); - if (seed != null) hostList.put(seed.get(yacySeed.NAME, "nameless"), seed.hash); - } - - String hostName = null; - try { - while ((hostName = hostList.firstKey()) != null) { - prop.put("running_hosts_" + hc + "_hosthash", hostList.get(hostName)); - prop.putHTML("running_hosts_" + hc + "_hostname", hostName); - hc++; - hostList.remove(hostName); - } - } catch (final NoSuchElementException ex) {} - prop.put("running_hosts", hc); - } else { - prop.put("running_hosts", "0"); - } - - prop.put("date",(new Date()).toString()); - */ - return prop; - } -} diff --git a/htroot/env/templates/submenuIndexControl.template b/htroot/env/templates/submenuIndexControl.template index 7b0759dad..e27d1ab12 100644 --- a/htroot/env/templates/submenuIndexControl.template +++ b/htroot/env/templates/submenuIndexControl.template @@ -4,7 +4,6 @@
  • RWI Admin
  • URL Reference Admin
  • Queue Import
    • -
  • Index Transfer
  • Index Cleaner
  • Wikimedia Dump Import