update for V4.2

griddb · May 22, 2019 · ec466bf · ec466bf
1 parent eb61b45
commit ec466bf
Show file tree

Hide file tree

Showing 17 changed files with 612 additions and 130 deletions.
diff --git a/java_client/src/com/toshiba/mwcloud/gs/GridStoreFactory.java b/java_client/src/com/toshiba/mwcloud/gs/GridStoreFactory.java
@@ -242,6 +242,13 @@ public static GridStoreFactory getInstance() {
 	 * notificationAddressおよびnotificationMemberと同時に指定することはできない。
 	 * バージョン2.9よりサポート
 	 * </td></tr>
+	 * <tr><td>applicationName</td><td>アプリケーションの名前。
+	 * アプリケーションの識別を補助するための情報として、接続先のクラスタ上での
+	 * 各種管理情報の出力の際に含められる場合がある。ただし、アプリケーションの
+	 * 同一性を どのように定義するかについては関与しない。省略時は
+	 * アプリケーション名の指定がなかったものとみなされる。空文字列は指定
+	 * できない。
+	 * バージョン4.2よりサポート</td></tr>
 	 * </tbody>
 	 * </table>
 	 *
@@ -374,6 +381,12 @@ public static GridStoreFactory getInstance() {
 	 * This property is supported on version 2.9 or later.
 	 *
 	 * </td></tr>
+	 * <tr><td>applicationName</td><td>Name of an application. It may be
+	 * contained in various information for management on the connected
+	 * cluster. However, the cluster shall not be involved with the identity of
+	 * applications. If the property is omitted, it is regarded that the name
+	 * is not specified. Empty string cannot be specified.
+	 * This property is supported on version 4.2 or later.</td></tr>
 	 * </tbody>
 	 * </table>
 	 *

diff --git a/java_client/src/com/toshiba/mwcloud/gs/common/BasicBuffer.java b/java_client/src/com/toshiba/mwcloud/gs/common/BasicBuffer.java
@@ -132,6 +132,9 @@ public void putChar(char value) {
 	}
 
 	public void putString(String value) {
+		if (value.indexOf('\0') >= 0) {
+			throw errorNullCharacterRuntime();
+		}
 		final byte[] buf = value.getBytes(DEFAULT_CHARSET);
 		prepare(Integer.SIZE / Byte.SIZE + buf.length);
 		base.putInt(buf.length);
@@ -242,6 +245,21 @@ public void clear() {
 		base.clear();
 	}
 
+	public static IllegalArgumentException errorNullCharacterRuntime() {
+		try {
+			throw errorNullCharacter();
+		}
+		catch (GSException e) {
+			throw new IllegalArgumentException(e);
+		}
+	}
+
+	public static GSException errorNullCharacter() {
+		return new GSException(
+				GSErrorCode.ILLEGAL_VALUE_FORMAT,
+				"Illegal '\\0' character found");
+	}
+
 	public static class BufferUtils {
 
 		private BufferUtils() {

diff --git a/java_client/src/com/toshiba/mwcloud/gs/common/ContainerProperties.java b/java_client/src/com/toshiba/mwcloud/gs/common/ContainerProperties.java
@@ -35,20 +35,20 @@ public static class ContainerIdInfo {
 
 		public final ContainerKey remoteKey;
 
-		public final MetaContainerType metaContainerType;
+		public final MetaDistributionType metaDistType;
 
 		public final long metaContainerId;
 
 		public final MetaNamingType metaNamingType;
 
 		public ContainerIdInfo(
 				int versionId, long containerId, ContainerKey remoteKey,
-				MetaContainerType metaContainerType, long metaContainerId,
+				MetaDistributionType metaDistType, long metaContainerId,
 				MetaNamingType metaNamingType) {
 			this.versionId = versionId;
 			this.containerId = containerId;
 			this.remoteKey = remoteKey;
-			this.metaContainerType = metaContainerType;
+			this.metaDistType = metaDistType;
 			this.metaContainerId = metaContainerId;
 			this.metaNamingType = metaNamingType;
 		}
@@ -184,9 +184,10 @@ public Integer[] getRawKeys() {
 
 	}
 
-	public enum MetaContainerType {
+	public enum MetaDistributionType {
 		NONE,
-		FULL
+		FULL,
+		NODE
 	}
 
 	public enum MetaNamingType {

diff --git a/java_client/src/com/toshiba/mwcloud/gs/common/Extensibles.java b/java_client/src/com/toshiba/mwcloud/gs/common/Extensibles.java
@@ -127,6 +127,10 @@ public void multiGet(
 				? extends RowKeyPredicate<?>, List<Row>> multiContext,
 				boolean internalMode) throws GSException;
 
+		public void setContainerMonitoring(boolean monitoring);
+
+		public boolean isContainerMonitoring();
+
 		@Override
 		public AsPartitionController getPartitionController()
 				throws GSException;
@@ -145,6 +149,8 @@ public void createIndex(IndexInfo info, OptionalRequestSource source)
 		public void dropIndex(IndexInfo info, OptionalRequestSource source)
 				throws GSException;
 
+		public ContainerKey getKey();
+
 		@Override
 		public <S> AsQuery<S> query(final String tql, Class<S> rowType)
 				throws GSException;
@@ -168,6 +174,12 @@ public void setAcceptableResultKeys(
 		public void setContainerLostAcceptable(
 				boolean acceptable) throws GSException;
 
+		public QueryInfo getInfo();
+
+		public Query<R> getBaseQuery();
+
+		public AsContainer<?, ?> getContainer();
+
 	}
 
 	public interface AsRowSet<R> extends RowSet<R> {
@@ -178,6 +190,10 @@ public interface AsRowSet<R> extends RowSet<R> {
 
 		public byte[] getExtOption(int key) throws GSException;
 
+		public QueryInfo getQueryInfo();
+
+		public AsContainer<?, ?> getContainer();
+
 	}
 
 	public interface AsPartitionController extends PartitionController {
@@ -229,6 +245,12 @@ public interface StatementHandler {
 
 	}
 
+	public interface QueryInfo {
+
+		String getQueryString();
+
+	}
+
 	public static AsStore get(GridStore store) {
 		final AsStore extensible;
 		try {

diff --git a/java_client/src/com/toshiba/mwcloud/gs/common/PropertyUtils.java b/java_client/src/com/toshiba/mwcloud/gs/common/PropertyUtils.java
@@ -158,6 +158,25 @@ public Integer getIntProperty(
 			}
 		}
 
+		public Double getDoubleProperty(
+				String name, boolean deprecated) throws GSException {
+			final String strValue = getProperty(name, deprecated);
+			if (strValue == null) {
+				return null;
+			}
+
+			try {
+				return Double.valueOf(strValue);
+			}
+			catch (NumberFormatException e) {
+				throw new GSException(
+						GSErrorCode.ILLEGAL_VALUE_FORMAT,
+						"Failed to parse as double (value=" + strValue +
+						", propertyName=" + name +
+						", reason=" + e.getMessage() + ")", e);
+			}
+		}
+
 		public Boolean getBooleanProperty(
 				String name, Boolean defaultValue,
 				boolean deprecated) throws GSException {

diff --git a/java_client/src/com/toshiba/mwcloud/gs/common/RowMapper.java b/java_client/src/com/toshiba/mwcloud/gs/common/RowMapper.java
@@ -65,7 +65,7 @@ public class RowMapper {
 
 	protected static boolean restrictKeyOrderFirst = true;
 
-	private static final boolean STRING_FIELD_ENCODING_STRICT = true; 
+	private static final boolean STRING_FIELD_ENCODING_STRICT = true;
 
 	private static final RowMapper AGGREGATION_RESULT_MAPPER;
 
@@ -4166,7 +4166,7 @@ static void putString(BasicBuffer out, String value, boolean varSizeMode)
 				final byte[] dest = out.base().array();
 				for (int i = 0; i < buf.length; i++) {
 					if (buf[i] == 0) {
-						throw errorNullCharacter();
+						throw BasicBuffer.errorNullCharacter();
 					}
 					dest[pos + i] = buf[i];
 				}
@@ -4190,10 +4190,4 @@ static String getString(BasicBuffer in, boolean varSizeMode) throws GSException
 		return new String(buf, 0, buf.length, BasicBuffer.DEFAULT_CHARSET);
 	}
 
-	private static GSException errorNullCharacter() {
-		return new GSException(
-				GSErrorCode.ILLEGAL_VALUE_FORMAT,
-				"Illegal '\\0' character found");
-	}
-
 }
diff --git a/java_client/src/com/toshiba/mwcloud/gs/experimental/ContainerAttribute.java b/java_client/src/com/toshiba/mwcloud/gs/experimental/ContainerAttribute.java
@@ -30,7 +30,9 @@ public enum ContainerAttribute {
 
 	LARGE(0x00000020),
 
-	SUB(0x00000030)
+	SUB(0x00000030),
+
+	VIEW(0x00000040)
 	;
 
 	private int flag;