[GitHub] mikewalch closed pull request #515: Rename logEntris to logEntries

[GitBox <gi...@apache.org>]

mikewalch closed pull request #515: Rename logEntris to logEntries
URL: https://github.com/apache/accumulo/pull/515
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 9ad246cc3a..6359aa77fe 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -344,7 +344,7 @@ public Tablet(final TabletServer tabletServer, final KeyExtent extent,
     VolumeManager fs = tabletServer.getFileSystem();
     boolean replicationEnabled = ReplicationConfigurationUtil.isEnabled(extent,
         this.tableConfiguration);
-    TabletFiles tabletPaths = new TabletFiles(data.getDirectory(), data.getLogEntris(),
+    TabletFiles tabletPaths = new TabletFiles(data.getDirectory(), data.getLogEntries(),
         data.getDataFiles());
     tabletPaths = VolumeUtil.updateTabletVolumes(tabletServer, tabletServer.getLock(), fs, extent,
         tabletPaths, replicationEnabled);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
index ed7f81c47f..7774875a6d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
@@ -70,7 +70,7 @@
 
   private String time = null;
   private SortedMap<FileRef,DataFileValue> dataFiles = new TreeMap<>();
-  private List<LogEntry> logEntris = new ArrayList<>();
+  private List<LogEntry> logEntries = new ArrayList<>();
   private HashSet<FileRef> scanFiles = new HashSet<>();
   private long flushID = -1;
   private long compactID = -1;
@@ -102,7 +102,7 @@ public TabletData(KeyExtent extent, VolumeManager fs, Iterator<Entry<Key,Value>>
       } else if (DIRECTORY_COLUMN.hasColumns(key)) {
         directory = value.toString();
       } else if (family.equals(LogColumnFamily.NAME)) {
-        logEntris.add(LogEntry.fromKeyValue(key, entry.getValue()));
+        logEntries.add(LogEntry.fromKeyValue(key, entry.getValue()));
       } else if (family.equals(ScanFileColumnFamily.NAME)) {
         scanFiles.add(new FileRef(fs, key));
       } else if (FLUSH_COLUMN.hasColumns(key)) {
@@ -166,7 +166,7 @@ public TabletData(VolumeManager fs, ZooReader rdr, AccumuloConfiguration conf)
     }
 
     try {
-      logEntris = MetadataTableUtil.getLogEntries(null, RootTable.EXTENT);
+      logEntries = MetadataTableUtil.getLogEntries(null, RootTable.EXTENT);
     } catch (Exception ex) {
       throw new RuntimeException("Unable to read tablet log entries", ex);
     }
@@ -198,8 +198,8 @@ public String getTime() {
     return dataFiles;
   }
 
-  public List<LogEntry> getLogEntris() {
-    return logEntris;
+  public List<LogEntry> getLogEntries() {
+    return logEntries;
   }
 
   public HashSet<FileRef> getScanFiles() {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services