@based/db 0.0.18 → 0.0.20

package/dist/lib/darwin_aarch64/include/selva/db.h

@@ -75,28 +75,92 @@ struct SelvaTypeEntry *selva_get_type_by_node(const struct SelvaDb *db, struct S
  * Get the node schema for type.
  */
 SELVA_EXPORT
-const struct SelvaNodeSchema *selva_get_ns_by_te(const struct SelvaTypeEntry *te) __attribute__((nonnull, pure));
+__attribute__((nonnull, pure))
+inline const struct SelvaNodeSchema *selva_get_ns_by_te(const struct SelvaTypeEntry *te)
+#if !__zig
+{
+    return &te->ns;
+}
+#else
+;
+#endif
 
 SELVA_EXPORT
-const struct SelvaFieldSchema *get_fs_by_fields_schema_field(const struct SelvaFieldsSchema *fields_schema, field_t field) __attribute__((nonnull, pure));
+__attribute__((nonnull, pure))
+inline const struct SelvaFieldSchema *get_fs_by_fields_schema_field(const struct SelvaFieldsSchema *fields_schema, field_t field)
+#if !__zig
+{
+    if (field >= fields_schema->nr_fields) {
+        return nullptr;
+    }
+
+    return &fields_schema->field_schemas[field];
+}
+#else
+;
+#endif
 
 /**
  * Get the field schema for field.
  */
 SELVA_EXPORT
-const struct SelvaFieldSchema *selva_get_fs_by_ns_field(const struct SelvaNodeSchema *ns, field_t field) __attribute__((nonnull, pure));
+__attribute__((nonnull, pure))
+inline const struct SelvaFieldSchema *selva_get_fs_by_te_field(const struct SelvaTypeEntry *te, field_t field)
+#if !__zig
+{
+    return get_fs_by_fields_schema_field(&te->ns.fields_schema, field);
+}
+#else
+;
+#endif
 
 /**
  * Get the field schema for field.
  */
 SELVA_EXPORT
-const struct SelvaFieldSchema *selva_get_fs_by_node(struct SelvaDb *db, struct SelvaNode *node, field_t field) __attribute__((nonnull, pure));
+__attribute__((nonnull, pure))
+inline const struct SelvaFieldSchema *selva_get_fs_by_ns_field(const struct SelvaNodeSchema *ns, field_t field)
+#if !__zig
+{
+    return get_fs_by_fields_schema_field(&ns->fields_schema, field);
+}
+#else
+;
+#endif
+
+/**
+ * Get the field schema for field.
+ */
+SELVA_EXPORT
+__attribute__((nonnull, pure))
+inline const struct SelvaFieldSchema *selva_get_fs_by_node(struct SelvaDb *db, struct SelvaNode *node, field_t field)
+#if !__zig
+{
+    struct SelvaTypeEntry *type;
+
+    type = selva_get_type_by_node(db, node);
+    if (!type) {
+        return nullptr;
+    }
+
+    return selva_get_fs_by_ns_field(&type->ns, field);
+}
+#else
+;
+#endif
 
 SELVA_EXPORT
 #if __has_c_attribute(reproducible)
 [[reproducible]]
 #endif
-enum SelvaFieldType selva_get_fs_type(const struct SelvaFieldSchema *fs);
+inline enum SelvaFieldType selva_get_fs_type(const struct SelvaFieldSchema *fs)
+#if !__zig
+{
+    return fs->type;
+}
+#else
+;
+#endif
 
 /**
  * Get the EdgeFieldConstraint from a ref field schema.
@@ -105,7 +169,17 @@ enum SelvaFieldType selva_get_fs_type(const struct SelvaFieldSchema *fs);
  * struct SelvaFieldSchema *dst_fs = selva_get_fs_by_node(db, dst, efc->inverse_field);
  */
 SELVA_EXPORT
-const struct EdgeFieldConstraint *selva_get_edge_field_constraint(const struct SelvaFieldSchema *fs) __attribute__((nonnull));
+__attribute__((nonnull))
+inline const struct EdgeFieldConstraint *selva_get_edge_field_constraint(const struct SelvaFieldSchema *fs)
+#if !__zig
+{
+    return (fs->type == SELVA_FIELD_TYPE_REFERENCE || fs->type == SELVA_FIELD_TYPE_REFERENCES)
+        ? &fs->edge_constraint
+        : nullptr;
+}
+#else
+;
+#endif
 
 SELVA_EXPORT
 const struct SelvaFieldsSchema *selva_get_edge_field_fields_schema(struct SelvaDb *db, const struct EdgeFieldConstraint *efc);
@@ -173,6 +247,11 @@ struct SelvaNode *selva_prev_node(struct SelvaTypeEntry *type, struct SelvaNode
 SELVA_EXPORT
 struct SelvaNode *selva_next_node(struct SelvaTypeEntry *type, struct SelvaNode *node) __attribute__((nonnull));
 
+/**
+ * \addtogroup db_cursor
+ * @{
+ */
+
 /**
  * Create a new cursor pointing to node.
  * If the node is deleted later then the cursor is updated to point to the next
@@ -205,6 +284,10 @@ void selva_cursor_del(struct SelvaTypeEntry *type, cursor_id_t id) __attribute__
 SELVA_EXPORT
 size_t selva_cursor_count(const struct SelvaTypeEntry *type) __attribute__((nonnull));
 
+/**
+ * @}
+ */
+
 /**
  * Total count of nodes of type.
  */

package/dist/lib/darwin_aarch64/include/selva/fields.h

@@ -58,37 +58,21 @@ struct SelvaNodeWeakReferences {
     struct SelvaNodeWeakReference *refs __pcounted_by(nr_refs);
 };
 
-struct SelvaMicroBuffer {
-    uint16_t len;
-    uint8_t data[] __counted_by(len);
-} __packed;
-
-struct SelvaFieldsAny {
-    enum SelvaFieldType type; /*!< Type of the value. */
-    union {
-        bool boolean; /*!< SELVA_FIELD_TYPE_BOOLEAN */
-        double number; /*!< SELVA_FIELD_TYPE_NUMBER */
-        int64_t timestamp; /*!< SELVA_FIELD_TYPE_TIMESTAMP, should fit time_t */
-        struct selva_string *string; /*!< SELVA_FIELD_TYPE_STRING */
-        int8_t int8; /* SELVA_FIELD_TYPE_INT8 */
-        uint8_t uint8; /*!< SELVA_FIELD_TYPE_UINT8 */
-        int16_t int16; /*!< SELVA_FIELD_TYPE_INT16 */
-        uint16_t uint16; /*!< SELVA_FIELD_TYPE_UINT16 */
-        int32_t int32; /*!< SELVA_FIELD_TYPE_INT32 */
-        uint32_t uint32; /*!< SELVA_FIELD_TYPE_UINT32 */
-        int64_t int64; /* SELVA_FIELD_TYPE_INT64 */
-        uint64_t uint64; /*!< SELVA_FIELD_TYPE_UINT64 */
-        uint8_t enu; /*!< SELVA_FIELD_TYPE_ENUM */
-#if 0
-        struct SelvaTextField *text; /*!< SELVA_FIELD_TYPE_TEXT */
-        struct SelvaNodeReference *reference; /*!< SELVA_FIELD_TYPE_REFERENCE */
-        struct SelvaNodeReferences *references; /*!< SELVA_FIELD_TYPE_REFERENCES */
-        struct SelvaNodeWeakReference weak_reference; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCE */
-        struct SelvaNodeWeakReferences weak_references; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCES */
-        struct SelvaMicroBuffer *smb; /*!< SELVA_FIELD_TYPE_MICRO_BUFFER */
-#endif
-        // HyperLogLogPlusPlus cardinality; /*!< SELVA_FIELD_TYPE_HLL */
-    };
+/**
+ * Type helper to determine the size of statically (constant/fixed) sized fields.
+ */
+union SelvaStaticFields {
+    bool boolean; /*!< SELVA_FIELD_TYPE_BOOLEAN */
+    double number; /*!< SELVA_FIELD_TYPE_NUMBER */
+    struct selva_string *string; /*!< SELVA_FIELD_TYPE_STRING */
+    int8_t int8; /* SELVA_FIELD_TYPE_INT8 */
+    uint8_t uint8; /*!< SELVA_FIELD_TYPE_UINT8 */
+    int16_t int16; /*!< SELVA_FIELD_TYPE_INT16 */
+    uint16_t uint16; /*!< SELVA_FIELD_TYPE_UINT16 */
+    int32_t int32; /*!< SELVA_FIELD_TYPE_INT32 */
+    uint32_t uint32; /*!< SELVA_FIELD_TYPE_UINT32 */
+    uint8_t enu; /*!< SELVA_FIELD_TYPE_ENUM */
+    struct SelvaNodeWeakReference weak_reference; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCE */
 };
 
 struct SelvaFieldsPointer {
@@ -128,7 +112,6 @@ int selva_fields_get_mutable_string(
     __attribute__((access(write_only, 4)));
 
 /*
- * TODO prefix with selva_
  * TODO Document diff to get_mutable_string
  */
 SELVA_EXPORT
@@ -137,6 +120,15 @@ struct selva_string *selva_fields_ensure_string(
         const struct SelvaFieldSchema *fs,
         size_t initial_len);
 
+SELVA_EXPORT
+struct selva_string *selva_fields_ensure_string2(
+        struct SelvaDb *db,
+        struct SelvaNode *node,
+        const struct EdgeFieldConstraint *efc,
+        struct SelvaNodeReference *ref,
+        const struct SelvaFieldSchema *fs,
+        size_t initial_len);
+
 SELVA_EXPORT
 int selva_fields_reference_set(
         struct SelvaDb *db,
@@ -274,16 +266,16 @@ int selva_fields_get_text(
         size_t *len);
 
 SELVA_EXPORT
-struct SelvaNodeReference *selva_fields_get_reference(struct SelvaNode *node, field_t field);
+struct SelvaNodeReference *selva_fields_get_reference(struct SelvaDb *db, struct SelvaNode *node, field_t field);
 
 SELVA_EXPORT
-struct SelvaNodeReferences *selva_fields_get_references(struct SelvaNode *node, field_t field);
+struct SelvaNodeReferences *selva_fields_get_references(struct SelvaDb *db, struct SelvaNode *node, field_t field);
 
 SELVA_EXPORT
-struct SelvaNodeWeakReference selva_fields_get_weak_reference(struct SelvaFields *fields, field_t field);
+struct SelvaNodeWeakReference selva_fields_get_weak_reference(struct SelvaDb *db, struct SelvaFields *fields, field_t field);
 
 SELVA_EXPORT
-struct SelvaNodeWeakReferences selva_fields_get_weak_references(struct SelvaFields *fields, field_t field);
+struct SelvaNodeWeakReferences selva_fields_get_weak_references(struct SelvaDb *db, struct SelvaFields *fields, field_t field);
 
 SELVA_EXPORT
 struct SelvaNode *selva_fields_resolve_weak_reference(
@@ -333,9 +325,6 @@ void selva_fields_init(const struct SelvaFieldsSchema *schema, struct SelvaField
 SELVA_EXPORT
 void selva_fields_destroy(struct SelvaDb *db, struct SelvaNode *node);
 
-SELVA_EXPORT
-int selva_fields_get_text_crc(const struct SelvaNode *node, const struct SelvaFieldSchema *fs, enum selva_lang_code lang, uint32_t *crc);
-
 SELVA_EXPORT
 void selva_fields_hash_update(struct XXH3_state_s *hash_state, struct SelvaDb *db, const struct SelvaFieldsSchema *schema, const struct SelvaFields *fields);
 

package/dist/lib/darwin_aarch64/include/selva/types.h

@@ -23,23 +23,13 @@ struct SelvaFieldsSchema;
 
 enum SelvaFieldType {
     SELVA_FIELD_TYPE_NULL = 0,
-    SELVA_FIELD_TYPE_TIMESTAMP = 1,
-#if 0
-    SELVA_FIELD_TYPE_SPARE1 = 2,
-    SELVA_FIELD_TYPE_SPARE2 = 3,
-#endif
     SELVA_FIELD_TYPE_NUMBER = 4,
-#if 0
-    SELVA_FIELD_TYPE_SPARE3 = 5,
-#endif
     SELVA_FIELD_TYPE_INT8 = 20,
     SELVA_FIELD_TYPE_UINT8 = 6,
     SELVA_FIELD_TYPE_INT16 = 21,
     SELVA_FIELD_TYPE_UINT16 = 22,
     SELVA_FIELD_TYPE_INT32 = 23,
     SELVA_FIELD_TYPE_UINT32 = 7,
-    SELVA_FIELD_TYPE_INT64 = 24,
-    SELVA_FIELD_TYPE_UINT64 = 8,
     SELVA_FIELD_TYPE_BOOLEAN = 9,
     SELVA_FIELD_TYPE_ENUM = 10,
     SELVA_FIELD_TYPE_STRING = 11,

package/dist/lib/linux_aarch64/include/selva/db.h

@@ -75,28 +75,92 @@ struct SelvaTypeEntry *selva_get_type_by_node(const struct SelvaDb *db, struct S
  * Get the node schema for type.
  */
 SELVA_EXPORT
-const struct SelvaNodeSchema *selva_get_ns_by_te(const struct SelvaTypeEntry *te) __attribute__((nonnull, pure));
+__attribute__((nonnull, pure))
+inline const struct SelvaNodeSchema *selva_get_ns_by_te(const struct SelvaTypeEntry *te)
+#if !__zig
+{
+    return &te->ns;
+}
+#else
+;
+#endif
 
 SELVA_EXPORT
-const struct SelvaFieldSchema *get_fs_by_fields_schema_field(const struct SelvaFieldsSchema *fields_schema, field_t field) __attribute__((nonnull, pure));
+__attribute__((nonnull, pure))
+inline const struct SelvaFieldSchema *get_fs_by_fields_schema_field(const struct SelvaFieldsSchema *fields_schema, field_t field)
+#if !__zig
+{
+    if (field >= fields_schema->nr_fields) {
+        return nullptr;
+    }
+
+    return &fields_schema->field_schemas[field];
+}
+#else
+;
+#endif
 
 /**
  * Get the field schema for field.
  */
 SELVA_EXPORT
-const struct SelvaFieldSchema *selva_get_fs_by_ns_field(const struct SelvaNodeSchema *ns, field_t field) __attribute__((nonnull, pure));
+__attribute__((nonnull, pure))
+inline const struct SelvaFieldSchema *selva_get_fs_by_te_field(const struct SelvaTypeEntry *te, field_t field)
+#if !__zig
+{
+    return get_fs_by_fields_schema_field(&te->ns.fields_schema, field);
+}
+#else
+;
+#endif
 
 /**
  * Get the field schema for field.
  */
 SELVA_EXPORT
-const struct SelvaFieldSchema *selva_get_fs_by_node(struct SelvaDb *db, struct SelvaNode *node, field_t field) __attribute__((nonnull, pure));
+__attribute__((nonnull, pure))
+inline const struct SelvaFieldSchema *selva_get_fs_by_ns_field(const struct SelvaNodeSchema *ns, field_t field)
+#if !__zig
+{
+    return get_fs_by_fields_schema_field(&ns->fields_schema, field);
+}
+#else
+;
+#endif
+
+/**
+ * Get the field schema for field.
+ */
+SELVA_EXPORT
+__attribute__((nonnull, pure))
+inline const struct SelvaFieldSchema *selva_get_fs_by_node(struct SelvaDb *db, struct SelvaNode *node, field_t field)
+#if !__zig
+{
+    struct SelvaTypeEntry *type;
+
+    type = selva_get_type_by_node(db, node);
+    if (!type) {
+        return nullptr;
+    }
+
+    return selva_get_fs_by_ns_field(&type->ns, field);
+}
+#else
+;
+#endif
 
 SELVA_EXPORT
 #if __has_c_attribute(reproducible)
 [[reproducible]]
 #endif
-enum SelvaFieldType selva_get_fs_type(const struct SelvaFieldSchema *fs);
+inline enum SelvaFieldType selva_get_fs_type(const struct SelvaFieldSchema *fs)
+#if !__zig
+{
+    return fs->type;
+}
+#else
+;
+#endif
 
 /**
  * Get the EdgeFieldConstraint from a ref field schema.
@@ -105,7 +169,17 @@ enum SelvaFieldType selva_get_fs_type(const struct SelvaFieldSchema *fs);
  * struct SelvaFieldSchema *dst_fs = selva_get_fs_by_node(db, dst, efc->inverse_field);
  */
 SELVA_EXPORT
-const struct EdgeFieldConstraint *selva_get_edge_field_constraint(const struct SelvaFieldSchema *fs) __attribute__((nonnull));
+__attribute__((nonnull))
+inline const struct EdgeFieldConstraint *selva_get_edge_field_constraint(const struct SelvaFieldSchema *fs)
+#if !__zig
+{
+    return (fs->type == SELVA_FIELD_TYPE_REFERENCE || fs->type == SELVA_FIELD_TYPE_REFERENCES)
+        ? &fs->edge_constraint
+        : nullptr;
+}
+#else
+;
+#endif
 
 SELVA_EXPORT
 const struct SelvaFieldsSchema *selva_get_edge_field_fields_schema(struct SelvaDb *db, const struct EdgeFieldConstraint *efc);
@@ -173,6 +247,11 @@ struct SelvaNode *selva_prev_node(struct SelvaTypeEntry *type, struct SelvaNode
 SELVA_EXPORT
 struct SelvaNode *selva_next_node(struct SelvaTypeEntry *type, struct SelvaNode *node) __attribute__((nonnull));
 
+/**
+ * \addtogroup db_cursor
+ * @{
+ */
+
 /**
  * Create a new cursor pointing to node.
  * If the node is deleted later then the cursor is updated to point to the next
@@ -205,6 +284,10 @@ void selva_cursor_del(struct SelvaTypeEntry *type, cursor_id_t id) __attribute__
 SELVA_EXPORT
 size_t selva_cursor_count(const struct SelvaTypeEntry *type) __attribute__((nonnull));
 
+/**
+ * @}
+ */
+
 /**
  * Total count of nodes of type.
  */

package/dist/lib/linux_aarch64/include/selva/fields.h

@@ -58,37 +58,21 @@ struct SelvaNodeWeakReferences {
     struct SelvaNodeWeakReference *refs __pcounted_by(nr_refs);
 };
 
-struct SelvaMicroBuffer {
-    uint16_t len;
-    uint8_t data[] __counted_by(len);
-} __packed;
-
-struct SelvaFieldsAny {
-    enum SelvaFieldType type; /*!< Type of the value. */
-    union {
-        bool boolean; /*!< SELVA_FIELD_TYPE_BOOLEAN */
-        double number; /*!< SELVA_FIELD_TYPE_NUMBER */
-        int64_t timestamp; /*!< SELVA_FIELD_TYPE_TIMESTAMP, should fit time_t */
-        struct selva_string *string; /*!< SELVA_FIELD_TYPE_STRING */
-        int8_t int8; /* SELVA_FIELD_TYPE_INT8 */
-        uint8_t uint8; /*!< SELVA_FIELD_TYPE_UINT8 */
-        int16_t int16; /*!< SELVA_FIELD_TYPE_INT16 */
-        uint16_t uint16; /*!< SELVA_FIELD_TYPE_UINT16 */
-        int32_t int32; /*!< SELVA_FIELD_TYPE_INT32 */
-        uint32_t uint32; /*!< SELVA_FIELD_TYPE_UINT32 */
-        int64_t int64; /* SELVA_FIELD_TYPE_INT64 */
-        uint64_t uint64; /*!< SELVA_FIELD_TYPE_UINT64 */
-        uint8_t enu; /*!< SELVA_FIELD_TYPE_ENUM */
-#if 0
-        struct SelvaTextField *text; /*!< SELVA_FIELD_TYPE_TEXT */
-        struct SelvaNodeReference *reference; /*!< SELVA_FIELD_TYPE_REFERENCE */
-        struct SelvaNodeReferences *references; /*!< SELVA_FIELD_TYPE_REFERENCES */
-        struct SelvaNodeWeakReference weak_reference; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCE */
-        struct SelvaNodeWeakReferences weak_references; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCES */
-        struct SelvaMicroBuffer *smb; /*!< SELVA_FIELD_TYPE_MICRO_BUFFER */
-#endif
-        // HyperLogLogPlusPlus cardinality; /*!< SELVA_FIELD_TYPE_HLL */
-    };
+/**
+ * Type helper to determine the size of statically (constant/fixed) sized fields.
+ */
+union SelvaStaticFields {
+    bool boolean; /*!< SELVA_FIELD_TYPE_BOOLEAN */
+    double number; /*!< SELVA_FIELD_TYPE_NUMBER */
+    struct selva_string *string; /*!< SELVA_FIELD_TYPE_STRING */
+    int8_t int8; /* SELVA_FIELD_TYPE_INT8 */
+    uint8_t uint8; /*!< SELVA_FIELD_TYPE_UINT8 */
+    int16_t int16; /*!< SELVA_FIELD_TYPE_INT16 */
+    uint16_t uint16; /*!< SELVA_FIELD_TYPE_UINT16 */
+    int32_t int32; /*!< SELVA_FIELD_TYPE_INT32 */
+    uint32_t uint32; /*!< SELVA_FIELD_TYPE_UINT32 */
+    uint8_t enu; /*!< SELVA_FIELD_TYPE_ENUM */
+    struct SelvaNodeWeakReference weak_reference; /*!< SELVA_FIELD_TYPE_WEAK_REFERENCE */
 };
 
 struct SelvaFieldsPointer {
@@ -128,7 +112,6 @@ int selva_fields_get_mutable_string(
     __attribute__((access(write_only, 4)));
 
 /*
- * TODO prefix with selva_
  * TODO Document diff to get_mutable_string
  */
 SELVA_EXPORT
@@ -137,6 +120,15 @@ struct selva_string *selva_fields_ensure_string(
         const struct SelvaFieldSchema *fs,
         size_t initial_len);
 
+SELVA_EXPORT
+struct selva_string *selva_fields_ensure_string2(
+        struct SelvaDb *db,
+        struct SelvaNode *node,
+        const struct EdgeFieldConstraint *efc,
+        struct SelvaNodeReference *ref,
+        const struct SelvaFieldSchema *fs,
+        size_t initial_len);
+
 SELVA_EXPORT
 int selva_fields_reference_set(
         struct SelvaDb *db,
@@ -274,16 +266,16 @@ int selva_fields_get_text(
         size_t *len);
 
 SELVA_EXPORT
-struct SelvaNodeReference *selva_fields_get_reference(struct SelvaNode *node, field_t field);
+struct SelvaNodeReference *selva_fields_get_reference(struct SelvaDb *db, struct SelvaNode *node, field_t field);
 
 SELVA_EXPORT
-struct SelvaNodeReferences *selva_fields_get_references(struct SelvaNode *node, field_t field);
+struct SelvaNodeReferences *selva_fields_get_references(struct SelvaDb *db, struct SelvaNode *node, field_t field);
 
 SELVA_EXPORT
-struct SelvaNodeWeakReference selva_fields_get_weak_reference(struct SelvaFields *fields, field_t field);
+struct SelvaNodeWeakReference selva_fields_get_weak_reference(struct SelvaDb *db, struct SelvaFields *fields, field_t field);
 
 SELVA_EXPORT
-struct SelvaNodeWeakReferences selva_fields_get_weak_references(struct SelvaFields *fields, field_t field);
+struct SelvaNodeWeakReferences selva_fields_get_weak_references(struct SelvaDb *db, struct SelvaFields *fields, field_t field);
 
 SELVA_EXPORT
 struct SelvaNode *selva_fields_resolve_weak_reference(
@@ -333,9 +325,6 @@ void selva_fields_init(const struct SelvaFieldsSchema *schema, struct SelvaField
 SELVA_EXPORT
 void selva_fields_destroy(struct SelvaDb *db, struct SelvaNode *node);
 
-SELVA_EXPORT
-int selva_fields_get_text_crc(const struct SelvaNode *node, const struct SelvaFieldSchema *fs, enum selva_lang_code lang, uint32_t *crc);
-
 SELVA_EXPORT
 void selva_fields_hash_update(struct XXH3_state_s *hash_state, struct SelvaDb *db, const struct SelvaFieldsSchema *schema, const struct SelvaFields *fields);
 

package/dist/lib/linux_aarch64/include/selva/types.h

@@ -23,23 +23,13 @@ struct SelvaFieldsSchema;
 
 enum SelvaFieldType {
     SELVA_FIELD_TYPE_NULL = 0,
-    SELVA_FIELD_TYPE_TIMESTAMP = 1,
-#if 0
-    SELVA_FIELD_TYPE_SPARE1 = 2,
-    SELVA_FIELD_TYPE_SPARE2 = 3,
-#endif
     SELVA_FIELD_TYPE_NUMBER = 4,
-#if 0
-    SELVA_FIELD_TYPE_SPARE3 = 5,
-#endif
     SELVA_FIELD_TYPE_INT8 = 20,
     SELVA_FIELD_TYPE_UINT8 = 6,
     SELVA_FIELD_TYPE_INT16 = 21,
     SELVA_FIELD_TYPE_UINT16 = 22,
     SELVA_FIELD_TYPE_INT32 = 23,
     SELVA_FIELD_TYPE_UINT32 = 7,
-    SELVA_FIELD_TYPE_INT64 = 24,
-    SELVA_FIELD_TYPE_UINT64 = 8,
     SELVA_FIELD_TYPE_BOOLEAN = 9,
     SELVA_FIELD_TYPE_ENUM = 10,
     SELVA_FIELD_TYPE_STRING = 11,