fiftyone-devicedetection-onpremise 4.5.0a36__tar.gz → 4.5.0a37__tar.gz

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone_devicedetection_onpremise
-Version: 4.5.0a36
+Version: 4.5.0a37
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/collection.c

@@ -88,9 +88,13 @@ bool fiftyoneDegreesCollectionGetIsMemoryOnly() { return true; }
  * Used by memory collection where there is nothing to be done when the release
  * occurs because the memory it uses is only freed when the collection is 
  * freed. 
+ *
+ * The data is reset so that further item operations
+ * no longer access collection-controlled memory.
  */
 static void releaseNothing(Item *item) {
 	assert(item != NULL);
+	DataReset(&item->data);
 }
 #ifdef _MSC_VER
 #pragma warning (default: 4100) 

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/fiftyone.h

@@ -290,6 +290,7 @@ MAP_TYPE(WkbtotReductionMode)
 #define ResourceManagerFree fiftyoneDegreesResourceManagerFree /**< Synonym for #fiftyoneDegreesResourceManagerFree function. */
 #define StringGet fiftyoneDegreesStringGet /**< Synonym for #fiftyoneDegreesStringGet function. */
 #define StoredBinaryValueGet fiftyoneDegreesStoredBinaryValueGet /**< Synonym for #fiftyoneDegreesStoredBinaryValueGet function. */
+#define StoredBinaryValueRead fiftyoneDegreesStoredBinaryValueRead /**< Synonym for #fiftyoneDegreesStoredBinaryValueRead function. */
 #define StoredBinaryValueCompareWithString fiftyoneDegreesStoredBinaryValueCompareWithString /**< Synonym for #fiftyoneDegreesStoredBinaryValueCompareWithString function. */
 #define StoredBinaryValueToIntOrDefault fiftyoneDegreesStoredBinaryValueToIntOrDefault /**< Synonym for #fiftyoneDegreesStoredBinaryValueToIntOrDefault function. */
 #define StoredBinaryValueToDoubleOrDefault fiftyoneDegreesStoredBinaryValueToDoubleOrDefault /**< Synonym for #fiftyoneDegreesStoredBinaryValueToDoubleOrDefault function. */

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/storedBinaryValue.c

@@ -205,116 +205,6 @@ StoredBinaryValue* fiftyoneDegreesStoredBinaryValueGet(
     return result;
 }
 
-/**
- * Function to compare the current String item to the
- * target search value using the IpAddress format.
- * @param value the current String item
- * @param target the target search value. This should
- * be in string readable format of an IP address.
- * @return 0 if they are equal, otherwise negative
- * for smaller and positive for bigger
- */
-static int compareIpAddressToString(const VarLengthByteArray * const value, const char * const target) {
-    int result = 0;
-    IpAddress ipAddress;
-    bool parsed = IpAddressParse(
-            target,
-            target + strlen(target),
-            &ipAddress);
-    if (parsed) {
-        const int16_t valueLength = value->size;
-        int16_t searchLength = 0;
-        switch (ipAddress.type) {
-            case IP_TYPE_IPV4:
-                searchLength = IPV4_LENGTH;
-            break;
-            case IP_TYPE_IPV6:
-                searchLength = IPV6_LENGTH;
-            break;
-            case IP_TYPE_INVALID:
-                default:
-                    break;
-        }
-
-        if (searchLength == 0) {
-            result = valueLength;
-        }
-        else {
-            // Compare length first
-            const size_t compareLength = ((valueLength < searchLength)
-                ? valueLength : searchLength);
-            result = memcmp(&value->firstByte,
-                ipAddress.value, compareLength);
-            if (result == 0) {
-                result = valueLength - searchLength;
-            }
-        }
-    }
-    return result;
-}
-
-static int compareWkbToString(
-    const VarLengthByteArray * const binaryValue,
-    const WkbtotReductionMode reductionMode,
-    const char * const target,
-    Exception * const exception) {
-    WkbtotResult toWktResult = {
-        0,
-        false,
-    };
-
-    if (!binaryValue || !exception) {
-        EXCEPTION_SET(FIFTYONE_DEGREES_STATUS_NULL_POINTER);
-        return -1;
-    }
-
-    int result = -1;
-
-    {
-        char buffer[REASONABLE_WKT_STRING_LENGTH];
-        StringBuilder builder = { buffer, REASONABLE_WKT_STRING_LENGTH };
-        StringBuilderInit(&builder);
-        WriteWkbAsWktToStringBuilder(
-            &binaryValue->firstByte,
-            reductionMode,
-            MAX_DOUBLE_DECIMAL_PLACES,
-            &builder,
-            exception
-            );
-        StringBuilderComplete(&builder);
-        toWktResult = (WkbtotResult){
-            builder.added,
-            builder.full,
-        };
-        if (EXCEPTION_OKAY && !toWktResult.bufferTooSmall) {
-            result = strcmp(buffer, target);
-        }
-    }
-    if (toWktResult.bufferTooSmall) {
-        EXCEPTION_CLEAR;
-        const size_t requiredSize = toWktResult.written + 1;
-        char * const buffer = Malloc(requiredSize);
-        StringBuilder builder = { buffer, requiredSize };
-        StringBuilderInit(&builder);
-        WriteWkbAsWktToStringBuilder(
-            &binaryValue->firstByte,
-            reductionMode,
-            MAX_DOUBLE_DECIMAL_PLACES,
-            &builder,
-            exception
-            );
-        StringBuilderComplete(&builder);
-        toWktResult = (WkbtotResult){
-            builder.added,
-            builder.full,
-        };
-        if (EXCEPTION_OKAY && !toWktResult.bufferTooSmall) {
-            result = strcmp(buffer, target);
-        }
-    }
-    return result;
-}
-
 static double shortToDouble(const StoredBinaryValue * const value, const double maxAngle) {
     return (value->shortValue * maxAngle) / INT16_MAX;
 }
@@ -324,88 +214,39 @@ static double toAzimuth(const StoredBinaryValue * const value) {
 static double toDeclination(const StoredBinaryValue * const value) {
     return shortToDouble(value, 90);
 }
-static double toDoubleFromFloat(const StoredBinaryValue * const value) {
-    return FLOAT_TO_NATIVE(value->floatValue);
-}
-
-static int compareDoubleToString(
-    const double testedValue,
-    const char * const target) {
-
-    const double searchValue = (float)strtod(target, NULL);
-    if (errno == ERANGE)
-    {
-        errno = 0;
-        return -1;
-    }
-    const double dv = testedValue - searchValue;
-    return !dv ? 0 : (dv < 0 ? -1 : 1);
-}
 
 int fiftyoneDegreesStoredBinaryValueCompareWithString(
     const StoredBinaryValue * const value,
     const PropertyValueType storedValueType,
     const char * const target,
+    StringBuilder * const tempBuilder,
     Exception * const exception) {
 
-    switch (storedValueType) {
-        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING: {
-            const size_t targetLength = strlen(target);
-            const size_t valueLength = value->stringValue.size - 1;
-            const size_t cmpLength = (targetLength < valueLength) ? targetLength : valueLength;
-            const int result = strncmp(&value->stringValue.value, target, cmpLength);
-            if (result) {
-                return result;
-            }
-            if (cmpLength < targetLength) {
-                return -1;
-            }
-            return 0;
-        }
-        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_IP_ADDRESS: {
-            return compareIpAddressToString(&value->byteArrayValue, target);
-        }
-        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB: {
-            return compareWkbToString(
-                &value->byteArrayValue,
-                FIFTYONE_DEGREES_WKBToT_REDUCTION_NONE,
-                target,
-                exception);
-        }
-        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_WKB_R: {
-            return compareWkbToString(
-                &value->byteArrayValue,
-                FIFTYONE_DEGREES_WKBToT_REDUCTION_SHORT,
-                target,
-                exception);
-        }
-        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_INTEGER: {
-            const int32_t intValue = value->intValue;
-            const int32_t searchInt = (int32_t) strtol(target, NULL, 10);
-            if (errno == ERANGE)
-            {
-                errno = 0;
-                return -1;
-            }
-            return intValue - searchInt;
-        }
-        case FIFTYONE_DEGREES_PROPERTY_VALUE_SINGLE_PRECISION_FLOAT: {
-            return compareDoubleToString(toDoubleFromFloat(value), target);
-        }
-        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_AZIMUTH: {
-            return compareDoubleToString(toAzimuth(value), target);
-        }
-        case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_DECLINATION: {
-            return compareDoubleToString(toDeclination(value), target);
-        }
-        default: {
-            EXCEPTION_SET(UNSUPPORTED_STORED_VALUE_TYPE);
-            return -1;
-        }
+    if (storedValueType == FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING) {
+        const int cmpResult = strncmp(
+            &value->stringValue.value,
+            target,
+            value->stringValue.size);
+        return cmpResult;
     }
+    EXCEPTION_CLEAR;
+    const uint8_t decimalPlaces = (
+        tempBuilder->length < MAX_DOUBLE_DECIMAL_PLACES
+        ? (uint8_t)tempBuilder->length
+        : MAX_DOUBLE_DECIMAL_PLACES);
+    StringBuilderAddStringValue(
+        tempBuilder,
+        value,
+        storedValueType,
+        decimalPlaces,
+        exception);
+    StringBuilderComplete(tempBuilder);
+    const int result = (EXCEPTION_OKAY
+        ? strcmp(tempBuilder->ptr, target)
+        : -1);
+    return result;
 }
 
-
 int fiftyoneDegreesStoredBinaryValueToIntOrDefault(
     const fiftyoneDegreesStoredBinaryValue * const value,
     const fiftyoneDegreesPropertyValueType storedValueType,

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/storedBinaryValue.h

@@ -132,6 +132,7 @@ EXTERNAL fiftyoneDegreesStoredBinaryValue* fiftyoneDegreesStoredBinaryValueGet(
  * @param value the current binary value item
  * @param storedValueType format of byte array representation
  * @param target the target search value.
+ * @param tempBuilder temporary builder to stringify value into.
  * @return 0 if they are equal, otherwise negative
  * for smaller and positive for bigger
  */
@@ -139,6 +140,7 @@ EXTERNAL int fiftyoneDegreesStoredBinaryValueCompareWithString(
  const fiftyoneDegreesStoredBinaryValue *value,
  fiftyoneDegreesPropertyValueType storedValueType,
  const char *target,
+ fiftyoneDegreesStringBuilder *tempBuilder,
  fiftyoneDegreesException *exception);
 
 /**

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/stringBuilder.c

@@ -220,12 +220,15 @@ fiftyoneDegreesStringBuilder* fiftyoneDegreesStringBuilderAddChars(
 	fiftyoneDegreesStringBuilder* builder,
 	const char * const value,
 	size_t const length) {
-	if (length < builder->remaining &&
-		memcpy(builder->current, value, length) == builder->current) {
-		builder->remaining -= length;
-		builder->current += length;
+	const bool fitsIn = length < builder->remaining;
+	const size_t clippedLength = (
+		fitsIn ? length : (builder->remaining ? builder->remaining - 1 : 0));
+	if (0 < clippedLength &&
+		memcpy(builder->current, value, clippedLength) == builder->current) {
+		builder->remaining -= clippedLength;
+		builder->current += clippedLength;
 	}
-	else {
+	if (!fitsIn) {
 		builder->full = true;
 	}
 	builder->added += length;

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/value.c

@@ -31,6 +31,7 @@ typedef struct value_search_t {
 	Collection *strings;
 	const char *valueName;
 	PropertyValueType valueType;
+	StringBuilder *tempBuilder;
 } valueSearch;
 
 #ifdef _MSC_VER
@@ -44,6 +45,9 @@ static int compareValueByName(void *state, Item *item, long curIndex, Exception
 	StoredBinaryValue *value;
 	valueSearch *search = (valueSearch*)state;
 	DataReset(&name.data);
+	if (search->tempBuilder) {
+		StringBuilderInit(search->tempBuilder);
+	}
 	value = ValueGetContent(
 		search->strings,
 		(Value*)item->data.ptr,
@@ -55,6 +59,7 @@ static int compareValueByName(void *state, Item *item, long curIndex, Exception
 			value,
 			search->valueType,
 			search->valueName,
+			search->tempBuilder,
 			exception);
 		COLLECTION_RELEASE(search->strings, &name);
 	}
@@ -155,6 +160,13 @@ long fiftyoneDegreesValueGetIndexByNameAndType(
 	search.valueName = valueName;
 	search.strings = strings;
 	search.valueType = storedValueType;
+
+	const bool isString = (storedValueType == FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING);
+	const size_t requiredSize = strlen(valueName) + 3;
+	char * const buffer = isString ? NULL : Malloc(requiredSize);
+	StringBuilder tempBuilder = { buffer, requiredSize };
+	search.tempBuilder = isString ? NULL : &tempBuilder;
+
 	index = CollectionBinarySearch(
 		values,
 		&item,
@@ -163,6 +175,9 @@ long fiftyoneDegreesValueGetIndexByNameAndType(
 		(void*)&search,
 		compareValueByName,
 		exception);
+	if (buffer) {
+		Free(buffer);
+	}
 	if (EXCEPTION_OKAY) {
 		COLLECTION_RELEASE(values, &item);
 	}
@@ -200,6 +215,13 @@ Value* fiftyoneDegreesValueGetByNameAndType(
 	search.valueName = valueName;
 	search.strings = strings;
 	search.valueType = storedValueType;
+
+	const bool isString = (storedValueType == FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING);
+	const size_t requiredSize = strlen(valueName) + 3;
+	char * const buffer = isString ? NULL : Malloc(requiredSize);
+	StringBuilder tempBuilder = { buffer, requiredSize };
+	search.tempBuilder = isString ? NULL : &tempBuilder;
+
 	if (
 		(int)property->firstValueIndex != -1 &&
 		CollectionBinarySearch(
@@ -213,5 +235,8 @@ Value* fiftyoneDegreesValueGetByNameAndType(
 		EXCEPTION_OKAY) {
 		value = (Value*)item->data.ptr;
 	}
+	if (buffer) {
+		Free(buffer);
+	}
 	return value;
 }

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/wkbtot.c

@@ -227,10 +227,14 @@ static const NumReader *selectNumReader(const WkbtotReductionMode reductionMode)
     }
 }
 
+typedef struct {
+    StringBuilder * const stringBuilder;
+    bool isSeparated;
+} OutputState;
 
 typedef struct {
     const byte *binaryBuffer;
-    StringBuilder * const stringBuilder;
+    OutputState output;
 
     CoordMode coordMode;
     ByteOrder wkbByteOrder;
@@ -264,24 +268,29 @@ static void writeEmpty(
     ProcessingContext * const context) {
 
     static const char empty[] = "EMPTY";
-    StringBuilderAddChars(context->stringBuilder, empty, sizeof(empty));
+    if (!context->output.isSeparated) {
+        StringBuilderAddChar(context->output.stringBuilder, ' ');
+    }
+    StringBuilderAddChars(context->output.stringBuilder, empty, sizeof(empty) - 1);
+    context->output.isSeparated = false;
 }
 
 static void writeTaggedGeometryName(
-    const ProcessingContext * const context,
+    ProcessingContext * const context,
     const char * const geometryName) {
 
     StringBuilderAddChars(
-        context->stringBuilder,
+        context->output.stringBuilder,
         geometryName,
         strlen(geometryName));
     if (context->coordMode.tag) {
-        StringBuilderAddChar(context->stringBuilder, ' ');
+        StringBuilderAddChar(context->output.stringBuilder, ' ');
         StringBuilderAddChars(
-            context->stringBuilder,
+            context->output.stringBuilder,
             context->coordMode.tag,
             context->coordMode.tagLength);
     }
+    context->output.isSeparated = false;
 }
 
 
@@ -296,17 +305,20 @@ static void withParenthesesIterate(
 
     Exception * const exception = context->exception;
 
-    StringBuilderAddChar(context->stringBuilder, '(');
+    StringBuilderAddChar(context->output.stringBuilder, '(');
+    context->output.isSeparated = true;
     for (uint32_t i = 0; i < count; i++) {
         if (i) {
-            StringBuilderAddChar(context->stringBuilder, ',');
+            StringBuilderAddChar(context->output.stringBuilder, ',');
+            context->output.isSeparated = true;
         }
         visitor(context);
         if (EXCEPTION_FAILED) {
             return;
         }
     }
-    StringBuilderAddChar(context->stringBuilder, ')');
+    StringBuilderAddChar(context->output.stringBuilder, ')');
+    context->output.isSeparated = true;
 }
 
 static void handlePointSegment(
@@ -314,10 +326,12 @@ static void handlePointSegment(
 
     for (CoordIndexType i = 0; i < context->coordMode.dimensionsCount; i++) {
         if (i) {
-            StringBuilderAddChar(context->stringBuilder, ' ');
+            StringBuilderAddChar(context->output.stringBuilder, ' ');
+            context->output.isSeparated = true;
         }
         const double nextCoord = readDouble(context, i);
-        StringBuilderAddDouble(context->stringBuilder, nextCoord, context->decimalPlaces);
+        StringBuilderAddDouble(context->output.stringBuilder, nextCoord, context->decimalPlaces);
+        context->output.isSeparated = false;
     }
 }
 
@@ -575,7 +589,10 @@ static void handleWKBRoot(
 
     ProcessingContext context = {
         binaryBuffer,
-        stringBuilder,
+        {
+            stringBuilder,
+            true,
+        },
 
         CoordModes[0],
         ~*binaryBuffer,

{fiftyone_devicedetection_onpremise-4.5.0a36 → fiftyone_devicedetection_onpremise-4.5.0a37}/src/fiftyone_devicedetection_onpremise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone-devicedetection-onpremise
-Version: 4.5.0a36
+Version: 4.5.0a37
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

fiftyone_devicedetection_onpremise-4.5.0a37/version.txt

@@ -0,0 +1 @@
+4.5.0-alpha.37

fiftyone_devicedetection_onpremise-4.5.0a36/version.txt

@@ -1 +0,0 @@
-4.5.0-alpha.36