This is an automated email from the ASF dual-hosted git repository.
zeroshade pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 38dc738a5 fix(go/adbc/pkg): Run make regenerate to keep generated code
in sync with templates (#3202)
38dc738a5 is described below
commit 38dc738a5f01599492d7d5677e2302514b0fab64
Author: Felipe Oliveira Carvalho <[email protected]>
AuthorDate: Fri Jul 25 17:36:02 2025 +0200
fix(go/adbc/pkg): Run make regenerate to keep generated code in sync with
templates (#3202)
---
go/adbc/pkg/bigquery/driver.go | 4 ++--
go/adbc/pkg/bigquery/utils.c | 8 +-------
go/adbc/pkg/bigquery/utils.h | 3 +--
go/adbc/pkg/flightsql/driver.go | 4 ++--
go/adbc/pkg/flightsql/init.go | 17 +++++++++++++++--
go/adbc/pkg/flightsql/utils.c | 8 +-------
go/adbc/pkg/flightsql/utils.h | 5 +----
go/adbc/pkg/panicdummy/driver.go | 4 ++--
go/adbc/pkg/panicdummy/utils.c | 4 +++-
go/adbc/pkg/panicdummy/utils.h | 3 ++-
go/adbc/pkg/snowflake/utils.c | 6 ------
go/adbc/pkg/snowflake/utils.h | 1 -
12 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/go/adbc/pkg/bigquery/driver.go b/go/adbc/pkg/bigquery/driver.go
index b58c2272e..408930cf3 100644
--- a/go/adbc/pkg/bigquery/driver.go
+++ b/go/adbc/pkg/bigquery/driver.go
@@ -1813,8 +1813,8 @@ func BigQueryStatementExecutePartitions(stmt
*C.struct_AdbcStatement, schema *C.
return C.ADBC_STATUS_OK
}
-//export AdbcDriverBigqueryInit
-func AdbcDriverBigqueryInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
+//export AdbcDriverBigQueryInit
+func AdbcDriverBigQueryInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
driver := (*C.struct_AdbcDriver)(unsafe.Pointer(rawDriver))
switch version {
diff --git a/go/adbc/pkg/bigquery/utils.c b/go/adbc/pkg/bigquery/utils.c
index a07c22f2b..6b3d38013 100644
--- a/go/adbc/pkg/bigquery/utils.c
+++ b/go/adbc/pkg/bigquery/utils.c
@@ -431,16 +431,10 @@ AdbcStatusCode AdbcStatementSetOptionInt(struct
AdbcStatement* statement,
ADBC_EXPORT
AdbcStatusCode AdbcDriverInit(int version, void* driver, struct AdbcError*
error) {
- return AdbcDriverBigqueryInit(version, driver, error);
+ return AdbcDriverBigQueryInit(version, driver, error);
}
#endif // ADBC_NO_COMMON_ENTRYPOINTS
-ADBC_EXPORT
-AdbcStatusCode BigQueryDriverInit(int version, void* driver, struct AdbcError*
error) {
- // For backwards compatibility
- return AdbcDriverBigqueryInit(version, driver, error);
-}
-
int BigQueryArrayStreamGetSchema(struct ArrowArrayStream*, struct
ArrowSchema*);
int BigQueryArrayStreamGetNext(struct ArrowArrayStream*, struct ArrowArray*);
diff --git a/go/adbc/pkg/bigquery/utils.h b/go/adbc/pkg/bigquery/utils.h
index 3eb938b9f..1f7be2871 100644
--- a/go/adbc/pkg/bigquery/utils.h
+++ b/go/adbc/pkg/bigquery/utils.h
@@ -156,9 +156,8 @@ AdbcStatusCode BigQueryStatementSetSubstraitPlan(struct
AdbcStatement* stmt,
const uint8_t* plan, size_t
length,
struct AdbcError* err);
-AdbcStatusCode AdbcDriverBigqueryInit(int version, void* rawDriver,
+AdbcStatusCode AdbcDriverBigQueryInit(int version, void* rawDriver,
struct AdbcError* err);
-AdbcStatusCode BigQueryDriverInit(int version, void* rawDriver, struct
AdbcError* err);
static inline void BigQueryerrRelease(struct AdbcError* error) {
if (error->release) {
diff --git a/go/adbc/pkg/flightsql/driver.go b/go/adbc/pkg/flightsql/driver.go
index c766edad6..d87fddcbc 100644
--- a/go/adbc/pkg/flightsql/driver.go
+++ b/go/adbc/pkg/flightsql/driver.go
@@ -1813,8 +1813,8 @@ func FlightSQLStatementExecutePartitions(stmt
*C.struct_AdbcStatement, schema *C
return C.ADBC_STATUS_OK
}
-//export AdbcDriverFlightsqlInit
-func AdbcDriverFlightsqlInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
+//export AdbcDriverFlightSQLInit
+func AdbcDriverFlightSQLInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
driver := (*C.struct_AdbcDriver)(unsafe.Pointer(rawDriver))
switch version {
diff --git a/go/adbc/pkg/flightsql/init.go b/go/adbc/pkg/flightsql/init.go
index eb1018069..5d232e4a0 100644
--- a/go/adbc/pkg/flightsql/init.go
+++ b/go/adbc/pkg/flightsql/init.go
@@ -31,6 +31,19 @@ import "C"
//export FlightSQLDriverInit
func FlightSQLDriverInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
- // For backwards compatibility
- return AdbcDriverFlightsqlInit(version, rawDriver, err)
+ return AdbcDriverFlightSQLInit(version, rawDriver, err)
+}
+
+// For backwards compatibility
+//
+//export AdbcDriverFlightsqlInit
+func AdbcDriverFlightsqlInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
+ return AdbcDriverFlightSQLInit(version, rawDriver, err)
+}
+
+// For backwards compatibility
+//
+//export FlightSqlDriverInit
+func FlightSqlDriverInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
+ return AdbcDriverFlightSQLInit(version, rawDriver, err)
}
diff --git a/go/adbc/pkg/flightsql/utils.c b/go/adbc/pkg/flightsql/utils.c
index f62389dcf..11d466552 100644
--- a/go/adbc/pkg/flightsql/utils.c
+++ b/go/adbc/pkg/flightsql/utils.c
@@ -431,16 +431,10 @@ AdbcStatusCode AdbcStatementSetOptionInt(struct
AdbcStatement* statement,
ADBC_EXPORT
AdbcStatusCode AdbcDriverInit(int version, void* driver, struct AdbcError*
error) {
- return AdbcDriverFlightsqlInit(version, driver, error);
+ return AdbcDriverFlightSQLInit(version, driver, error);
}
#endif // ADBC_NO_COMMON_ENTRYPOINTS
-ADBC_EXPORT
-AdbcStatusCode FlightSqlDriverInit(int version, void* driver, struct
AdbcError* error) {
- // For backwards compatibility
- return AdbcDriverFlightsqlInit(version, driver, error);
-}
-
int FlightSQLArrayStreamGetSchema(struct ArrowArrayStream*, struct
ArrowSchema*);
int FlightSQLArrayStreamGetNext(struct ArrowArrayStream*, struct ArrowArray*);
diff --git a/go/adbc/pkg/flightsql/utils.h b/go/adbc/pkg/flightsql/utils.h
index cf9c80df9..474865b23 100644
--- a/go/adbc/pkg/flightsql/utils.h
+++ b/go/adbc/pkg/flightsql/utils.h
@@ -154,11 +154,8 @@ AdbcStatusCode FlightSQLStatementSetSubstraitPlan(struct
AdbcStatement* stmt,
const uint8_t* plan, size_t
length,
struct AdbcError* err);
-AdbcStatusCode AdbcDriverFlightsqlInit(int version, void* rawDriver,
+AdbcStatusCode AdbcDriverFlightSQLInit(int version, void* rawDriver,
struct AdbcError* err);
-AdbcStatusCode FlightSqlDriverInit(int version, void* rawDriver, struct
AdbcError* err);
-
-AdbcStatusCode FlightSQLDriverInit(int version, void* rawDriver, struct
AdbcError* err);
static inline void FlightSQLerrRelease(struct AdbcError* error) {
if (error->release) {
diff --git a/go/adbc/pkg/panicdummy/driver.go b/go/adbc/pkg/panicdummy/driver.go
index 576d36d65..d5e6798f7 100644
--- a/go/adbc/pkg/panicdummy/driver.go
+++ b/go/adbc/pkg/panicdummy/driver.go
@@ -1813,8 +1813,8 @@ func PanicDummyStatementExecutePartitions(stmt
*C.struct_AdbcStatement, schema *
return C.ADBC_STATUS_OK
}
-//export PanicDummyDriverInit
-func PanicDummyDriverInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
+//export AdbcDriverPanicDummyInit
+func AdbcDriverPanicDummyInit(version C.int, rawDriver *C.void, err
*C.struct_AdbcError) C.AdbcStatusCode {
driver := (*C.struct_AdbcDriver)(unsafe.Pointer(rawDriver))
switch version {
diff --git a/go/adbc/pkg/panicdummy/utils.c b/go/adbc/pkg/panicdummy/utils.c
index 0c9828b4c..56e0952e5 100644
--- a/go/adbc/pkg/panicdummy/utils.c
+++ b/go/adbc/pkg/panicdummy/utils.c
@@ -85,6 +85,7 @@ struct AdbcErrorDetail PanicDummyErrorGetDetail(const struct
AdbcError* error,
};
}
+#if !defined(ADBC_NO_COMMON_ENTRYPOINTS)
int AdbcErrorGetDetailCount(const struct AdbcError* error) {
return PanicDummyErrorGetDetailCount(error);
}
@@ -430,8 +431,9 @@ AdbcStatusCode AdbcStatementSetOptionInt(struct
AdbcStatement* statement,
ADBC_EXPORT
AdbcStatusCode AdbcDriverInit(int version, void* driver, struct AdbcError*
error) {
- return PanicDummyDriverInit(version, driver, error);
+ return AdbcDriverPanicDummyInit(version, driver, error);
}
+#endif // ADBC_NO_COMMON_ENTRYPOINTS
int PanicDummyArrayStreamGetSchema(struct ArrowArrayStream*, struct
ArrowSchema*);
int PanicDummyArrayStreamGetNext(struct ArrowArrayStream*, struct ArrowArray*);
diff --git a/go/adbc/pkg/panicdummy/utils.h b/go/adbc/pkg/panicdummy/utils.h
index d225e891a..d092d16fd 100644
--- a/go/adbc/pkg/panicdummy/utils.h
+++ b/go/adbc/pkg/panicdummy/utils.h
@@ -156,7 +156,8 @@ AdbcStatusCode PanicDummyStatementSetSubstraitPlan(struct
AdbcStatement* stmt,
const uint8_t* plan, size_t
length,
struct AdbcError* err);
-AdbcStatusCode PanicDummyDriverInit(int version, void* rawDriver, struct
AdbcError* err);
+AdbcStatusCode AdbcDriverPanicDummyInit(int version, void* rawDriver,
+ struct AdbcError* err);
static inline void PanicDummyerrRelease(struct AdbcError* error) {
if (error->release) {
diff --git a/go/adbc/pkg/snowflake/utils.c b/go/adbc/pkg/snowflake/utils.c
index 46c05b6cd..52b5ecab1 100644
--- a/go/adbc/pkg/snowflake/utils.c
+++ b/go/adbc/pkg/snowflake/utils.c
@@ -435,12 +435,6 @@ AdbcStatusCode AdbcDriverInit(int version, void* driver,
struct AdbcError* error
}
#endif // ADBC_NO_COMMON_ENTRYPOINTS
-ADBC_EXPORT
-AdbcStatusCode SnowflakeDriverInit(int version, void* driver, struct
AdbcError* error) {
- // For backwards compatibility
- return AdbcDriverSnowflakeInit(version, driver, error);
-}
-
int SnowflakeArrayStreamGetSchema(struct ArrowArrayStream*, struct
ArrowSchema*);
int SnowflakeArrayStreamGetNext(struct ArrowArrayStream*, struct ArrowArray*);
diff --git a/go/adbc/pkg/snowflake/utils.h b/go/adbc/pkg/snowflake/utils.h
index 2942def9c..812786ea3 100644
--- a/go/adbc/pkg/snowflake/utils.h
+++ b/go/adbc/pkg/snowflake/utils.h
@@ -156,7 +156,6 @@ AdbcStatusCode SnowflakeStatementSetSubstraitPlan(struct
AdbcStatement* stmt,
AdbcStatusCode AdbcDriverSnowflakeInit(int version, void* rawDriver,
struct AdbcError* err);
-AdbcStatusCode SnowflakeDriverInit(int version, void* rawDriver, struct
AdbcError* err);
static inline void SnowflakeerrRelease(struct AdbcError* error) {
if (error->release) {
