Skip to content

Commit

Permalink
Version 7.1.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
root authored and root committed Oct 4, 2022
1 parent 13b3431 commit c327be2
Show file tree
Hide file tree
Showing 12 changed files with 1,305 additions and 77 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Version 7.1

### Version 7.1.8.2 - 2022-10-03

#### Changed
- Reduced logging during setting of timed flush


### Version 7.1.8.1 - 2022-10-02

#### Changed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MAJOR = 7
MINOR = 1
REVISION = 8
ABI_VERSION = 1
ABI_VERSION = 2
4 changes: 2 additions & 2 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gpudb</groupId>
<artifactId>gpudb-api</artifactId>
<version>7.1.8.1</version>
<version>7.1.8.2</version>
<packaging>jar</packaging>
<name>Kinetica Java API</name>
<repositories>
Expand Down Expand Up @@ -80,7 +80,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gpudb-api.version>7.1.8.1</gpudb-api.version>
<gpudb-api.version>7.1.8.2</gpudb-api.version>
<target.build.dir>target</target.build.dir> <!-- override on cmd-line -->
</properties>
<profiles>
Expand Down
7 changes: 4 additions & 3 deletions api/src/main/java/com/gpudb/BulkInserter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -943,14 +943,15 @@ private BulkInserter(GPUdb gpudb,
// Create the scheduler only if the flush interval has been set to a valid value by the user.
// The default value is -1 to indicate that automatic flush is not called for
if( this.flushOptions.getFlushInterval() > 0 ) {
GPUdbLogger.debug("Timed flush turned on, flush interval set to <" + this.flushOptions.getFlushInterval() + ">");
timedFlushExecutorService = Executors.newSingleThreadScheduledExecutor();
timedFlushExecutorService.scheduleWithFixedDelay(new TimedFlushTask(this),
this.flushOptions.getFlushInterval(),
this.flushOptions.getFlushInterval(),
TimeUnit.SECONDS);
timedFlushExecutorServiceTerminated = false;
} else {
GPUdbLogger.debug("Timed flush turned off, flush interval set to negative value ...");
GPUdbLogger.debug("Timed flush turned off, flush interval set to negative value");
this.timedFlushExecutorService = null;
timedFlushExecutorServiceTerminated = true;
}
Expand Down Expand Up @@ -1002,9 +1003,9 @@ public void setTimedFlushOptions(FlushOptions flushOptions) throws GPUdbExceptio

//reset the state to false after restart
timedFlushExecutorServiceTerminated = timedFlushExecutorService.isTerminated();
GPUdbLogger.info(String.format("Timed flush restarted with new flush interval = %d", this.flushOptions.getFlushInterval()));
GPUdbLogger.debug("Timed flush restarted, flush interval set to <" + this.flushOptions.getFlushInterval() + ">");
} else {
GPUdbLogger.info("Timed flush turned off; flush interval set to a negative value ...");
GPUdbLogger.debug("Timed flush turned off, flush interval set to negative value");
}


Expand Down
261 changes: 244 additions & 17 deletions api/src/main/java/com/gpudb/GPUdb.java
View file

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions api/src/main/java/com/gpudb/protocol/AlterDirectoryRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* A set of parameters for {@link
* com.gpudb.GPUdb#alterDirectory(AlterDirectoryRequest)}.
* <p>
* Alters a directory in <a href="../../../../../../tools/kifs/"
* Alters an existing directory in <a href="../../../../../../tools/kifs/"
* target="_top">KiFS</a>.
*/
public class AlterDirectoryRequest implements IndexedRecord {
Expand All @@ -44,21 +44,21 @@ public static Schema getClassSchema() {


/**
* Map containing the properties of the directory to be updated. Error if
* Map containing the properties of the directory to be altered. Error if
* empty.
* <ul>
* <li> {@link
* com.gpudb.protocol.AlterDirectoryRequest.DirectoryUpdatesMap#DATA_LIMIT
* DATA_LIMIT}: The maximum capacity to apply to the created directory. Set
* to -1 to indicate no upper limit.
* DATA_LIMIT}: The maximum capacity, in bytes, to apply to the directory.
* Set to -1 to indicate no upper limit.
* </ul>
* A set of string constants for the parameter {@code directoryUpdatesMap}.
*/
public static final class DirectoryUpdatesMap {

/**
* The maximum capacity to apply to the created directory. Set to -1 to
* indicate no upper limit.
* The maximum capacity, in bytes, to apply to the directory. Set to -1
* to indicate no upper limit.
*/
public static final String DATA_LIMIT = "data_limit";

Expand All @@ -83,14 +83,14 @@ public AlterDirectoryRequest() {
* Constructs an AlterDirectoryRequest object with the specified
* parameters.
*
* @param directoryName Name of the directory in KiFS to be created.
* @param directoryName Name of the directory in KiFS to be altered.
* @param directoryUpdatesMap Map containing the properties of the
* directory to be updated. Error if empty.
* directory to be altered. Error if empty.
* <ul>
* <li> {@link
* com.gpudb.protocol.AlterDirectoryRequest.DirectoryUpdatesMap#DATA_LIMIT
* DATA_LIMIT}: The maximum capacity to apply
* to the created directory. Set to -1 to
* DATA_LIMIT}: The maximum capacity, in bytes,
* to apply to the directory. Set to -1 to
* indicate no upper limit.
* </ul>
* @param options Optional parameters.
Expand All @@ -104,7 +104,7 @@ public AlterDirectoryRequest(String directoryName, Map<String, String> directory

/**
*
* @return Name of the directory in KiFS to be created.
* @return Name of the directory in KiFS to be altered.
*
*/
public String getDirectoryName() {
Expand All @@ -113,7 +113,7 @@ public String getDirectoryName() {

/**
*
* @param directoryName Name of the directory in KiFS to be created.
* @param directoryName Name of the directory in KiFS to be altered.
*
* @return {@code this} to mimic the builder pattern.
*
Expand All @@ -125,12 +125,12 @@ public AlterDirectoryRequest setDirectoryName(String directoryName) {

/**
*
* @return Map containing the properties of the directory to be updated.
* @return Map containing the properties of the directory to be altered.
* Error if empty.
* <ul>
* <li> {@link
* com.gpudb.protocol.AlterDirectoryRequest.DirectoryUpdatesMap#DATA_LIMIT
* DATA_LIMIT}: The maximum capacity to apply to the created
* DATA_LIMIT}: The maximum capacity, in bytes, to apply to the
* directory. Set to -1 to indicate no upper limit.
* </ul>
*
Expand All @@ -142,12 +142,12 @@ public Map<String, String> getDirectoryUpdatesMap() {
/**
*
* @param directoryUpdatesMap Map containing the properties of the
* directory to be updated. Error if empty.
* directory to be altered. Error if empty.
* <ul>
* <li> {@link
* com.gpudb.protocol.AlterDirectoryRequest.DirectoryUpdatesMap#DATA_LIMIT
* DATA_LIMIT}: The maximum capacity to apply
* to the created directory. Set to -1 to
* DATA_LIMIT}: The maximum capacity, in bytes,
* to apply to the directory. Set to -1 to
* indicate no upper limit.
* </ul>
*
Expand Down
17 changes: 9 additions & 8 deletions api/src/main/java/com/gpudb/protocol/CreateDatasinkRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,9 @@ public CreateDatasinkRequest() {
*
* @param name Name of the data sink to be created.
* @param destination Destination for the output data in format
* 'destination_type://path[:port]'.
* Supported destination types are 'http', 'https' and
* 'kafka'.
* 'storage_provider_type://path[:port]'.
* Supported storage provider types are 'azure', 'gcs',
* 'hdfs', 'http', 'https', 'jdbc', 'kafka' and 's3'.
* @param options Optional parameters.
* <ul>
* <li> {@link
Expand Down Expand Up @@ -644,8 +644,9 @@ public CreateDatasinkRequest setName(String name) {
/**
*
* @return Destination for the output data in format
* 'destination_type://path[:port]'.
* Supported destination types are 'http', 'https' and 'kafka'.
* 'storage_provider_type://path[:port]'.
* Supported storage provider types are 'azure', 'gcs', 'hdfs',
* 'http', 'https', 'jdbc', 'kafka' and 's3'.
*
*/
public String getDestination() {
Expand All @@ -655,9 +656,9 @@ public String getDestination() {
/**
*
* @param destination Destination for the output data in format
* 'destination_type://path[:port]'.
* Supported destination types are 'http', 'https' and
* 'kafka'.
* 'storage_provider_type://path[:port]'.
* Supported storage provider types are 'azure', 'gcs',
* 'hdfs', 'http', 'https', 'jdbc', 'kafka' and 's3'.
*
* @return {@code this} to mimic the builder pattern.
*
Expand Down
30 changes: 15 additions & 15 deletions api/src/main/java/com/gpudb/protocol/CreateDirectoryRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ public static Schema getClassSchema() {
* empty string in this case. The user must exist.
* <li> {@link
* com.gpudb.protocol.CreateDirectoryRequest.Options#DATA_LIMIT
* DATA_LIMIT}: The maximum capacity to apply to the created directory. Set
* to -1 to indicate no upper limit. If empty, the system default limit is
* applied.
* DATA_LIMIT}: The maximum capacity, in bytes, to apply to the created
* directory. Set to -1 to indicate no upper limit. If empty, the system
* default limit is applied.
* <li> {@link
* com.gpudb.protocol.CreateDirectoryRequest.Options#NO_ERROR_IF_EXISTS
* NO_ERROR_IF_EXISTS}: If {@code true}, does not return an error if the
Expand Down Expand Up @@ -84,9 +84,9 @@ public static final class Options {
public static final String CREATE_HOME_DIRECTORY = "create_home_directory";

/**
* The maximum capacity to apply to the created directory. Set to -1 to
* indicate no upper limit. If empty, the system default limit is
* applied.
* The maximum capacity, in bytes, to apply to the created directory.
* Set to -1 to indicate no upper limit. If empty, the system default
* limit is applied.
*/
public static final String DATA_LIMIT = "data_limit";

Expand Down Expand Up @@ -137,9 +137,9 @@ public CreateDirectoryRequest() {
* case. The user must exist.
* <li> {@link
* com.gpudb.protocol.CreateDirectoryRequest.Options#DATA_LIMIT
* DATA_LIMIT}: The maximum capacity to apply to the
* created directory. Set to -1 to indicate no upper limit.
* If empty, the system default limit is applied.
* DATA_LIMIT}: The maximum capacity, in bytes, to apply to
* the created directory. Set to -1 to indicate no upper
* limit. If empty, the system default limit is applied.
* <li> {@link
* com.gpudb.protocol.CreateDirectoryRequest.Options#NO_ERROR_IF_EXISTS
* NO_ERROR_IF_EXISTS}: If {@code true}, does not return an
Expand Down Expand Up @@ -198,9 +198,9 @@ public CreateDirectoryRequest setDirectoryName(String directoryName) {
* must exist.
* <li> {@link
* com.gpudb.protocol.CreateDirectoryRequest.Options#DATA_LIMIT
* DATA_LIMIT}: The maximum capacity to apply to the created
* directory. Set to -1 to indicate no upper limit. If empty, the
* system default limit is applied.
* DATA_LIMIT}: The maximum capacity, in bytes, to apply to the
* created directory. Set to -1 to indicate no upper limit. If
* empty, the system default limit is applied.
* <li> {@link
* com.gpudb.protocol.CreateDirectoryRequest.Options#NO_ERROR_IF_EXISTS
* NO_ERROR_IF_EXISTS}: If {@code true}, does not return an error
Expand Down Expand Up @@ -234,9 +234,9 @@ public Map<String, String> getOptions() {
* case. The user must exist.
* <li> {@link
* com.gpudb.protocol.CreateDirectoryRequest.Options#DATA_LIMIT
* DATA_LIMIT}: The maximum capacity to apply to the
* created directory. Set to -1 to indicate no upper limit.
* If empty, the system default limit is applied.
* DATA_LIMIT}: The maximum capacity, in bytes, to apply to
* the created directory. Set to -1 to indicate no upper
* limit. If empty, the system default limit is applied.
* <li> {@link
* com.gpudb.protocol.CreateDirectoryRequest.Options#NO_ERROR_IF_EXISTS
* NO_ERROR_IF_EXISTS}: If {@code true}, does not return an
Expand Down
Loading

0 comments on commit c327be2

Please sign in to comment.