Skip to content

Commit

Permalink
Fix --fix-links on repair database
Browse files Browse the repository at this point in the history 
Resolves: #8897
  • Loading branch information
@luigidellaquila
luigidellaquila committed Jun 7, 2019
1 parent 1d163db commit 061b025
Showing 1 changed file with 12 additions and 38 deletions.
50 changes: 12 additions & 38 deletions tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,12 @@
import com.orientechnologies.orient.core.config.OGlobalConfiguration;
import com.orientechnologies.orient.core.config.OStorageConfiguration;
import com.orientechnologies.orient.core.config.OStorageEntryConfiguration;
import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
import com.orientechnologies.orient.core.db.ODatabaseType;
import com.orientechnologies.orient.core.db.OrientDB;
import com.orientechnologies.orient.core.db.OrientDBConfig;
import com.orientechnologies.orient.core.db.OrientDBConfigBuilder;
import com.orientechnologies.orient.core.db.OrientDBInternal;
import com.orientechnologies.orient.core.db.OrientDBRemote;
import com.orientechnologies.orient.core.db.*;
import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
import com.orientechnologies.orient.core.db.document.SimpleRecordReader;
import com.orientechnologies.orient.core.db.record.OIdentifiable;
import com.orientechnologies.orient.core.db.record.ridbag.ORidBag;
import com.orientechnologies.orient.core.db.tool.OBonsaiTreeRepair;
import com.orientechnologies.orient.core.db.tool.OCheckIndexTool;
import com.orientechnologies.orient.core.db.tool.ODatabaseCompare;
import com.orientechnologies.orient.core.db.tool.ODatabaseExport;
import com.orientechnologies.orient.core.db.tool.ODatabaseExportException;
import com.orientechnologies.orient.core.db.tool.ODatabaseImport;
import com.orientechnologies.orient.core.db.tool.ODatabaseImportException;
import com.orientechnologies.orient.core.db.tool.OGraphRepair;
import com.orientechnologies.orient.core.db.tool.*;
import com.orientechnologies.orient.core.exception.OConfigurationException;
import com.orientechnologies.orient.core.exception.ODatabaseException;
import com.orientechnologies.orient.core.exception.ORetryQueryException;
Expand Down Expand Up @@ -101,31 +88,11 @@
import com.orientechnologies.orient.server.config.OServerConfigurationManager;
import com.orientechnologies.orient.server.config.OServerUserConfiguration;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.*;
import java.lang.reflect.Array;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.Scanner;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -2086,7 +2053,14 @@ public void repairDatabase(
final boolean fix_links = iOptions == null || iOptions.contains("--fix-links");
if (fix_links) {
// REPAIR DATABASE AT LOW LEVEL
repairDatabase(iOptions);
boolean verbose = iOptions != null && iOptions.contains("-v");

new ODatabaseRepair().setDatabase(currentDatabase).setOutputListener(new OCommandOutputListener() {
@Override
public void onMessage(String iText) {
message(iText);
}
}).setVerbose(verbose).run();
}

if (!currentDatabase.getURL().startsWith("plocal")) {
Expand Down

0 comments on commit 061b025

Please sign in to comment.