From 4abf27b28eb6e6cb666bf00264e4a6af74918687 Mon Sep 17 00:00:00 2001
From: Steve Johnson <steve@hopper.com>
Date: Wed, 25 Jul 2018 00:43:53 -0400
Subject: [PATCH] fix: Match interface counter64 OIDs with unsigned bigint
 (#8940)

* fix: Match interface counter64 OIDs with unsigned bigint

* move to one line, add ifInOctets

* Update db_schema.yaml

* Update db_schema.yaml
---
 misc/db_schema.yaml | 48 ++++++++++++++++++++++-----------------------
 sql-schema/256.sql  |  1 +
 2 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 sql-schema/256.sql

diff --git a/misc/db_schema.yaml b/misc/db_schema.yaml
index c229408cb6..78e907dcf2 100644
--- a/misc/db_schema.yaml
+++ b/misc/db_schema.yaml
@@ -1163,30 +1163,30 @@ ports:
     - { Field: pagpEthcOperationMode, Type: varchar(16), 'Null': true, Extra: '' }
     - { Field: pagpDeviceId, Type: varchar(48), 'Null': true, Extra: '' }
     - { Field: pagpGroupIfIndex, Type: int(11), 'Null': true, Extra: '' }
-    - { Field: ifInUcastPkts, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInUcastPkts_prev, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInUcastPkts_delta, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInUcastPkts_rate, Type: int(11), 'Null': true, Extra: '' }
-    - { Field: ifOutUcastPkts, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutUcastPkts_prev, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutUcastPkts_delta, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutUcastPkts_rate, Type: int(11), 'Null': true, Extra: '' }
-    - { Field: ifInErrors, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInErrors_prev, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInErrors_delta, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInErrors_rate, Type: int(11), 'Null': true, Extra: '' }
-    - { Field: ifOutErrors, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutErrors_prev, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutErrors_delta, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutErrors_rate, Type: int(11), 'Null': true, Extra: '' }
-    - { Field: ifInOctets, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInOctets_prev, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInOctets_delta, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifInOctets_rate, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutOctets, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutOctets_prev, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutOctets_delta, Type: bigint(20), 'Null': true, Extra: '' }
-    - { Field: ifOutOctets_rate, Type: bigint(20), 'Null': true, Extra: '' }
+    - { Field: ifInUcastPkts, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInUcastPkts_prev, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInUcastPkts_delta, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInUcastPkts_rate, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutUcastPkts, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutUcastPkts_prev, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutUcastPkts_delta, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutUcastPkts_rate, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInErrors, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInErrors_prev, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInErrors_delta, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInErrors_rate, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutErrors, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutErrors_prev, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutErrors_delta, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutErrors_rate, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInOctets, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInOctets_prev, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInOctets_delta, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifInOctets_rate, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutOctets, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutOctets_prev, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutOctets_delta, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
+    - { Field: ifOutOctets_rate, Type: 'bigint(20) unsigned', 'Null': true, Extra: '' }
     - { Field: poll_time, Type: int(11), 'Null': true, Extra: '' }
     - { Field: poll_prev, Type: int(11), 'Null': true, Extra: '' }
     - { Field: poll_period, Type: int(11), 'Null': true, Extra: '' }
diff --git a/sql-schema/256.sql b/sql-schema/256.sql
new file mode 100644
index 0000000000..394f5d555a
--- /dev/null
+++ b/sql-schema/256.sql
@@ -0,0 +1 @@
+ALTER TABLE `ports` MODIFY `ifInUcastPkts` BIGINT UNSIGNED, MODIFY `ifInUcastPkts_prev` BIGINT UNSIGNED, MODIFY `ifInUcastPkts_delta` BIGINT UNSIGNED, MODIFY `ifInUcastPkts_rate` BIGINT UNSIGNED, MODIFY `ifOutUcastPkts` BIGINT UNSIGNED, MODIFY `ifOutUcastPkts_prev` BIGINT UNSIGNED, MODIFY `ifOutUcastPkts_delta` BIGINT UNSIGNED, MODIFY `ifOutUcastPkts_rate` BIGINT UNSIGNED, MODIFY `ifInErrors` BIGINT UNSIGNED, MODIFY `ifInErrors_prev` BIGINT UNSIGNED, MODIFY `ifInErrors_delta` BIGINT UNSIGNED, MODIFY `ifInErrors_rate` BIGINT UNSIGNED, MODIFY `ifOutErrors` BIGINT UNSIGNED, MODIFY `ifOutErrors_prev` BIGINT UNSIGNED, MODIFY `ifOutErrors_delta` BIGINT UNSIGNED, MODIFY `ifOutErrors_rate` BIGINT UNSIGNED, MODIFY `ifInOctets` BIGINT UNSIGNED, MODIFY `ifInOctets_prev` BIGINT UNSIGNED, MODIFY `ifInOctets_delta` BIGINT UNSIGNED, MODIFY `ifInOctets_rate` BIGINT UNSIGNED, MODIFY `ifOutOctets` BIGINT UNSIGNED, MODIFY `ifOutOctets_prev` BIGINT UNSIGNED, MODIFY `ifOutOctets_delta` BIGINT UNSIGNED, MODIFY `ifOutOctets_rate` BIGINT UNSIGNED;