You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2017/12/15 16:18:01 UTC
[03/13] asterixdb git commit: [ASTERIXDB-1564][CONF] Consistently Use
Log4j2
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/build/IndexBuilder.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/build/IndexBuilder.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/build/IndexBuilder.java
index 9f648c5..f62860a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/build/IndexBuilder.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/build/IndexBuilder.java
@@ -19,8 +19,6 @@
package org.apache.hyracks.storage.am.common.build;
import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -36,9 +34,12 @@ import org.apache.hyracks.storage.common.IResourceLifecycleManager;
import org.apache.hyracks.storage.common.IStorageManager;
import org.apache.hyracks.storage.common.LocalResource;
import org.apache.hyracks.storage.common.file.IResourceIdFactory;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class IndexBuilder implements IIndexBuilder {
- private static final Logger LOGGER = Logger.getLogger(IndexBuilder.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
protected final INCServiceContext ctx;
protected final IStorageManager storageManager;
@@ -85,7 +86,7 @@ public class IndexBuilder implements IIndexBuilder {
//The reason for this is to handle many cases such as:
//1. Crash while delete index is running (we don't do global cleanup on restart)
//2. Node leaves and then join with old data
- LOGGER.log(Level.WARNING,
+ LOGGER.log(Level.WARN,
"Removing existing index on index create for the index: " + resourceRef.getRelativePath());
lcManager.unregister(resourceRef.getRelativePath());
index.destroy();
@@ -95,7 +96,7 @@ public class IndexBuilder implements IIndexBuilder {
// This is another big problem that we need to disallow soon
// We can only disallow this if we have a global cleanup after crash
// on reboot
- LOGGER.log(Level.WARNING,
+ LOGGER.log(Level.WARN,
"Deleting " + resourceRef.getRelativePath()
+ " on index create. The index is not registered"
+ " but the file exists in the filesystem");
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
index abfe0bb..520dbc0 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
@@ -19,9 +19,6 @@
package org.apache.hyracks.storage.am.common.dataflow;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -33,10 +30,13 @@ import org.apache.hyracks.storage.common.IResource;
import org.apache.hyracks.storage.common.IResourceLifecycleManager;
import org.apache.hyracks.storage.common.IStorageManager;
import org.apache.hyracks.storage.common.LocalResource;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class IndexDataflowHelper implements IIndexDataflowHelper {
- private static final Logger LOGGER = Logger.getLogger(IndexDataflowHelper.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final INCServiceContext ctx;
private final IResourceLifecycleManager<IIndex> lcManager;
private final ILocalResourceRepository localResourceRepository;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
index ea1635a..c59c1a8 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java
@@ -27,8 +27,6 @@ import static org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDes
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.comm.IFrameWriter;
import org.apache.hyracks.api.context.IHyracksTaskContext;
@@ -36,10 +34,12 @@ import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.std.base.AbstractOperatorNodePushable;
import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class IndexDropOperatorNodePushable extends AbstractOperatorNodePushable {
- private static final Logger LOGGER = Logger.getLogger(IndexDropOperatorNodePushable.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final long DROP_ATTEMPT_WAIT_TIME_MILLIS = TimeUnit.SECONDS.toMillis(1);
private final IIndexDataflowHelper indexHelper;
private final Set<DropOption> options;
@@ -83,11 +83,11 @@ public class IndexDropOperatorNodePushable extends AbstractOperatorNodePushable
return;
} catch (HyracksDataException e) {
if (isIgnorable(e)) {
- LOGGER.log(Level.INFO, e, () -> "Ignoring exception on drop");
+ LOGGER.info("Ignoring exception on drop", e);
return;
}
if (canRetry(e)) {
- LOGGER.log(Level.INFO, e, () -> "Retrying drop on exception");
+ LOGGER.info( "Retrying drop on exception", e);
continue;
}
throw e;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
index 132149b..1e5f69b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
@@ -21,8 +21,6 @@ package org.apache.hyracks.storage.am.common.dataflow;
import java.io.DataOutput;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.comm.VSizeFrame;
import org.apache.hyracks.api.context.IHyracksTaskContext;
@@ -50,10 +48,13 @@ import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public abstract class IndexSearchOperatorNodePushable extends AbstractUnaryInputUnaryOutputOperatorNodePushable {
- static final Logger LOGGER = Logger.getLogger(IndexSearchOperatorNodePushable.class.getName());
+ static final Logger LOGGER = LogManager.getLogger();
protected final IHyracksTaskContext ctx;
protected final IIndexDataflowHelper indexHelper;
protected FrameTupleAccessor accessor;
@@ -299,7 +300,7 @@ public abstract class IndexSearchOperatorNodePushable extends AbstractUnaryInput
try {
nonMatchWriter.writeMissing(out);
} catch (Exception e) {
- LOGGER.log(Level.WARNING, e.getMessage(), e);
+ LOGGER.log(Level.WARN, e.getMessage(), e);
}
nullTuple.addFieldEndOffset();
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
index 84a2e95..7ef4a98 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
@@ -86,5 +86,9 @@
<artifactId>hyracks-util</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
index bb27236..26c7b0d 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
@@ -18,9 +18,6 @@
*/
package org.apache.hyracks.storage.am.lsm.common.impls;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter;
@@ -30,10 +27,13 @@ import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.util.ComponentUtils;
import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public abstract class AbstractLSMDiskComponent extends AbstractLSMComponent implements ILSMDiskComponent {
- private static final Logger LOGGER = Logger.getLogger(AbstractLSMDiskComponent.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final DiskComponentMetadata metadata;
@@ -129,7 +129,7 @@ public abstract class AbstractLSMDiskComponent extends AbstractLSMComponent impl
// However, we cannot throw an exception here to be compatible with legacy datasets.
// In this case, the disk component would always get a garbage Id [-1, -1], which makes the
// component Id-based optimization useless but still correct.
- LOGGER.warning("Component Id not found from disk component metadata");
+ LOGGER.warn("Component Id not found from disk component metadata");
}
return componentId;
}
@@ -144,7 +144,7 @@ public abstract class AbstractLSMDiskComponent extends AbstractLSMComponent impl
@Override
public void markAsValid(boolean persist) throws HyracksDataException {
ComponentUtils.markAsValid(getMetadataHolder(), persist);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.log(Level.INFO, "Marked as valid component with id: " + getId());
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
index dc808ad..6115ba6 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
@@ -27,8 +27,6 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.exceptions.ErrorCode;
@@ -71,9 +69,12 @@ import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
import org.apache.hyracks.util.trace.ITracer;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public abstract class AbstractLSMIndex implements ILSMIndex {
- private static final Logger LOGGER = Logger.getLogger(AbstractLSMIndex.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
protected final ILSMHarness lsmHarness;
protected final IIOManager ioManager;
protected final ILSMIOOperationScheduler ioScheduler;
@@ -694,7 +695,7 @@ public abstract class AbstractLSMIndex implements ILSMIndex {
if (opCtx.getOperation() == IndexOperation.DELETE_MEMORY_COMPONENT) {
return EmptyComponent.INSTANCE;
} else {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
FlushOperation flushOp = (FlushOperation) operation;
LOGGER.log(Level.INFO, "Flushing component with id: " + flushOp.getFlushingComponent().getId());
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
index 15cf8e5..c0bef7d 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
@@ -19,8 +19,6 @@
package org.apache.hyracks.storage.am.lsm.common.impls;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter;
@@ -31,10 +29,13 @@ import org.apache.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public abstract class AbstractLSMMemoryComponent extends AbstractLSMComponent implements ILSMMemoryComponent {
- private static final Logger LOGGER = Logger.getLogger(AbstractLSMMemoryComponent.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final IVirtualBufferCache vbc;
private final AtomicBoolean isModified;
private int writerCount;
@@ -280,7 +281,7 @@ public abstract class AbstractLSMMemoryComponent extends AbstractLSMComponent im
throw new IllegalStateException(
this + " receives illegal id. Old id " + this.componentId + ", new id " + componentId);
}
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.log(Level.INFO, "Component Id was reset from " + this.componentId + " to " + componentId);
}
this.componentId = componentId;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ComponentReplacementContext.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ComponentReplacementContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ComponentReplacementContext.java
index 98c1560..ee7afa0 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ComponentReplacementContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ComponentReplacementContext.java
@@ -21,8 +21,6 @@ package org.apache.hyracks.storage.am.lsm.common.impls;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
@@ -37,9 +35,12 @@ import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ComponentReplacementContext implements ILSMIndexOperationContext {
- private static final Logger LOGGER = Logger.getLogger(ComponentReplacementContext.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final List<ILSMComponent> components;
private final List<ILSMComponent> diskComponents;
private final List<ILSMComponentId> replacedComponentIds;
@@ -166,7 +167,7 @@ public class ComponentReplacementContext implements ILSMIndexOperationContext {
}
if (!found) {
// component has been merged?
- LOGGER.log(Level.WARNING, "Memory Component with id = " + replacedComponentIds.get(i)
+ LOGGER.log(Level.WARN, "Memory Component with id = " + replacedComponentIds.get(i)
+ " was flushed and merged before search cursor replaces it");
return false;
}
@@ -198,7 +199,7 @@ public class ComponentReplacementContext implements ILSMIndexOperationContext {
ctx.getComponentHolder().add(swapIndexes[i], diskComponents.get(i));
}
} catch (Exception e) {
- LOGGER.log(Level.WARNING, "Failure replacing memory components with disk components", e);
+ LOGGER.log(Level.WARN, "Failure replacing memory components with disk components", e);
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java
index 20f9f6a..d9d3a07 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java
@@ -19,8 +19,6 @@
package org.apache.hyracks.storage.am.lsm.common.impls;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -41,9 +39,11 @@ import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.util.trace.ITracer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ExternalIndexHarness extends LSMHarness {
- private static final Logger LOGGER = Logger.getLogger(ExternalIndexHarness.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
public ExternalIndexHarness(ILSMIndex lsmIndex, ILSMMergePolicy mergePolicy, ILSMOperationTracker opTracker,
boolean replicationEnabled) {
@@ -230,7 +230,7 @@ public class ExternalIndexHarness extends LSMHarness {
@Override
public void merge(ILSMIndexOperationContext ctx, ILSMIOOperation operation) throws HyracksDataException {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Started a merge operation for index: " + lsmIndex + " ...");
}
@@ -243,7 +243,7 @@ public class ExternalIndexHarness extends LSMHarness {
exitComponents(ctx, LSMOperationType.MERGE, newComponent, false);
operation.getCallback().afterFinalize(LSMIOOperationType.MERGE, newComponent);
}
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Finished the merge operation for index: " + lsmIndex);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index 5368591..15ed0ff 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@ -24,8 +24,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -58,9 +56,12 @@ import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.util.trace.ITracer;
import org.apache.hyracks.util.trace.ITracer.Scope;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class LSMHarness implements ILSMHarness {
- private static final Logger LOGGER = Logger.getLogger(LSMHarness.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
protected final ILSMIndex lsmIndex;
protected final ComponentReplacementContext componentReplacementCtx;
@@ -195,8 +196,8 @@ public class LSMHarness implements ILSMHarness {
}
entranceSuccessful = numEntered == components.size();
} catch (Throwable e) { // NOSONAR: Log and re-throw
- if (LOGGER.isLoggable(Level.SEVERE)) {
- LOGGER.log(Level.SEVERE, opType.name() + " failed to enter components on " + lsmIndex, e);
+ if (LOGGER.isErrorEnabled()) {
+ LOGGER.log(Level.ERROR, opType.name() + " failed to enter components on " + lsmIndex, e);
}
throw e;
} finally {
@@ -270,8 +271,8 @@ public class LSMHarness implements ILSMHarness {
ctx.setAccessingComponents(false);
exitOperation(ctx, opType, newComponent, failedOperation);
} catch (Throwable e) { // NOSONAR: Log and re-throw
- if (LOGGER.isLoggable(Level.SEVERE)) {
- LOGGER.log(Level.SEVERE, e.getMessage(), e);
+ if (LOGGER.isErrorEnabled()) {
+ LOGGER.log(Level.ERROR, e.getMessage(), e);
}
throw e;
} finally {
@@ -324,8 +325,8 @@ public class LSMHarness implements ILSMHarness {
c.deactivateAndDestroy();
}
} catch (Throwable e) { // NOSONAR Log and re-throw
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.log(Level.WARNING, "Failure scheduling replication or destroying merged component", e);
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.log(Level.WARN, "Failure scheduling replication or destroying merged component", e);
}
throw e; // NOSONAR: The last call in the finally clause
}
@@ -557,7 +558,7 @@ public class LSMHarness implements ILSMHarness {
@Override
public void flush(ILSMIndexOperationContext ctx, ILSMIOOperation operation) throws HyracksDataException {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Started a flush operation for index: " + lsmIndex + " ...");
}
try {
@@ -569,8 +570,8 @@ public class LSMHarness implements ILSMHarness {
newComponent.markAsValid(lsmIndex.isDurable());
} catch (Throwable e) { // NOSONAR Log and re-throw
failedOperation = true;
- if (LOGGER.isLoggable(Level.SEVERE)) {
- LOGGER.log(Level.SEVERE, "Flush failed on " + lsmIndex, e);
+ if (LOGGER.isErrorEnabled()) {
+ LOGGER.log(Level.ERROR, "Flush failed on " + lsmIndex, e);
}
throw e;
} finally {
@@ -586,7 +587,7 @@ public class LSMHarness implements ILSMHarness {
opTracker.completeOperation(lsmIndex, LSMOperationType.FLUSH, ctx.getSearchOperationCallback(),
ctx.getModificationCallback());
}
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Finished the flush operation for index: " + lsmIndex);
}
}
@@ -618,7 +619,7 @@ public class LSMHarness implements ILSMHarness {
@Override
public void merge(ILSMIndexOperationContext ctx, ILSMIOOperation operation) throws HyracksDataException {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Started a merge operation for index: " + lsmIndex + " ...");
}
try {
@@ -631,8 +632,8 @@ public class LSMHarness implements ILSMHarness {
newComponent.markAsValid(lsmIndex.isDurable());
} catch (Throwable e) { // NOSONAR: Log and re-throw
failedOperation = true;
- if (LOGGER.isLoggable(Level.SEVERE)) {
- LOGGER.log(Level.SEVERE, "Failed merge operation on " + lsmIndex, e);
+ if (LOGGER.isErrorEnabled()) {
+ LOGGER.log(Level.ERROR, "Failed merge operation on " + lsmIndex, e);
}
throw e;
} finally {
@@ -658,7 +659,7 @@ public class LSMHarness implements ILSMHarness {
opTracker.completeOperation(lsmIndex, LSMOperationType.MERGE, ctx.getSearchOperationCallback(),
ctx.getModificationCallback());
}
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Finished the merge operation for index: " + lsmIndex);
}
}
@@ -751,8 +752,8 @@ public class LSMHarness implements ILSMHarness {
processor.finish();
}
} catch (HyracksDataException e) {
- if (LOGGER.isLoggable(Level.SEVERE)) {
- LOGGER.log(Level.SEVERE, "Failed to process frame", e);
+ if (LOGGER.isErrorEnabled()) {
+ LOGGER.log(Level.ERROR, "Failed to process frame", e);
}
throw e;
} finally {
@@ -806,8 +807,8 @@ public class LSMHarness implements ILSMHarness {
opTracker.wait();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.log(Level.WARNING, "Ignoring interrupt while waiting for lagging merge on " + lsmIndex,
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.log(Level.WARN, "Ignoring interrupt while waiting for lagging merge on " + lsmIndex,
e);
}
}
@@ -891,7 +892,7 @@ public class LSMHarness implements ILSMHarness {
try {
opTracker.wait(); // NOSONAR: OpTracker is always synchronized here
} catch (InterruptedException e) {
- LOGGER.log(Level.WARNING, "Interrupted while attempting component level delete", e);
+ LOGGER.log(Level.WARN, "Interrupted while attempting component level delete", e);
Thread.currentThread().interrupt();
throw HyracksDataException.create(e);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java
index 1b827b7..3179790 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java
@@ -20,8 +20,6 @@ package org.apache.hyracks.storage.am.lsm.common.impls;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -31,9 +29,12 @@ import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrame;
import org.apache.hyracks.storage.am.lsm.common.api.IComponentMetadata;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class MemoryComponentMetadata implements IComponentMetadata {
- private static final Logger LOGGER = Logger.getLogger(MemoryComponentMetadata.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final byte[] empty = new byte[0];
private final List<org.apache.commons.lang3.tuple.Pair<IValueReference, ArrayBackedValueStorage>> store =
new ArrayList<>();
@@ -77,7 +78,7 @@ public class MemoryComponentMetadata implements IComponentMetadata {
LOGGER.log(Level.INFO, "Copying Metadata into a different component");
ITreeIndexMetadataFrame frame = mdpManager.createMetadataFrame();
for (Pair<IValueReference, ArrayBackedValueStorage> pair : store) {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.log(Level.INFO, "Copying " + pair.getKey() + " : " + pair.getValue().getLength() + " bytes");
}
mdpManager.put(frame, pair.getKey(), pair.getValue());
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/SynchronousScheduler.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/SynchronousScheduler.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/SynchronousScheduler.java
index da3e986..506dcea 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/SynchronousScheduler.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/SynchronousScheduler.java
@@ -18,15 +18,15 @@
*/
package org.apache.hyracks.storage.am.lsm.common.impls;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class SynchronousScheduler implements ILSMIOOperationScheduler {
- private static final Logger LOGGER = Logger.getLogger(SynchronousScheduler.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
public static final SynchronousScheduler INSTANCE = new SynchronousScheduler();
private SynchronousScheduler() {
@@ -37,7 +37,7 @@ public class SynchronousScheduler implements ILSMIOOperationScheduler {
try {
operation.call();
} catch (Exception e) {
- LOGGER.log(Level.SEVERE, "IO Operation failed", e);
+ LOGGER.log(Level.ERROR, "IO Operation failed", e);
throw HyracksDataException.create(e);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java
index 4cfc3b6..5fa6b4f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java
@@ -19,8 +19,6 @@
package org.apache.hyracks.storage.am.lsm.common.impls;
-import java.util.logging.Logger;
-
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.io.FileReference;
import org.apache.hyracks.api.io.IODeviceHandle;
@@ -29,10 +27,12 @@ import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.util.trace.ITracer;
import org.apache.hyracks.util.trace.ITracer.Scope;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
class TracedIOOperation implements ILSMIOOperation {
- static final Logger LOGGER = Logger.getLogger(TracedIOOperation.class.getName());
+ static final Logger LOGGER = LogManager.getLogger();
protected final ILSMIOOperation ioOp;
private final LSMIOOperationType ioOpType;
@@ -128,7 +128,7 @@ class ComparableTracedIOOperation extends TracedIOOperation implements Comparabl
if (myIoOp instanceof Comparable && other instanceof ComparableTracedIOOperation) {
return ((Comparable) myIoOp).compareTo(((ComparableTracedIOOperation) other).getIoOp());
}
- LOGGER.warning("Comparing ioOps of type " + myIoOp.getClass().getSimpleName() + " and "
+ LOGGER.warn("Comparing ioOps of type " + myIoOp.getClass().getSimpleName() + " and "
+ other.getClass().getSimpleName() + " in " + getClass().getSimpleName());
return Integer.signum(hashCode() - other.hashCode());
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
index 3a22793..d192351 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
@@ -25,8 +25,6 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -42,9 +40,12 @@ import org.apache.hyracks.storage.common.file.BufferedFileHandle;
import org.apache.hyracks.storage.common.file.FileMapManager;
import org.apache.hyracks.storage.common.file.IFileMapManager;
import org.apache.hyracks.util.JSONUtil;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class VirtualBufferCache implements IVirtualBufferCache {
- private static final Logger LOGGER = Logger.getLogger(VirtualBufferCache.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final ICacheMemoryAllocator allocator;
private final IFileMapManager fileMapManager;
@@ -125,7 +126,7 @@ public class VirtualBufferCache implements IVirtualBufferCache {
}
private void logStats() {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.log(Level.INFO, "Free (allocated) pages = " + freePages.size() + ". Budget = " + pageBudget
+ ". Large pages = " + largePages.get() + ". Overall usage = " + used.get());
}
@@ -187,7 +188,7 @@ public class VirtualBufferCache implements IVirtualBufferCache {
bucket.bucketLock.unlock();
}
}
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.log(Level.INFO, "Reclaimed pages = " + reclaimedPages);
}
logStats();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/ComponentUtils.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/ComponentUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/ComponentUtils.java
index 0097a37..94a3702 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/ComponentUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/ComponentUtils.java
@@ -19,8 +19,6 @@
package org.apache.hyracks.storage.am.lsm.common.util;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.api.IPointable;
@@ -34,10 +32,13 @@ import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ComponentUtils {
- private static final Logger LOGGER = Logger.getLogger(ComponentUtils.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
public static final MutableArrayValueReference MARKER_LSN_KEY = new MutableArrayValueReference("Marker".getBytes());
public static final long NOT_FOUND = -1L;
@@ -76,40 +77,40 @@ public class ComponentUtils {
* @throws HyracksDataException
*/
public static void get(ILSMIndex index, IValueReference key, IPointable pointable) throws HyracksDataException {
- boolean loggable = LOGGER.isLoggable(Level.FINE);
+ boolean loggable = LOGGER.isDebugEnabled();
if (loggable) {
- LOGGER.log(Level.FINE, "Getting " + key + " from index " + index);
+ LOGGER.log(Level.DEBUG, "Getting " + key + " from index " + index);
}
// Lock the opTracker to ensure index components don't change
synchronized (index.getOperationTracker()) {
index.getCurrentMemoryComponent().getMetadata().get(key, pointable);
if (pointable.getLength() == 0) {
if (loggable) {
- LOGGER.log(Level.FINE, key + " was not found in mutable memory component of " + index);
+ LOGGER.log(Level.DEBUG, key + " was not found in mutable memory component of " + index);
}
// was not found in the in current mutable component, search in the other in memory components
fromImmutableMemoryComponents(index, key, pointable);
if (pointable.getLength() == 0) {
if (loggable) {
- LOGGER.log(Level.FINE, key + " was not found in all immmutable memory components of " + index);
+ LOGGER.log(Level.DEBUG, key + " was not found in all immmutable memory components of " + index);
}
// was not found in the in all in memory components, search in the disk components
fromDiskComponents(index, key, pointable);
if (loggable) {
if (pointable.getLength() == 0) {
- LOGGER.log(Level.FINE, key + " was not found in all disk components of " + index);
+ LOGGER.log(Level.DEBUG, key + " was not found in all disk components of " + index);
} else {
- LOGGER.log(Level.FINE, key + " was found in disk components of " + index);
+ LOGGER.log(Level.DEBUG, key + " was found in disk components of " + index);
}
}
} else {
if (loggable) {
- LOGGER.log(Level.FINE, key + " was found in the immutable memory components of " + index);
+ LOGGER.log(Level.DEBUG, key + " was found in the immutable memory components of " + index);
}
}
} else {
if (loggable) {
- LOGGER.log(Level.FINE, key + " was found in mutable memory component of " + index);
+ LOGGER.log(Level.DEBUG, key + " was found in mutable memory component of " + index);
}
}
}
@@ -135,13 +136,13 @@ public class ComponentUtils {
private static void fromDiskComponents(ILSMIndex index, IValueReference key, IPointable pointable)
throws HyracksDataException {
- boolean loggable = LOGGER.isLoggable(Level.FINE);
+ boolean loggable = LOGGER.isDebugEnabled();
if (loggable) {
- LOGGER.log(Level.FINE, "Getting " + key + " from disk components of " + index);
+ LOGGER.log(Level.DEBUG, "Getting " + key + " from disk components of " + index);
}
for (ILSMDiskComponent c : index.getDiskComponents()) {
if (loggable) {
- LOGGER.log(Level.FINE, "Getting " + key + " from disk components " + c);
+ LOGGER.log(Level.DEBUG, "Getting " + key + " from disk components " + c);
}
c.getMetadata().get(key, pointable);
if (pointable.getLength() != 0) {
@@ -152,19 +153,20 @@ public class ComponentUtils {
}
private static void fromImmutableMemoryComponents(ILSMIndex index, IValueReference key, IPointable pointable) {
- boolean loggable = LOGGER.isLoggable(Level.FINE);
+ boolean loggable = LOGGER.isDebugEnabled();
if (loggable) {
- LOGGER.log(Level.FINE, "Getting " + key + " from immutable memory components of " + index);
+ LOGGER.log(Level.DEBUG, "Getting " + key + " from immutable memory components of " + index);
}
List<ILSMMemoryComponent> memComponents = index.getMemoryComponents();
int numOtherMemComponents = memComponents.size() - 1;
int next = index.getCurrentMemoryComponentIndex();
if (loggable) {
- LOGGER.log(Level.FINE, index + " has " + numOtherMemComponents + " immutable memory components");
+ LOGGER.log(Level.DEBUG, index + " has " + numOtherMemComponents + " immutable memory components");
}
for (int i = 0; i < numOtherMemComponents; i++) {
if (loggable) {
- LOGGER.log(Level.FINE, "trying to get " + key + " from immutable memory components number: " + (i + 1));
+ LOGGER.log(Level.DEBUG,
+ "trying to get " + key + " from immutable memory components number: " + (i + 1));
}
next = next - 1;
if (next < 0) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/IOOperationUtils.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/IOOperationUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/IOOperationUtils.java
index 0aeb0b9..9bd873d 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/IOOperationUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/IOOperationUtils.java
@@ -18,14 +18,14 @@
*/
package org.apache.hyracks.storage.am.lsm.common.util;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.impls.BlockingIOOperationCallbackWrapper;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class IOOperationUtils {
- private static final Logger LOGGER = Logger.getLogger(IOOperationUtils.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private IOOperationUtils() {
}
@@ -35,7 +35,7 @@ public class IOOperationUtils {
try {
ioCallback.waitForIO();
} catch (InterruptedException e) {
- LOGGER.log(Level.WARNING, "Operation has been interrupted. returning");
+ LOGGER.log(Level.WARN, "Operation has been interrupted. returning");
Thread.currentThread().interrupt();
throw HyracksDataException.create(e);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
index acd2e49..9998e97 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
@@ -88,5 +88,9 @@
<artifactId>hyracks-storage-am-bloomfilter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
index 030e4fd..01f0f1a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
@@ -20,8 +20,6 @@ package org.apache.hyracks.storage.am.lsm.invertedindex.impls;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
@@ -77,9 +75,12 @@ import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.MultiComparator;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
import org.apache.hyracks.util.trace.ITracer;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class LSMInvertedIndex extends AbstractLSMIndex implements IInvertedIndex {
- private static final Logger LOGGER = Logger.getLogger(LSMInvertedIndex.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
protected final IBinaryTokenizerFactory tokenizerFactory;
@@ -178,7 +179,7 @@ public class LSMInvertedIndex extends AbstractLSMIndex implements IInvertedIndex
} catch (HyracksDataException e) {
if (e.getErrorCode() != ErrorCode.DUPLICATE_KEY) {
// Key has already been deleted.
- LOGGER.log(Level.WARNING, "Failure during index delete operation", e);
+ LOGGER.log(Level.WARN, "Failure during index delete operation", e);
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
index a699075..2a40e4c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
@@ -51,5 +51,9 @@
<artifactId>hyracks-dataflow-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
index 7167565..6212896 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
@@ -36,8 +36,6 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -49,10 +47,13 @@ import org.apache.hyracks.api.replication.IIOReplicationManager;
import org.apache.hyracks.api.util.IoUtil;
import org.apache.hyracks.storage.common.file.BufferedFileHandle;
import org.apache.hyracks.storage.common.file.IFileMapManager;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
- private static final Logger LOGGER = Logger.getLogger(BufferCache.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final int MAP_FACTOR = 3;
private static final int MIN_CLEANED_COUNT_DIFF = 3;
@@ -76,7 +77,7 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
private final Queue<BufferCacheHeaderHelper> headerPageCache = new ConcurrentLinkedQueue<>();
//DEBUG
- private Level fileOpsLevel = Level.FINE;
+ private Level fileOpsLevel = Level.DEBUG;
private ArrayList<CachedPage> confiscatedPages;
private Lock confiscateLock;
private HashMap<CachedPage, StackTraceElement[]> confiscatedPagesOwner;
@@ -517,7 +518,7 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
*/
try {
Thread.sleep(PERIOD_BETWEEN_READ_ATTEMPTS);
- LOGGER.log(Level.WARNING, String.format("Failed to read page. Retrying attempt (%d/%d)", i + 1,
+ LOGGER.log(Level.WARN, String.format("Failed to read page. Retrying attempt (%d/%d)", i + 1,
MAX_PAGE_READ_ATTEMPTS), readException);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
@@ -705,7 +706,7 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
try {
write(cPage);
} catch (HyracksDataException e) {
- LOGGER.log(Level.WARNING, "Unable to write dirty page", e);
+ LOGGER.log(Level.WARN, "Unable to write dirty page", e);
cleaned = false;
}
if (cleaned) {
@@ -782,8 +783,8 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
ioManager.close(value.getFileHandle());
}
} catch (HyracksDataException e) {
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.log(Level.WARNING, "Error flushing file id: " + key, e);
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.log(Level.WARN, "Error flushing file id: " + key, e);
}
}
});
@@ -793,7 +794,7 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
@Override
public int createFile(FileReference fileRef) throws HyracksDataException {
- if (LOGGER.isLoggable(fileOpsLevel)) {
+ if (LOGGER.isEnabled(fileOpsLevel)) {
LOGGER.log(fileOpsLevel, "Creating file: " + fileRef + " in cache: " + this);
}
IoUtil.create(fileRef);
@@ -814,7 +815,7 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
@Override
public int openFile(FileReference fileRef) throws HyracksDataException {
- if (LOGGER.isLoggable(fileOpsLevel)) {
+ if (LOGGER.isEnabled(fileOpsLevel)) {
LOGGER.log(fileOpsLevel, "Opening file: " + fileRef + " in cache: " + this);
}
int fileId;
@@ -831,7 +832,7 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
@Override
public void openFile(int fileId) throws HyracksDataException {
- if (LOGGER.isLoggable(fileOpsLevel)) {
+ if (LOGGER.isEnabled(fileOpsLevel)) {
LOGGER.log(fileOpsLevel, "Opening file: " + fileId + " in cache: " + this);
}
synchronized (fileInfoMap) {
@@ -929,11 +930,11 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
@Override
public void closeFile(int fileId) throws HyracksDataException {
- if (LOGGER.isLoggable(fileOpsLevel)) {
+ if (LOGGER.isEnabled(fileOpsLevel)) {
LOGGER.log(fileOpsLevel, "Closing file: " + fileId + " in cache: " + this);
}
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine(dumpState());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(dumpState());
}
synchronized (fileInfoMap) {
@@ -945,7 +946,7 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
throw new HyracksDataException("Closed fileId: " + fileId + " more times than it was opened.");
}
}
- if (LOGGER.isLoggable(fileOpsLevel)) {
+ if (LOGGER.isEnabled(fileOpsLevel)) {
LOGGER.log(fileOpsLevel, "Closed file: " + fileId + " in cache: " + this);
}
}
@@ -980,7 +981,7 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
@Override
public void deleteFile(int fileId) throws HyracksDataException {
- if (LOGGER.isLoggable(fileOpsLevel)) {
+ if (LOGGER.isEnabled(fileOpsLevel)) {
LOGGER.log(fileOpsLevel, "Deleting file: " + fileId + " in cache: " + this);
}
synchronized (fileInfoMap) {
@@ -1306,8 +1307,8 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent {
}
}
} finally {
- if (cycleCount > PIN_ATTEMPT_CYCLES_WARNING_THRESHOLD && LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.warning("Took " + cycleCount + " cycles to find free page in buffer cache. (buffer cache "
+ if (cycleCount > PIN_ATTEMPT_CYCLES_WARNING_THRESHOLD && LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Took " + cycleCount + " cycles to find free page in buffer cache. (buffer cache "
+ "undersized?)" + (DEBUG
? " ; " + (masterPinCount.get() - startingPinCount)
+ " successful pins since start of cycle"
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java
index 872ac35..a6a3bc8 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java
@@ -22,13 +22,13 @@ import java.nio.ByteBuffer;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ClockPageReplacementStrategy implements IPageReplacementStrategy {
- private static final Logger LOGGER = Logger.getLogger(ClockPageReplacementStrategy.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final int MAX_UNSUCCESSFUL_CYCLE_COUNT = 3;
private IBufferCacheInternal bufferCache;
@@ -130,8 +130,8 @@ public class ClockPageReplacementStrategy implements IPageReplacementStrategy {
}
if (looped && clockPtr >= startClockPtr) {
cycleCount++;
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("completed " + cycleCount + "/" + MAX_UNSUCCESSFUL_CYCLE_COUNT
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("completed " + cycleCount + "/" + MAX_UNSUCCESSFUL_CYCLE_COUNT
+ " clock cycle(s) without finding victim");
}
if (cycleCount >= MAX_UNSUCCESSFUL_CYCLE_COUNT) {
@@ -219,8 +219,8 @@ public class ClockPageReplacementStrategy implements IPageReplacementStrategy {
}
} else {
// we don't have the budget to resize- proceed anyway, but log
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.warning("Exceeding buffer cache budget of " + maxAllowedNumPages + " by "
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Exceeding buffer cache budget of " + maxAllowedNumPages + " by "
+ (numPages.get() + delta - maxAllowedNumPages)
+ " pages in order to satisfy large page read");
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
index 104e943..6559308 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
@@ -104,5 +104,9 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
index fbd3950..2a7b978 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
@@ -22,8 +22,6 @@ package org.apache.hyracks.storage.am.btree;
import static org.junit.Assert.fail;
import java.util.Random;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
@@ -51,11 +49,13 @@ import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
@SuppressWarnings("rawtypes")
public abstract class OrderedIndexExamplesTest {
- protected static final Logger LOGGER = Logger.getLogger(OrderedIndexExamplesTest.class.getName());
+ protected static final Logger LOGGER = LogManager.getLogger();
protected final Random rnd = new Random(50);
protected abstract ITreeIndex createTreeIndex(ITypeTraits[] typeTraits, IBinaryComparatorFactory[] cmpFactories,
@@ -69,7 +69,7 @@ public abstract class OrderedIndexExamplesTest {
*/
@Test
public void fixedLengthKeyValueExample() throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Fixed-Length Key,Value Example.");
}
@@ -96,7 +96,7 @@ public abstract class OrderedIndexExamplesTest {
treeIndex.activate();
long start = System.currentTimeMillis();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Inserting into tree...");
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
@@ -109,7 +109,7 @@ public abstract class OrderedIndexExamplesTest {
int f0 = rnd.nextInt() % numInserts;
int f1 = 5;
TupleUtils.createIntegerTuple(tb, tuple, f0, f1);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
if (i % 1000 == 0) {
LOGGER.info("Inserting " + i + " : " + f0 + " " + f1);
}
@@ -123,7 +123,7 @@ public abstract class OrderedIndexExamplesTest {
}
}
long end = System.currentTimeMillis();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(numInserts + " inserts in " + (end - start) + "ms");
}
@@ -157,7 +157,7 @@ public abstract class OrderedIndexExamplesTest {
*/
@Test
public void pageSplitTestExample() throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("BTree page split test.");
}
@@ -232,7 +232,7 @@ public abstract class OrderedIndexExamplesTest {
*/
@Test
public void twoFixedLengthKeysOneFixedLengthValueExample() throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Composite Key Test");
}
@@ -262,7 +262,7 @@ public abstract class OrderedIndexExamplesTest {
treeIndex.activate();
long start = System.currentTimeMillis();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Inserting into tree...");
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
@@ -276,7 +276,7 @@ public abstract class OrderedIndexExamplesTest {
int f1 = rnd.nextInt() % 1000;
int f2 = 5;
TupleUtils.createIntegerTuple(tb, tuple, f0, f1, f2);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
if (i % 1000 == 0) {
LOGGER.info("Inserting " + i + " : " + f0 + " " + f1 + " " + f2);
}
@@ -290,7 +290,7 @@ public abstract class OrderedIndexExamplesTest {
}
}
long end = System.currentTimeMillis();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(numInserts + " inserts in " + (end - start) + "ms");
}
@@ -322,7 +322,7 @@ public abstract class OrderedIndexExamplesTest {
*/
@Test
public void varLenKeyValueExample() throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Variable-Length Key,Value Example");
}
@@ -349,7 +349,7 @@ public abstract class OrderedIndexExamplesTest {
treeIndex.activate();
long start = System.currentTimeMillis();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Inserting into tree...");
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
@@ -364,7 +364,7 @@ public abstract class OrderedIndexExamplesTest {
String f0 = randomString(Math.abs(rnd.nextInt()) % maxLength + 1, rnd);
String f1 = randomString(Math.abs(rnd.nextInt()) % maxLength + 1, rnd);
TupleUtils.createTuple(tb, tuple, fieldSerdes, f0, f1);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
if (i % 1000 == 0) {
LOGGER.info("Inserting[" + i + "] " + f0 + " " + f1);
}
@@ -378,7 +378,7 @@ public abstract class OrderedIndexExamplesTest {
}
}
long end = System.currentTimeMillis();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(numInserts + " inserts in " + (end - start) + "ms");
}
@@ -410,7 +410,7 @@ public abstract class OrderedIndexExamplesTest {
*/
@Test
public void deleteExample() throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Deletion Example");
}
@@ -444,7 +444,7 @@ public abstract class OrderedIndexExamplesTest {
// Max string length to be generated.
int runs = 3;
for (int run = 0; run < runs; run++) {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Deletion example run: " + (run + 1) + "/" + runs);
LOGGER.info("Inserting into tree...");
}
@@ -460,7 +460,7 @@ public abstract class OrderedIndexExamplesTest {
TupleUtils.createTuple(tb, tuple, fieldSerdes, f0, f1);
f0s[i] = f0;
f1s[i] = f1;
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
if (i % 1000 == 0) {
LOGGER.info("Inserting " + i);
}
@@ -476,13 +476,13 @@ public abstract class OrderedIndexExamplesTest {
insDoneCmp[i] = insDone;
}
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Deleting from tree...");
}
int delDone = 0;
for (int i = 0; i < ins; i++) {
TupleUtils.createTuple(tb, tuple, fieldSerdes, f0s[i], f1s[i]);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
if (i % 1000 == 0) {
LOGGER.info("Deleting " + i);
}
@@ -496,7 +496,7 @@ public abstract class OrderedIndexExamplesTest {
}
}
if (insDoneCmp[i] != delDone) {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("INCONSISTENT STATE, ERROR IN DELETION EXAMPLE.");
LOGGER.info("INSDONECMP: " + insDoneCmp[i] + " " + delDone);
}
@@ -504,7 +504,7 @@ public abstract class OrderedIndexExamplesTest {
}
}
if (insDone != delDone) {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("ERROR! INSDONE: " + insDone + " DELDONE: " + delDone);
}
break;
@@ -523,7 +523,7 @@ public abstract class OrderedIndexExamplesTest {
*/
@Test
public void updateExample() throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Update example");
}
@@ -549,7 +549,7 @@ public abstract class OrderedIndexExamplesTest {
treeIndex.create();
treeIndex.activate();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Inserting into tree...");
}
IndexAccessParameters actx =
@@ -565,7 +565,7 @@ public abstract class OrderedIndexExamplesTest {
String f1 = randomString(Math.abs(rnd.nextInt()) % maxLength + 1, rnd);
TupleUtils.createTuple(tb, tuple, fieldSerdes, f0, f1);
keys[i] = f0;
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
if (i % 1000 == 0) {
LOGGER.info("Inserting " + i);
}
@@ -583,7 +583,7 @@ public abstract class OrderedIndexExamplesTest {
int runs = 3;
for (int run = 0; run < runs; run++) {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Update test run: " + (run + 1) + "/" + runs);
LOGGER.info("Updating BTree");
}
@@ -591,7 +591,7 @@ public abstract class OrderedIndexExamplesTest {
// Generate a new random value for f1.
String f1 = randomString(Math.abs(rnd.nextInt()) % maxLength + 1, rnd);
TupleUtils.createTuple(tb, tuple, fieldSerdes, keys[i], f1);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
if (i % 1000 == 0) {
LOGGER.info("Updating " + i);
}
@@ -612,7 +612,7 @@ public abstract class OrderedIndexExamplesTest {
*/
@Test
public void bulkLoadExample() throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Bulk load example");
}
// Declare fields.
@@ -642,7 +642,7 @@ public abstract class OrderedIndexExamplesTest {
// Load sorted records.
int ins = 100000;
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Bulk loading " + ins + " tuples");
}
long start = System.currentTimeMillis();
@@ -655,7 +655,7 @@ public abstract class OrderedIndexExamplesTest {
}
bulkLoader.end();
long end = System.currentTimeMillis();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(ins + " tuples loaded in " + (end - start) + "ms");
}
@@ -688,7 +688,7 @@ public abstract class OrderedIndexExamplesTest {
*/
@Test
public void bulkOrderVerificationExample() throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Bulk load order verification example");
}
// Declare fields.
@@ -757,7 +757,7 @@ public abstract class OrderedIndexExamplesTest {
}
protected void orderedScan(IIndexAccessor indexAccessor, ISerializerDeserializer[] fieldSerdes) throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Ordered Scan:");
}
IIndexCursor scanCursor = indexAccessor.createSearchCursor(false);
@@ -768,7 +768,7 @@ public abstract class OrderedIndexExamplesTest {
scanCursor.next();
ITupleReference frameTuple = scanCursor.getTuple();
String rec = TupleUtils.printTuple(frameTuple, fieldSerdes);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(rec);
}
}
@@ -779,7 +779,7 @@ public abstract class OrderedIndexExamplesTest {
protected void diskOrderScan(IIndexAccessor indexAccessor, ISerializerDeserializer[] fieldSerdes) throws Exception {
try {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Disk-Order Scan:");
}
ITreeIndexAccessor treeIndexAccessor = (ITreeIndexAccessor) indexAccessor;
@@ -791,7 +791,7 @@ public abstract class OrderedIndexExamplesTest {
diskOrderCursor.next();
ITupleReference frameTuple = diskOrderCursor.getTuple();
String rec = TupleUtils.printTuple(frameTuple, fieldSerdes);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(rec);
}
}
@@ -801,13 +801,13 @@ public abstract class OrderedIndexExamplesTest {
} catch (UnsupportedOperationException e) {
// Ignore exception because some indexes, e.g. the LSMBTree, don't
// support disk-order scan.
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Ignoring disk-order scan since it's not supported.");
}
} catch (ClassCastException e) {
// Ignore exception because IIndexAccessor sometimes isn't
// an ITreeIndexAccessor, e.g., for the LSMBTree.
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Ignoring disk-order scan since it's not supported.");
}
}
@@ -816,7 +816,7 @@ public abstract class OrderedIndexExamplesTest {
protected void rangeSearch(IBinaryComparatorFactory[] cmpFactories, IIndexAccessor indexAccessor,
ISerializerDeserializer[] fieldSerdes, ITupleReference lowKey, ITupleReference highKey,
ITupleReference minFilterTuple, ITupleReference maxFilterTuple) throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
String lowKeyString = TupleUtils.printTuple(lowKey, fieldSerdes);
String highKeyString = TupleUtils.printTuple(highKey, fieldSerdes);
LOGGER.info("Range-Search in: [ " + lowKeyString + ", " + highKeyString + "]");
@@ -837,7 +837,7 @@ public abstract class OrderedIndexExamplesTest {
rangeCursor.next();
ITupleReference frameTuple = rangeCursor.getTuple();
String rec = TupleUtils.printTuple(frameTuple, fieldSerdes);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(rec);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexMultiThreadTest.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexMultiThreadTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexMultiThreadTest.java
index d73439d..90c64cb 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexMultiThreadTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexMultiThreadTest.java
@@ -20,8 +20,6 @@
package org.apache.hyracks.storage.am.btree;
import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
@@ -35,12 +33,14 @@ import org.apache.hyracks.storage.am.common.IndexMultiThreadTestDriver;
import org.apache.hyracks.storage.am.common.TestWorkloadConf;
import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig;
import org.apache.hyracks.storage.common.IIndex;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
@SuppressWarnings("rawtypes")
public abstract class OrderedIndexMultiThreadTest {
- protected final Logger LOGGER = Logger.getLogger(OrderedIndexMultiThreadTest.class.getName());
+ protected final Logger LOGGER = LogManager.getLogger();
// Machine-specific number of threads to use for testing.
protected final int REGULAR_NUM_THREADS = Runtime.getRuntime().availableProcessors();
@@ -67,7 +67,7 @@ public abstract class OrderedIndexMultiThreadTest {
String dataMsg) throws InterruptedException, HyracksDataException {
setUp();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
String indexTypeName = getIndexTypeName();
LOGGER.info(indexTypeName + " MultiThread Test:\nData: " + dataMsg + "; Threads: " + numThreads
+ "; Workload: " + conf.toString() + ".");
@@ -94,7 +94,7 @@ public abstract class OrderedIndexMultiThreadTest {
index.validate();
driver.deinit();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("BTree MultiThread Test Time: " + times[0] + "ms");
}