Move common/object.h to common/type/object.h.

This header does not contain a type but is used to define types so this seems like a better location.

src/command/backup/pageChecksum.c

@@ -8,7 +8,7 @@ Page Checksum Filter
 #include "command/backup/pageChecksum.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "postgres/interface.h"
 #include "postgres/interface/static.auto.h"
 

src/common/compress/gz/compress.c

@@ -12,7 +12,7 @@ Gz Compress
 #include "common/io/filter/filter.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Filter type constant

src/common/compress/gz/decompress.c

@@ -12,7 +12,7 @@ Gz Decompress
 #include "common/io/filter/filter.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Filter type constant

src/common/compress/lz4/compress.c

@@ -17,7 +17,7 @@ Developed against version r131 using the documentation in https://github.com/lz4
 #include "common/io/filter/filter.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Older versions of lz4 do not define the max header size.  This seems to be the max for any version.

src/common/compress/lz4/decompress.c

@@ -14,7 +14,7 @@ LZ4 Decompress
 #include "common/io/filter/filter.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Filter type constant

src/common/crypto/cipherBlock.c

@@ -14,7 +14,7 @@ Block Cipher
 #include "common/io/filter/filter.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Filter type constant

src/common/crypto/hash.c

@@ -14,7 +14,7 @@ Cryptographic Hash
 #include "common/io/filter/filter.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/crypto/common.h"
 
 /***********************************************************************************************************************************

src/common/exec.c

@@ -18,7 +18,7 @@ Execute Process
 #include "common/io/io.h"
 #include "common/io/read.intern.h"
 #include "common/io/write.intern.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/wait.h"
 
 /***********************************************************************************************************************************

src/common/ini.c

@@ -12,7 +12,7 @@ Ini Handler
 #include "common/log.h"
 #include "common/ini.h"
 #include "common/type/keyValue.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/bufferRead.c

@@ -8,7 +8,7 @@ Buffer IO Read
 #include "common/io/read.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/bufferWrite.c

@@ -8,7 +8,7 @@ Buffer IO Write
 #include "common/io/write.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/filter/buffer.c

@@ -10,7 +10,7 @@ IO Buffer Filter
 #include "common/io/filter/filter.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Filter type constant

src/common/io/filter/filter.c

@@ -7,7 +7,7 @@ IO Filter Interface
 #include "common/io/filter/filter.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/filter/group.c

@@ -12,8 +12,8 @@ IO Filter Group
 #include "common/io/io.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Filter and buffer structure

src/common/io/filter/sink.c

@@ -8,7 +8,7 @@ IO Sink Filter
 #include "common/io/filter/sink.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Filter type constant

src/common/io/filter/size.c

@@ -10,7 +10,7 @@ IO Size Filter
 #include "common/io/filter/size.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Filter type constant

src/common/io/handleRead.c

@@ -11,7 +11,7 @@ Handle IO Read
 #include "common/io/read.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/handleWrite.c

@@ -10,7 +10,7 @@ Handle IO Write
 #include "common/io/write.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/http/cache.c

@@ -6,8 +6,8 @@ Http Client Cache
 #include "common/debug.h"
 #include "common/io/http/cache.h"
 #include "common/log.h"
-#include "common/object.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/http/client.c

@@ -10,7 +10,7 @@ Http Client
 #include "common/io/read.intern.h"
 #include "common/io/tls/client.h"
 #include "common/log.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/wait.h"
 
 /***********************************************************************************************************************************

src/common/io/http/header.c

@@ -6,8 +6,8 @@ Http Header
 #include "common/debug.h"
 #include "common/io/http/header.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/keyValue.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/http/query.c

@@ -7,8 +7,8 @@ Http Query
 #include "common/io/http/common.h"
 #include "common/io/http/query.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/keyValue.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/read.c

@@ -10,7 +10,7 @@ IO Read Interface
 #include "common/io/read.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/io/tls/client.c

@@ -33,9 +33,9 @@ TLS Client
 #include "common/io/read.intern.h"
 #include "common/io/write.intern.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/time.h"
 #include "common/type/keyValue.h"
+#include "common/type/object.h"
 #include "common/wait.h"
 
 /***********************************************************************************************************************************

src/common/io/write.c

@@ -10,7 +10,7 @@ IO Write Interface
 #include "common/io/write.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/macro.h

@@ -16,7 +16,7 @@ Useful for converting non-string types (e.g. int) to strings for inclusion in me
 Glue together a string/macro and another string//macro
 
 Useful for creating function names when one or both of the macro parameter needs to be converted to a macro before concatenating.
-common/object.h has numerous examples of this.
+common/type/object.h has numerous examples of this.
 ***********************************************************************************************************************************/
 #define GLUE_HELPER(param1, param2)                                 param1##param2
 #define GLUE(param1, param2)                                        GLUE_HELPER(param1, param2)

src/common/regExp.c

@@ -8,7 +8,7 @@ Regular Expression Handler
 
 #include "common/debug.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/regExp.h"
 
 /***********************************************************************************************************************************

src/common/type/buffer.c

@@ -8,7 +8,7 @@ Buffer Handler
 
 #include "common/debug.h"
 #include "common/type/buffer.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Constant buffers that are generally useful

src/common/type/keyValue.c

@@ -7,9 +7,9 @@ Key Value Handler
 
 #include "common/debug.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/keyValue.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 #include "common/type/variantList.h"
 
 /***********************************************************************************************************************************

src/common/type/list.c

@@ -10,7 +10,7 @@ List Handler
 
 #include "common/debug.h"
 #include "common/type/list.h"
-#include "common/object.h"
+#include "common/type/object.h"
 
 /***********************************************************************************************************************************
 Object type

src/common/type/mcv.c

@@ -4,9 +4,9 @@ Calculate Most Common Value
 #include "build.auto.h"
 
 #include "common/debug.h"
-#include "common/object.h"
 #include "common/type/list.h"
 #include "common/type/mcv.h"
+#include "common/type/object.h"
 #include "common/type/variant.h"
 
 /***********************************************************************************************************************************

src/common/type/object.h

@@ -15,8 +15,8 @@ String) a shorter prefix may be used.
 When a macro exists to create a function definition in a C file there is no equivalent macro to create the prototype in the header.
 The prototype is not repetitious enough to justify a macro and it would only serve to obfuscate the header file.
 ***********************************************************************************************************************************/
-#ifndef COMMON_OBJECT_H
-#define COMMON_OBJECT_H
+#ifndef COMMON_TYPE_OBJECT_H
+#define COMMON_TYPE_OBJECT_H
 
 #include "common/macro.h"
 

src/common/type/xml.c

@@ -11,8 +11,8 @@ Xml Handler
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 #include "common/type/xml.h"
 
 /***********************************************************************************************************************************

src/common/wait.c

@@ -6,7 +6,7 @@ Wait Handler
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/wait.h"
 
 /***********************************************************************************************************************************

src/db/db.c

@@ -6,7 +6,7 @@ Database Client
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/wait.h"
 #include "db/db.h"
 #include "db/protocol.h"

src/info/info.c

@@ -15,8 +15,8 @@ Info Handler
 #include "common/ini.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/json.h"
+#include "common/type/object.h"
 #include "info/info.h"
 #include "storage/helper.h"
 #include "version.h"

src/info/infoArchive.c

@@ -13,7 +13,7 @@ Archive Info Handler
 #include "common/log.h"
 #include "common/ini.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "info/infoArchive.h"
 #include "info/infoPg.h"
 #include "postgres/interface.h"

src/info/infoBackup.c

@@ -14,10 +14,10 @@ Backup Info Handler
 #include "common/ini.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/regExp.h"
 #include "common/type/json.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 #include "info/infoBackup.h"
 #include "info/manifest.h"
 #include "postgres/interface.h"

src/info/infoPg.c

@@ -14,9 +14,9 @@ PostgreSQL Info Handler
 #include "common/ini.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/json.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 #include "info/info.h"
 #include "info/infoPg.h"
 #include "postgres/interface.h"

src/info/manifest.c

@@ -10,11 +10,11 @@ Backup Manifest Handler
 #include "common/crypto/cipherBlock.h"
 #include "common/debug.h"
 #include "common/log.h"
-#include "common/object.h"
 #include "common/regExp.h"
 #include "common/type/json.h"
 #include "common/type/list.h"
 #include "common/type/mcv.h"
+#include "common/type/object.h"
 #include "info/info.h"
 #include "info/manifest.h"
 #include "postgres/interface.h"

src/postgres/client.c

@@ -8,8 +8,8 @@ Postgres Client
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 #include "common/wait.h"
 #include "postgres/client.h"
 

src/protocol/client.c

@@ -6,10 +6,10 @@ Protocol Client
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/time.h"
 #include "common/type/json.h"
 #include "common/type/keyValue.h"
+#include "common/type/object.h"
 #include "protocol/client.h"
 #include "version.h"
 

src/protocol/command.c

@@ -6,9 +6,9 @@ Protocol Command
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/json.h"
 #include "common/type/keyValue.h"
+#include "common/type/object.h"
 #include "protocol/command.h"
 
 /***********************************************************************************************************************************

src/protocol/parallel.c

@@ -9,10 +9,10 @@ Protocol Parallel Executor
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/json.h"
 #include "common/type/keyValue.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 #include "protocol/command.h"
 #include "protocol/parallel.h"
 

src/protocol/parallelJob.c

@@ -6,7 +6,7 @@ Protocol Parallel Job
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "protocol/command.h"
 #include "protocol/parallelJob.h"
 

src/protocol/server.c

@@ -8,11 +8,11 @@ Protocol Server
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/time.h"
 #include "common/type/json.h"
 #include "common/type/keyValue.h"
 #include "common/type/list.h"
+#include "common/type/object.h"
 #include "protocol/client.h"
 #include "protocol/helper.h"
 #include "protocol/server.h"

src/storage/posix/read.c

@@ -10,7 +10,7 @@ Posix Storage Read
 #include "common/io/read.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "storage/posix/read.h"
 #include "storage/posix/storage.intern.h"
 #include "storage/read.intern.h"

src/storage/posix/storage.intern.h

@@ -4,7 +4,7 @@ Posix Storage Internal
 #ifndef STORAGE_POSIX_STORAGE_INTERN_H
 #define STORAGE_POSIX_STORAGE_INTERN_H
 
-#include "common/object.h"
+#include "common/type/object.h"
 #include "storage/posix/storage.h"
 
 /***********************************************************************************************************************************

src/storage/posix/write.c

@@ -12,7 +12,7 @@ Posix Storage File write
 #include "common/io/write.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/user.h"
 #include "storage/posix/storage.intern.h"
 #include "storage/posix/write.h"

src/storage/read.c

@@ -6,7 +6,7 @@ Storage Read Interface
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "storage/read.intern.h"
 
 /***********************************************************************************************************************************

src/storage/remote/read.c

@@ -11,8 +11,8 @@ Remote Storage Read
 #include "common/io/read.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/convert.h"
+#include "common/type/object.h"
 #include "storage/remote/protocol.h"
 #include "storage/remote/read.h"
 #include "storage/read.intern.h"

src/storage/remote/storage.c

@@ -6,8 +6,8 @@ Remote Storage
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/type/json.h"
+#include "common/type/object.h"
 #include "storage/remote/protocol.h"
 #include "storage/remote/read.h"
 #include "storage/remote/storage.intern.h"

src/storage/remote/write.c

@@ -8,7 +8,7 @@ Remote Storage File write
 #include "common/io/write.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "storage/remote/protocol.h"
 #include "storage/remote/write.h"
 #include "storage/write.intern.h"

src/storage/s3/read.c

@@ -11,7 +11,7 @@ S3 Storage Read
 #include "common/io/read.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "storage/s3/read.h"
 #include "storage/read.intern.h"
 

src/storage/s3/storage.c

@@ -12,8 +12,8 @@ S3 Storage
 #include "common/io/http/common.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
 #include "common/regExp.h"
+#include "common/type/object.h"
 #include "common/type/xml.h"
 #include "storage/s3/read.h"
 #include "storage/s3/storage.intern.h"

src/storage/s3/write.c

@@ -7,7 +7,7 @@ S3 Storage File write
 #include "common/io/write.intern.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/type/xml.h"
 #include "storage/s3/write.h"
 #include "storage/write.intern.h"

src/storage/storage.c

@@ -11,7 +11,7 @@ Storage Interface
 #include "common/type/list.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "common/regExp.h"
 #include "common/wait.h"
 #include "storage/storage.intern.h"

src/storage/write.c

@@ -6,7 +6,7 @@ Storage Write Interface
 #include "common/debug.h"
 #include "common/log.h"
 #include "common/memContext.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "storage/write.intern.h"
 
 /***********************************************************************************************************************************

test/code-count/file-type.yaml

@@ -863,7 +863,7 @@ src/common/memContext.h:
   class: core
   type: c/h
 
-src/common/object.h:
+src/common/type/object.h:
   class: core
   type: c/h
 

test/define.yaml

@@ -119,13 +119,6 @@ unit:
         coverage:
           common/debug: full
 
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: object
-        total: 1
-
-        coverage:
-          common/object: noCode
-
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: lock
         total: 2
@@ -154,6 +147,13 @@ unit:
         coverage:
           common/type/convert: full
 
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: type-object
+        total: 1
+
+        coverage:
+          common/type/object: noCode
+
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: type-list
         total: 4

test/src/module/performance/storageTest.c

@@ -19,7 +19,7 @@ stress testing as needed.
 #include "common/io/handleRead.h"
 #include "common/io/handleWrite.h"
 #include "common/io/io.h"
-#include "common/object.h"
+#include "common/type/object.h"
 #include "protocol/client.h"
 #include "protocol/server.h"
 #include "storage/posix/storage.h"