Split journal entries between file, block, lineage, and rawTable

Alluxio · Nov 23, 2015 · a8c11fd · a8c11fd
1 parent aaa1bcd
commit a8c11fd
Show file tree

Hide file tree

Showing 41 changed files with 15,891 additions and 15,724 deletions.
diff --git a/integration-tests/src/test/java/tachyon/master/lineage/LineageMasterIntegrationTest.java b/integration-tests/src/test/java/tachyon/master/lineage/LineageMasterIntegrationTest.java
@@ -40,7 +40,7 @@
 import tachyon.heartbeat.HeartbeatScheduler;
 import tachyon.job.CommandLineJob;
 import tachyon.job.JobConf;
-import tachyon.proto.JournalEntryProtos.LineageFileState;
+import tachyon.proto.journal.Lineage.LineageFileState;
 import tachyon.thrift.LineageInfo;
 import tachyon.util.CommonUtils;
 

diff --git a/servers/src/main/java/tachyon/master/Master.java b/servers/src/main/java/tachyon/master/Master.java
@@ -22,7 +22,7 @@
 import tachyon.master.journal.JournalCheckpointStreamable;
 import tachyon.master.journal.JournalInputStream;
 import tachyon.master.journal.ReadWriteJournal;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 public interface Master extends JournalCheckpointStreamable {
   /**

diff --git a/servers/src/main/java/tachyon/master/MasterBase.java b/servers/src/main/java/tachyon/master/MasterBase.java
@@ -31,7 +31,7 @@
 import tachyon.master.journal.JournalTailerThread;
 import tachyon.master.journal.JournalWriter;
 import tachyon.master.journal.ReadWriteJournal;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * This is the base class for all masters, and contains common functionality. Common functionality

diff --git a/servers/src/main/java/tachyon/master/block/BlockContainerIdGenerator.java b/servers/src/main/java/tachyon/master/block/BlockContainerIdGenerator.java
@@ -18,8 +18,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import tachyon.master.journal.JournalEntryRepresentable;
-import tachyon.proto.JournalEntryProtos.BlockContainerIdGeneratorEntry;
+import tachyon.proto.journal.Block.BlockContainerIdGeneratorEntry;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * This class generates unique block container ids.

diff --git a/servers/src/main/java/tachyon/master/block/BlockMaster.java b/servers/src/main/java/tachyon/master/block/BlockMaster.java
@@ -57,9 +57,9 @@
 import tachyon.master.journal.JournalInputStream;
 import tachyon.master.journal.JournalOutputStream;
 import tachyon.master.journal.JournalProtoUtils;
-import tachyon.proto.JournalEntryProtos.BlockContainerIdGeneratorEntry;
+import tachyon.proto.journal.Block.BlockContainerIdGeneratorEntry;
-import tachyon.proto.JournalEntryProtos.BlockInfoEntry;
+import tachyon.proto.journal.Block.BlockInfoEntry;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 import tachyon.thrift.BlockInfo;
 import tachyon.thrift.BlockLocation;
 import tachyon.thrift.BlockMasterService;

diff --git a/servers/src/main/java/tachyon/master/file/FileSystemMaster.java b/servers/src/main/java/tachyon/master/file/FileSystemMaster.java
@@ -72,19 +72,19 @@
 import tachyon.master.journal.Journal;
 import tachyon.master.journal.JournalOutputStream;
 import tachyon.master.journal.JournalProtoUtils;
-import tachyon.proto.JournalEntryProtos.AddMountPointEntry;
+import tachyon.proto.journal.File.AddMountPointEntry;
-import tachyon.proto.JournalEntryProtos.CompleteFileEntry;
+import tachyon.proto.journal.File.CompleteFileEntry;
-import tachyon.proto.JournalEntryProtos.DeleteFileEntry;
+import tachyon.proto.journal.File.DeleteFileEntry;
-import tachyon.proto.JournalEntryProtos.DeleteMountPointEntry;
+import tachyon.proto.journal.File.DeleteMountPointEntry;
-import tachyon.proto.JournalEntryProtos.InodeDirectoryEntry;
+import tachyon.proto.journal.File.InodeDirectoryEntry;
-import tachyon.proto.JournalEntryProtos.InodeDirectoryIdGeneratorEntry;
+import tachyon.proto.journal.File.InodeDirectoryIdGeneratorEntry;
-import tachyon.proto.JournalEntryProtos.InodeFileEntry;
+import tachyon.proto.journal.File.InodeFileEntry;
-import tachyon.proto.JournalEntryProtos.InodeLastModificationTimeEntry;
+import tachyon.proto.journal.File.InodeLastModificationTimeEntry;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.File.PersistDirectoryEntry;
-import tachyon.proto.JournalEntryProtos.PersistDirectoryEntry;
+import tachyon.proto.journal.File.ReinitializeFileEntry;
-import tachyon.proto.JournalEntryProtos.ReinitializeFileEntry;
+import tachyon.proto.journal.File.RenameEntry;
-import tachyon.proto.JournalEntryProtos.RenameEntry;
+import tachyon.proto.journal.File.SetStateEntry;
-import tachyon.proto.JournalEntryProtos.SetStateEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 import tachyon.thrift.BlockInfo;
 import tachyon.thrift.BlockLocation;
 import tachyon.thrift.FileBlockInfo;

diff --git a/servers/src/main/java/tachyon/master/file/meta/InodeDirectory.java b/servers/src/main/java/tachyon/master/file/meta/InodeDirectory.java
@@ -22,8 +22,8 @@
 
 import tachyon.Constants;
 import tachyon.collections.IndexedSet;
-import tachyon.proto.JournalEntryProtos.InodeDirectoryEntry;
+import tachyon.proto.journal.File.InodeDirectoryEntry;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 import tachyon.thrift.FileInfo;
 
 /**

diff --git a/servers/src/main/java/tachyon/master/file/meta/InodeDirectoryIdGenerator.java b/servers/src/main/java/tachyon/master/file/meta/InodeDirectoryIdGenerator.java
@@ -20,8 +20,8 @@
 import tachyon.master.block.BlockId;
 import tachyon.master.block.ContainerIdGenerable;
 import tachyon.master.journal.JournalEntryRepresentable;
-import tachyon.proto.JournalEntryProtos.InodeDirectoryIdGeneratorEntry;
+import tachyon.proto.journal.File.InodeDirectoryIdGeneratorEntry;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * Inode id management for directory inodes. Keep track of a block container id, along with a block

diff --git a/servers/src/main/java/tachyon/master/file/meta/InodeFile.java b/servers/src/main/java/tachyon/master/file/meta/InodeFile.java
@@ -26,8 +26,8 @@
 import tachyon.exception.FileAlreadyCompletedException;
 import tachyon.exception.InvalidFileSizeException;
 import tachyon.master.block.BlockId;
-import tachyon.proto.JournalEntryProtos.InodeFileEntry;
+import tachyon.proto.journal.File.InodeFileEntry;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 import tachyon.thrift.FileInfo;
 
 /**

diff --git a/servers/src/main/java/tachyon/master/file/meta/InodeTree.java b/servers/src/main/java/tachyon/master/file/meta/InodeTree.java
@@ -47,9 +47,9 @@
 import tachyon.master.journal.JournalCheckpointStreamable;
 import tachyon.master.journal.JournalOutputStream;
 import tachyon.master.journal.JournalProtoUtils;
-import tachyon.proto.JournalEntryProtos.InodeDirectoryEntry;
+import tachyon.proto.journal.File.InodeDirectoryEntry;
-import tachyon.proto.JournalEntryProtos.InodeFileEntry;
+import tachyon.proto.journal.File.InodeFileEntry;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 import tachyon.underfs.UnderFileSystem;
 import tachyon.util.FormatUtils;
 import tachyon.util.io.PathUtils;

diff --git a/servers/src/main/java/tachyon/master/journal/JournalEntryRepresentable.java b/servers/src/main/java/tachyon/master/journal/JournalEntryRepresentable.java
@@ -15,7 +15,7 @@
 
 package tachyon.master.journal;
 
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * This interface enables representing a class as a {@link JournalEntry}.

diff --git a/servers/src/main/java/tachyon/master/journal/JournalFormatter.java b/servers/src/main/java/tachyon/master/journal/JournalFormatter.java
@@ -23,7 +23,7 @@
 
 import tachyon.Constants;
 import tachyon.conf.TachyonConf;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 import tachyon.util.CommonUtils;
 
 /**

diff --git a/servers/src/main/java/tachyon/master/journal/JournalInputStream.java b/servers/src/main/java/tachyon/master/journal/JournalInputStream.java
@@ -17,7 +17,7 @@
 
 import java.io.IOException;
 
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * This input stream retrieves {@link JournalEntry} from journal checkpoint files and journal log

diff --git a/servers/src/main/java/tachyon/master/journal/JournalOutputStream.java b/servers/src/main/java/tachyon/master/journal/JournalOutputStream.java
@@ -17,7 +17,7 @@
 
 import java.io.IOException;
 
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * This output stream writes {@link JournalEntry} objects to the journal. This output stream can

diff --git a/servers/src/main/java/tachyon/master/journal/JournalProtoUtils.java b/servers/src/main/java/tachyon/master/journal/JournalProtoUtils.java
@@ -18,7 +18,7 @@
 import com.google.protobuf.Message;
 
 import tachyon.exception.ExceptionMessage;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * Utils for working with the journal.

diff --git a/servers/src/main/java/tachyon/master/journal/JournalTailer.java b/servers/src/main/java/tachyon/master/journal/JournalTailer.java
@@ -24,7 +24,7 @@
 
 import tachyon.Constants;
 import tachyon.master.Master;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * This class tails the journal for a master. It will process the journal checkpoint file, and then

diff --git a/servers/src/main/java/tachyon/master/journal/JournalWriter.java b/servers/src/main/java/tachyon/master/journal/JournalWriter.java
@@ -29,7 +29,7 @@
 import tachyon.conf.TachyonConf;
 import tachyon.exception.ExceptionMessage;
 import tachyon.master.MasterContext;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 import tachyon.underfs.UnderFileSystem;
 
 /**

diff --git a/servers/src/main/java/tachyon/master/journal/ProtoBufJournalFormatter.java b/servers/src/main/java/tachyon/master/journal/ProtoBufJournalFormatter.java
@@ -19,7 +19,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
 
 /**
  * Reads and writes protocol buffer journal entries. The entries contain headers describing their

diff --git a/servers/src/main/java/tachyon/master/lineage/LineageMaster.java b/servers/src/main/java/tachyon/master/lineage/LineageMaster.java
@@ -65,14 +65,14 @@
 import tachyon.master.lineage.meta.LineageStoreView;
 import tachyon.master.lineage.recompute.RecomputeExecutor;
 import tachyon.master.lineage.recompute.RecomputePlanner;
-import tachyon.proto.JournalEntryProtos.AsyncCompleteFileEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
-import tachyon.proto.JournalEntryProtos.DeleteLineageEntry;
+import tachyon.proto.journal.Lineage.AsyncCompleteFileEntry;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Lineage.DeleteLineageEntry;
-import tachyon.proto.JournalEntryProtos.LineageEntry;
+import tachyon.proto.journal.Lineage.LineageEntry;
-import tachyon.proto.JournalEntryProtos.LineageFileState;
+import tachyon.proto.journal.Lineage.LineageFileState;
-import tachyon.proto.JournalEntryProtos.LineageIdGeneratorEntry;
+import tachyon.proto.journal.Lineage.LineageIdGeneratorEntry;
-import tachyon.proto.JournalEntryProtos.PersistFilesEntry;
+import tachyon.proto.journal.Lineage.PersistFilesEntry;
-import tachyon.proto.JournalEntryProtos.PersistFilesRequestEntry;
+import tachyon.proto.journal.Lineage.PersistFilesRequestEntry;
 import tachyon.thrift.BlockLocation;
 import tachyon.thrift.CheckpointFile;
 import tachyon.thrift.CommandType;

diff --git a/servers/src/main/java/tachyon/master/lineage/meta/Lineage.java b/servers/src/main/java/tachyon/master/lineage/meta/Lineage.java
@@ -26,9 +26,9 @@
 import tachyon.job.Job;
 import tachyon.job.JobConf;
 import tachyon.master.journal.JournalEntryRepresentable;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
-import tachyon.proto.JournalEntryProtos.LineageEntry;
+import tachyon.proto.journal.Lineage.LineageEntry;
-import tachyon.proto.JournalEntryProtos.LineageFileState;
+import tachyon.proto.journal.Lineage.LineageFileState;
 import tachyon.thrift.LineageFileInfo;
 import tachyon.thrift.LineageInfo;
 
@@ -261,7 +261,7 @@ public synchronized JournalEntry toJournalEntry() {
     String jobCommand = commandLineJob.getCommand();
     String jobOutputPath = commandLineJob.getJobConf().getOutputFilePath();
 
-    LineageEntry lineage = tachyon.proto.JournalEntryProtos.LineageEntry.newBuilder()
+    LineageEntry lineage = LineageEntry.newBuilder()
         .setId(mId)
         .addAllInputFiles(inputFileIds)
         .addAllOutputFileIds(outputFileIds)

diff --git a/servers/src/main/java/tachyon/master/lineage/meta/LineageFile.java b/servers/src/main/java/tachyon/master/lineage/meta/LineageFile.java
@@ -16,7 +16,7 @@
 package tachyon.master.lineage.meta;
 
 import tachyon.client.file.TachyonFile;
-import tachyon.proto.JournalEntryProtos.LineageFileState;
+import tachyon.proto.journal.Lineage.LineageFileState;
 import tachyon.thrift.LineageFileInfo;
 
 /**

diff --git a/servers/src/main/java/tachyon/master/lineage/meta/LineageIdGenerator.java b/servers/src/main/java/tachyon/master/lineage/meta/LineageIdGenerator.java
@@ -18,8 +18,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import tachyon.master.journal.JournalEntryRepresentable;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
-import tachyon.proto.JournalEntryProtos.LineageIdGeneratorEntry;
+import tachyon.proto.journal.Lineage.LineageIdGeneratorEntry;
 
 /**
  * Generates the lineage id as sequence number.

diff --git a/servers/src/main/java/tachyon/master/lineage/meta/LineageStore.java b/servers/src/main/java/tachyon/master/lineage/meta/LineageStore.java
@@ -33,8 +33,8 @@
 import tachyon.job.Job;
 import tachyon.master.journal.JournalCheckpointStreamable;
 import tachyon.master.journal.JournalOutputStream;
-import tachyon.proto.JournalEntryProtos.LineageEntry;
+import tachyon.proto.journal.Lineage.LineageEntry;
-import tachyon.proto.JournalEntryProtos.LineageFileState;
+import tachyon.proto.journal.Lineage.LineageFileState;
 
 /**
  * A store of lineages. This class is thread-safe.

diff --git a/servers/src/main/java/tachyon/master/rawtable/RawTableMaster.java b/servers/src/main/java/tachyon/master/rawtable/RawTableMaster.java
@@ -44,9 +44,9 @@
 import tachyon.master.journal.JournalOutputStream;
 import tachyon.master.journal.JournalProtoUtils;
 import tachyon.master.rawtable.meta.RawTables;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
-import tachyon.proto.JournalEntryProtos.RawTableEntry;
+import tachyon.proto.journal.RawTable.RawTableEntry;
-import tachyon.proto.JournalEntryProtos.UpdateMetadataEntry;
+import tachyon.proto.journal.RawTable.UpdateMetadataEntry;
 import tachyon.thrift.FileInfo;
 import tachyon.thrift.RawTableInfo;
 import tachyon.thrift.RawTableMasterService;

diff --git a/servers/src/main/java/tachyon/master/rawtable/meta/RawTable.java b/servers/src/main/java/tachyon/master/rawtable/meta/RawTable.java
@@ -20,8 +20,8 @@
 import com.google.protobuf.ByteString;
 
 import tachyon.master.journal.JournalEntryRepresentable;
-import tachyon.proto.JournalEntryProtos.JournalEntry;
+import tachyon.proto.journal.Journal.JournalEntry;
-import tachyon.proto.JournalEntryProtos.RawTableEntry;
+import tachyon.proto.journal.RawTable.RawTableEntry;
 import tachyon.util.io.BufferUtils;
 
 public class RawTable implements JournalEntryRepresentable {