Skip to content

Commit

Permalink
update for V4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
knonomura committed May 25, 2018
1 parent 68f5022 commit 547c509
Show file tree
Hide file tree
Showing 66 changed files with 9,933 additions and 3,037 deletions.
45 changes: 43 additions & 2 deletions java_client/src/com/toshiba/mwcloud/gs/Collection.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,55 @@
public interface Collection<K, R> extends Container<K, R> {

/**
* Not supported
* Creates a query to obtain a set of Rows which are matched to specified
* geometry range conditions.
*
* <p>When obtaining a set of Rows using {@link Query#fetch(boolean)}, the
* option of locking for update can be enabled.</p>
*
* <p>{@link GSException} will not be thrown in the current version.
* If there is an error such as column names, exception will be thrown when
* fetching the obtained query.</p>
*
* <p>In the current version, {@link NullPointerException} will not be dispatched
* when {@link GSException} and {@code null} cannot be specified as {@code null}.
* If there is an error in the column name, etc., an exception is thrown when
* the obtained query is fetched. </p>
*
* @param column A name of the geometry type column to be compared. {@code null} cannot be specified
* @param geometry Geometry structure to be compared. {@code null} cannot be specified
* @param geometryOp Comparison method. {@code null} cannot be specified
*
* @throws GSException It will not be thrown in the current version.
*/
public Query<R> query(
String column, Geometry geometry, GeometryOperator geometryOp)
throws GSException;

/**
* Not supported
* Creates a query to obtain a set of Rows which are matched to specified
* geometry range conditions with exclusion range.
*
* <p>Obtains a set of Rows which has the column values that intersect with
* {@code geometryIntersection} and do not intersect with
* {@code geometryDisjoint}. Conditions of the intersection determination is
* the same as the {@link GeometryOperator#INTERSECT}.
*
* <p>When obtaining a set of Rows using {@link Query#fetch(boolean)}, the
* option of locking for update can be enabled.</p>
*
* <p>In the current version, {@link NullPointerException} will not be dispatched
* when {@link GSException} and {@code null} cannot be specified as {@code null}.
* If there is an error in the column name, etc., an exception is thrown when
* the obtained query is fetched. </p>
*
* @param column A name of the geometry type column to be compared. {@code null} cannot be specified
* @param geometryIntersection Geometry structure indicating a range that
* intersects with the value on the column. {@code null} cannot be specified
* @param geometryDisjoint Geometry structure indicating a range that does
* not intersect with the values on the column. {@code null} cannot be specified
*
* @throws GSException It will not be thrown in the current version.
*/
public Query<R> query(
String column, Geometry geometryIntersection, Geometry geometryDisjoint)
Expand Down
34 changes: 34 additions & 0 deletions java_client/src/com/toshiba/mwcloud/gs/ColumnInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public class ColumnInfo {

private final GSType type;

private final Boolean nullable;

private final Set<IndexType> indexTypes;

/**
Expand All @@ -55,8 +57,29 @@ public ColumnInfo(String name, GSType type) {
* No index type is set if it is an empty set.
*/
public ColumnInfo(String name, GSType type, Set<IndexType> indexTypes) {
this(name, type, null, indexTypes);
}

/**
* Create column information by specifying the column name, type,
* NOT NULL constraint state, and index type set.
*
* <p>If a set of not empty index types is specified, the contents are duplicated. </p>
*
* @param name column name. Not set when {@code null} is specified.
* @param type column type. Not set when {@code null} is specified.
* @param nullable {@code true} if NOT NULL constraint is not set, {@code false} is set.
* Not set when {@code null} is specified.
* @param indexTypes A set of index types. Not set when {@code null} is specified.
* When empty, the index is considered as not set.
*
*/
public ColumnInfo(
String name, GSType type, Boolean nullable,
Set<IndexType> indexTypes) {
this.name = name;
this.type = type;
this.nullable = nullable;

if (indexTypes == null) {
this.indexTypes = null;
Expand Down Expand Up @@ -89,6 +112,17 @@ public GSType getType() {
return type;
}

/**
* Retrieve the value irrespective to NOT NULL constraint is set in the column or not.
*
* @return {@code true} if the NOT NULL constraint is not set,
* {@code false} if set. If not set {@code null}.
*
*/
public Boolean getNullable() {
return nullable;
}

/**
* Returns all of set of index type.
*
Expand Down
25 changes: 21 additions & 4 deletions java_client/src/com/toshiba/mwcloud/gs/CompressionMethod.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,39 @@
package com.toshiba.mwcloud.gs;

/**
* Not supported
* Represents types of compression methods.
*
* <p>These types are used when setting a time series compression.</p>
*/
public enum CompressionMethod {

/**
* Not supported
* Represents no compression.
*/
NO,

/**
* Not supported
* Represents a thinning compression without error
*
* <p>In this type of compression, rows that have the same
* value registered immediately before and after are thinned.
* The thinned values are recovered in the interpolation or sampling
* processing without information loss.</p>
*/
SS,

/**
* Not supported
* Represents a thinning compression with error
*
* <p>In this type of compression, values that represent
* gradient same as before and immediately after may be thinned.
* The algorithm to determine the equality of the gradients
* can be specified by users.
* Only if specified column meets the above conditions and
* other columns are the same as the last registered data, the
* row is thinned.
* The thinned value is recovered in an interpolation or
* sampling processing within the specified error range.</p>
*/
HI

Expand Down
Loading

0 comments on commit 547c509

Please sign in to comment.