Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
540a16d
Initial changes
aayush3011 Apr 24, 2024
6f49c75
Initial changes
aayush3011 Apr 25, 2024
97509eb
Merge branch 'main' into users/akataria/nonStreamingOrderBy
aayush3011 Apr 25, 2024
938279a
Increment versions for core releases (#40003)
azure-sdk May 2, 2024
c6c520e
Ensure ServiceBus session idle timeout fall back to retry-options::tr…
anuchandy May 2, 2024
222f2d9
Added Alpha3 Java Media Streaming Events (#40002)
v-durgeshs May 2, 2024
387170a
Update version of github-event-processor to 1.0.0-dev.20240502.2 (#40…
azure-sdk May 2, 2024
b1e8fdc
Prepare May 2024 Identity Release (#40006)
billwert May 2, 2024
c3c4648
Prepare Identity Broker May 2024 Release (#40014)
billwert May 2, 2024
a5127c6
Increment package versions for identity releases (#40015)
azure-sdk May 2, 2024
ba334df
[JobRouter] SDK Review updates (#40011)
williamzhao87 May 2, 2024
5682de3
FixFaultInjectionRuleFailedToApplyPerPartitionInGatewayMode (#40005)
xinlian12 May 3, 2024
39cb79f
azure-cosmos-test_1.0.0.beta.7Release (#40021)
xinlian12 May 3, 2024
86b36d3
Merge branch 'main' into users/akataria/nonStreamingOrderBy
aayush3011 May 3, 2024
9a38357
Fixed existsById API in ReactiveCosmosTemplate (#40022)
kushagraThapar May 3, 2024
a979c11
Initial changes
aayush3011 May 3, 2024
e2756a5
Initial changes
aayush3011 May 3, 2024
d768057
Skip Recorded test and delete Event record until test proxy to work w…
minwoolee-msft May 3, 2024
71b1905
Fix invalid CODEOWNERS (#40032)
alzimmermsft May 3, 2024
8be2277
Initial changes
aayush3011 May 3, 2024
28a2b5a
ServiceBus: fix session tracing (#39962)
May 3, 2024
deff567
[Automation] Generate SDK based on TypeSpec 0.15.15 (#40048)
azure-sdk May 6, 2024
058f8a8
[CODEOWNERS] Updates for org changes (#40049)
jsquire May 6, 2024
9406783
Move from using the docker image to java2docfx for docs validation (#…
JimSuplizio May 6, 2024
6dee85b
owners (#39686)
harsimar May 6, 2024
61b177c
Use ClientLogger in testing output (#40010)
alzimmermsft May 6, 2024
8349880
Fix null pointer exception and context usage (#40053)
alzimmermsft May 6, 2024
c75b369
Rename AML to AzureMachineLearning (#40056)
alzimmermsft May 6, 2024
af7f403
Fixed the Key Vault `test-resources.json` file to properly configure …
vcolin7 May 6, 2024
c9da24c
Close response body in bearer policy (#40052)
May 6, 2024
7055e66
Running Prepare-Release for azure-messaging-servicebus 7.17.0 (#40058)
anuchandy May 7, 2024
4428897
mgmt, TypeSpec code generation pipeline (#39963)
XiaofeiCao May 7, 2024
a755e6a
Add codeowner linter owners (#39997)
weshaggard May 7, 2024
23b7d1e
Update to ESRP task version that supports federated auth (#40059)
hallipr May 7, 2024
94bd0d4
Increment package versions for cosmos releases (#40031)
azure-sdk May 7, 2024
149bd61
Update azure-sdk-build-tools Repository Resource Refs in Yaml files (…
azure-sdk May 7, 2024
847a8ae
Add reduced embeddings sample to azure-search-documents (#40069)
alzimmermsft May 7, 2024
376955f
Search May Preview Regen Updates (#40057)
jairmyree May 7, 2024
f01f7f4
Preparing Search May 2024 Beta Release (#40071)
jairmyree May 7, 2024
e491b9d
Resolving comments
aayush3011 May 7, 2024
151bb50
Fixing build issues
aayush3011 May 7, 2024
c86b87e
eng, update autorest.java, improve error output in sdk automation (#4…
weidongxu-microsoft May 8, 2024
a3d2d26
Merge to main after spring cloud azure 4.18.0 released (#40075)
Netyyyy May 8, 2024
f6909fb
Miscellaneous Core performance improvements (#39552)
alzimmermsft May 8, 2024
73afd5b
Merge branch 'Azure:main' into users/akataria/nonStreamingOrderBy
aayush3011 May 8, 2024
3271984
Increment package versions for search releases (#40072)
azure-sdk May 9, 2024
0e921d2
Update io.fabric8:kubernetes-client (#40086)
jairmyree May 9, 2024
b2a4bef
Increment package versions for servicebus releases (#40094)
azure-sdk May 9, 2024
6884420
Emit stable auto-instrumented otel metrics (#39960)
heyams May 9, 2024
3b0d751
Merge branch 'Azure:main' into users/akataria/nonStreamingOrderBy
aayush3011 May 9, 2024
87572f7
Merge branch 'feature/vector_search' into users/akataria/nonStreaming…
aayush3011 May 9, 2024
92a1a90
[Key Vault] Added support for `/prerestore` and `/prebackup` endpoint…
vcolin7 May 9, 2024
179f904
Initial changes
aayush3011 May 9, 2024
5602e33
Merge branch 'users/akataria/nonStreamingOrderBy' of github.com:aayus…
aayush3011 May 9, 2024
36ab9b7
Merge branch 'feature/vector_search' into users/akataria/nonStreaming…
aayush3011 May 9, 2024
0b29ce1
Prepare to release beta.22 (#40097)
heyams May 9, 2024
28217eb
Fix template name (#40099)
JimSuplizio May 9, 2024
a8fcba9
Update partner release to use WIF (#40101)
weshaggard May 9, 2024
0db1017
core mgmt, `SubResource` implements `JsonSerializable` to support azu…
XiaofeiCao May 10, 2024
2fae403
Update spring-reference and sync changelog (#40105)
Netyyyy May 10, 2024
47b1085
Support per-call response timeout in all HttpClient implementations (…
alzimmermsft May 10, 2024
e7deb7b
Change how JavaType is resolved to support JsonSerializable better (#…
alzimmermsft May 10, 2024
70639b5
Initial changes
aayush3011 May 10, 2024
c45c3a5
Fixes
aayush3011 May 10, 2024
6c255ee
Merge branch 'Azure:main' into users/akataria/nonStreamingOrderBy
aayush3011 May 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Search May Preview Regen Updates (#40057)
* Search May Preview Regeneration
- Still need to add varargs convenience

* Removing ovveride statements from `setFields` for `VectorizableImageUrlQuery` and `VectorizableImageBinaryQuery`

* Removing ovveride statements from `setFields` for `VectorizableImageUrlQuery` and `VectorizableImageBinaryQuery`

* adding varargs

* Additional adjustments to FieldBuilder and Search Index Customizations

* Updating cspell.json

* Adjust `SearchScoreThreshold` customization
Re-enable code generation in CI

* Updates:

- Updated Cspell
- Rename `maxStoragePerIndex` property to `maxStoragePerIndexInBytes` in SearchServiceLimits
- Set `hybridSearch` property to be type `HybridSearch` in SearchRequest
- Add `hybridSearch` to SearchOptions and `SearchAsyncClient.createSearchRequest()`

* Adding Support and testing byte[] and List<byte> within field builder

* Fix linting

---------

Co-authored-by: alzimmermsft <[email protected]>
  • Loading branch information
jairmyree and alzimmermsft authored May 7, 2024
commit 376955f126c2242e30a5d4545f4412280bf09b8d
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public final class FieldBuilder {
private static final int MAX_DEPTH = 10000;
private static final Map<Type, SearchFieldDataType> SUPPORTED_NONE_PARAMETERIZED_TYPE = new HashMap<>();
private static final Set<Type> UNSUPPORTED_TYPES = new HashSet<>();
private static final Set<SearchFieldDataType> UNSUPPORTED_SERVICE_TYPES = new HashSet<>();

private static final SearchFieldDataType COLLECTION_STRING
= SearchFieldDataType.collection(SearchFieldDataType.STRING);
Expand Down Expand Up @@ -83,6 +84,7 @@ public final class FieldBuilder {
SUPPORTED_NONE_PARAMETERIZED_TYPE.put(Byte.class, SearchFieldDataType.SBYTE);
SUPPORTED_NONE_PARAMETERIZED_TYPE.put(short.class, SearchFieldDataType.INT16);
SUPPORTED_NONE_PARAMETERIZED_TYPE.put(Short.class, SearchFieldDataType.INT16);
UNSUPPORTED_SERVICE_TYPES.add(SearchFieldDataType.BYTE);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public SearchServiceLimits() {

/**
* Get the maxFieldsPerIndex property: The maximum allowed fields per index.
*
*
* @return the maxFieldsPerIndex value.
*/
public Integer getMaxFieldsPerIndex() {
Expand All @@ -61,7 +61,7 @@ public Integer getMaxFieldsPerIndex() {

/**
* Set the maxFieldsPerIndex property: The maximum allowed fields per index.
*
*
* @param maxFieldsPerIndex the maxFieldsPerIndex value to set.
* @return the SearchServiceLimits object itself.
*/
Expand All @@ -73,7 +73,7 @@ public SearchServiceLimits setMaxFieldsPerIndex(Integer maxFieldsPerIndex) {
/**
* Get the maxFieldNestingDepthPerIndex property: The maximum depth which you can nest sub-fields in an index,
* including the top-level complex field. For example, a/b/c has a nesting depth of 3.
*
*
* @return the maxFieldNestingDepthPerIndex value.
*/
public Integer getMaxFieldNestingDepthPerIndex() {
Expand All @@ -83,7 +83,7 @@ public Integer getMaxFieldNestingDepthPerIndex() {
/**
* Set the maxFieldNestingDepthPerIndex property: The maximum depth which you can nest sub-fields in an index,
* including the top-level complex field. For example, a/b/c has a nesting depth of 3.
*
*
* @param maxFieldNestingDepthPerIndex the maxFieldNestingDepthPerIndex value to set.
* @return the SearchServiceLimits object itself.
*/
Expand All @@ -95,7 +95,7 @@ public SearchServiceLimits setMaxFieldNestingDepthPerIndex(Integer maxFieldNesti
/**
* Get the maxComplexCollectionFieldsPerIndex property: The maximum number of fields of type
* Collection(Edm.ComplexType) allowed in an index.
*
*
* @return the maxComplexCollectionFieldsPerIndex value.
*/
public Integer getMaxComplexCollectionFieldsPerIndex() {
Expand All @@ -105,7 +105,7 @@ public Integer getMaxComplexCollectionFieldsPerIndex() {
/**
* Set the maxComplexCollectionFieldsPerIndex property: The maximum number of fields of type
* Collection(Edm.ComplexType) allowed in an index.
*
*
* @param maxComplexCollectionFieldsPerIndex the maxComplexCollectionFieldsPerIndex value to set.
* @return the SearchServiceLimits object itself.
*/
Expand All @@ -117,7 +117,7 @@ public SearchServiceLimits setMaxComplexCollectionFieldsPerIndex(Integer maxComp
/**
* Get the maxComplexObjectsInCollectionsPerDocument property: The maximum number of objects in complex collections
* allowed per document.
*
*
* @return the maxComplexObjectsInCollectionsPerDocument value.
*/
public Integer getMaxComplexObjectsInCollectionsPerDocument() {
Expand All @@ -127,7 +127,7 @@ public Integer getMaxComplexObjectsInCollectionsPerDocument() {
/**
* Set the maxComplexObjectsInCollectionsPerDocument property: The maximum number of objects in complex collections
* allowed per document.
*
*
* @param maxComplexObjectsInCollectionsPerDocument the maxComplexObjectsInCollectionsPerDocument value to set.
* @return the SearchServiceLimits object itself.
*/
Expand All @@ -139,7 +139,7 @@ public Integer getMaxComplexObjectsInCollectionsPerDocument() {

/**
* Get the maxStoragePerIndexInBytes property: The maximum amount of storage in bytes allowed per index.
*
*
* @return the maxStoragePerIndexInBytes value.
*/
public Long getMaxStoragePerIndexInBytes() {
Expand All @@ -148,7 +148,7 @@ public Long getMaxStoragePerIndexInBytes() {

/**
* Set the maxStoragePerIndexInBytes property: The maximum amount of storage in bytes allowed per index.
*
*
* @param maxStoragePerIndexInBytes the maxStoragePerIndexInBytes value to set.
* @return the SearchServiceLimits object itself.
*/
Expand All @@ -171,7 +171,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {

/**
* Reads an instance of SearchServiceLimits from the JsonReader.
*
*
* @param jsonReader The JsonReader being read.
* @return An instance of SearchServiceLimits if the JsonReader was pointing to an instance of it, or null if it was
* pointing to JSON null.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class VectorSearchVectorizer implements JsonSerializable<VectorSearchVect

/**
* Creates an instance of VectorSearchVectorizer class.
*
*
* @param name the name value to set.
*/
public VectorSearchVectorizer(String name) {
Expand All @@ -34,7 +34,7 @@ public VectorSearchVectorizer(String name) {

/**
* Get the name property: The name to associate with this particular vectorization method.
*
*
* @return the name value.
*/
public String getName() {
Expand All @@ -50,7 +50,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {

/**
* Reads an instance of VectorSearchVectorizer from the JsonReader.
*
*
* @param jsonReader The JsonReader being read.
* @return An instance of VectorSearchVectorizer if the JsonReader was pointing to an instance of it, or null if it
* was pointing to JSON null.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public void ignoredPropertyName() {
public void supportedFields() {
List<SearchField> fields = SearchIndexClient.buildSearchFields(AllSupportedFields.class, null);

assertEquals(23, fields.size());
assertEquals(25, fields.size());

Map<String, SearchFieldDataType> fieldToDataType = fields.stream()
.collect(Collectors.toMap(SearchField::getName, SearchField::getType));
Expand Down Expand Up @@ -154,6 +154,9 @@ public void supportedFields() {
assertEquals(SearchFieldDataType.INT16, fieldToDataType.get("primitiveShort"));
assertEquals(SearchFieldDataType.SBYTE, fieldToDataType.get("nullableByte"));
assertEquals(SearchFieldDataType.SBYTE, fieldToDataType.get("primitiveByte"));
assertEquals(SearchFieldDataType.collection(SearchFieldDataType.SBYTE), fieldToDataType.get("byteArray"));
assertEquals(SearchFieldDataType.collection(SearchFieldDataType.SBYTE), fieldToDataType.get("byteList"));

}

@SuppressWarnings({"unused", "UseOfObsoleteDateTimeApi"})
Expand Down Expand Up @@ -296,6 +299,18 @@ public byte getPrimitiveByte() {
public Byte getNullableByte() {
return nullableByte;
}

// 24. name = 'byteArray', OData type = COMPLEX
private byte[] byteArray;
public byte[] getByteArray() {
return byteArray;
}

// 25. name = 'byteList', OData type = COMPLEX
private List<Byte> byteList;
public List<Byte> getByteList() {
return byteList;
}
}
@Test
public void validNormalizerField() {
Expand Down