modify data-type mapping

knonomura · knonomura · commit d53da910d0ae · 2018-04-19T20:54:15.000+09:00
diff --git a/src/RowKeyPredicate.cpp b/src/RowKeyPredicate.cpp
@@ -20,7 +20,7 @@
 
 namespace griddb {
 
-    RowKeyPredicate::RowKeyPredicate(GSRowKeyPredicate *predicate): mPredicate(predicate),
+    RowKeyPredicate::RowKeyPredicate(GSRowKeyPredicate *predicate, GSType type): mPredicate(predicate), mType(type),
             timestamp_output_with_float(false){
     }
     /**
@@ -149,12 +149,13 @@ namespace griddb {
      * Get key type. Convert from C-API: gsGetPredicateKeyType
      */
     GSType RowKeyPredicate::get_key_type() {
-        GSType key;
-        GSResult ret = gsGetPredicateKeyType(mPredicate, &key);
-        if (ret != GS_RESULT_OK) {
-            throw new GSException(mPredicate, ret);
-        }
-        return key;
+        return mType;
+//        GSType key;
+//        GSResult ret = gsGetPredicateKeyType(mPredicate, &key);
+//        if (ret != GS_RESULT_OK) {
+//            throw new GSException(mPredicate, ret);
+//        }
+//        return key;
     }
     /*
      * Returns the value of Row key at the start and end position of the range condition
diff --git a/src/RowKeyPredicate.h b/src/RowKeyPredicate.h
@@ -29,6 +29,7 @@ namespace griddb {
 
 class RowKeyPredicate {
     GSRowKeyPredicate *mPredicate;
+    GSType mType;
 
     friend class Store;
 
@@ -69,7 +70,7 @@ class RowKeyPredicate {
         GSType get_key_type();
 
     private:
-        RowKeyPredicate(GSRowKeyPredicate *predicate);
+        RowKeyPredicate(GSRowKeyPredicate *predicate, GSType type);
 
 };
 
diff --git a/src/RowSet.cpp b/src/RowSet.cpp
@@ -21,11 +21,12 @@
 namespace griddb {
 
     RowSet::RowSet(GSRowSet *rowSet, GSContainerInfo *containerInfo, GSRow *gsRow) :
-        mRowSet(rowSet), mContainerInfo(containerInfo), mRow(gsRow), timestamp_output_with_float(false) {
+        mRowSet(rowSet), mContainerInfo(containerInfo), mRow(gsRow),
+        timestamp_output_with_float(false), typeList(NULL) {
         if (mRowSet != NULL) {
             mType = gsGetRowSetType(mRowSet);
         } else {
-            throw new GSException(mRowSet, "mRowSet is NULL");
+            throw GSException(mRowSet, "mRowSet is NULL");
         }
     }
     /**
@@ -47,6 +48,9 @@ namespace griddb {
     }
     RowSet::~RowSet() {
         close();
+        if (typeList) {
+            free(typeList);
+        }
     }
     /**
      * Close rowset.
@@ -66,7 +70,7 @@ namespace griddb {
         GSResult ret = gsUpdateCurrentRow(mRowSet, mRow);
 
         if (ret != GS_RESULT_OK) {
-            throw new GSException(mRowSet, ret);
+            throw GSException(mRowSet, ret);
         }
     }
     /**
@@ -77,7 +81,7 @@ namespace griddb {
         if (*hasNextRow) {
             GSResult ret = gsGetNextRow(mRowSet, mRow);
             if (ret != GS_RESULT_OK) {
-                throw new GSException(mRowSet, ret);
+                throw GSException(mRowSet, ret);
             }
             rowdata->set_from_row(mRow);
         }
@@ -115,7 +119,7 @@ namespace griddb {
     void RowSet::remove() {
         GSResult ret = gsDeleteCurrentRow(mRowSet);
         if (ret != GS_RESULT_OK) {
-            throw new GSException(mRowSet, ret);
+            throw GSException(mRowSet, ret);
         }
     }
 
@@ -167,4 +171,24 @@ namespace griddb {
         }
     }
 
+    /**
+     * Support put row
+     */
+    GSType* RowSet::getGSTypeList(){
+        if (typeList == NULL){
+            typeList = (GSType*) malloc(sizeof(GSType) * mContainerInfo->columnCount);
+            for (int i = 0; i < mContainerInfo->columnCount; i++){
+                typeList[i] = mContainerInfo->columnInfoList[i].type;
+            }
+        }
+        return typeList;
+    }
+
+    /**
+     * Support put row
+     */
+    int RowSet::getColumnCount(){
+        return mContainerInfo->columnCount;
+    }
+
 }
diff --git a/src/RowSet.h b/src/RowSet.h
@@ -38,6 +38,7 @@ class RowSet {
     GSRowSet *mRowSet;
     GSContainerInfo *mContainerInfo;
     GSRow *mRow;
+    GSType* typeList;
 
     friend class Query;
 
@@ -59,6 +60,8 @@ class RowSet {
         QueryAnalysisEntry* get_next_query_analysis();
         AggregationResult* get_next_aggregation();
         void next_row(Row* rowdata, bool* hasNextRow);
+        GSType* getGSTypeList();
+        int getColumnCount();
 
     private:
         RowSet(GSRowSet *rowSet, GSContainerInfo *containerInfo, GSRow *mRow);
diff --git a/src/Store.cpp b/src/Store.cpp
@@ -143,7 +143,7 @@ namespace griddb {
             throw GSException(mStore, ret);
         }
 
-        return new RowKeyPredicate(predicate);
+        return new RowKeyPredicate(predicate, type);
     }
     /**
      * New creation or update operation is carried out on an arbitrary number of rows of multiple Containers, with the request unit enlarged as much as possible.
diff --git a/src/gstype_python.i b/src/gstype_python.i

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,12 @@`
`21`	`21`	`namespace griddb {`
`22`	`22`
`23`	`23`	`RowSet::RowSet(GSRowSet rowSet, GSContainerInfo containerInfo, GSRow *gsRow) :`
`24`		`- mRowSet(rowSet), mContainerInfo(containerInfo), mRow(gsRow), timestamp_output_with_float(false) {`
	`24`	`+ mRowSet(rowSet), mContainerInfo(containerInfo), mRow(gsRow),`
	`25`	`+ timestamp_output_with_float(false), typeList(NULL) {`
`25`	`26`	`if (mRowSet != NULL) {`
`26`	`27`	`mType = gsGetRowSetType(mRowSet);`
`27`	`28`	`} else {`
`28`		`- throw new GSException(mRowSet, "mRowSet is NULL");`
	`29`	`+ throw GSException(mRowSet, "mRowSet is NULL");`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`/**`
`@@ -47,6 +48,9 @@ namespace griddb {`
`47`	`48`	`}`
`48`	`49`	`RowSet::~RowSet() {`
`49`	`50`	`close();`
	`51`	`+ if (typeList) {`
	`52`	`+ free(typeList);`
	`53`	`+ }`
`50`	`54`	`}`
`51`	`55`	`/**`
`52`	`56`	`* Close rowset.`
`@@ -66,7 +70,7 @@ namespace griddb {`
`66`	`70`	`GSResult ret = gsUpdateCurrentRow(mRowSet, mRow);`
`67`	`71`
`68`	`72`	`if (ret != GS_RESULT_OK) {`
`69`		`- throw new GSException(mRowSet, ret);`
	`73`	`+ throw GSException(mRowSet, ret);`
`70`	`74`	`}`
`71`	`75`	`}`
`72`	`76`	`/**`
`@@ -77,7 +81,7 @@ namespace griddb {`
`77`	`81`	`if (*hasNextRow) {`
`78`	`82`	`GSResult ret = gsGetNextRow(mRowSet, mRow);`
`79`	`83`	`if (ret != GS_RESULT_OK) {`
`80`		`- throw new GSException(mRowSet, ret);`
	`84`	`+ throw GSException(mRowSet, ret);`
`81`	`85`	`}`
`82`	`86`	`rowdata->set_from_row(mRow);`
`83`	`87`	`}`
`@@ -115,7 +119,7 @@ namespace griddb {`
`115`	`119`	`void RowSet::remove() {`
`116`	`120`	`GSResult ret = gsDeleteCurrentRow(mRowSet);`
`117`	`121`	`if (ret != GS_RESULT_OK) {`
`118`		`- throw new GSException(mRowSet, ret);`
	`122`	`+ throw GSException(mRowSet, ret);`
`119`	`123`	`}`
`120`	`124`	`}`
`121`	`125`
`@@ -167,4 +171,24 @@ namespace griddb {`
`167`	`171`	`}`
`168`	`172`	`}`
`169`	`173`
	`174`	`+ /**`
	`175`	`+ * Support put row`
	`176`	`+ */`
	`177`	`+ GSType* RowSet::getGSTypeList(){`
	`178`	`+ if (typeList == NULL){`
	`179`	`+ typeList = (GSType) malloc(sizeof(GSType) mContainerInfo->columnCount);`
	`180`	`+ for (int i = 0; i < mContainerInfo->columnCount; i++){`
	`181`	`+ typeList[i] = mContainerInfo->columnInfoList[i].type;`
	`182`	`+ }`
	`183`	`+ }`
	`184`	`+ return typeList;`
	`185`	`+ }`
	`186`	`+`
	`187`	`+ /**`
	`188`	`+ * Support put row`
	`189`	`+ */`
	`190`	`+ int RowSet::getColumnCount(){`
	`191`	`+ return mContainerInfo->columnCount;`
	`192`	`+ }`
	`193`	`+`
`170`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ namespace griddb {`
`143`	`143`	`throw GSException(mStore, ret);`
`144`	`144`	`}`
`145`	`145`
`146`		`- return new RowKeyPredicate(predicate);`
	`146`	`+ return new RowKeyPredicate(predicate, type);`
`147`	`147`	`}`
`148`	`148`	`/**`
`149`	`149`	`* New creation or update operation is carried out on an arbitrary number of rows of multiple Containers, with the request unit enlarged as much as possible.`