more test fixes

apucher · apucher · commit 1b0a2da55933 · 2022-05-16T22:30:00.000-07:00
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java
@@ -636,6 +636,9 @@ private static void closeSegmentDirectoryQuietly(SegmentDirectory segmentDirecto
   }
 
   private static PinotConfiguration toPinotConfiguration(Configuration configuration) {
+    if (configuration == null) {
+      return new PinotConfiguration();
+    }
     return new PinotConfiguration((Map<String, Object>) (Map) ConfigurationConverter.getMap(configuration));
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerAcquireSegmentTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerAcquireSegmentTest.java
@@ -22,13 +22,15 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.commons.configuration.MapConfiguration;
 import org.apache.commons.io.FileUtils;
 import org.apache.helix.HelixManager;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
@@ -117,6 +119,7 @@ private TableDataManager makeTestableManager()
       config = mock(TableDataManagerConfig.class);
       when(config.getTableName()).thenReturn(TABLE_NAME);
       when(config.getDataDir()).thenReturn(_tmpDir.getAbsolutePath());
+      when(config.getAuthConfig()).thenReturn(new MapConfiguration(new HashMap<>()));
     }
     tableDataManager.init(config, "dummyInstance", mock(ZkHelixPropertyStore.class),
         new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null, 0);

Original file line number	Diff line number	Diff line change
`@@ -636,6 +636,9 @@ private static void closeSegmentDirectoryQuietly(SegmentDirectory segmentDirecto`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`private static PinotConfiguration toPinotConfiguration(Configuration configuration) {`
	`639`	`+ if (configuration == null) {`
	`640`	`+ return new PinotConfiguration();`
	`641`	`+ }`
`639`	`642`	`return new PinotConfiguration((Map<String, Object>) (Map) ConfigurationConverter.getMap(configuration));`
`640`	`643`	`}`
`641`	`644`	`}`