[hornetq-commits] JBoss hornetq SVN: r9504 - in trunk: tests/src/org/hornetq/tests/integration/journal and 2 other directories.

Author: clebert.suconic(a)jboss.com Date: 2010-08-04 13:19:50 -0400 (Wed, 04 Aug 2010) New Revision: 9504 Added: trunk/src/main/org/hornetq/core/journal/impl/ExportJournal.java trunk/src/main/org/hornetq/core/journal/impl/ImportJournal.java trunk/tests/src/org/hornetq/tests/integration/journal/NIOImportExportTest.java Removed: trunk/tests/src/org/hornetq/tests/util/ListJournal.java Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java Log: HORNETQ-180 - Import / export tool Added: trunk/src/main/org/hornetq/core/journal/impl/ExportJournal.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/ExportJournal.java (rev 0) +++ trunk/src/main/org/hornetq/core/journal/impl/ExportJournal.java 2010-08-04 17:19:50 UTC (rev 9504) @@ -0,0 +1,191 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.journal.impl; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.util.List; + +import org.hornetq.core.journal.*; + +import org.hornetq.core.journal.SequentialFileFactory; +import org.hornetq.utils.Base64; + +/** + * Use this class to export the journal data. You can use it as a main class or through its native method {@link ExportJournal#exportJournal(String, String, String, int, int, String)} + * + * If you use the main method, use it as <JournalDirectory> <JournalPrefix> <FileExtension> <MinFiles> <FileSize> <FileOutput> + * + * Example: java -cp hornetq-core.jar org.hornetq.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ExportJournal +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + public static void main(String arg[]) + { + if (arg.length != 6) + { + System.err.println("Use: java -cp hornetq-core.jar org.hornetq.core.journal.impl.ExportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <MinFiles> <FileSize> <FileOutput>"); + return; + } + + try + { + exportJournal(arg[0], arg[1], arg[2], Integer.parseInt(arg[3]), Integer.parseInt(arg[4]), arg[5]); + } + catch (Exception e) + { + e.printStackTrace(); + } + + } + + public static void exportJournal(String directory, + String journalPrefix, + String journalSuffix, + int minFiles, + int fileSize, + String fileOutpu) throws Exception + { + NIOSequentialFileFactory nio = new NIOSequentialFileFactory(directory); + + JournalImpl journal = new JournalImpl(fileSize, minFiles, 0, 0, nio, journalPrefix, journalSuffix, 1); + + FileOutputStream fileOut = new FileOutputStream(new File(fileOutpu)); + + BufferedOutputStream buffOut = new BufferedOutputStream(fileOut); + + PrintStream out = new PrintStream(buffOut); + + List<JournalFile> files = journal.orderFiles(); + + for (JournalFile file : files) + { + out.println("#File," + file); + + exportJournalFile(out, nio, file); + } + + out.close(); + } + + /** + * @param out + * @param fileFactory + * @param file + * @throws Exception + */ + public static void exportJournalFile(final PrintStream out, SequentialFileFactory fileFactory, JournalFile file) throws Exception + { + JournalImpl.readJournalFile(fileFactory, file, new JournalReaderCallback() + { + + public void onReadUpdateRecordTX(long transactionID, RecordInfo recordInfo) throws Exception + { + out.println("operation@UpdateTX,txID@" + transactionID + "," + describeRecord(recordInfo)); + } + + public void onReadUpdateRecord(RecordInfo recordInfo) throws Exception + { + out.println("operation@Update," + describeRecord(recordInfo)); + } + + public void onReadRollbackRecord(long transactionID) throws Exception + { + out.println("operation@Rollback,txID@" + transactionID); + } + + public void onReadPrepareRecord(long transactionID, byte[] extraData, int numberOfRecords) throws Exception + { + out.println("operation@Prepare,txID@" + transactionID + + ",numberOfRecords@" + + numberOfRecords + + ",extraData@" + + encode(extraData)); + } + + public void onReadDeleteRecordTX(long transactionID, RecordInfo recordInfo) throws Exception + { + out.println("operation@DeleteRecordTX,txID@" + transactionID + "," + describeRecord(recordInfo)); + } + + public void onReadDeleteRecord(long recordID) throws Exception + { + out.println("operation@DeleteRecord,id@" + recordID); + } + + public void onReadCommitRecord(long transactionID, int numberOfRecords) throws Exception + { + out.println("operation@Commit,txID@" + transactionID + ",numberOfRecords@" + numberOfRecords); + } + + public void onReadAddRecordTX(long transactionID, RecordInfo recordInfo) throws Exception + { + out.println("operation@AddRecordTX,txID@" + transactionID + "," + describeRecord(recordInfo)); + } + + public void onReadAddRecord(RecordInfo recordInfo) throws Exception + { + out.println("operation@AddRecord," + describeRecord(recordInfo)); + } + + public void markAsDataFile(JournalFile file) + { + } + }); + } + + private static String describeRecord(RecordInfo recordInfo) + { + return "id@" + recordInfo.id + + ",userRecordType@" + + recordInfo.userRecordType + + ",length@" + + recordInfo.data.length + + ",isUpdate@" + + recordInfo.isUpdate + + ",data@" + + encode(recordInfo.data); + } + + private static String encode(byte[] data) + { + return Base64.encodeBytes(data, 0, data.length, Base64.DONT_BREAK_LINES | Base64.URL_SAFE); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Added: trunk/src/main/org/hornetq/core/journal/impl/ImportJournal.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/ImportJournal.java (rev 0) +++ trunk/src/main/org/hornetq/core/journal/impl/ImportJournal.java 2010-08-04 17:19:50 UTC (rev 9504) @@ -0,0 +1,358 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.journal.impl; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStreamReader; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.atomic.AtomicInteger; + +import org.hornetq.core.journal.RecordInfo; +import org.hornetq.core.journal.impl.JournalImpl.JournalRecord; +import org.hornetq.utils.Base64; + +/** + * Use this class to import the journal data from a listed file. You can use it as a main class or through its native method {@link ImportJournal#importJournal(String, String, String, int, int, String)} + * + * If you use the main method, use it as <JournalDirectory> <JournalPrefix> <FileExtension> <MinFiles> <FileSize> <FileOutput> + * + * Example: java -cp hornetq-core.jar org.hornetq.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ImportJournal +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + public static void main(String arg[]) + { + if (arg.length != 6) + { + System.err.println("Use: java -cp hornetq-core.jar org.hornetq.core.journal.impl.ImportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <MinFiles> <FileSize> <FileOutput>"); + return; + } + + try + { + importJournal(arg[0], arg[1], arg[2], Integer.parseInt(arg[3]), Integer.parseInt(arg[4]), arg[5]); + } + catch (Exception e) + { + e.printStackTrace(); + } + + } + + public static void importJournal(String directory, + String journalPrefix, + String journalSuffix, + int minFiles, + int fileSize, + String fileInput) throws Exception + { + + File journalDir = new File(directory); + + journalDir.mkdirs(); + + NIOSequentialFileFactory nio = new NIOSequentialFileFactory(directory); + + JournalImpl journal = new JournalImpl(fileSize, minFiles, 0, 0, nio, journalPrefix, journalSuffix, 1); + + if (journal.orderFiles().size() != 0) + { + throw new IllegalStateException("Import needs to create a brand new journal"); + } + + journal.start(); + + // The journal is empty, as we checked already. Calling load just to initialize the internal data + journal.loadInternalOnly(); + + FileInputStream fileInputStream = new FileInputStream(new File(fileInput)); + + BufferedReader reader = new BufferedReader(new InputStreamReader(fileInputStream)); + + String line; + + HashMap<Long, AtomicInteger> txCounters = new HashMap<Long, AtomicInteger>(); + + long lineNumber = 0; + + Map<Long, JournalRecord> journalRecords = journal.getRecords(); + + while ((line = reader.readLine()) != null) + { + lineNumber++; + String splitLine[] = line.split(","); + if (splitLine[0].equals("#File")) + { + txCounters.clear(); + continue; + } + + Properties lineProperties = parseLine(splitLine); + + String operation = null; + try + { + operation = lineProperties.getProperty("operation"); + + if (operation.equals("AddRecord")) + { + RecordInfo info = parseRecord(lineProperties); + journal.appendAddRecord(info.id, info.userRecordType, info.data, false); + } + else if (operation.equals("AddRecordTX")) + { + long txID = parseLong("txID", lineProperties); + AtomicInteger counter = getCounter(txID, txCounters); + counter.incrementAndGet(); + RecordInfo info = parseRecord(lineProperties); + journal.appendAddRecordTransactional(txID, info.id, info.userRecordType, info.data); + } + else if (operation.equals("AddRecordTX")) + { + long txID = parseLong("txID", lineProperties); + AtomicInteger counter = getCounter(txID, txCounters); + counter.incrementAndGet(); + RecordInfo info = parseRecord(lineProperties); + journal.appendAddRecordTransactional(txID, info.id, info.userRecordType, info.data); + } + else if (operation.equals("UpdateTX")) + { + long txID = parseLong("txID", lineProperties); + AtomicInteger counter = getCounter(txID, txCounters); + counter.incrementAndGet(); + RecordInfo info = parseRecord(lineProperties); + journal.appendUpdateRecordTransactional(txID, info.id, info.userRecordType, info.data); + } + else if (operation.equals("Update")) + { + RecordInfo info = parseRecord(lineProperties); + journal.appendUpdateRecord(info.id, info.userRecordType, info.data, false); + } + else if (operation.equals("DeleteRecord")) + { + long id = parseLong("id", lineProperties); + + // If not found it means the append/update records were reclaimed already + if (journalRecords.get((Long)id) != null) + { + journal.appendDeleteRecord(id, false); + } + } + else if (operation.equals("DeleteRecordTX")) + { + long txID = parseLong("txID", lineProperties); + long id = parseLong("id", lineProperties); + AtomicInteger counter = getCounter(txID, txCounters); + counter.incrementAndGet(); + + // If not found it means the append/update records were reclaimed already + if (journalRecords.get((Long)id) != null) + { + journal.appendDeleteRecordTransactional(txID, id); + } + } + else if (operation.equals("Prepare")) + { + long txID = parseLong("txID", lineProperties); + int numberOfRecords = parseInt("numberOfRecords", lineProperties); + AtomicInteger counter = getCounter(txID, txCounters); + byte[] data = parseEncoding("extraData", lineProperties); + + if (counter.get() == numberOfRecords) + { + journal.appendPrepareRecord(txID, data, false); + } + else + { + System.err.println("Transaction " + txID + + " at line " + + lineNumber + + " is incomplete. The prepare record expected " + + numberOfRecords + + " while the import only had " + + counter); + } + } + else if (operation.equals("Commit")) + { + long txID = parseLong("txID", lineProperties); + int numberOfRecords = parseInt("numberOfRecords", lineProperties); + AtomicInteger counter = getCounter(txID, txCounters); + if (counter.get() == numberOfRecords) + { + journal.appendCommitRecord(txID, false); + } + else + { + System.err.println("Transaction " + txID + + " at line " + + lineNumber + + " is incomplete. The commit record expected " + + numberOfRecords + + " while the import only had " + + counter); + } + } + else if (operation.equals("Rollback")) + { + long txID = parseLong("txID", lineProperties); + journal.appendRollbackRecord(txID, false); + } + else + { + System.err.println("Invalid opeartion " + operation + " at line " + lineNumber); + } + } + catch (Exception ex) + { + System.err.println("Error at line " + lineNumber + ", operation=" + operation + " msg = " + ex.getMessage()); + } + } + + journal.compact(); + + journal.stop(); + } + + protected static AtomicInteger getCounter(Long txID, Map<Long, AtomicInteger> txCounters) + { + + AtomicInteger counter = txCounters.get(txID); + if (counter == null) + { + counter = new AtomicInteger(0); + txCounters.put(txID, counter); + } + + return counter; + } + + protected static RecordInfo parseRecord(Properties properties) throws Exception + { + int id = parseInt("id", properties); + byte userRecordType = parseByte("userRecordType", properties); + boolean isUpdate = parseBoolean("isUpdate", properties); + byte[] data = parseEncoding("data", properties); + return new RecordInfo(id, userRecordType, data, isUpdate); + } + + private static byte[] parseEncoding(String name, Properties properties) throws Exception + { + String value = parseString(name, properties); + + return decode(value); + } + + /** + * @param properties + * @return + */ + private static int parseInt(String name, Properties properties) throws Exception + { + String value = parseString(name, properties); + + return Integer.parseInt(value); + } + + private static long parseLong(String name, Properties properties) throws Exception + { + String value = parseString(name, properties); + + return Long.parseLong(value); + } + + private static boolean parseBoolean(String name, Properties properties) throws Exception + { + String value = parseString(name, properties); + + return Boolean.parseBoolean(value); + } + + private static byte parseByte(String name, Properties properties) throws Exception + { + String value = parseString(name, properties); + + return Byte.parseByte(value); + } + + /** + * @param name + * @param properties + * @return + * @throws Exception + */ + private static String parseString(String name, Properties properties) throws Exception + { + String value = properties.getProperty(name); + + if (value == null) + { + throw new Exception("property " + name + " not found"); + } + return value; + } + + protected static Properties parseLine(String[] splitLine) + { + Properties properties = new Properties(); + + for (String el : splitLine) + { + String[] tuple = el.split("@"); + if (tuple.length == 2) + { + properties.put(tuple[0], tuple[1]); + } + else + { + properties.put(tuple[0], tuple[0]); + } + } + + return properties; + } + + private static byte[] decode(String data) + { + return Base64.decode(data, Base64.DONT_BREAK_LINES | Base64.URL_SAFE); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2010-08-04 07:16:42 UTC (rev 9503) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2010-08-04 17:19:50 UTC (rev 9504) @@ -13,7 +13,6 @@ package org.hornetq.core.journal.impl; -import java.io.PrintStream; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collections; @@ -447,91 +446,10 @@ } - /** - * @param fileFactory - * @param journal - * @throws Exception - */ - public static void listJournalFiles(final PrintStream out, final JournalImpl journal) throws Exception - { - List<JournalFile> files = journal.orderFiles(); - - SequentialFileFactory fileFactory = journal.fileFactory; - for (JournalFile file : files) - { - out.println("####### listing file " + file.getFile().getFileName() + - " sequence = " + - file.getFileID()); - listJournalFile(out, fileFactory, file); - } - } - /** - * @param out - * @param fileFactory - * @param file - * @throws Exception - */ - public static void listJournalFile(final PrintStream out, SequentialFileFactory fileFactory, JournalFile file) throws Exception - { - JournalImpl.readJournalFile(fileFactory, file, new JournalReaderCallback() - { - public void onReadUpdateRecordTX(long transactionID, RecordInfo recordInfo) throws Exception - { - out.println("ReadUpdateTX, txID=" + transactionID + ", " + recordInfo); - } - - public void onReadUpdateRecord(RecordInfo recordInfo) throws Exception - { - out.println("ReadUpdate " + recordInfo); - } - - public void onReadRollbackRecord(long transactionID) throws Exception - { - out.println("Rollback txID=" + transactionID); - } - - public void onReadPrepareRecord(long transactionID, byte[] extraData, int numberOfRecords) throws Exception - { - out.println("Prepare txID=" + transactionID + ", numberOfRecords=" + numberOfRecords); - } - - public void onReadDeleteRecordTX(long transactionID, RecordInfo recordInfo) throws Exception - { - out.println("DeleteRecordTX txID=" + transactionID + ", " + recordInfo); - } - - public void onReadDeleteRecord(long recordID) throws Exception - { - out.println("DeleteRecord id=" + recordID); - } - - public void onReadCommitRecord(long transactionID, int numberOfRecords) throws Exception - { - out.println("CommitRecord txID=" + transactionID + ", numberOfRecords=" + numberOfRecords); - } - - public void onReadAddRecordTX(long transactionID, RecordInfo recordInfo) throws Exception - { - out.println("AddRecordTX, txID=" + transactionID + ", " + recordInfo); - } - - public void onReadAddRecord(RecordInfo recordInfo) throws Exception - { - out.println("AddRecord " + recordInfo); - } - - public void markAsDataFile(JournalFile file) - { - } - }); - } - - - /** this method is used internally only however tools may use it to maintenance. */ public static int readJournalFile(final SequentialFileFactory fileFactory, final JournalFile file, @@ -3319,7 +3237,7 @@ while (nextFile == null) { - nextFile = openedFiles.poll(60, TimeUnit.SECONDS); + nextFile = openedFiles.poll(5, TimeUnit.SECONDS); if (nextFile == null) { JournalImpl.log.warn("Couldn't open a file in 60 Seconds", Added: trunk/tests/src/org/hornetq/tests/integration/journal/NIOImportExportTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/NIOImportExportTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/integration/journal/NIOImportExportTest.java 2010-08-04 17:19:50 UTC (rev 9504) @@ -0,0 +1,210 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.tests.integration.journal; + +import java.io.File; + +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.journal.SequentialFileFactory; +import org.hornetq.core.journal.impl.NIOSequentialFileFactory; +import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase; +import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding; + +/** + * A NIOImportExportTest + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class NIOImportExportTest extends JournalImplTestBase +{ + + /* (non-Javadoc) + * @see org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() + */ + @Override + protected SequentialFileFactory getFileFactory() throws Exception + { + File file = new File(getTestDir()); + + deleteDirectory(file); + + file.mkdir(); + + return new NIOSequentialFileFactory(getTestDir(), true); + } + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + protected void tearDown() throws Exception + { + + } + + public void testExportImport() throws Exception + { + setup(10, 10 * 1024, true); + + createJournal(); + + startJournal(); + + load(); + + add(1, 2); + + journal.forceMoveNextFile(); + + delete(1, 2); + + add(3, 4); + + journal.forceMoveNextFile(); + + addTx(5, 6, 7, 8); + + journal.forceMoveNextFile(); + + addTx(5, 9); + + commit(5); + + journal.forceMoveNextFile(); + + deleteTx(10, 6, 7, 8, 9); + + commit(10); + + addTx(11, 11, 12); + commit(11); + + stopJournal(); + + exportImportJournal(); + + createJournal(); + + startJournal(); + + loadAndCheck(); + + } + + + public void testExportImport3() throws Exception + { + setup(10, 10 * 1024, true); + + createJournal(); + + startJournal(); + + load(); + + add(1, 2); + + journal.forceMoveNextFile(); + + delete(1, 2); + + add(3, 4); + + journal.forceMoveNextFile(); + + addTx(5, 6, 7, 8); + + journal.forceMoveNextFile(); + + addTx(5, 9); + + commit(5); + + journal.forceMoveNextFile(); + + deleteTx(10, 6, 7, 8, 9); + + commit(10); + + addTx(11, 12, 13); + + EncodingSupport xid = new SimpleEncoding(10, (byte)0); + prepare(11, xid); + + stopJournal(); + + exportImportJournal(); + + createJournal(); + + startJournal(); + + loadAndCheck(); + + commit(11); + + stopJournal(); + + exportImportJournal(); + + createJournal(); + + startJournal(); + + loadAndCheck(); + + + } + + public void testExportImport2() throws Exception + { + setup(10, 10 * 1024, true); + + createJournal(); + + startJournal(); + + load(); + + add(1); + + stopJournal(); + + exportImportJournal(); + + createJournal(); + + startJournal(); + + loadAndCheck(); + + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java 2010-08-04 07:16:42 UTC (rev 9503) +++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java 2010-08-04 17:19:50 UTC (rev 9504) @@ -13,6 +13,8 @@ package org.hornetq.tests.unit.core.journal.impl; +import java.io.File; +import java.io.FilenameFilter; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -28,6 +30,8 @@ import org.hornetq.core.journal.RecordInfo; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.journal.TestableJournal; +import org.hornetq.core.journal.impl.ExportJournal; +import org.hornetq.core.journal.impl.ImportJournal; import org.hornetq.core.journal.impl.JournalImpl; import org.hornetq.core.logging.Logger; import org.hornetq.tests.util.UnitTestCase; @@ -165,6 +169,50 @@ journal.stop(); } + /** + * @throws Exception + */ + protected void exportImportJournal() throws Exception + { + System.out.println("Exporting to " + getTestDir() + "/output.log"); + + ExportJournal.exportJournal(getTestDir(), + this.filePrefix, + this.fileExtension, + this.minFiles, + this.fileSize, + getTestDir() + "/output.log"); + + File dir = new File(getTestDir()); + + FilenameFilter fnf = new FilenameFilter() + { + public boolean accept(final File file, final String name) + { + return name.endsWith("." + fileExtension); + } + }; + + System.out.println("file = " + dir); + + File files[] = dir.listFiles(fnf); + + for (File file : files) + { + System.out.println("Deleting " + file); + file.delete(); + } + + ImportJournal.importJournal(getTestDir(), + filePrefix, + fileExtension, + minFiles, + fileSize, + getTestDir() + "/output.log"); + } + + + protected void loadAndCheck() throws Exception { loadAndCheck(false); Deleted: trunk/tests/src/org/hornetq/tests/util/ListJournal.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ListJournal.java 2010-08-04 07:16:42 UTC (rev 9503) +++ trunk/tests/src/org/hornetq/tests/util/ListJournal.java 2010-08-04 17:19:50 UTC (rev 9504) @@ -1,128 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.tests.util; - -import java.io.FileOutputStream; -import java.io.PrintStream; -import java.util.ArrayList; - -import org.hornetq.core.config.impl.FileConfiguration; -import org.hornetq.core.journal.PreparedTransactionInfo; -import org.hornetq.core.journal.RecordInfo; -import org.hornetq.core.journal.SequentialFileFactory; -import org.hornetq.core.journal.impl.AIOSequentialFileFactory; -import org.hornetq.core.journal.impl.JournalImpl; - -/** - * Lists the journal content for debug purposes. - * - * This is just a class useful on debug during development, - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 12, 2008 11:42:35 AM - * - * - */ -public class ListJournal -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - public static void main(final String arg[]) - { - try - { - FileConfiguration fileConf = new FileConfiguration(); - - fileConf.setJournalDirectory("/work/projects/trunk/journal"); - - // fileConf.setConfigurationUrl(arg[0]); - - fileConf.start(); - - SequentialFileFactory fileFactory = new AIOSequentialFileFactory(fileConf.getJournalDirectory()); - - JournalImpl journal = new JournalImpl(fileConf.getJournalFileSize(), - 10, - 0, - 0, - fileFactory, - "hornetq-data", - "hq", - fileConf.getJournalMaxIO_NIO()); - - ArrayList<RecordInfo> records = new ArrayList<RecordInfo>(); - ArrayList<PreparedTransactionInfo> prepared = new ArrayList<PreparedTransactionInfo>(); - - journal.start(); - - - PrintStream out = new PrintStream(new FileOutputStream("/tmp/file.out")); - - out.println("######### Journal records per file"); - - JournalImpl.listJournalFiles(out, journal); - - journal.load(records, prepared, null); - - out.println(); - - out.println("##########################################"); - out.println("# T O T A L L I S T #"); - - if (prepared.size() > 0) - { - out.println("There are " + prepared.size() + " prepared transactions on the journal"); - } - - out.println("Total of " + records.size() + " committed records"); - - for (RecordInfo record : records) - { - out.println("user record: " + record); - } - - journal.checkReclaimStatus(); - - System.out.println("Data = " + journal.debug()); - - journal.stop(); - - out.close(); - } - catch (Exception e) - { - e.printStackTrace(); - } - - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -}