From 08643fc476c93e477139ad9ae02e0beca3d3e516 Mon Sep 17 00:00:00 2001
From: Yuyang Wang <yuyang.wang@snowflake.com>
Date: Thu, 6 Feb 2025 10:34:51 -0800
Subject: [PATCH] place holder

---
 src/snowflake/snowpark/_internal/proto/ast.proto | 1 +
 src/snowflake/snowpark/functions.py              | 2 +-
 tests/ast/data/functions2.test                   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/snowflake/snowpark/_internal/proto/ast.proto b/src/snowflake/snowpark/_internal/proto/ast.proto
index 849cf4f269d..c9c7afae66c 100644
--- a/src/snowflake/snowpark/_internal/proto/ast.proto
+++ b/src/snowflake/snowpark/_internal/proto/ast.proto
@@ -4,6 +4,7 @@
 syntax = "proto3";
 
 option java_package = "com.snowflake.snowpark.proto";
+option java_outer_classname = "JavaProto";
 
 package ast;
 
diff --git a/src/snowflake/snowpark/functions.py b/src/snowflake/snowpark/functions.py
index cd5a6317ce1..c14158e431c 100644
--- a/src/snowflake/snowpark/functions.py
+++ b/src/snowflake/snowpark/functions.py
@@ -717,7 +717,7 @@ def bitshiftright_unsigned(
         bitshiftright(c, n, _emit_ast=False),
         _emit_ast=False,
     )
-    col = call_builtin("bitand", unsigned_c, max_bit - 1, _emit_ast=_emit_ast)
+    col = call_builtin("bitand", unsigned_c, max_bit - 1, _emit_ast=False)
     col._ast = ast
     return col
 
diff --git a/tests/ast/data/functions2.test b/tests/ast/data/functions2.test
index 34849119198..5bdaf87dadf 100644
--- a/tests/ast/data/functions2.test
+++ b/tests/ast/data/functions2.test
@@ -644,6 +644,8 @@ df314 = df.select(instr("A", "test_str"))
 
 df315 = df.select(nth_value("A", 2, False), nth_value("A", 2, True), nth_value(col("B"), 2, False))
 
+df316 = df.select(bitshiftright_unsigned("A", 2), bitshiftright_unsigned("A", col("B")))
+
 ## EXPECTED ENCODED AST
 
 interned_value_table {