Skip to content

Commit ece172a

Browse files
BaunsgaardBaunsgaard
committed
[MINOR] Fix CompressionSettings static boolean
1 parent 1aca039 commit ece172a

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

‎src/main/java/org/apache/sysds/runtime/compress/CompressionSettings.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ public class CompressionSettings {
128128
/** The sorting type used in sorting/joining offsets to create SDC groups */
129129
public final SORT_TYPE sdcSortType;
130130

131-
private static boolean printedStatus = false;
131+
/** if the settings have been logged already. */
132+
public static boolean printedStatus = false;
132133

133134
protected CompressionSettings(double samplingRatio, double samplePower, boolean allowSharedDictionary,
134135
String transposeInput, int seed, boolean lossy, EnumSet<CompressionType> validCompressions,

‎src/test/java/org/apache/sysds/test/component/compress/CompressedLoggingTests.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void compressedLoggingTest_Trace() {
4747
final TestAppender appender = LoggingUtils.overwrite();
4848

4949
try {
50+
CompressionSettings.printedStatus = false;
5051
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.TRACE);
5152
MatrixBlock mb = TestUtils.generateTestMatrixBlock(1000, 5, 1, 1, 0.5, 235);
5253
MatrixBlock m2 = CompressedMatrixBlockFactory.compress(mb).getLeft();
@@ -73,6 +74,7 @@ public void compressedLoggingTest_WorkloadCost() {
7374
final TestAppender appender = LoggingUtils.overwrite();
7475

7576
try {
77+
CompressionSettings.printedStatus = false;
7678
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
7779
MatrixBlock mb = TestUtils.generateTestMatrixBlock(1000, 5, 1, 1, 0.5, 235);
7880
InstructionTypeCounter inst = new InstructionTypeCounter(10, 0, 0, 0, 0, 0, 0, 0, false);
@@ -101,6 +103,7 @@ public void compressedLoggingTest_ManyColumns() {
101103
final TestAppender appender = LoggingUtils.overwrite();
102104

103105
try {
106+
CompressionSettings.printedStatus = false;
104107
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
105108
MatrixBlock mb = TestUtils.generateTestMatrixBlock(2000, 1001, 1, 65, 0.5, 235);
106109
mb = TestUtils.round(mb);
@@ -129,6 +132,7 @@ public void compressedLoggingTest_failedCompression() {
129132
final TestAppender appender = LoggingUtils.overwrite();
130133

131134
try {
135+
CompressionSettings.printedStatus = false;
132136
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
133137

134138
MatrixBlock mb = TestUtils.generateTestMatrixBlock(5, 5, 0.2, 1, 0.5, 235);
@@ -156,6 +160,7 @@ public void compressedLoggingTest_failedCompression_afterCocode() {
156160
final TestAppender appender = LoggingUtils.overwrite();
157161

158162
try {
163+
CompressionSettings.printedStatus = false;
159164
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
160165

161166
MatrixBlock mb = TestUtils.generateTestMatrixBlock(10, 50, 1, 1, 0.5, 235);
@@ -183,6 +188,7 @@ public void compressedLoggingTest_WorkloadCostFail() {
183188
final TestAppender appender = LoggingUtils.overwrite();
184189

185190
try {
191+
CompressionSettings.printedStatus = false;
186192
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
187193
MatrixBlock mb = TestUtils.generateTestMatrixBlock(10, 50, 1, 1, 0.5, 235);
188194
InstructionTypeCounter inst = new InstructionTypeCounter(10, 0, 0, 0, 0, 0, 0, 0, false);
@@ -210,6 +216,7 @@ public void compressedLoggingTest_WorkloadCostFail_2() {
210216
final TestAppender appender = LoggingUtils.overwrite();
211217

212218
try {
219+
CompressionSettings.printedStatus = false;
213220
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
214221
MatrixBlock mb = TestUtils.generateTestMatrixBlock(10, 50, 1, 1, 0.5, 235);
215222
InstructionTypeCounter inst = new InstructionTypeCounter(0, 10, 0, 0, 0, 0, 0, 0, true);
@@ -237,6 +244,7 @@ public void compressedLoggingTest_SparkSettings() {
237244
final TestAppender appender = LoggingUtils.overwrite();
238245

239246
try {
247+
CompressionSettings.printedStatus = false;
240248
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
241249
MatrixBlock mb = TestUtils.generateTestMatrixBlock(100, 2, 1, 1, 0.5, 235);
242250
CompressionSettingsBuilder sb = new CompressionSettingsBuilder();
@@ -265,6 +273,7 @@ public void compressedLoggingTest_TraceBigGroup() {
265273
final TestAppender appender = LoggingUtils.overwrite();
266274

267275
try {
276+
CompressionSettings.printedStatus = false;
268277
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.TRACE);
269278
MatrixBlock mb = TestUtils.generateTestMatrixBlock(10000, 1, 1, 128, 0.5, 235);
270279
mb = TestUtils.round(mb);
@@ -292,6 +301,7 @@ public void compressedLoggingTest_TraceBigGroupConst() {
292301
final TestAppender appender = LoggingUtils.overwrite();
293302

294303
try {
304+
CompressionSettings.printedStatus = false;
295305
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.TRACE);
296306
MatrixBlock mb = TestUtils.generateTestMatrixBlock(10, 1000, 1, 1, 1.0, 235);
297307
mb = TestUtils.round(mb);
@@ -319,6 +329,7 @@ public void compressedLoggingTestEmpty() {
319329
final TestAppender appender = LoggingUtils.overwrite();
320330

321331
try {
332+
CompressionSettings.printedStatus = false;
322333
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.TRACE);
323334
MatrixBlock mb = TestUtils.generateTestMatrixBlock(10, 1000, 1, 1, 0.0, 235);
324335
mb = TestUtils.round(mb);
@@ -346,6 +357,7 @@ public void compressedLoggingTest_recompress() {
346357
TestAppender appender = null;
347358

348359
try {
360+
CompressionSettings.printedStatus = false;
349361
appender = LoggingUtils.overwrite();
350362
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
351363
MatrixBlock mb = TestUtils.generateTestMatrixBlock(100, 3, 1, 1, 0.5, 235);
@@ -375,6 +387,7 @@ public void compressedLoggingTest_AbortEnd() {
375387
final TestAppender appender = LoggingUtils.overwrite();
376388

377389
try {
390+
CompressionSettings.printedStatus = false;
378391
Logger.getLogger(CompressedMatrixBlockFactory.class).setLevel(Level.DEBUG);
379392
MatrixBlock mb = TestUtils.generateTestMatrixBlock(400, 600, 1, 1024, 0.18, 235);
380393
mb = TestUtils.round(mb);
@@ -406,6 +419,7 @@ public void compressionSettings() {
406419
final TestAppender appender = LoggingUtils.overwrite();
407420

408421
try {
422+
CompressionSettings.printedStatus = false;
409423
Logger.getLogger(CompressionSettings.class).setLevel(Level.DEBUG);
410424
new CompressionSettingsBuilder().create();
411425
final List<LoggingEvent> log = LoggingUtils.reinsert(appender);
@@ -430,6 +444,8 @@ public void compressionSettingsEstimationType() {
430444
final TestAppender appender = LoggingUtils.overwrite();
431445

432446
try {
447+
CompressionSettings.printedStatus = false;
448+
433449
Logger.getLogger(CompressionSettings.class).setLevel(Level.DEBUG);
434450
new CompressionSettingsBuilder().setSamplingRatio(0.1).create();
435451
final List<LoggingEvent> log = LoggingUtils.reinsert(appender);

0 commit comments

Comments
 (0)