Merge branch 'main' into dev/birschick-bq/open-telemetry-poc

birschick-bq · Nov 7, 2024 · 3824499 · 3824499
2 parents 2384ed4 + 28b8c1b
commit 3824499
Show file tree

Hide file tree

Showing 127 changed files with 6,095 additions and 1,167 deletions.
diff --git a/.github/workflows/native-windows.yml b/.github/workflows/native-windows.yml
@@ -80,10 +80,10 @@ jobs:
           miniforge-version: latest
           use-mamba: true
       - name: Install Dependencies
-        shell: bash -l {0}
+        shell: pwsh
         run: |
-          mamba install -c conda-forge \
-            --file ci/conda_env_cpp.txt
+          mamba install -c conda-forge `
+            --file ci\conda_env_cpp.txt
           # Force bundled gtest
           mamba uninstall gtest
 
@@ -137,10 +137,10 @@ jobs:
           miniforge-version: latest
           use-mamba: true
       - name: Install Dependencies
-        shell: bash -l {0}
+        shell: pwsh
         run: |
-          mamba install -c conda-forge \
-            --file ci/conda_env_cpp.txt
+          mamba install -c conda-forge `
+            --file ci\conda_env_cpp.txt
           # Force bundled gtest
           mamba uninstall gtest
 
@@ -213,10 +213,10 @@ jobs:
           miniforge-version: latest
           use-mamba: true
       - name: Install Dependencies
-        shell: bash -l {0}
+        shell: pwsh
         run: |
-          mamba install -c conda-forge \
-            --file ci/conda_env_cpp.txt
+          mamba install -c conda-forge `
+            --file ci\conda_env_cpp.txt
       - uses: actions/setup-go@v5
         with:
           go-version: "${{ env.GO_VERSION }}"
@@ -280,12 +280,12 @@ jobs:
           miniforge-version: latest
           use-mamba: true
       - name: Install Dependencies
-        shell: bash -l {0}
+        shell: pwsh
         run: |
-          mamba install -c conda-forge \
-            python=${{ matrix.python }} \
-            --file ci/conda_env_cpp.txt \
-            --file ci/conda_env_python.txt
+          mamba install -c conda-forge `
+            python=${{ matrix.python }} `
+            --file ci\conda_env_cpp.txt `
+            --file ci\conda_env_python.txt
 
       - uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -70,6 +70,18 @@ jobs:
         run: |
           rustup toolchain install stable --no-self-update
           rustup default stable
+      - name: Install Protoc
+        if: runner.os == 'Linux'
+        run: |
+          curl -L "https://github.com/protocolbuffers/protobuf/releases/download/v28.3/protoc-28.3-linux-$(uname -m).zip" -o protoc.zip
+          unzip protoc.zip -d $HOME/.local
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+      - name: Install Protoc
+        if: runner.os == 'macOS'
+        run: |
+          curl -L "https://github.com/protocolbuffers/protobuf/releases/download/v28.3/protoc-28.3-osx-universal_binary.zip" -o protoc.zip
+          unzip "protoc.zip" -d $HOME/.local
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
       - uses: actions/download-artifact@v4
         with:
           name: driver-manager-${{ matrix.os }}

diff --git a/.gitignore b/.gitignore
@@ -57,6 +57,7 @@ cpp/.idea/
 c/apidoc/html/
 c/apidoc/latex/
 c/apidoc/xml/
+c/apidoc/objects.inv
 docs/example.gz
 docs/example1.dat
 docs/example3.dat

diff --git a/c/apidoc/Doxyfile b/c/apidoc/Doxyfile
@@ -500,7 +500,7 @@ EXTRACT_ALL            = NO
 # be included in the documentation.
 # The default value is: NO.
 
-EXTRACT_PRIVATE        = NO
+EXTRACT_PRIVATE        = YES
 
 # If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
 # methods of a class will be included in the documentation.
@@ -891,7 +891,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../../c/include/arrow-adbc/adbc.h ../../README.md ../../c/include/arrow-adbc/adbc_driver_manager.h
+INPUT                  = ../../c/include/arrow-adbc/adbc.h ../../README.md ../../c/include/arrow-adbc/adbc_driver_manager.h ../../c/driver/framework/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -920,12 +920,7 @@ INPUT_ENCODING         = UTF-8
 # comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
 # *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.java \
+FILE_PATTERNS          = *.java \
                          *.ii \
                          *.ixx \
                          *.ipp \

diff --git a/c/driver/framework/base_driver.h b/c/driver/framework/base_driver.h
@@ -455,11 +455,22 @@ class Driver {
     }
 
     auto error_obj = reinterpret_cast<Status*>(error->private_data);
+    if (!error_obj) {
+      return 0;
+    }
     return error_obj->CDetailCount();
   }
 
   static AdbcErrorDetail CErrorGetDetail(const AdbcError* error, int index) {
+    if (error->vendor_code != ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA) {
+      return {nullptr, nullptr, 0};
+    }
+
     auto error_obj = reinterpret_cast<Status*>(error->private_data);
+    if (!error_obj) {
+      return {nullptr, nullptr, 0};
+    }
+
     return error_obj->CDetail(index);
   }
 

diff --git a/c/driver/framework/objects.cc b/c/driver/framework/objects.cc
@@ -284,7 +284,7 @@ struct GetObjectsBuilder {
   }
 
   Status AppendCatalogs() {
-    UNWRAP_STATUS(helper->LoadCatalogs());
+    UNWRAP_STATUS(helper->LoadCatalogs(catalog_filter));
     while (true) {
       UNWRAP_RESULT(auto maybe_catalog, helper->NextCatalog());
       if (!maybe_catalog.has_value()) break;
@@ -302,7 +302,7 @@ struct GetObjectsBuilder {
   }
 
   Status AppendSchemas(std::string_view catalog) {
-    UNWRAP_STATUS(helper->LoadSchemas(catalog));
+    UNWRAP_STATUS(helper->LoadSchemas(catalog, schema_filter));
     while (true) {
       UNWRAP_RESULT(auto maybe_schema, helper->NextSchema());
       if (!maybe_schema.has_value()) break;
@@ -323,7 +323,7 @@ struct GetObjectsBuilder {
   }
 
   Status AppendTables(std::string_view catalog, std::string_view schema) {
-    UNWRAP_STATUS(helper->LoadTables(catalog, schema));
+    UNWRAP_STATUS(helper->LoadTables(catalog, schema, table_filter, table_types));
     while (true) {
       UNWRAP_RESULT(auto maybe_table, helper->NextTable());
       if (!maybe_table.has_value()) break;
@@ -348,7 +348,7 @@ struct GetObjectsBuilder {
 
   Status AppendColumns(std::string_view catalog, std::string_view schema,
                        std::string_view table) {
-    UNWRAP_STATUS(helper->LoadColumns(catalog, schema, table));
+    UNWRAP_STATUS(helper->LoadColumns(catalog, schema, table, column_filter));
     while (true) {
       UNWRAP_RESULT(auto maybe_column, helper->NextColumn());
       if (!maybe_column.has_value()) break;

diff --git a/c/driver/framework/objects.h b/c/driver/framework/objects.h
@@ -108,26 +108,30 @@ struct GetObjectsHelper {
     return status::NotImplemented("GetObjects");
   }
 
-  virtual Status LoadCatalogs() {
+  virtual Status LoadCatalogs(std::optional<std::string_view> catalog_filter) {
     return status::NotImplemented("GetObjects at depth = catalog");
   };
 
   virtual Result<std::optional<std::string_view>> NextCatalog() { return std::nullopt; }
 
-  virtual Status LoadSchemas(std::string_view catalog) {
+  virtual Status LoadSchemas(std::string_view catalog,
+                             std::optional<std::string_view> schema_filter) {
     return status::NotImplemented("GetObjects at depth = schema");
   };
 
   virtual Result<std::optional<std::string_view>> NextSchema() { return std::nullopt; }
 
-  virtual Status LoadTables(std::string_view catalog, std::string_view schema) {
+  virtual Status LoadTables(std::string_view catalog, std::string_view schema,
+                            std::optional<std::string_view> table_filter,
+                            const std::vector<std::string_view>& table_types) {
     return status::NotImplemented("GetObjects at depth = table");
   };
 
   virtual Result<std::optional<Table>> NextTable() { return std::nullopt; }
 
   virtual Status LoadColumns(std::string_view catalog, std::string_view schema,
-                             std::string_view table) {
+                             std::string_view table,
+                             std::optional<std::string_view> column_filter) {
     return status::NotImplemented("GetObjects at depth = column");
   };
 

diff --git a/c/driver/framework/status.h b/c/driver/framework/status.h
@@ -147,6 +147,7 @@ class Status {
 #undef STATUS_CTOR
 
  private:
+  /// \brief Private Status implementation details
   struct Impl {
     // invariant: code is never OK
     AdbcStatusCode code;