fix(csharp): extract spog org id from cluster path#502
Open
msrathore-db wants to merge 1 commit into
Open
Conversation
Signed-off-by: Madhavendra Rathore <madhavendra.rathore@databricks.com>
eric-wang-1990
approved these changes
Jun 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
sql/protocolv1/o/<workspace-id>/<cluster-id>.PropertyHelper.ParseOrgIdFromPropertiesnow extracts the workspace ID from the/o/<wsid>/path segment as a fallback when?o=<wsid>is not present.?o=query parameter wins, then/sql/protocolv1/o/<wsid>/<cluster-id>path segment.Why
For all-purpose cluster Thrift paths on SPOG, PoPP can route the Thrift request from the
/o/<workspace-id>/path segment. Other HTTP requests built from the same connection, including SEA/telemetry-style requests, do not naturally carry that path context. Without thex-databricks-org-idheader they can be routed without workspace context and redirected to/login.What changes
(?:^|/)sql/protocolv1/o/(\d+)/[^/?]+.SparkParameters.PathandAdbcOptions.Uriinputs.?o=precedence, warehouse-path non-match, and URI path extraction.Test plan
dotnet test csharp/test/AdbcDrivers.Databricks.Tests.csproj --filter FullyQualifiedName~PropertyHelperTestsdotnet build csharp/src/AdbcDrivers.Databricks.csprojpeco.azuredatabricks.netall-purpose cluster path.This pull request and its description were written with assistance from Claude Code.