Changeset: e48b004ad7f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e48b004ad7f9
Modified Files:
        clients/Tests/MAL-signatures-hge.test
        clients/Tests/MAL-signatures.test
        sql/backends/monet5/sql_upgrades.c
        
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.int128
        
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: inet4+6
Log Message:

Implemented and approved inet4/inet6 upgrade code.


diffs (truncated from 7396 to 300 lines):

diff --git a/clients/Tests/MAL-signatures-hge.test 
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -25870,6 +25870,46 @@ CMDbatAND
 Return B and V
 batcalc
 and
+pattern batcalc.and(X_0:bat[:inet4], X_1:bat[:inet4]):bat[:inet4]
+CMDbatAND
+Return B1 and B2
+batcalc
+and
+pattern batcalc.and(X_0:bat[:inet4], X_1:bat[:inet4], X_2:bat[:oid], 
X_3:bat[:oid]):bat[:inet4]
+CMDbatAND
+Return B1 and B2
+batcalc
+and
+pattern batcalc.and(X_0:bat[:inet4], X_1:inet4):bat[:inet4]
+CMDbatAND
+Return B and V
+batcalc
+and
+pattern batcalc.and(X_0:bat[:inet4], X_1:inet4, X_2:bat[:oid]):bat[:inet4]
+CMDbatAND
+Return B and V
+batcalc
+and
+pattern batcalc.and(X_0:bat[:inet6], X_1:bat[:inet6]):bat[:inet6]
+CMDbatAND
+Return B1 and B2
+batcalc
+and
+pattern batcalc.and(X_0:bat[:inet6], X_1:bat[:inet6], X_2:bat[:oid], 
X_3:bat[:oid]):bat[:inet6]
+CMDbatAND
+Return B1 and B2
+batcalc
+and
+pattern batcalc.and(X_0:bat[:inet6], X_1:inet6):bat[:inet6]
+CMDbatAND
+Return B and V
+batcalc
+and
+pattern batcalc.and(X_0:bat[:inet6], X_1:inet6, X_2:bat[:oid]):bat[:inet6]
+CMDbatAND
+Return B and V
+batcalc
+and
 pattern batcalc.and(X_0:bat[:int], X_1:bat[:int]):bat[:int]
 CMDbatAND
 Return B1 and B2
@@ -25980,6 +26020,26 @@ CMDbatAND
 Return V and B
 batcalc
 and
+pattern batcalc.and(X_0:inet4, X_1:bat[:inet4]):bat[:inet4]
+CMDbatAND
+Return V and B
+batcalc
+and
+pattern batcalc.and(X_0:inet4, X_1:bat[:inet4], X_2:bat[:oid]):bat[:inet4]
+CMDbatAND
+Return V and B
+batcalc
+and
+pattern batcalc.and(X_0:inet6, X_1:bat[:inet6]):bat[:inet6]
+CMDbatAND
+Return V and B
+batcalc
+and
+pattern batcalc.and(X_0:inet6, X_1:bat[:inet6], X_2:bat[:oid]):bat[:inet6]
+CMDbatAND
+Return V and B
+batcalc
+and
 pattern batcalc.and(X_0:int, X_1:bat[:int]):bat[:int]
 CMDbatAND
 Return V and B
@@ -29102,12 +29162,12 @@ batcalc
 inet4
 command batcalc.inet4(X_0:bat[:str], X_1:bat[:oid]):bat[:inet4]
 INETstr2inet4_bulk
-Coerce a string to a inet4, validating its format
+Coerce a string to an inet4, validating its format
 batcalc
 inet6
 command batcalc.inet6(X_0:bat[:inet4], X_1:bat[:oid]):bat[:inet6]
 INETinet42inet6_bulk
-Coerce a inet4 to a inet6
+Coerce an inet4 to an inet6
 batcalc
 inet6
 command batcalc.inet6(X_0:bat[:inet6], X_1:bat[:oid]):bat[:inet6]
@@ -29117,7 +29177,7 @@ batcalc
 inet6
 command batcalc.inet6(X_0:bat[:str], X_1:bat[:oid]):bat[:inet6]
 INETstr2inet6_bulk
-Coerce a string to a inet6, validating its format
+Coerce a string to an inet6, validating its format
 batcalc
 int
 pattern batcalc.int(X_0:bat[:bit]):bat[:int]
@@ -29780,6 +29840,26 @@ CMDbatNOT
 Unary bitwise not over the tail of the bat with candidates list
 batcalc
 not
+pattern batcalc.not(X_0:bat[:inet4]):bat[:inet4]
+CMDbatNOT
+Unary bitwise not over the tail of the bat
+batcalc
+not
+pattern batcalc.not(X_0:bat[:inet4], X_1:bat[:oid]):bat[:inet4]
+CMDbatNOT
+Unary bitwise not over the tail of the bat with candidates list
+batcalc
+not
+pattern batcalc.not(X_0:bat[:inet6]):bat[:inet6]
+CMDbatNOT
+Unary bitwise not over the tail of the bat
+batcalc
+not
+pattern batcalc.not(X_0:bat[:inet6], X_1:bat[:oid]):bat[:inet6]
+CMDbatNOT
+Unary bitwise not over the tail of the bat with candidates list
+batcalc
+not
 pattern batcalc.not(X_0:bat[:int]):bat[:int]
 CMDbatNOT
 Unary bitwise not over the tail of the bat
@@ -30010,6 +30090,46 @@ CMDbatOR
 Return B or V
 batcalc
 or
+pattern batcalc.or(X_0:bat[:inet4], X_1:bat[:inet4]):bat[:inet4]
+CMDbatOR
+Return B1 or B2
+batcalc
+or
+pattern batcalc.or(X_0:bat[:inet4], X_1:bat[:inet4], X_2:bat[:oid], 
X_3:bat[:oid]):bat[:inet4]
+CMDbatOR
+Return B1 or B2
+batcalc
+or
+pattern batcalc.or(X_0:bat[:inet4], X_1:inet4):bat[:inet4]
+CMDbatOR
+Return B or V
+batcalc
+or
+pattern batcalc.or(X_0:bat[:inet4], X_1:inet4, X_2:bat[:oid]):bat[:inet4]
+CMDbatOR
+Return B or V
+batcalc
+or
+pattern batcalc.or(X_0:bat[:inet6], X_1:bat[:inet6]):bat[:inet6]
+CMDbatOR
+Return B1 or B2
+batcalc
+or
+pattern batcalc.or(X_0:bat[:inet6], X_1:bat[:inet6], X_2:bat[:oid], 
X_3:bat[:oid]):bat[:inet6]
+CMDbatOR
+Return B1 or B2
+batcalc
+or
+pattern batcalc.or(X_0:bat[:inet6], X_1:inet6):bat[:inet6]
+CMDbatOR
+Return B or V
+batcalc
+or
+pattern batcalc.or(X_0:bat[:inet6], X_1:inet6, X_2:bat[:oid]):bat[:inet6]
+CMDbatOR
+Return B or V
+batcalc
+or
 pattern batcalc.or(X_0:bat[:int], X_1:bat[:int]):bat[:int]
 CMDbatOR
 Return B1 or B2
@@ -30120,6 +30240,26 @@ CMDbatOR
 Return V or B
 batcalc
 or
+pattern batcalc.or(X_0:inet4, X_1:bat[:inet4]):bat[:inet4]
+CMDbatOR
+Return V or B
+batcalc
+or
+pattern batcalc.or(X_0:inet4, X_1:bat[:inet4], X_2:bat[:oid]):bat[:inet4]
+CMDbatOR
+Return V or B
+batcalc
+or
+pattern batcalc.or(X_0:inet6, X_1:bat[:inet6]):bat[:inet6]
+CMDbatOR
+Return V or B
+batcalc
+or
+pattern batcalc.or(X_0:inet6, X_1:bat[:inet6], X_2:bat[:oid]):bat[:inet6]
+CMDbatOR
+Return V or B
+batcalc
+or
 pattern batcalc.or(X_0:int, X_1:bat[:int]):bat[:int]
 CMDbatOR
 Return V or B
@@ -30697,12 +30837,12 @@ batcalc
 str
 command batcalc.str(X_0:bat[:inet4], X_1:bat[:oid]):bat[:str]
 INETinet42str_bulk
-Coerce a inet4 to a string type
+Coerce an inet4 to a string type
 batcalc
 str
 command batcalc.str(X_0:bat[:inet6], X_1:bat[:oid]):bat[:str]
 INETinet62str_bulk
-Coerce a inet6 to a string type
+Coerce an inet6 to a string type
 batcalc
 str
 pattern batcalc.str(X_0:int, X_1:int, X_2:int, X_3:int, X_4:bat[:any_1], 
X_5:bat[:oid], X_6:int):bat[:str]
@@ -30895,6 +31035,46 @@ CMDbatXOR
 Return B xor V
 batcalc
 xor
+pattern batcalc.xor(X_0:bat[:inet4], X_1:bat[:inet4]):bat[:inet4]
+CMDbatXOR
+Return B1 xor B2
+batcalc
+xor
+pattern batcalc.xor(X_0:bat[:inet4], X_1:bat[:inet4], X_2:bat[:oid], 
X_3:bat[:oid]):bat[:inet4]
+CMDbatXOR
+Return B1 xor B2
+batcalc
+xor
+pattern batcalc.xor(X_0:bat[:inet4], X_1:inet4):bat[:inet4]
+CMDbatXOR
+Return B xor V
+batcalc
+xor
+pattern batcalc.xor(X_0:bat[:inet4], X_1:inet4, X_2:bat[:oid]):bat[:inet4]
+CMDbatXOR
+Return B xor V
+batcalc
+xor
+pattern batcalc.xor(X_0:bat[:inet6], X_1:bat[:inet6]):bat[:inet6]
+CMDbatXOR
+Return B1 xor B2
+batcalc
+xor
+pattern batcalc.xor(X_0:bat[:inet6], X_1:bat[:inet6], X_2:bat[:oid], 
X_3:bat[:oid]):bat[:inet6]
+CMDbatXOR
+Return B1 xor B2
+batcalc
+xor
+pattern batcalc.xor(X_0:bat[:inet6], X_1:inet6):bat[:inet6]
+CMDbatXOR
+Return B xor V
+batcalc
+xor
+pattern batcalc.xor(X_0:bat[:inet6], X_1:inet6, X_2:bat[:oid]):bat[:inet6]
+CMDbatXOR
+Return B xor V
+batcalc
+xor
 pattern batcalc.xor(X_0:bat[:int], X_1:bat[:int]):bat[:int]
 CMDbatXOR
 Return B1 xor B2
@@ -31005,6 +31185,26 @@ CMDbatXOR
 Return V xor B
 batcalc
 xor
+pattern batcalc.xor(X_0:inet4, X_1:bat[:inet4]):bat[:inet4]
+CMDbatXOR
+Return V xor B
+batcalc
+xor
+pattern batcalc.xor(X_0:inet4, X_1:bat[:inet4], X_2:bat[:oid]):bat[:inet4]
+CMDbatXOR
+Return V xor B
+batcalc
+xor
+pattern batcalc.xor(X_0:inet6, X_1:bat[:inet6]):bat[:inet6]
+CMDbatXOR
+Return V xor B
+batcalc
+xor
+pattern batcalc.xor(X_0:inet6, X_1:bat[:inet6], X_2:bat[:oid]):bat[:inet6]
+CMDbatXOR
+Return V xor B
+batcalc
+xor
 pattern batcalc.xor(X_0:int, X_1:bat[:int]):bat[:int]
 CMDbatXOR
 Return V xor B
@@ -42905,6 +43105,16 @@ CMDvarAND
 Return V1 AND V2
 calc
 and
+pattern calc.and(X_0:inet4, X_1:inet4):inet4
+CMDvarAND
+Return V1 AND V2
+calc
+and
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to