Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TEIID-5574 working towards better property names #1112

Merged
merged 2 commits into from Dec 20, 2018
Merged

TEIID-5574 working towards better property names #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0f2cd1
TEIID-5574 updating the cli / xml buffer configuration
shawkins Dec 19, 2018
faa6203
TEIID-5574 adding full backwards compatibility
shawkins Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 32 additions & 0 deletions admin/src/main/java/org/teiid/adminapi/EngineStatisticsBean.java
View file
Open in desktop
Expand Up @@ -29,15 +29,31 @@ public interface EngineStatisticsBean {
/**
* Total amount memory used by buffer manager for active queries and cached queries
* @return
* @see #getBufferHeapInUseKb()
*/
@Deprecated
long getTotalMemoryUsedInKB();

/**
* Heap memory estimate in use by buffer manager
* @return
*/
long getBufferHeapInUseKb();

/**
* Total memory used by buffer manager for active plans
* @return
* @see #getBufferHeapReservedByActivePlansKb()
*/
@Deprecated
long getMemoryUsedByActivePlansInKB();

/**
* Total processing memory reserved by active plans
* @return
*/
long getBufferHeapReservedByActivePlansKb();

/**
* Number of writes to disk by buffer manager to save the overflow from memory
* @return
Expand All @@ -53,15 +69,31 @@ public interface EngineStatisticsBean {
/**
* Total number of cache reads, includes disk and soft-cache references
* @return
* @see #getStorageReadCount();
*/
@Deprecated
long getCacheReadCount();

/**
* Total number of storage reads from the layer below the heap
* @return
*/
long getStorageReadCount();

/**
* Total number of cache writes, includes disk and soft-cache references
* @return
* @see #getStorageReadCount()
*/
@Deprecated
long getCacheWriteCount();

/**
* Total number of storage writes to the layer below the heap
* @return
*/
long getStorageWriteCount();

/**
* Disk space used by buffer manager to save overflowed memory contents
* @return
Expand Down
20 changes: 20 additions & 0 deletions admin/src/main/java/org/teiid/adminapi/impl/EngineStatisticsMetadata.java
View file
Open in desktop
Expand Up @@ -149,4 +149,24 @@ public String toString() {
sb.append("; maxWaitPlanCount ").append(maxWaitPlanCount); //$NON-NLS-1$
return sb.toString();
}

@Override
public long getBufferHeapInUseKb() {
return totalMemoryUsedInKB;
}

@Override
public long getBufferHeapReservedByActivePlansKb() {
return memoryUsedByActivePlansInKB;
}

@Override
public long getStorageReadCount() {
return cacheReadCount;
}

@Override
public long getStorageWriteCount() {
return cacheWriteCount;
}
}
27 changes: 27 additions & 0 deletions jboss-integration/src/main/java/org/teiid/jboss/Element.java
View file
Open in desktop
Expand Up @@ -51,20 +51,47 @@ enum Element {
PREPARSER_MODULE_ELEMENT("preparser-module", "preparser-module"),

// buffer manager
@Deprecated
BUFFER_SERVICE_ELEMENT("buffer-service"),
@Deprecated
USE_DISK_ATTRIBUTE("use-disk", "buffer-service-use-disk"),
@Deprecated
PROCESSOR_BATCH_SIZE_ATTRIBUTE("processor-batch-size", "buffer-service-processor-batch-size"),
@Deprecated
MAX_PROCESSING_KB_ATTRIBUTE("max-processing-kb", "buffer-service-max-processing-kb"),
@Deprecated
MAX_RESERVED_KB_ATTRIBUTE("max-reserve-kb", "buffer-service-max-reserve-kb"),
@Deprecated
MAX_FILE_SIZE_ATTRIBUTE("max-file-size", "buffer-service-max-file-size"),
@Deprecated
MAX_BUFFER_SPACE_ATTRIBUTE("max-buffer-space", "buffer-service-max-buffer-space"),
@Deprecated
MAX_OPEN_FILES_ATTRIBUTE("max-open-files", "buffer-service-max-open-files"),
@Deprecated
MEMORY_BUFFER_SPACE_ATTRIBUTE("memory-buffer-space", "buffer-service-memory-buffer-space"),
@Deprecated
MEMORY_BUFFER_OFFHEAP_ATTRIBUTE("memory-buffer-off-heap", "buffer-service-memory-buffer-off-heap"),
@Deprecated
MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE("max-storage-object-size", "buffer-service-max-storage-object-size"),
@Deprecated
INLINE_LOBS("inline-lobs", "buffer-service-inline-lobs"),
@Deprecated
ENCRYPT_FILES_ATTRIBUTE("encrypt-files", "buffer-service-encrypt-files"),

BUFFER_MANAGER_ELEMENT("buffer-manager"),
BUFFER_MANAGER_PROCESSOR_BATCH_SIZE_ATTRIBUTE("processor-batch-size", "buffer-manager-processor-batch-size"),
BUFFER_MANAGER_INLINE_LOBS("inline-lobs", "buffer-manager-inline-lobs"),
BUFFER_MANAGER_MAX_PROCESSING_KB_ATTRIBUTE("heap-max-processing-kb", "buffer-manager-heap-max-processing-kb"),
BUFFER_MANAGER_MAX_RESERVED_MB_ATTRIBUTE("heap-max-reserve-mb", "buffer-manager-heap-max-reserve-mb"),
BUFFER_MANAGER_USE_DISK_ATTRIBUTE("storage-enabled", "buffer-manager-storage-enabled"),
BUFFER_MANAGER_MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE("storage-max-object-size-kb", "buffer-manager-storage-max-object-size-kb"),
BUFFER_MANAGER_MEMORY_BUFFER_SPACE_ATTRIBUTE("fixed-memory-space-mb", "buffer-manager-fixed-memory-space-mb"),
BUFFER_MANAGER_MEMORY_BUFFER_OFFHEAP_ATTRIBUTE("fixed-memory-off-heap", "buffer-manager-fixed-memory-off-heap"),
BUFFER_MANAGER_MAX_FILE_SIZE_ATTRIBUTE("disk-max-file-size-mb", "buffer-manager-disk-max-file-size-mb"),
BUFFER_MANAGER_MAX_BUFFER_SPACE_ATTRIBUTE("disk-max-space-mb", "buffer-manager-disk-max-space-mb"),
BUFFER_MANAGER_MAX_OPEN_FILES_ATTRIBUTE("disk-max-open-files", "buffer-manager-disk-max-open-files"),
BUFFER_MANAGER_ENCRYPT_FILES_ATTRIBUTE("disk-encrypt-files", "buffer-manager-disk-encrypt-files"),

//prepared-plan-cache-config
PREPAREDPLAN_CACHE_ELEMENT("preparedplan-cache"),
PPC_ENABLE_ATTRIBUTE("enable", "preparedplan-cache-enable"),
Expand Down
5 changes: 3 additions & 2 deletions jboss-integration/src/main/java/org/teiid/jboss/Namespace.java
View file
Open in desktop
Expand Up @@ -24,12 +24,13 @@
enum Namespace {
// must be first
UNKNOWN(null),
TEIID_1_1("urn:jboss:domain:teiid:1.1"); //$NON-NLS-1$
TEIID_1_1("urn:jboss:domain:teiid:1.1"), //$NON-NLS-1$
TEIID_1_2("urn:jboss:domain:teiid:1.2"); //$NON-NLS-1$

/**
* The current namespace version.
*/
public static final Namespace CURRENT = TEIID_1_1;
public static final Namespace CURRENT = TEIID_1_2;

private final String uri;

Expand Down
136 changes: 87 additions & 49 deletions jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
View file
Open in desktop
Expand Up @@ -145,20 +145,34 @@ class TeiidAdd extends AbstractAddStepHandler {

// object replicator
TeiidConstants.DC_STACK_ATTRIBUTE,

// Buffer Service
TeiidConstants.USE_DISK_ATTRIBUTE,
TeiidConstants.INLINE_LOBS,
TeiidConstants.PROCESSOR_BATCH_SIZE_ATTRIBUTE,
TeiidConstants.MAX_PROCESSING_KB_ATTRIBUTE,
TeiidConstants.MAX_RESERVED_KB_ATTRIBUTE,
TeiidConstants.MAX_FILE_SIZE_ATTRIBUTE,
TeiidConstants.MAX_BUFFER_SPACE_ATTRIBUTE,
TeiidConstants.MAX_OPEN_FILES_ATTRIBUTE,
TeiidConstants.MEMORY_BUFFER_SPACE_ATTRIBUTE,
TeiidConstants.MEMORY_BUFFER_OFFHEAP_ATTRIBUTE,
TeiidConstants.MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE,
TeiidConstants.ENCRYPT_FILES_ATTRIBUTE,
TeiidConstants.USE_DISK_ATTRIBUTE,
TeiidConstants.INLINE_LOBS,
TeiidConstants.PROCESSOR_BATCH_SIZE_ATTRIBUTE,
TeiidConstants.MAX_PROCESSING_KB_ATTRIBUTE,
TeiidConstants.MAX_RESERVED_KB_ATTRIBUTE,
TeiidConstants.MAX_FILE_SIZE_ATTRIBUTE,
TeiidConstants.MAX_BUFFER_SPACE_ATTRIBUTE,
TeiidConstants.MAX_OPEN_FILES_ATTRIBUTE,
TeiidConstants.MEMORY_BUFFER_SPACE_ATTRIBUTE,
TeiidConstants.MEMORY_BUFFER_OFFHEAP_ATTRIBUTE,
TeiidConstants.MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE,
TeiidConstants.ENCRYPT_FILES_ATTRIBUTE,

// Buffer Manager
TeiidConstants.BUFFER_MANAGER_USE_DISK_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_INLINE_LOBS,
TeiidConstants.BUFFER_MANAGER_PROCESSOR_BATCH_SIZE_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_MAX_PROCESSING_KB_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_MAX_RESERVED_MB_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_MAX_FILE_SIZE_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_MAX_BUFFER_SPACE_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_MAX_OPEN_FILES_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_MEMORY_BUFFER_SPACE_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_MEMORY_BUFFER_OFFHEAP_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE,
TeiidConstants.BUFFER_MANAGER_ENCRYPT_FILES_ATTRIBUTE,

// prepared plan cache
TeiidConstants.PPC_NAME_ATTRIBUTE,
Expand Down Expand Up @@ -696,42 +710,66 @@ private BufferManagerService buildBufferManager(final OperationContext context,
return bufferManger;
}

if (isDefined(USE_DISK_ATTRIBUTE, node, context)) {
bufferManger.setUseDisk(asBoolean(USE_DISK_ATTRIBUTE, node, context));
}
if (isDefined(PROCESSOR_BATCH_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setProcessorBatchSize(asInt(PROCESSOR_BATCH_SIZE_ATTRIBUTE, node, context));
}
if (isDefined(MAX_PROCESSING_KB_ATTRIBUTE, node, context)) {
bufferManger.setMaxProcessingKb(asInt(MAX_PROCESSING_KB_ATTRIBUTE, node, context));
}
if (isDefined(MAX_RESERVED_KB_ATTRIBUTE, node, context)) {
bufferManger.setMaxReserveKb(asInt(MAX_RESERVED_KB_ATTRIBUTE, node, context));
}
if (isDefined(MAX_FILE_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setMaxFileSize(asLong(MAX_FILE_SIZE_ATTRIBUTE, node, context));
}
if (isDefined(MAX_BUFFER_SPACE_ATTRIBUTE, node, context)) {
bufferManger.setMaxBufferSpace(asLong(MAX_BUFFER_SPACE_ATTRIBUTE, node, context));
}
if (isDefined(MAX_OPEN_FILES_ATTRIBUTE, node, context)) {
bufferManger.setMaxOpenFiles(asInt(MAX_OPEN_FILES_ATTRIBUTE, node, context));
}
if (isDefined(MEMORY_BUFFER_SPACE_ATTRIBUTE, node, context)) {
bufferManger.setMemoryBufferSpace(asInt(MEMORY_BUFFER_SPACE_ATTRIBUTE, node, context));
}
if (isDefined(MEMORY_BUFFER_OFFHEAP_ATTRIBUTE, node, context)) {
bufferManger.setMemoryBufferOffHeap(asBoolean(MEMORY_BUFFER_OFFHEAP_ATTRIBUTE, node, context));
}
if (isDefined(MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setMaxStorageObjectSize(asInt(MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE, node, context));
}
if (isDefined(INLINE_LOBS, node, context)) {
bufferManger.setInlineLobs(asBoolean(INLINE_LOBS, node, context));
}
if (isDefined(ENCRYPT_FILES_ATTRIBUTE, node, context)) {
bufferManger.setEncryptFiles(asBoolean(ENCRYPT_FILES_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_USE_DISK_ATTRIBUTE, node, context)) {
bufferManger.setUseDisk(asBoolean(BUFFER_MANAGER_USE_DISK_ATTRIBUTE, node, context));
} else if (isDefined(USE_DISK_ATTRIBUTE, node, context)) {
bufferManger.setUseDisk(asBoolean(USE_DISK_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_PROCESSOR_BATCH_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setProcessorBatchSize(asInt(BUFFER_MANAGER_PROCESSOR_BATCH_SIZE_ATTRIBUTE, node, context));
} else if (isDefined(PROCESSOR_BATCH_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setProcessorBatchSize(asInt(PROCESSOR_BATCH_SIZE_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_MAX_PROCESSING_KB_ATTRIBUTE, node, context)) {
bufferManger.setMaxProcessingKb(asInt(BUFFER_MANAGER_MAX_PROCESSING_KB_ATTRIBUTE, node, context));
} else if (isDefined(MAX_PROCESSING_KB_ATTRIBUTE, node, context)) {
bufferManger.setMaxProcessingKb(asInt(MAX_PROCESSING_KB_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_MAX_RESERVED_MB_ATTRIBUTE, node, context)) {
bufferManger.setMaxReservedHeapMb(asInt(BUFFER_MANAGER_MAX_RESERVED_MB_ATTRIBUTE, node, context));
} else if (isDefined(MAX_RESERVED_KB_ATTRIBUTE, node, context)) {
bufferManger.setMaxReserveKb(asInt(MAX_RESERVED_KB_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_MAX_FILE_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setMaxFileSize(asLong(BUFFER_MANAGER_MAX_FILE_SIZE_ATTRIBUTE, node, context));
} else if (isDefined(MAX_FILE_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setMaxFileSize(asLong(MAX_FILE_SIZE_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_MAX_BUFFER_SPACE_ATTRIBUTE, node, context)) {
bufferManger.setMaxDiskBufferSpaceMb(asLong(BUFFER_MANAGER_MAX_BUFFER_SPACE_ATTRIBUTE, node, context));
} else if (isDefined(MAX_BUFFER_SPACE_ATTRIBUTE, node, context)) {
bufferManger.setMaxDiskBufferSpaceMb(asLong(MAX_BUFFER_SPACE_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_MAX_OPEN_FILES_ATTRIBUTE, node, context)) {
bufferManger.setMaxOpenFiles(asInt(BUFFER_MANAGER_MAX_OPEN_FILES_ATTRIBUTE, node, context));
} else if (isDefined(MAX_OPEN_FILES_ATTRIBUTE, node, context)) {
bufferManger.setMaxOpenFiles(asInt(MAX_OPEN_FILES_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_MEMORY_BUFFER_SPACE_ATTRIBUTE, node, context)) {
bufferManger.setFixedMemoryBufferSpaceMb(asInt(BUFFER_MANAGER_MEMORY_BUFFER_SPACE_ATTRIBUTE, node, context));
} else if (isDefined(MEMORY_BUFFER_SPACE_ATTRIBUTE, node, context)) {
bufferManger.setFixedMemoryBufferSpaceMb(asInt(MEMORY_BUFFER_SPACE_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_MEMORY_BUFFER_OFFHEAP_ATTRIBUTE, node, context)) {
bufferManger.setFixedMemoryBufferOffHeap(asBoolean(BUFFER_MANAGER_MEMORY_BUFFER_OFFHEAP_ATTRIBUTE, node, context));
} else if (isDefined(MEMORY_BUFFER_OFFHEAP_ATTRIBUTE, node, context)) {
bufferManger.setFixedMemoryBufferOffHeap(asBoolean(MEMORY_BUFFER_OFFHEAP_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setMaxStorageObjectSizeKb(asInt(BUFFER_MANAGER_MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE, node, context));
} else if (isDefined(MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE, node, context)) {
bufferManger.setMaxStorageObjectSize(asInt(MAX_STORAGE_OBJECT_SIZE_ATTRIBUTE, node, context));
}
if (isDefined(BUFFER_MANAGER_INLINE_LOBS, node, context)) {
bufferManger.setInlineLobs(asBoolean(BUFFER_MANAGER_INLINE_LOBS, node, context));
} else if (isDefined(INLINE_LOBS, node, context)) {
bufferManger.setInlineLobs(asBoolean(INLINE_LOBS, node, context));
}
if (isDefined(BUFFER_MANAGER_ENCRYPT_FILES_ATTRIBUTE, node, context)) {
bufferManger.setEncryptFiles(asBoolean(BUFFER_MANAGER_ENCRYPT_FILES_ATTRIBUTE, node, context));
} else if (isDefined(ENCRYPT_FILES_ATTRIBUTE, node, context)) {
bufferManger.setEncryptFiles(asBoolean(ENCRYPT_FILES_ATTRIBUTE, node, context));
}
return bufferManger;
}

Expand Down