release 1

Author: ShenaMao

.dockerfiles/linux_coverage/Dockerfile

@@ -0,0 +1,20 @@
+FROM python:3.10.13-bullseye
+RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list
+RUN sed -i 's/security.debian.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list
+RUN apt update -y
+RUN apt install -y cmake
+
+WORKDIR /tmp
+RUN curl https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz > openssl-1.0.2u.tar.gz
+RUN tar -xzf openssl-1.0.2u.tar.gz
+WORKDIR /tmp/openssl-1.0.2u
+ENV CFLAGS=-fPIC
+ENV CXXFLAGS=-std=gnu++11
+RUN ./config shared no-asm --prefix=/usr/local/openssl --openssldir=/usr/local/openssl 
+RUN make -j
+RUN make install
+ENV OPENSSL_ROOT_DIR=/usr/local/openssl
+
+WORKDIR /
+ENV CXXFLAGS="-std=gnu++11 -static-libgcc -static-libstdc++"
+ENV PATH="/opt/BullseyeCoverage/bin:$PATH"

.gitignore

@@ -1,5 +1,6 @@
 /build/
 /builds/
+/core/test/build/
 /dist/
 /*egg-info/
 /wheelhouse/

CMakeLists.txt

@@ -76,6 +76,12 @@ message(STATUS "[pybind11 ${pybind11_VERSION}]")
 
 # add src to pybind11 module
 aux_source_directory(core/src SRC)
+
+# add thirdpartys to src
+aux_source_directory(core/thirdparty/abseil/src ABSL_SRC)
+list(APPEND SRC ${ABSL_SRC})
+
+message("SRC: ${SRC}")
 pybind11_add_module(${MODULE_NAME} ${SRC})
 
 # definitions
@@ -89,6 +95,7 @@ target_compile_definitions(${MODULE_NAME}
 # include-dirs
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/core/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/core/thirdparty/abseil/include
     ${OPENSSL_INCLUDE_DIR}
     ${Python_INCLUDE_DIRS}
 )

core/include/ConstantFactory.h

@@ -129,7 +129,7 @@ class ConstantFactory{
 
 	Dictionary* createDictionary(DATA_TYPE keyInternalType, DATA_TYPE keyType, DATA_TYPE valueType){
 		if (valueType > DT_STRING
-			&& (valueType != DT_UUID && valueType != DT_IP && valueType != DT_INT128 && valueType!= DT_BLOB && valueType != DT_DATEHOUR && valueType != DT_DATEMINUTE)) {
+			&& (valueType != DT_DATEHOUR && valueType != DT_DATEMINUTE && valueType!= DT_BLOB)) {
 			valueType = DT_ANY;
 		}
 		if(valueType != DT_ANY){
@@ -140,23 +140,24 @@ class ConstantFactory{
 				case DT_LONG : return new LongDictionary(keyType,valueType);
 				case DT_FLOAT : return new FloatDictionary(valueType);
 				case DT_DOUBLE : return new DoubleDictionary(valueType);
-				case DT_INT128 :
-					if (valueType == DT_INT128)
-						return NULL;
-					return new Int128Dictionary(keyType,valueType);
-				case DT_STRING : return new StringDictionary(keyType,valueType);
-				default : return NULL;
+				case DT_INT128 : return new Int128Dictionary(keyType,valueType);
+				case DT_STRING :
+				case DT_BLOB : return new StringDictionary(keyType,valueType);
+				default : throw RuntimeException("Not allowed to create Dictionary for the key type " + Util::getDataTypeString(keyType));
 			}
 		}
 		else{
 			switch(keyInternalType){
 				case DT_CHAR :
 				case DT_SHORT :
 				case DT_INT : return new IntAnyDictionary(keyType);
+				case DT_FLOAT: return new FloatAnyDictionary(keyType);
+				case DT_DOUBLE: return new DoubleAnyDictionary(keyType);
 				case DT_LONG : return new LongAnyDictionary(keyType);
 				case DT_INT128 : return new Int128AnyDictionary(keyType);
-				case DT_STRING : return new AnyDictionary();
-				default : return NULL;
+				case DT_STRING :
+				case DT_BLOB : return new AnyDictionary();
+				default : throw RuntimeException("Not allowed to create Dictionary for this key type " + Util::getDataTypeString(keyType));
 			}
 		}
 	}
@@ -271,6 +272,7 @@ class ConstantFactory{
 	Constant* createIPAddr(int extraParam){return new IPAddr();}
 	Constant* createDecima32(int extraParam) { return new Decimal32(extraParam); }
 	Constant* createDecima64(int extraParam) { return new Decimal64(extraParam); }
+	Constant* createDecima128(int extraParam) { return new Decimal128(extraParam); }
 
 	Vector* createVoidVector(INDEX size, INDEX capacity, bool fastMode, int extraParam, void* data, void** dataSegment, int segmentSizeInBit, bool containNull){
 		throw RuntimeException("Not allowed to create void vector");
@@ -497,6 +499,16 @@ class ConstantFactory{
 			return NULL;
 	}
 
+	Vector* createDecimal128Vector(INDEX size, INDEX capacity, bool fastMode, int extraParam, void* data, void** dataSegment, int segmentSizeInBit, bool containNull) {
+		if (data == NULL && dataSegment == NULL) {
+			allocate<wide_integer::int128>(size, capacity, fastMode, segmentSizeInBit, data, dataSegment);
+		}
+		if (data != NULL)
+			return new FastDecimalVector<wide_integer::int128>(extraParam, size, capacity, (wide_integer::int128*)data, containNull);
+		else
+			return NULL;
+	}
+
 	Vector* createBoolArrayVector(INDEX size, INDEX capacity, bool fastMode, int extraParam, void *data, void *pindex, void** dataSegment, int segmentSizeInBit, bool containNull) {
 		// if(data == NULL && dataSegment == NULL){
 		// 	allocate<char>(size, capacity, fastMode, segmentSizeInBit, data, dataSegment);
@@ -627,7 +639,10 @@ class ConstantFactory{
 		return new FastArrayVector(size, capacity, (char*)data, containNull, DATA_TYPE(DT_DECIMAL64 + ARRAY_TYPE_BASE), (INDEX *)pindex, extraParam);
 	}
 
-	
+	Vector* createDecimal128ArrayVector(INDEX size, INDEX capacity, bool fastMode, int extraParam, void* data, void *pindex, void** dataSegment, int segmentSizeInBit, bool containNull) {
+		return new FastArrayVector(size, capacity, (char*)data, containNull, DATA_TYPE(DT_DECIMAL128 + ARRAY_TYPE_BASE), (INDEX *)pindex, extraParam);
+	}
+
 	Vector* createVoidMatrix(int cols, int rows, int colCapacity, int extraParam, void* data, void** dataSegment, int segmentSizeInBit, bool containNull){
 		throw RuntimeException("Not allowed to create a void matrix");
 	}
@@ -808,6 +823,8 @@ class ConstantFactory{
 		arrConstFactory[DT_IP]=&ConstantFactory::createIPAddr;
 		arrConstFactory[DT_DECIMAL32] = &ConstantFactory::createDecima32;
 		arrConstFactory[DT_DECIMAL64] = &ConstantFactory::createDecima64;
+		arrConstFactory[DT_DECIMAL128] = &ConstantFactory::createDecima128;
+
 		arrConstFactory[DT_DICTIONARY]=NULL;
 
 		arrConstVectorFactory[DT_VOID]=&ConstantFactory::createVoidVector;
@@ -836,6 +853,8 @@ class ConstantFactory{
 		arrConstVectorFactory[DT_IP]=&ConstantFactory::createIPAddrVector;
 		arrConstVectorFactory[DT_DECIMAL32] = &ConstantFactory::createDecimal32Vector;
 		arrConstVectorFactory[DT_DECIMAL64] = &ConstantFactory::createDecimal64Vector;
+		arrConstVectorFactory[DT_DECIMAL128] = &ConstantFactory::createDecimal128Vector;
+
 		arrConstVectorFactory[DT_FUNCTIONDEF]=&ConstantFactory::createAnyVector;
 		arrConstVectorFactory[DT_HANDLE]=&ConstantFactory::createAnyVector;
 		arrConstVectorFactory[DT_ANY]=&ConstantFactory::createAnyVector;
@@ -867,6 +886,7 @@ class ConstantFactory{
 		arrConstArrayVectorFactory[DT_IP] = &ConstantFactory::createIpArrayVector;
 		arrConstArrayVectorFactory[DT_DECIMAL32] = &ConstantFactory::createDecimal32ArrayVector;
 		arrConstArrayVectorFactory[DT_DECIMAL64] = &ConstantFactory::createDecimal64ArrayVector;
+		arrConstArrayVectorFactory[DT_DECIMAL128] = &ConstantFactory::createDecimal128ArrayVector;
 
 		arrConstMatrixFactory[DT_VOID]=&ConstantFactory::createVoidMatrix;
 		arrConstMatrixFactory[DT_BOOL]=&ConstantFactory::createBoolMatrix;
@@ -1047,7 +1067,6 @@ class ConstantFactory{
 	ConstantVectorFunc arrConstVectorFactory[TYPE_COUNT];
 	ConstantArrayVectorFunc arrConstArrayVectorFactory[TYPE_COUNT];
 	ConstantMatrixFunc arrConstMatrixFactory[TYPE_COUNT];
-	ConstantRptVectorFunc arrConstRptVectorFactory[TYPE_COUNT];
 	unordered_map<string,DATA_TYPE> typeMap_;
 	unordered_map<string,DATA_FORM> formMap_;
 	char arrTypeSymbol[TYPE_COUNT];