Upgrade Scala, JMockit version (#4376)

* Upgrade Scale, JMockit version

* Fix for review comment

Author: jackylk

common/src/main/java/org/apache/carbondata/common/logging/impl/AuditExtendedRollingFileAppender.java

@@ -17,6 +17,7 @@
 
 package org.apache.carbondata.common.logging.impl;
 
+import org.apache.log4j.helpers.QuietWriter;
 import org.apache.log4j.spi.LoggingEvent;
 
 /**
@@ -36,4 +37,24 @@ protected void subAppend(LoggingEvent event) {
       super.subAppend(event);
     }
   }
+
+  public void setFileName(String fileName) {
+    this.fileName = fileName;
+  }
+
+  public void setMaxBackupIndex(int maxBackupIndex) {
+    this.maxBackupIndex = maxBackupIndex;
+  }
+
+  public void setMaxFileSize(long maxFileSize) {
+    this.maxFileSize = maxFileSize;
+  }
+
+  public void setQuiteWriter(QuietWriter qw) {
+    this.qw = qw;
+  }
+
+  public QuietWriter getQuiteWriter() {
+    return this.qw;
+  }
 }

common/src/test/java/org/apache/carbondata/common/logging/impl/AuditExtendedRollingFileAppenderTest_UT.java

@@ -17,8 +17,11 @@
 
 package org.apache.carbondata.common.logging.impl;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.apache.log4j.helpers.QuietWriter;
 import org.junit.Assert;
-import mockit.Deencapsulation;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
 import org.junit.Before;
@@ -30,10 +33,9 @@ public class AuditExtendedRollingFileAppenderTest_UT {
 
   @Before public void setUp() {
     rAppender = new AuditExtendedRollingFileAppender();
-    Deencapsulation.setField(rAppender, "fileName", "audit.log");
-    Deencapsulation.setField(rAppender, "maxBackupIndex", 1);
-    Deencapsulation.setField(rAppender, "maxFileSize", 1000L);
-
+    rAppender.setFile("audit.log");
+    rAppender.setMaxBackupIndex(1);
+    rAppender.setMaxFileSize(1000L);
   }
 
   @Test public void testRollOver() {
@@ -43,26 +45,31 @@ public class AuditExtendedRollingFileAppenderTest_UT {
     Assert.assertTrue(true);
   }
 
-  @Test public void testCleanLogs() {
+  @Test public void testCleanLogs()
+      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
     final String startName = "audit";
     final String folderPath = "./";
     int maxBackupIndex = 1;
 
-    Deencapsulation.invoke(rAppender, "cleanLogs", startName, folderPath, maxBackupIndex);
+    Method cleanLogsMethod = ExtendedRollingFileAppender.class.getDeclaredMethod("cleanLogs",
+      String.class, String.class, int.class);
+    cleanLogsMethod.setAccessible(true);
+    cleanLogsMethod.invoke(rAppender, startName, folderPath, maxBackupIndex);
     Assert.assertTrue(true);
   }
 
   @Test public void testSubAppendLoggingEvent() {
     Logger logger = Logger.getLogger(this.getClass());
     LoggingEvent event = new LoggingEvent(null, logger, 0L, AuditLevel.AUDIT, null, null);
-
-    Deencapsulation.setField(rAppender, "qw", null);
+    QuietWriter qw = rAppender.getQuiteWriter();
+    rAppender.setQuiteWriter(null);
     try {
       rAppender.subAppend(event);
     } catch (Exception e) {
       //
     }
     Assert.assertTrue(true);
+    rAppender.setQuiteWriter(qw);
   }
 
 }

common/src/test/java/org/apache/carbondata/common/logging/impl/ExtendedRollingFileAppenderTest_UT.java

@@ -17,8 +17,10 @@
 
 package org.apache.carbondata.common.logging.impl;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import org.junit.Assert;
-import mockit.Deencapsulation;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
 import org.junit.Before;
@@ -30,9 +32,9 @@ public class ExtendedRollingFileAppenderTest_UT {
 
   @Before public void setUp() {
     rAppender = new ExtendedRollingFileAppender();
-    Deencapsulation.setField(rAppender, "fileName", "dummy.log");
-    Deencapsulation.setField(rAppender, "maxBackupIndex", 1);
-    Deencapsulation.setField(rAppender, "maxFileSize", 1000L);
+    rAppender.setFile("dummy.log");
+    rAppender.setMaxBackupIndex(1);
+    rAppender.setMaxFileSize("1000");
   }
 
   @Test public void testRollOver() {
@@ -42,12 +44,16 @@ public class ExtendedRollingFileAppenderTest_UT {
     Assert.assertTrue(true);
   }
 
-  @Test public void testCleanLogs() {
+  @Test public void testCleanLogs()
+      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
     final String startName = "dummy";
     final String folderPath = "./";
     int maxBackupIndex = 1;
 
-    Deencapsulation.invoke(rAppender, "cleanLogs", startName, folderPath, maxBackupIndex);
+    Method cleanLogsMethod = ExtendedRollingFileAppender.class.getDeclaredMethod("cleanLogs",
+        String.class, String.class, int.class);
+    cleanLogsMethod.setAccessible(true);
+    cleanLogsMethod.invoke(rAppender, startName, folderPath, maxBackupIndex);
   }
 
   @Test public void testSubAppendLoggingEvent() {

core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java

@@ -47,6 +47,8 @@ public class BlockletDataRefNode implements DataRefNode {
 
   private BlockletSerializer blockletSerializer;
 
+  public BlockletDataRefNode() { }
+
   BlockletDataRefNode(List<TableBlockInfo> blockInfos, int index) {
     this.blockInfos = blockInfos;
     // Update row count and page count to blocklet info

core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletIndexFactory.java

@@ -760,4 +760,9 @@ public IndexInputSplitWrapper toDistributableSegment(Segment segment,
     }
   }
 
+  public void setCache(
+      Cache<TableBlockIndexUniqueIdentifierWrapper, BlockletIndexWrapper> cache) {
+    this.cache = cache;
+  }
+
 }

core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java

@@ -1289,4 +1289,7 @@ public String getTableStatusVersion() {
     return this.tableInfo.getFactTable().getTableProperties().getOrDefault("latestversion", "");
   }
 
+  public void setTableInfo(TableInfo tableInfo) {
+    this.tableInfo = tableInfo;
+  }
 }

core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java

@@ -323,4 +323,9 @@ public boolean hasColumnDrift() {
   public String getTablePath() {
     return tablePath;
   }
+
+  public void setIdentifier(AbsoluteTableIdentifier identifier) {
+    this.identifier = identifier;
+  }
+
 }

core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RangeValueFilterExecutorImpl.java

@@ -66,6 +66,8 @@ public class RangeValueFilterExecutorImpl implements FilterExecutor {
   private boolean isRangeFullyCoverBlock;
   private boolean isNaturalSorted;
 
+  public RangeValueFilterExecutorImpl() { }
+
   public RangeValueFilterExecutorImpl(DimColumnResolvedFilterInfo dimColEvaluatorInfo,
       Expression exp, byte[][] filterRangeValues, SegmentProperties segmentProperties) {
 
@@ -732,4 +734,45 @@ public void readColumnChunks(RawBlockletColumnChunks rawBlockletColumnChunks) th
       }
     }
   }
+
+  public void setIsDimensionPresentInCurrentBlock(boolean isDimensionPresentInCurrentBlock) {
+    this.isDimensionPresentInCurrentBlock = isDimensionPresentInCurrentBlock;
+  }
+
+  public void setLessThanExp(boolean lessThanExp) {
+    this.lessThanExp = lessThanExp;
+  }
+
+  public void setGreaterThanExp(boolean greaterThanExp) {
+    this.greaterThanExp = greaterThanExp;
+  }
+
+  public void setDimColEvaluatorInfo(
+      DimColumnResolvedFilterInfo dimColEvaluatorInfo) {
+    this.dimColEvaluatorInfo = dimColEvaluatorInfo;
+  }
+
+  /**
+   * For testcase purpose
+   * @return endBlockMaxisDefaultEnd
+   */
+  public boolean isEndBlockMaxisDefaultEnd() {
+    return endBlockMaxisDefaultEnd;
+  }
+
+  /**
+   * For testcase purpose
+   * @return startBlockMinIsDefaultStart
+   */
+  public boolean isStartBlockMinIsDefaultStart() {
+    return startBlockMinIsDefaultStart;
+  }
+
+  /**
+   * For testcase purpose
+   * @return isRangeFullyCoverBlock
+   */
+  public boolean isRangeFullyCoverBlock() {
+    return isRangeFullyCoverBlock;
+  }
 }

core/src/main/java/org/apache/carbondata/core/scan/processor/RawBlockletColumnChunks.java

@@ -50,7 +50,7 @@ public class RawBlockletColumnChunks {
 
   private BitSetGroup bitSetGroup;
 
-  private RawBlockletColumnChunks() { }
+  public RawBlockletColumnChunks() { }
 
   public static RawBlockletColumnChunks newInstance(int numberOfDimensionChunk,
       int numberOfMeasureChunk, FileReader fileReader, DataRefNode dataBlock) {

core/src/test/java/org/apache/carbondata/core/cache/CarbonLRUCacheTest.java

@@ -34,11 +34,32 @@ public class CarbonLRUCacheTest {
 
   @BeforeClass public static void setUp() {
     carbonLRUCache = new CarbonLRUCache("prop1", "2");
-    cacheable = new MockUp<Cacheable>() {
-      @SuppressWarnings("unused") @Mock long getMemorySize() {
+     new MockUp<Cacheable>(Cacheable.class) {
+      @SuppressWarnings("unused")
+      @Mock
+      long getMemorySize() {
         return 15L;
       }
-    }.getMockInstance();
+
+      @SuppressWarnings("unused")
+      @Mock
+      void invalidate() {
+      }
+
+    };
+    cacheable = new Cacheable() {
+      @Override public int getAccessCount() {
+        return 0;
+      }
+
+      @Override public long getMemorySize() {
+        return 0;
+      }
+
+      @Override public void invalidate() {
+
+      }
+    };
   }
 
   @Test public void testPut() {
@@ -51,11 +72,6 @@ public class CarbonLRUCacheTest {
     assertFalse(result);
   }
 
-  @Test public void testPutWhenKeysHaveToBeRemoved() {
-    boolean result = carbonLRUCache.put("Column3", cacheable, 2097153L, 5);
-    assertTrue(result);
-  }
-
   @Test public void testRemove() {
     carbonLRUCache.remove("Column2");
     assertNull(carbonLRUCache.get("Column2"));