Update Swift refinements for graph counter query

Author: jcmosc

Sources/OpenGraph/Graph/Graph.swift

@@ -81,7 +81,7 @@ extension Graph {
 extension Graph {
     @_transparent
     @inline(__always)
-    public var mainUpdates: Int { numericCast(counter(for: .mainThreadUpdateCount)) }
+    public var mainUpdates: Int { numericCast(counter(for: .mainThreadUpdates)) }
 }
 
 extension Graph {

Sources/OpenGraphCxx/Graph/OGGraph.cpp

@@ -158,13 +158,13 @@ uint64_t OGGraphGetCounter(OGGraphRef graph, OGCounterQueryType query) {
     }
     OG::Graph::Context& context = graph->context;
     switch (query) {
-        case OGCounterQueryTypeNodeCount:
+        case OGCounterQueryTypeNodes:
             return context.get_graph().get_counter_0();
-        case OGCounterQueryTypeTransactionCount:
+        case OGCounterQueryTypeTransactions:
             return context.get_graph().get_counter_1();
-        case OGCounterQueryTypeUpdateCount:
+        case OGCounterQueryTypeUpdates:
             return context.get_graph().get_counter_2();
-        case OGCounterQueryTypeChangeCount:
+        case OGCounterQueryTypeChanges:
             return context.get_graph().get_counter_3();
         case OGCounterQueryTypeContextID:
             return context.get_graph().get_counter_4();
@@ -178,7 +178,7 @@ uint64_t OGGraphGetCounter(OGGraphRef graph, OGCounterQueryType query) {
             return context.get_graph().get_counter_8();
         case OGCounterQueryTypeNeedsUpdate:
             return context.get_graph().get_counter_9();
-        case OGCounterQueryTypeMainThreadUpdateCount:
+        case OGCounterQueryTypeMainThreadUpdates:
             return context.get_graph().get_counter_10();
         default:
             return 0;

Sources/OpenGraphCxx/include/OpenGraph/OGCounterQueryType.h

@@ -8,20 +8,20 @@
 #include <OpenGraph/OGBase.h>
 
 typedef OG_ENUM(uint32_t, OGCounterQueryType) {
-    OGCounterQueryTypeNodeCount,
-    OGCounterQueryTypeTransactionCount,
-    OGCounterQueryTypeUpdateCount,
-    OGCounterQueryTypeChangeCount,
+    OGCounterQueryTypeNodes,
+    OGCounterQueryTypeTransactions,
+    OGCounterQueryTypeUpdates,
+    OGCounterQueryTypeChanges,
     OGCounterQueryTypeContextID,
     OGCounterQueryTypeGraphID,
     OGCounterQueryTypeContextThreadUpdating,
     OGCounterQueryTypeThreadUpdating,
     OGCounterQueryTypeContextNeedsUpdate,
     OGCounterQueryTypeNeedsUpdate,
-    OGCounterQueryTypeMainThreadUpdateCount,
-    OGCounterQueryTypeNodeTotalCount,
-    OGCounterQueryTypeSubgraphCount,
-    OGCounterQueryTypeSubgraphTotalCount,
-};
+    OGCounterQueryTypeMainThreadUpdates,
+    OGCounterQueryTypeCreatedNodes,
+    OGCounterQueryTypeSubgraphs,
+    OGCounterQueryTypeCreatedSubgraphs,
+} OG_SWIFT_NAME(OGGraphRef.CounterQueryType);
 
 #endif /* OGCounterQueryType_h */