diff --git a/deploy/storage/base_bigtable_info.yaml b/deploy/storage/base_bigtable_info.yaml index 71662e1d6..f7b50760f 100644 --- a/deploy/storage/base_bigtable_info.yaml +++ b/deploy/storage/base_bigtable_info.yaml @@ -1,9 +1,13 @@ project: datcom-store instance: prophet-cache tables: + - auto2w_2023_06_13_14_16_23 + - auto1w_2023_06_13_14_15_34 + - auto1d_2023_06_13_14_15_34 - frequent_2023_06_04_09_17_02 - ipcc_2023_06_01_03_50_51 - biomedical_2023_06_02_03_45_35 - disaster_2023_06_03_13_08_47 + - country_2023_06_13_06_35_51 - infrequent_2023_05_19_10_24_48 - place_2023_06_03_03_55_29 \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/bulk_property_values_in/containedIn1.json b/internal/server/v1/propertyvalues/golden/bulk_property_values_in/containedIn1.json index f7de36f6f..1f36c82ed 100644 --- a/internal/server/v1/propertyvalues/golden/bulk_property_values_in/containedIn1.json +++ b/internal/server/v1/propertyvalues/golden/bulk_property_values_in/containedIn1.json @@ -100879,5 +100879,5 @@ ] } ], - "nextToken": "H4sIAAAAAAAA/6TTz07qQBQG8EsvcHsH0NJVV74CYKIrF8LwR4yaJpWYuDHDzEk5yTCTTKcYHsDX85kMdGfojInLLs4v5zudj7yQDtelsmY/WGVjEnGtLEMFYqlSyTiQCwqqKAuqDUxYASKzzGJhkTM5NsDiP3EQNuIgDOIg/BsHYTNuhq2oQeY+uEf1dltaVPmrVlDr3Puc/gL0wqA4fr2NppDXWjOf1V2mlFbQ1fAX0bJLClI+wA7kqN4ZkzAHvRSD4fUJpFMd/tkwbmuJGyfRpGj3J2bbh9nkP5k7p6OZhC0oy8w+4xutZe0WT04n+e5MsbAGHakWTq8/11rMCsvWEovNQa6Fbp0QucN844k2cQrdRxRCgsfwbJHqdzCpZI4c7h/VSw3umK1f41/YioLk41AAZ5q0XEvkTqaRfAaEetY5MiuL8vTzqzJ5kJ9VyH2YM+97q5rQ9hzmPAOulfAW4QsAAP//AQAA//9lGiY8TgUAAA==" + "nextToken": "H4sIAAAAAAAA/6zUwW7aMBgH8OExMAa24FNOewVg0nZngTEkJmVNoRKHVsb+FCwZW3IcKh6gr9dnqiC3qnKcqsdcfv78z/c3yUmfm1I7ex5vshmJuNGOSQ1ipVPFOJDvCeiiLBJj4TcrQGSOOVk4yZmaWWD0E0W4RRFGFOHPFOE2RfgLRbhDEe5ShDFt417UItu6g4aJOR5LJ3W+MxqC3V2dO1qCWVoprl8P0znkwfamzh6s0iSp4J+TD4wi+5GAUms4gZqGu/8JzsGsxHjy6w20X/3IW8u4CybXXrKdSHcOsDoXK+6RrVeLFgqOoB2z54wfjFHBU9573fi1O5eFs7JBCndef/THGLEoHNsrWRwuJwXDqRcmf2V+aBjFjVcc/JNCKGho1kyZmkewqWIN7u1fhGFq5Ym58DG7uBeh+OlSWO/t03KvJG/EtuJnRLKaca/sxkkVVocqgxr0fU+AP9ivjfe/am6nJthvGXCjRePivgAAAP//AQAA//+3Hl/VfgYAAA==" } \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/bulk_property_values_in/containedIn2.json b/internal/server/v1/propertyvalues/golden/bulk_property_values_in/containedIn2.json index cac43f12a..65cb5f507 100644 --- a/internal/server/v1/propertyvalues/golden/bulk_property_values_in/containedIn2.json +++ b/internal/server/v1/propertyvalues/golden/bulk_property_values_in/containedIn2.json @@ -22435,6 +22435,382 @@ "dcid": "eia/u/9948", "provenanceId": "dc/base/EIA860_Utilities" }, + { + "name": "Community Action Agency Of Butte County Inc Elk Creek Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95939_CommunityActionAgencyOfButteCountyIncElkCreekGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Feather Falls Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95940_CommunityActionAgencyOfButteCountyIncFeatherFallsGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Forbestown Market Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95941_CommunityActionAgencyOfButteCountyIncForbestownMarketCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Mountain Joy Fellowship", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95942_CommunityActionAgencyOfButteCountyIncMountainJoyFellowship", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Christian Life Assembly Of God Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_ChristianLifeAssemblyOfGodChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Gridley Guardian Building", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_CommunityActionAgencyOfButteCountyIncGridleyGuardianBuilding", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Grace Lutheran Churchfood Pantry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_GraceLutheranChurchfoodPantry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Gridley Emergency Relief Servicesgridley Christian Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_GridleyEmergencyReliefServicesgridleyChristianChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Sacred Heart Parishsacred Heart Parish Food Closet", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_SacredHeartParishsacredHeartParishFoodCloset", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Evangelical Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95951_CommunityActionAgencyOfButteCountyIncEvangelicalChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Magalia Community Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95954_CommunityActionAgencyOfButteCountyIncMagaliaCommunityChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc First Lutheran Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_CommunityActionAgencyOfButteCountyIncFirstLutheranChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Lutheran Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_FirstLutheranChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Glenn County Office Of Educationorland Administration Building", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_GlennCountyOfficeOfEducationorlandAdministrationBuilding", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCounty", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Concow Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCountyIncConcowGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc New Life Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCountyIncNewLifeChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Student Services -- Butte Glenn Community College District", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_StudentServicesButteGlennCommunityCollegeDistrict", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_CommunityActionAgencyOfButteCountyIncHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "New Hope Missionary Baptist", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_NewHopeMissionaryBaptist", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "New Life Christian Center Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_NewLifeChristianCenterChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Oroville Rescue Mission Administrationoroville Rescue Mission", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_OrovilleRescueMissionAdministrationorovilleRescueMission", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Salvation Armysalvation Army Church Oroville", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_SalvationArmysalvationArmyChurchOroville", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Father's House Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheFatherSHouseChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Hope Centerparadise Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheHopeCenterparadiseHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Palermo Family Bible Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95968_CommunityActionAgencyOfButteCountyIncPalermoFamilyBibleChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc First Baptist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_CommunityActionAgencyOfButteCountyIncFirstBaptistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Baptist Church Of Paradise", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_FirstBaptistChurchOfParadise", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Christian Church Paradise", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_FirstChristianChurchParadise", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Chico Rescue Mission", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95973_ChicoRescueMission", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Cohasset Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95973_CommunityActionAgencyOfButteCountyIncCohassetCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Stirling City Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95978_CommunityActionAgencyOfButteCountyIncStirlingCityCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Southern Baptist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_FirstSouthernBaptistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Glenn County Office Of Education", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_GlennCountyOfficeOfEducation", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Willows Adventist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_WillowsAdventistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Willows Seventh Day Adventist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_WillowsSeventhDayAdventistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Living Hope - Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96001_LivingHopeResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Fall River Community Food Pantry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96028_FallRiverCommunityFoodPantry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Fort Sage Family Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96113_FortSageFamilyResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Crossroads Ministry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_CrossroadsMinistry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Lassen Family Services", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_LassenFamilyServices", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Lassen-Modoc Food Bank", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_LassenModocFoodBank", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Susanville Salvation Army", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_SusanvilleSalvationArmy", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Susanville Salvation Army", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_SusanvilleSalvationArmyThe", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Westwood Family Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96137_WestwoodFamilyResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "South Lake Tahoe Senior Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96150_SouthLakeTahoeSeniorCenter", + "provenanceId": "dc/base/California_FoodResources" + }, { "name": "Census Tract 3260, Contra Costa County, California", "types": [ @@ -62562,5 +62938,5 @@ ] } ], - "nextToken": "H4sIAAAAAAAA/4zSQU7rMBgE4Fc3fVhui4JXvUVbJFixoLhpCQLJUmCNjPMrtWRsyXGKchAuwfE4ASrZxg5LL/5PM9aQBzKVtjHetcuXYkNSaY0XykCZG66FBHKxB7t3qvx9va63UNF/FOERRRhRhMcU4YQmeJIikg1Zs5wz1kFXqyCzG2LmxSUDrR/hCHoddjYEV2Dzcrm67kGmDEzd1M9OSB8kbqJEwpRve27/n24XlOTR6zTT8A7GC9cW8mCt7pHO8CRNFt+I3EYpcq+qQxDpqtxFhdmTKksNA8ZACm4/wHEtTPhDd1Fhzp06Ch+OcfqP8eJrRLJ4G968aSUHmM8RYfE4f9tZvNN5l2Krau9U79S6ucx+AAAA//8BAAD//0GS7HaLAwAA" + "nextToken": "H4sIAAAAAAAA/5zSwU4yMRQF4J8yP1wKmLEr3gIw0b0ZDJJgUh0h0Y2pnRtoUtuk08HMg/gSPp5PYHC2plNcdvPl3NNDn+lQ2sp4V083+TVNpTVeKIPFynAtJNLzJdqlU8XP62W+wB37xwh0GAHCCHQZgYQR+M8I9BiBPiMALIFBSuimzR6teJY18OUsmt22seP8IkOt13hAPY937yns0K6K6ezqF3SYoSmr8tEJ6aPJdZBMMuXrCKt3tCaMPgW19EbjGxovXJ3LvbU6Qu7DIE0mX4TyIE1v1W4fjTanPwTF0Z0qCo0nmi0puX1Hx7Uw8R+0DYpj7tRB+PiYxz67k88O3YSv59WrVvJE9qND83Dcv+0+3MFZk3KhSu9U1PSbuY6+AQAA//8BAAD///PQ5oZbBAAA" } \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/bulk_property_values_in/typeOf.json b/internal/server/v1/propertyvalues/golden/bulk_property_values_in/typeOf.json index 89c1c38af..4cb23d960 100644 --- a/internal/server/v1/propertyvalues/golden/bulk_property_values_in/typeOf.json +++ b/internal/server/v1/propertyvalues/golden/bulk_property_values_in/typeOf.json @@ -11795,5 +11795,5 @@ ] } ], - "nextToken": "H4sIAAAAAAAA/4zPsQ6CMBDGcakgTeNUFx5CY0ScnJBdF+OOocBF5LQWDI/hG5sYB9N4Scc23y//nNgKPwMziIkZbupQillaXKGFh9G5gV6lWuUrOZKMe5JxJhkfS8Z96fMgurjgmMB3F7wmcOGCEwKXLnhDlpcWDneosatqEiws8Hn9WQc8iF6eSKz5dK+gqs+oa8SCjMztyBGfrfsNJ2iavFIkiEWYYdca/WO+H4Tp3wAAAP//AQAA//+I6PNbWgIAAA==" + "nextToken": "H4sIAAAAAAAA/5zQv4rCQBDH8ctc/kyWq+aavMad2imSxE7QRuwj2SSLMavrJpLH8I0FsZCtBstd+H34MmIt/FzZUYR2PMttJX7T8qQ6dbWmsGqQqZHFH30RoEeAQIDfBOgTYECAIQFGBIjkY5wcOdg/E7twsAkTKznYlIlVHGzGLls6WJRpo/u6YQMLB3i+GOsA4+TuiZUz/9lIVTcHbRqtS3bE3I3Y6Vv3+Q32qm2LWrKBTES57jtr3ozXB9MYHgAAAP//AQAA//9f+jYmCgMAAA==" } \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/bulk_property_values_in_test.go b/internal/server/v1/propertyvalues/golden/bulk_property_values_in_test.go index b12fb440f..7d339c41a 100644 --- a/internal/server/v1/propertyvalues/golden/bulk_property_values_in_test.go +++ b/internal/server/v1/propertyvalues/golden/bulk_property_values_in_test.go @@ -55,7 +55,7 @@ func TestBulkPropertyValuesIn(t *testing.T) { "containedInPlace", []string{"country/USA", "geoId/06053", "geoId/06"}, 0, - "H4sIAAAAAAAA/6TST04CMRgFcBkBawEdZzUrrwCY6MqFUP6IUTPJSEzcmNp+GZqUNul0MBzA63kmA7MztDVx2UV/ee/Lw6+4w3SlrNn2l/kIx0wrS4UCvlCZpAzwJQFVViXRBsa0BJ5bakVpBaNyZIAmR0mEGkmEoiRCx0mEmkkTteIGnoXgHtHrdWWFKt60AqfzEHIu5qDnRvD96304gcJpTUNWd5ERUkPXg39Uy68ISPkIG5BDtzPCqAC94P3BzQGkUx/+xVBmncStl2gSYbcH/rZ3f9NTPPP+jqcS1qAsNducrbSWzhTPXif97UxEaY3wtLrzevheFKtAorFX6D4JziUEjECKTH+CySRV7h7++/YyIzbUumOcoFYcpV+73XrbZNWHFMzLNNLvCJNAnD2ztEIeXk3dKYD8bfn+w5wFZ1IPuB04zHkOTCse3O8PAAAA//8BAAD//wB95kIFBQAA", + "H4sIAAAAAAAA/6zUwW7aMBgH8OExMAa24FNOewVg0nZngTEkJmVNoRKHVsb+FCwZW3IcKh6gr9dnqiC3qnKcqsdcfv78z/c3yUmfm1I7ex5vshmJuNGOSQ1ipVPFOJDvCeiiLBJj4TcrQGSOOVk4yZmaWWD0E0W4RRFGFOHPFOE2RfgLRbhDEe5ShDFt417UItu6g4aJOR5LJ3W+MxqC3V2dO1qCWVoprl8P0znkwfamzh6s0iSp4J+TD4wi+5GAUms4gZqGu/8JzsGsxHjy6w20X/3IW8u4CybXXrKdSHcOsDoXK+6RrVeLFgqOoB2z54wfjFHBU9573fi1O5eFs7JBCndef/THGLEoHNsrWRwuJwXDqRcmf2V+aBjFjVcc/JNCKGho1kyZmkewqWIN7u1fhGFq5Ym58DG7uBeh+OlSWO/t03KvJG/EtuJnRLKaca/sxkkVVocqgxr0fU+AP9ivjfe/am6nJthvGXCjRePivgAAAP//AQAA//+3Hl/VfgYAAA==", }, { "typeOf.json", diff --git a/internal/server/v1/propertyvalues/golden/bulk_property_values_out/geoOverlaps1.json b/internal/server/v1/propertyvalues/golden/bulk_property_values_out/geoOverlaps1.json index ce76c07a5..c6a8a6fb6 100644 --- a/internal/server/v1/propertyvalues/golden/bulk_property_values_out/geoOverlaps1.json +++ b/internal/server/v1/propertyvalues/golden/bulk_property_values_out/geoOverlaps1.json @@ -52,5 +52,5 @@ "node": "geoId/06" } ], - "nextToken": "H4sIAAAAAAAA/+Ly5+JOT833TNE3MDMwNQZz/MtSi3ISC4q5pJ1T84pLi6MyC5zzU1JDEpNKcxJLMvPzHItSE4UYhJg4GIWYOJiEmDiYhZg4WIRYOFglWAEAAAD//wEAAP//Qf91ulEAAAA=" + "nextToken": "H4sIAAAAAAAA/+KK5+JOT833TNE3MDMwNQZz/MtSi3ISC4q5pJ1T84pLi6MyC5zzU1JDEpNKcxJLMvPzHItSE4UYhJg4GIWYOJiEmDiYhZg4WISYOFiFmDjYhJg42IWYODiEWDg4JVgBAAAA//8BAAD//wfbJS1hAAAA" } \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/bulk_property_values_out_test.go b/internal/server/v1/propertyvalues/golden/bulk_property_values_out_test.go index d8eca9c17..b629db0df 100644 --- a/internal/server/v1/propertyvalues/golden/bulk_property_values_out_test.go +++ b/internal/server/v1/propertyvalues/golden/bulk_property_values_out_test.go @@ -69,7 +69,7 @@ func TestBulkPropertyValuesOut(t *testing.T) { "geoOverlaps", []string{"country/USA", "geoId/06053", "geoId/06"}, 5, - "H4sIAAAAAAAA/+Ly5+JOT833TNE3MDMwNQZz/MtSi3ISC4q5pJ1T84pLi6MyC5zzU1JDEpNKcxJLMvPzHItSE4UYhJg4GIWYOJiEmDiYhZg4WIRYOFglWAEAAAD//wEAAP//Qf91ulEAAAA=", + "H4sIAAAAAAAA/+KK5+JOT833TNE3MDMwNQZz/MtSi3ISC4q5pJ1T84pLi6MyC5zzU1JDEpNKcxJLMvPzHItSE4UYhJg4GIWYOJiEmDiYhZg4WISYOFiFmDjYhJg42IWYODiEWDg4JVgBAAAA//8BAAD//wfbJS1hAAAA", }, } { req := &pbv1.BulkPropertyValuesRequest{ diff --git a/internal/server/v1/propertyvalues/golden/property_values_in/containedIn1.json b/internal/server/v1/propertyvalues/golden/property_values_in/containedIn1.json index a76368338..1e717acf2 100644 --- a/internal/server/v1/propertyvalues/golden/property_values_in/containedIn1.json +++ b/internal/server/v1/propertyvalues/golden/property_values_in/containedIn1.json @@ -69041,5 +69041,5 @@ "provenanceId": "dc/base/WikidataGeos" } ], - "nextToken": "H4sIAAAAAAAA/5zTTU7DMBAFYGLSYsxf8Cq3oLBgxQIIKVQCFClwANceNZYGW4rdoh6A63EmVLpDzVjiAPPpPXtG3Am+AD8zF5NrUWjvorIOzMw1qDSIowpcWIa3Xuko9yTjmWScScb3JeO5zPmoyMQNSeSVjesds+PNbHkopuR0USN8gIuqX7e68x4HU7ySTvnXebAh9pZo9Uh651PvTR2imqMN3UYehG5JSDzZRZeodk8Kxy/WGISEkUjR+E/oG1RED/qjTprerlQcjnHARwUrvzJR022a5RytJpms/GaiSsT5Zd6jxd3rt+2UQNqrChCfYQV4Ofnnw5wm9217CePEw5y1oL0zyUP4AQAA//8BAAD//7l9zyLSAwAA" + "nextToken": "H4sIAAAAAAAA/6zTT07zMBAF8C/+Sjsx/4JXuQWFBRcIRVQqkiEUdkiuPWosDbaUuEU9ANfjTKh0x8KJJS7w8/PTPP7IYY1+bi6nN7zQ3gVlHZq5k6Q08uMKXbfpnlulg/gnGGSCARMM/gsGI8HgSDAYCwYTwQDECPIi44soOaps2A2wxnurzPlLVCtmhO/ogmp3tW68p8Ep36Ju+du9tV1obUILr1H/4s57M+uCWpHtmv1Lg2EZhfm9XTeJVTxFxZMHawxhotmTUvoPbCWphH/HD+FUtnarwvCYE8gLVn5mfBn/vdysyOokNiu/GK974v6wy2Bp2BwOHfSg9XWFRAvcIl1N/6jYs+T7Pyx33FPseY3aO5M83G8AAAD//wEAAP//BWcvpLIEAAA=" } \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/property_values_in/containedIn2.json b/internal/server/v1/propertyvalues/golden/property_values_in/containedIn2.json index daf04a2ca..d3a9e8e8b 100644 --- a/internal/server/v1/propertyvalues/golden/property_values_in/containedIn2.json +++ b/internal/server/v1/propertyvalues/golden/property_values_in/containedIn2.json @@ -4936,6 +4936,382 @@ "dcid": "eia/u/9948", "provenanceId": "dc/base/EIA860_Utilities" }, + { + "name": "Community Action Agency Of Butte County Inc Elk Creek Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95939_CommunityActionAgencyOfButteCountyIncElkCreekGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Feather Falls Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95940_CommunityActionAgencyOfButteCountyIncFeatherFallsGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Forbestown Market Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95941_CommunityActionAgencyOfButteCountyIncForbestownMarketCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Mountain Joy Fellowship", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95942_CommunityActionAgencyOfButteCountyIncMountainJoyFellowship", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Christian Life Assembly Of God Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_ChristianLifeAssemblyOfGodChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Gridley Guardian Building", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_CommunityActionAgencyOfButteCountyIncGridleyGuardianBuilding", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Grace Lutheran Churchfood Pantry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_GraceLutheranChurchfoodPantry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Gridley Emergency Relief Servicesgridley Christian Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_GridleyEmergencyReliefServicesgridleyChristianChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Sacred Heart Parishsacred Heart Parish Food Closet", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_SacredHeartParishsacredHeartParishFoodCloset", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Evangelical Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95951_CommunityActionAgencyOfButteCountyIncEvangelicalChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Magalia Community Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95954_CommunityActionAgencyOfButteCountyIncMagaliaCommunityChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc First Lutheran Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_CommunityActionAgencyOfButteCountyIncFirstLutheranChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Lutheran Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_FirstLutheranChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Glenn County Office Of Educationorland Administration Building", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_GlennCountyOfficeOfEducationorlandAdministrationBuilding", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCounty", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Concow Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCountyIncConcowGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc New Life Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCountyIncNewLifeChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Student Services -- Butte Glenn Community College District", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_StudentServicesButteGlennCommunityCollegeDistrict", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_CommunityActionAgencyOfButteCountyIncHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "New Hope Missionary Baptist", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_NewHopeMissionaryBaptist", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "New Life Christian Center Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_NewLifeChristianCenterChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Oroville Rescue Mission Administrationoroville Rescue Mission", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_OrovilleRescueMissionAdministrationorovilleRescueMission", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Salvation Armysalvation Army Church Oroville", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_SalvationArmysalvationArmyChurchOroville", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Father's House Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheFatherSHouseChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Hope Centerparadise Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheHopeCenterparadiseHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Palermo Family Bible Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95968_CommunityActionAgencyOfButteCountyIncPalermoFamilyBibleChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc First Baptist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_CommunityActionAgencyOfButteCountyIncFirstBaptistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Baptist Church Of Paradise", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_FirstBaptistChurchOfParadise", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Christian Church Paradise", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_FirstChristianChurchParadise", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Chico Rescue Mission", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95973_ChicoRescueMission", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Cohasset Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95973_CommunityActionAgencyOfButteCountyIncCohassetCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Stirling City Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95978_CommunityActionAgencyOfButteCountyIncStirlingCityCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Southern Baptist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_FirstSouthernBaptistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Glenn County Office Of Education", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_GlennCountyOfficeOfEducation", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Willows Adventist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_WillowsAdventistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Willows Seventh Day Adventist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_WillowsSeventhDayAdventistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Living Hope - Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96001_LivingHopeResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Fall River Community Food Pantry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96028_FallRiverCommunityFoodPantry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Fort Sage Family Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96113_FortSageFamilyResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Crossroads Ministry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_CrossroadsMinistry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Lassen Family Services", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_LassenFamilyServices", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Lassen-Modoc Food Bank", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_LassenModocFoodBank", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Susanville Salvation Army", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_SusanvilleSalvationArmy", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Susanville Salvation Army", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_SusanvilleSalvationArmyThe", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Westwood Family Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96137_WestwoodFamilyResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "South Lake Tahoe Senior Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96150_SouthLakeTahoeSeniorCenter", + "provenanceId": "dc/base/California_FoodResources" + }, { "name": "Census Tract 3260, Contra Costa County, California", "types": [ @@ -45061,5 +45437,5 @@ "provenanceId": "dc/base/S2Cells" } ], - "nextToken": "H4sIAAAAAAAA/5zSUUoDMRAGYDfdahirLHnaW1h98MkHda24oBCoF4jJ0A6MCWTTSg/iJTyeJ5Cyr7tZ8AD/x/8PAw8gNxhad7W8hcoGnwx5dK3XbCzCeYO+23Xv0dikTpSQhRJSKCFnSshSlXJeCbjLEmVD6TCQPT1mawVtNl2tGD/RJxMPa7sNgQekMzmvyvpXwH2WghfabEeRfspjVli8kXOME8ZECx2+MGo2fvygz1nhQkfamzRe43iPWf1TwCq/Ru8+mOwE811Ak6+zvmmQ+RX3yNfLf2667Fs8UZciDb5a/y6LPwAAAP//AQAA//8OXaCHsAIAAA==" + "nextToken": "H4sIAAAAAAAA/6zSXUoDMRDAcTtd2+lYZZmnvYXVBy+wChYqRFcFH+Pu0AZiAtm00oN4CY/nCaTse0zBC/z4zwc9Eq7FL7vLxQ2VrXdRGyfd0imrW6GzWly/7Z+DbiOfMOCIAYEBxwxYMOApA04YcMqAyAXOSqBVkixqE/cZ1uRgVUxvSa28s/IhLuqwb9qN9zZDnuKsLKofIJWk6d6sN9noMPpTUpw/mK6zcqT5R6XynxKU1S7/QK9J8VwFs9MxP/Owz3H1PaKX9PRq+25NeyT7NaImndtc12LtSnZirxb/tIOLofLW9DGYrNcf3nX+CwAA//8BAAD//+Nq6TRQAwAA" } \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/property_values_in/typeOf1.json b/internal/server/v1/propertyvalues/golden/property_values_in/typeOf1.json index fdf7df76d..f767f5ecb 100644 --- a/internal/server/v1/propertyvalues/golden/property_values_in/typeOf1.json +++ b/internal/server/v1/propertyvalues/golden/property_values_in/typeOf1.json @@ -687,5 +687,5 @@ "provenanceId": "dc/base/WikidataOtherIdGeos" } ], - "nextToken": "H4sIAAAAAAAA/+Iy4mJ3zi/NKymq5GIrqSxI9U+DCwgxCDFxMAoxcTAJMXEwCzFxsAixcLBKmAMAAAD//wEAAP//QwWYezQAAAA=" + "nextToken": "H4sIAAAAAAAA/zzIMRZEMBSF4ZkrkuuVf2UnehZgFZQ4ThTZvU77xRxlOZ+j3i1ybde27h/wQ/4jC7lDTsg9ckYuyCZ5GKcXAAD//wEAAP//R0pl3EQAAAA=" } \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/property_values_in_test.go b/internal/server/v1/propertyvalues/golden/property_values_in_test.go index 8bace2f63..d08c37cff 100644 --- a/internal/server/v1/propertyvalues/golden/property_values_in_test.go +++ b/internal/server/v1/propertyvalues/golden/property_values_in_test.go @@ -54,7 +54,7 @@ func TestPropertyValuesIn(t *testing.T) { "containedInPlace", "geoId/06", 500, - "H4sIAAAAAAAA/5ySXUoDMRSFnTitMf4NeZpdWH3wyQd1rFhQGRhdQEwu7YVrApm00gW4Pdck2jfp3EAXcD6+czjqVsk5hJk7n1ypygafDHpwM9+SsaCOGvD9sn+Nxia9p4UstJBCC7mvhSx1KUdVoa5ZRNlgWm/Jjn+z9aF6YNPVlOADfDJx3dlFCDRo8cJy6v+ce+xTRKbVDctTjzhfZIzuWMLxMzpHkGFkLNrwCbEl44d78PuetBFXJg1rHMhRJeqvQk35Nu3yndCymKL+FqrJ6Pxh3hLS9tdsOmUg3WUDRE+wArqY7DjMafYmmwOPM8OcdWCDd9n//gAAAP//AQAA//+e6uq5iQMAAA==", + "H4sIAAAAAAAA/6zTT07zMBAF8C/+Sjsx/4JXuQWFBRcIRVQqkiEUdkiuPWosDbaUuEU9ANfjTKh0x8KJJS7w8/PTPP7IYY1+bi6nN7zQ3gVlHZq5k6Q08uMKXbfpnlulg/gnGGSCARMM/gsGI8HgSDAYCwYTwQDECPIi44soOaps2A2wxnurzPlLVCtmhO/ogmp3tW68p8Ep36Ju+du9tV1obUILr1H/4s57M+uCWpHtmv1Lg2EZhfm9XTeJVTxFxZMHawxhotmTUvoPbCWphH/HD+FUtnarwvCYE8gLVn5mfBn/vdysyOokNiu/GK974v6wy2Bp2BwOHfSg9XWFRAvcIl1N/6jYs+T7Pyx33FPseY3aO5M83G8AAAD//wEAAP//BWcvpLIEAAA=", }, { "geoOverlaps.json", @@ -75,7 +75,7 @@ func TestPropertyValuesIn(t *testing.T) { "typeOf", "Country", 0, - "H4sIAAAAAAAA/+Iy4mJ3zi/NKymq5GIrqSxI9U+DCwgxCDFxMAoxcTAJMXEwCzFxsAixcLBKmAMAAAD//wEAAP//QwWYezQAAAA=", + "H4sIAAAAAAAA/zzIMRZEMBSF4ZkrkuuVf2UnehZgFZQ4ThTZvU77xRxlOZ+j3i1ybde27h/wQ/4jC7lDTsg9ckYuyCZ5GKcXAAD//wEAAP//R0pl3EQAAAA=", }, { "nasa_source.json", diff --git a/internal/server/v1/propertyvalues/golden/property_values_out/geoOverlaps1.json b/internal/server/v1/propertyvalues/golden/property_values_out/geoOverlaps1.json index 35306ff32..6fdf3c8b5 100644 --- a/internal/server/v1/propertyvalues/golden/property_values_out/geoOverlaps1.json +++ b/internal/server/v1/propertyvalues/golden/property_values_out/geoOverlaps1.json @@ -41,5 +41,5 @@ "provenanceId": "dc/base/WikidataOtherIdGeos" } ], - "nextToken": "H4sIAAAAAAAA/+IK5OJNT833TNE3MDOxNDM34OJOT833L0stykksKOaSdk7NKy4tjsoscM5PSQ1JTCrNSSzJzM9zLEpNFGIQYuJgFGLiYBJi4mAWYuJgEWLhYJVgBQAAAP//AQAA//+kZzeJUwAAAA==" + "nextToken": "H4sIAAAAAAAA/wTAsQqCUBgF4DppnW60nCnoIXIIozGcmlqa2v7wRwTxirfb8/sFC8fO47O9VPX1Xt+qcOg8vv4+DzalcG58TDl9+qmJrb/tmwf79XF8zG5aCVwLhMCNwEJgKXArcCeQKrg/lQsAAAD//wEAAP//WUv+X2MAAAA=" } \ No newline at end of file diff --git a/internal/server/v1/propertyvalues/golden/property_values_out_test.go b/internal/server/v1/propertyvalues/golden/property_values_out_test.go index 48b1cd6e5..f59a334d4 100644 --- a/internal/server/v1/propertyvalues/golden/property_values_out_test.go +++ b/internal/server/v1/propertyvalues/golden/property_values_out_test.go @@ -76,7 +76,7 @@ func TestPropertyValuesOut(t *testing.T) { "geoOverlaps", "geoId/0649670", 0, - "H4sIAAAAAAAA/+IK5OJNT833TNE3MDOxNDM34OJOT833L0stykksKOaSdk7NKy4tjsoscM5PSQ1JTCrNSSzJzM9zLEpNFGIQYuJgFGLiYBJi4mAWYuJgEWLhYJVgBQAAAP//AQAA//+kZzeJUwAAAA==", + "H4sIAAAAAAAA/wTAsQqCUBgF4DppnW60nCnoIXIIozGcmlqa2v7wRwTxirfb8/sFC8fO47O9VPX1Xt+qcOg8vv4+DzalcG58TDl9+qmJrb/tmwf79XF8zG5aCVwLhMCNwEJgKXArcCeQKrg/lQsAAAD//wEAAP//WUv+X2MAAAA=", }, } { req := &pbv1.PropertyValuesRequest{ diff --git a/internal/server/v1/triples/golden/bulk_triples_in/result1.json b/internal/server/v1/triples/golden/bulk_triples_in/result1.json index 541c26388..6c567813c 100644 --- a/internal/server/v1/triples/golden/bulk_triples_in/result1.json +++ b/internal/server/v1/triples/golden/bulk_triples_in/result1.json @@ -10322,5 +10322,5 @@ "node": "dummy" } ], - "nextToken": "H4sIAAAAAAAA/2zNMcvCQAzG8bfX60sIDiWCH0gd3BQKLg5yliiBXlKu6eC3lxbcXJ7lgd8fT0h7scFe0qehG7mXzIr//h75/Pz10R8FqChCaCsKUFOASAEavOHmYLP6/cJlMsVd5jTNhTOrH1ktiya3gtvOk8vkC3pNRdJjYFqwCFX7hSPU68Y10nwAAAD//wEAAP//qyVVPKcAAAA=" + "nextToken": "H4sIAAAAAAAA/2zNQYvCMBDF8XY2276GPZRZ8AOpd4WCeJNYRgk2SUmnB7+9tAhevD3e//CzZ8tbn4Z0970bulF6HyTaSp+jHG7fGhdMKJlATPhhgmGD33Z5KibUTAATGvuwf7s0R70cJU8p2k0QN81ZgkTdS0zBR6cp2/9OnfpJF+TksnfXQbhgg7L9MAamLd+QQbWWmg2wruYFAAD//wEAAP//WA2jKccAAAA=" } \ No newline at end of file diff --git a/internal/server/v1/triples/golden/bulk_triples_in/result2.json b/internal/server/v1/triples/golden/bulk_triples_in/result2.json index 906312699..aedd140e3 100644 --- a/internal/server/v1/triples/golden/bulk_triples_in/result2.json +++ b/internal/server/v1/triples/golden/bulk_triples_in/result2.json @@ -8025,5 +8025,5 @@ "node": "dummy" } ], - "nextToken": "H4sIAAAAAAAA/2yNMQvCQAxG7fUqR3CQCP4gdXBTKLg4SCxRAr2kXNPBfy+tq8vjgw/egzPgQay3t3TUtwN3kllh7Z+BL69/H64wpApjCtuAIdUYUsSQGrjD5miT+uPKZTSFfWYap8KZ1U+slkXJrcCudXIZfZbeqAg9e8ZZFlO18LfrhXGJNF8AAAD//wEAAP//XvS886cAAAA=" + "nextToken": "H4sIAAAAAAAA/2zNwYrCMBDG8XY2234Neyiz4AOpd4WCeJNYRgk2SUmnB99eWj16m+EP38+eLW99GtLd927oRul9kGgrfY5yuH1rXDChZAIx4YcJhg1+2+WrmFAzAUxo7MP+7dIc9XKUPKVoN0HcNGcJEnUvMQUfnaZs/zt16iddkJPL3l0H4YINynX0zRiYlj6QQbWWmg2wXs0LAAD//wEAAP//njZfp8cAAAA=" } \ No newline at end of file diff --git a/internal/server/v1/triples/golden/bulk_triples_in_test.go b/internal/server/v1/triples/golden/bulk_triples_in_test.go index e3a5f719a..dd0c640a3 100644 --- a/internal/server/v1/triples/golden/bulk_triples_in_test.go +++ b/internal/server/v1/triples/golden/bulk_triples_in_test.go @@ -48,7 +48,7 @@ func TestBulkTriplesIn(t *testing.T) { { "result2.json", []string{"Country", "BiologicalSpecimen", "Count_Person", "dummy"}, - "H4sIAAAAAAAA/2zNMcvCQAzG8bfX60sIDiWCH0gd3BQKLg5yliiBXlKu6eC3lxbcXJ7lgd8fT0h7scFe0qehG7mXzIr//h75/Pz10R8FqChCaCsKUFOASAEavOHmYLP6/cJlMsVd5jTNhTOrH1ktiya3gtvOk8vkC3pNRdJjYFqwCFX7hSPU68Y10nwAAAD//wEAAP//qyVVPKcAAAA=", + "H4sIAAAAAAAA/2zNQYvCMBDF8XY2276GPZRZ8AOpd4WCeJNYRgk2SUmnB7+9tAhevD3e//CzZ8tbn4Z0970bulF6HyTaSp+jHG7fGhdMKJlATPhhgmGD33Z5KibUTAATGvuwf7s0R70cJU8p2k0QN81ZgkTdS0zBR6cp2/9OnfpJF+TksnfXQbhgg7L9MAamLd+QQbWWmg2wruYFAAD//wEAAP//WA2jKccAAAA=", }, } { req := &pbv1.BulkTriplesRequest{ diff --git a/internal/server/v1/triples/golden/triples_in/BiologicalSpecimen1.json b/internal/server/v1/triples/golden/triples_in/BiologicalSpecimen1.json index 6581fad15..646ee05f2 100644 --- a/internal/server/v1/triples/golden/triples_in/BiologicalSpecimen1.json +++ b/internal/server/v1/triples/golden/triples_in/BiologicalSpecimen1.json @@ -4018,5 +4018,5 @@ ] } }, - "nextToken": "H4sIAAAAAAAA/+Ly4BJyyszPyU/PTE7MCS5ITc7MTc3jYiupLEj1T8MmJ8QgxMTBKMTCwSTAKMTEwSzExMEixMTBCgAAAP//AQAA//8CuEaKSgAAAA==" + "nextToken": "H4sIAAAAAAAA/+KK4BJyyszPyU/PTE7MCS5ITc7MTc3jYiupLEj1T8MmJ8QgxMTBKMTEwSTExMEsxMTBIsTCwSoAEmETYuJgF2Li4BBi4uAEAAAA//8BAAD//3lnVxdaAAAA" } \ No newline at end of file diff --git a/internal/server/v1/triples/golden/triples_in/BiologicalSpecimen2.json b/internal/server/v1/triples/golden/triples_in/BiologicalSpecimen2.json index 092c2aa16..a26b32294 100644 --- a/internal/server/v1/triples/golden/triples_in/BiologicalSpecimen2.json +++ b/internal/server/v1/triples/golden/triples_in/BiologicalSpecimen2.json @@ -4006,5 +4006,5 @@ ] } }, - "nextToken": "H4sIAAAAAAAA/+Ly4BJyyszPyU/PTE7MCS5ITc7MTc3jYiupLEj1T8MmJ8QgxMTBKMTCwSTAJMTEwSzExMEixMTBCgAAAP//AQAA///M1Iw3SgAAAA==" + "nextToken": "H4sIAAAAAAAA/+KK4BJyyszPyU/PTE7MCS5ITc7MTc3jYiupLEj1T8MmJ8QgxMTBKMTEwSTExMEsxMTBIsTCwSoA4rEJMXGwCzFxcAgxcXACAAAA//8BAAD///08zURaAAAA" } \ No newline at end of file diff --git a/internal/server/v1/triples/golden/triples_in_test.go b/internal/server/v1/triples/golden/triples_in_test.go index cde0e48fb..80e4f929c 100644 --- a/internal/server/v1/triples/golden/triples_in_test.go +++ b/internal/server/v1/triples/golden/triples_in_test.go @@ -48,7 +48,7 @@ func TestTriplesIn(t *testing.T) { { "BiologicalSpecimen2.json", "BiologicalSpecimen", - "H4sIAAAAAAAA/+Ly4BJyyszPyU/PTE7MCS5ITc7MTc3jYiupLEj1T8MmJ8QgxMTBKMTCwSTAKMTEwSzExMEixMTBCgAAAP//AQAA//8CuEaKSgAAAA==", + "H4sIAAAAAAAA/+KK4BJyyszPyU/PTE7MCS5ITc7MTc3jYiupLEj1T8MmJ8QgxMTBKMTEwSTExMEsxMTBIsTCwSoAEmETYuJgF2Li4BBi4uAEAAAA//8BAAD//3lnVxdaAAAA", }, } { req := &pbv1.TriplesRequest{ diff --git a/internal/server/v2/propertyvalues/golden/simple/containedIn1.json b/internal/server/v2/propertyvalues/golden/simple/containedIn1.json index 9af15d415..32ae0c1a9 100644 --- a/internal/server/v2/propertyvalues/golden/simple/containedIn1.json +++ b/internal/server/v2/propertyvalues/golden/simple/containedIn1.json @@ -69049,5 +69049,5 @@ } } }, - "nextToken": "H4sIAAAAAAAA/5zTTU7DMBAFYGLSYsxf8Cq3oLBgxQIIKVQCFClwANceNZYGW4rdoh6A63EmVLpDzVjiAPPpPXtG3Am+AD8zF5NrUWjvorIOzMw1qDSIowpcWIa3Xuko9yTjmWScScb3JeO5zPmoyMQNSeSVjesds+PNbHkopuR0USN8gIuqX7e68x4HU7ySTvnXebAh9pZo9Uh651PvTR2imqMN3UYehG5JSDzZRZeodk8Kxy/WGISEkUjR+E/oG1RED/qjTprerlQcjnHARwUrvzJR022a5RytJpms/GaiSsT5Zd6jxd3rt+2UQNqrChCfYQV4Ofnnw5wm9217CePEw5y1oL0zyUP4AQAA//8BAAD//7l9zyLSAwAA" + "nextToken": "H4sIAAAAAAAA/6zTT07zMBAF8C/+Sjsx/4JXuQWFBRcIRVQqkiEUdkiuPWosDbaUuEU9ANfjTKh0x8KJJS7w8/PTPP7IYY1+bi6nN7zQ3gVlHZq5k6Q08uMKXbfpnlulg/gnGGSCARMM/gsGI8HgSDAYCwYTwQDECPIi44soOaps2A2wxnurzPlLVCtmhO/ogmp3tW68p8Ep36Ju+du9tV1obUILr1H/4s57M+uCWpHtmv1Lg2EZhfm9XTeJVTxFxZMHawxhotmTUvoPbCWphH/HD+FUtnarwvCYE8gLVn5mfBn/vdysyOokNiu/GK974v6wy2Bp2BwOHfSg9XWFRAvcIl1N/6jYs+T7Pyx33FPseY3aO5M83G8AAAD//wEAAP//BWcvpLIEAAA=" } \ No newline at end of file diff --git a/internal/server/v2/propertyvalues/golden/simple/containedIn2.json b/internal/server/v2/propertyvalues/golden/simple/containedIn2.json index cde4123fc..7af4b7dbf 100644 --- a/internal/server/v2/propertyvalues/golden/simple/containedIn2.json +++ b/internal/server/v2/propertyvalues/golden/simple/containedIn2.json @@ -4940,6 +4940,382 @@ "dcid": "eia/u/9948", "provenanceId": "dc/base/EIA860_Utilities" }, + { + "name": "Community Action Agency Of Butte County Inc Elk Creek Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95939_CommunityActionAgencyOfButteCountyIncElkCreekGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Feather Falls Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95940_CommunityActionAgencyOfButteCountyIncFeatherFallsGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Forbestown Market Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95941_CommunityActionAgencyOfButteCountyIncForbestownMarketCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Mountain Joy Fellowship", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95942_CommunityActionAgencyOfButteCountyIncMountainJoyFellowship", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Christian Life Assembly Of God Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_ChristianLifeAssemblyOfGodChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Gridley Guardian Building", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_CommunityActionAgencyOfButteCountyIncGridleyGuardianBuilding", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Grace Lutheran Churchfood Pantry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_GraceLutheranChurchfoodPantry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Gridley Emergency Relief Servicesgridley Christian Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_GridleyEmergencyReliefServicesgridleyChristianChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Sacred Heart Parishsacred Heart Parish Food Closet", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95948_SacredHeartParishsacredHeartParishFoodCloset", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Evangelical Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95951_CommunityActionAgencyOfButteCountyIncEvangelicalChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Magalia Community Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95954_CommunityActionAgencyOfButteCountyIncMagaliaCommunityChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc First Lutheran Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_CommunityActionAgencyOfButteCountyIncFirstLutheranChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Lutheran Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_FirstLutheranChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Glenn County Office Of Educationorland Administration Building", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95963_GlennCountyOfficeOfEducationorlandAdministrationBuilding", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCounty", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Concow Grange", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCountyIncConcowGrange", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc New Life Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_CommunityActionAgencyOfButteCountyIncNewLifeChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Student Services -- Butte Glenn Community College District", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95965_StudentServicesButteGlennCommunityCollegeDistrict", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_CommunityActionAgencyOfButteCountyIncHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "New Hope Missionary Baptist", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_NewHopeMissionaryBaptist", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "New Life Christian Center Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_NewLifeChristianCenterChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Oroville Rescue Mission Administrationoroville Rescue Mission", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_OrovilleRescueMissionAdministrationorovilleRescueMission", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Salvation Armysalvation Army Church Oroville", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_SalvationArmysalvationArmyChurchOroville", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Father's House Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheFatherSHouseChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "The Hope Centerparadise Hope Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95966_TheHopeCenterparadiseHopeCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Palermo Family Bible Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95968_CommunityActionAgencyOfButteCountyIncPalermoFamilyBibleChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc First Baptist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_CommunityActionAgencyOfButteCountyIncFirstBaptistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Baptist Church Of Paradise", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_FirstBaptistChurchOfParadise", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Christian Church Paradise", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95969_FirstChristianChurchParadise", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Chico Rescue Mission", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95973_ChicoRescueMission", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Cohasset Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95973_CommunityActionAgencyOfButteCountyIncCohassetCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Community Action Agency Of Butte County Inc Stirling City Community Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95978_CommunityActionAgencyOfButteCountyIncStirlingCityCommunityCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "First Southern Baptist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_FirstSouthernBaptistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Glenn County Office Of Education", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_GlennCountyOfficeOfEducation", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Willows Adventist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_WillowsAdventistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Willows Seventh Day Adventist Church", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_95988_WillowsSeventhDayAdventistChurch", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Living Hope - Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96001_LivingHopeResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Fall River Community Food Pantry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96028_FallRiverCommunityFoodPantry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Fort Sage Family Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96113_FortSageFamilyResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Crossroads Ministry", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_CrossroadsMinistry", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Lassen Family Services", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_LassenFamilyServices", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Lassen-Modoc Food Bank", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_LassenModocFoodBank", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Susanville Salvation Army", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_SusanvilleSalvationArmy", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Susanville Salvation Army", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96130_SusanvilleSalvationArmyThe", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "Westwood Family Resource Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96137_WestwoodFamilyResourceCenter", + "provenanceId": "dc/base/California_FoodResources" + }, + { + "name": "South Lake Tahoe Senior Center", + "types": [ + "FoodEstablishment" + ], + "dcid": "foodEstablishment/CA_96150_SouthLakeTahoeSeniorCenter", + "provenanceId": "dc/base/California_FoodResources" + }, { "name": "Census Tract 3260, Contra Costa County, California", "types": [ @@ -45069,5 +45445,5 @@ } } }, - "nextToken": "H4sIAAAAAAAA/5zSUUoDMRAGYDfdahirLHnaW1h98MkHda24oBCoF4jJ0A6MCWTTSg/iJTyeJ5Cyr7tZ8AD/x/8PAw8gNxhad7W8hcoGnwx5dK3XbCzCeYO+23Xv0dikTpSQhRJSKCFnSshSlXJeCbjLEmVD6TCQPT1mawVtNl2tGD/RJxMPa7sNgQekMzmvyvpXwH2WghfabEeRfspjVli8kXOME8ZECx2+MGo2fvygz1nhQkfamzRe43iPWf1TwCq/Ru8+mOwE811Ak6+zvmmQ+RX3yNfLf2667Fs8UZciDb5a/y6LPwAAAP//AQAA//8OXaCHsAIAAA==" + "nextToken": "H4sIAAAAAAAA/6zSXUoDMRDAcTtd2+lYZZmnvYXVBy+wChYqRFcFH+Pu0AZiAtm00oN4CY/nCaTse0zBC/z4zwc9Eq7FL7vLxQ2VrXdRGyfd0imrW6GzWly/7Z+DbiOfMOCIAYEBxwxYMOApA04YcMqAyAXOSqBVkixqE/cZ1uRgVUxvSa28s/IhLuqwb9qN9zZDnuKsLKofIJWk6d6sN9noMPpTUpw/mK6zcqT5R6XynxKU1S7/QK9J8VwFs9MxP/Owz3H1PaKX9PRq+25NeyT7NaImndtc12LtSnZirxb/tIOLofLW9DGYrNcf3nX+CwAA//8BAAD//+Nq6TRQAwAA" } \ No newline at end of file diff --git a/internal/server/v2/propertyvalues/golden/simple/geoOverlaps1.json b/internal/server/v2/propertyvalues/golden/simple/geoOverlaps1.json index b50d97864..5a103ae1d 100644 --- a/internal/server/v2/propertyvalues/golden/simple/geoOverlaps1.json +++ b/internal/server/v2/propertyvalues/golden/simple/geoOverlaps1.json @@ -49,5 +49,5 @@ } } }, - "nextToken": "H4sIAAAAAAAA/+IK5OJNT833TNE3MDOxNDM34OJOT833L0stykksKOaSdk7NKy4tjsoscM5PSQ1JTCrNSSzJzM9zLEpNFGIQYuJgFGLiYBJi4mAWYuJgEWLhYJVgBQAAAP//AQAA//+kZzeJUwAAAA==" + "nextToken": "H4sIAAAAAAAA/wTAsQqCUBgF4DppnW60nCnoIXIIozGcmlqa2v7wRwTxirfb8/sFC8fO47O9VPX1Xt+qcOg8vv4+DzalcG58TDl9+qmJrb/tmwf79XF8zG5aCVwLhMCNwEJgKXArcCeQKrg/lQsAAAD//wEAAP//WUv+X2MAAAA=" } \ No newline at end of file diff --git a/internal/server/v2/propertyvalues/golden/simple_property_values_test.go b/internal/server/v2/propertyvalues/golden/simple_property_values_test.go index 13cc70fad..6a28e1e96 100644 --- a/internal/server/v2/propertyvalues/golden/simple_property_values_test.go +++ b/internal/server/v2/propertyvalues/golden/simple_property_values_test.go @@ -82,7 +82,7 @@ func TestSimplePropertyValues(t *testing.T) { []string{"geoId/0649670"}, "->geoOverlaps", 0, - "H4sIAAAAAAAA/+IK5OJNT833TNE3MDOxNDM34OJOT833L0stykksKOaSdk7NKy4tjsoscM5PSQ1JTCrNSSzJzM9zLEpNFGIQYuJgFGLiYBJi4mAWYuJgEWLhYJVgBQAAAP//AQAA//+kZzeJUwAAAA==", + "H4sIAAAAAAAA/wTAsQqCUBgF4DppnW60nCnoIXIIozGcmlqa2v7wRwTxirfb8/sFC8fO47O9VPX1Xt+qcOg8vv4+DzalcG58TDl9+qmJrb/tmwf79XF8zG5aCVwLhMCNwEJgKXArcCeQKrg/lQsAAAD//wEAAP//WUv+X2MAAAA=", }, { "containedIn1.json", @@ -96,7 +96,7 @@ func TestSimplePropertyValues(t *testing.T) { []string{"geoId/06"}, "<-containedInPlace", 500, - "H4sIAAAAAAAA/5ySXUoDMRSFnTitMf4NeZpdWH3wyQd1rFhQGRhdQEwu7YVrApm00gW4Pdck2jfp3EAXcD6+czjqVsk5hJk7n1ypygafDHpwM9+SsaCOGvD9sn+Nxia9p4UstJBCC7mvhSx1KUdVoa5ZRNlgWm/Jjn+z9aF6YNPVlOADfDJx3dlFCDRo8cJy6v+ce+xTRKbVDctTjzhfZIzuWMLxMzpHkGFkLNrwCbEl44d78PuetBFXJg1rHMhRJeqvQk35Nu3yndCymKL+FqrJ6Pxh3hLS9tdsOmUg3WUDRE+wArqY7DjMafYmmwOPM8OcdWCDd9n//gAAAP//AQAA//+e6uq5iQMAAA==", + "H4sIAAAAAAAA/6zTT07zMBAF8C/+Sjsx/4JXuQWFBRcIRVQqkiEUdkiuPWosDbaUuEU9ANfjTKh0x8KJJS7w8/PTPP7IYY1+bi6nN7zQ3gVlHZq5k6Q08uMKXbfpnlulg/gnGGSCARMM/gsGI8HgSDAYCwYTwQDECPIi44soOaps2A2wxnurzPlLVCtmhO/ogmp3tW68p8Ep36Ju+du9tV1obUILr1H/4s57M+uCWpHtmv1Lg2EZhfm9XTeJVTxFxZMHawxhotmTUvoPbCWphH/HD+FUtnarwvCYE8gLVn5mfBn/vdysyOokNiu/GK974v6wy2Bp2BwOHfSg9XWFRAvcIl1N/6jYs+T7Pyx33FPseY3aO5M83G8AAAD//wEAAP//BWcvpLIEAAA=", }, { "obs.json", diff --git a/internal/server/v2/propertyvalues/golden/triple_in/result1.json b/internal/server/v2/propertyvalues/golden/triple_in/result1.json index e72cef09d..ef8813465 100644 --- a/internal/server/v2/propertyvalues/golden/triple_in/result1.json +++ b/internal/server/v2/propertyvalues/golden/triple_in/result1.json @@ -10317,5 +10317,5 @@ }, "dummy": {} }, - "nextToken": "H4sIAAAAAAAA/2zNMcvCQAzG8bfX60sIDiWCH0gd3BQKLg5yliiBXlKu6eC3lxbcXJ7lgd8fT0h7scFe0qehG7mXzIr//h75/Pz10R8FqChCaCsKUFOASAEavOHmYLP6/cJlMsVd5jTNhTOrH1ktiya3gtvOk8vkC3pNRdJjYFqwCFX7hSPU68Y10nwAAAD//wEAAP//qyVVPKcAAAA=" + "nextToken": "H4sIAAAAAAAA/2zNQYvCMBDF8XY2276GPZRZ8AOpd4WCeJNYRgk2SUmnB7+9tAhevD3e//CzZ8tbn4Z0970bulF6HyTaSp+jHG7fGhdMKJlATPhhgmGD33Z5KibUTAATGvuwf7s0R70cJU8p2k0QN81ZgkTdS0zBR6cp2/9OnfpJF+TksnfXQbhgg7L9MAamLd+QQbWWmg2wruYFAAD//wEAAP//WA2jKccAAAA=" } \ No newline at end of file diff --git a/internal/server/v2/propertyvalues/golden/triple_in/result2.json b/internal/server/v2/propertyvalues/golden/triple_in/result2.json index 1065c34fd..1282cd391 100644 --- a/internal/server/v2/propertyvalues/golden/triple_in/result2.json +++ b/internal/server/v2/propertyvalues/golden/triple_in/result2.json @@ -8019,5 +8019,5 @@ "Country": {}, "dummy": {} }, - "nextToken": "H4sIAAAAAAAA/2yNMQvCQAxG7fUqR3CQCP4gdXBTKLg4SCxRAr2kXNPBfy+tq8vjgw/egzPgQay3t3TUtwN3kllh7Z+BL69/H64wpApjCtuAIdUYUsSQGrjD5miT+uPKZTSFfWYap8KZ1U+slkXJrcCudXIZfZbeqAg9e8ZZFlO18LfrhXGJNF8AAAD//wEAAP//XvS886cAAAA=" + "nextToken": "H4sIAAAAAAAA/2zNwYrCMBDG8XY2234Neyiz4AOpd4WCeJNYRgk2SUmnB99eWj16m+EP38+eLW99GtLd927oRul9kGgrfY5yuH1rXDChZAIx4YcJhg1+2+WrmFAzAUxo7MP+7dIc9XKUPKVoN0HcNGcJEnUvMQUfnaZs/zt16iddkJPL3l0H4YINynX0zRiYlj6QQbWWmg2wXs0LAAD//wEAAP//njZfp8cAAAA=" } \ No newline at end of file diff --git a/internal/server/v2/propertyvalues/golden/triple_in_test.go b/internal/server/v2/propertyvalues/golden/triple_in_test.go index 4710a4ae1..d4d8aa428 100644 --- a/internal/server/v2/propertyvalues/golden/triple_in_test.go +++ b/internal/server/v2/propertyvalues/golden/triple_in_test.go @@ -51,7 +51,7 @@ func TestTripleIn(t *testing.T) { "result2.json", []string{"Country", "BiologicalSpecimen", "Count_Person", "dummy"}, "<-*", - "H4sIAAAAAAAA/2zNMcvCQAzG8bfX60sIDiWCH0gd3BQKLg5yliiBXlKu6eC3lxbcXJ7lgd8fT0h7scFe0qehG7mXzIr//h75/Pz10R8FqChCaCsKUFOASAEavOHmYLP6/cJlMsVd5jTNhTOrH1ktiya3gtvOk8vkC3pNRdJjYFqwCFX7hSPU68Y10nwAAAD//wEAAP//qyVVPKcAAAA=", + "H4sIAAAAAAAA/2zNQYvCMBDF8XY2276GPZRZ8AOpd4WCeJNYRgk2SUmnB7+9tAhevD3e//CzZ8tbn4Z0970bulF6HyTaSp+jHG7fGhdMKJlATPhhgmGD33Z5KibUTAATGvuwf7s0R70cJU8p2k0QN81ZgkTdS0zBR6cp2/9OnfpJF+TksnfXQbhgg7L9MAamLd+QQbWWmg2wruYFAAD//wEAAP//WA2jKccAAAA=", }, } { req := &pbv2.NodeRequest{ diff --git a/internal/store/bigtable/group.go b/internal/store/bigtable/group.go index 793bd731f..20890851e 100644 --- a/internal/store/bigtable/group.go +++ b/internal/store/bigtable/group.go @@ -28,10 +28,14 @@ import ( var groupRank = map[string]int{ "dcbranch": 0, // Used for the latest proto branch cache "branch": 0, // Used for legacy branch cache - "frequent": 1, - "ipcc": 2, - "biomedical": 3, - "disaster": 4, + "auto1d": 1, + "frequent": 2, + "auto1w": 3, + "auto2w": 4, + "ipcc": 5, + "biomedical": 6, + "disaster": 7, + "country": 8, "borgcron": 10000, // Used for legacy base cache "infrequent": 10000, "place": 11000, diff --git a/internal/store/bigtable/group_test.go b/internal/store/bigtable/group_test.go index c81f8fd3a..7133f6073 100644 --- a/internal/store/bigtable/group_test.go +++ b/internal/store/bigtable/group_test.go @@ -35,13 +35,21 @@ func TestSortTables(t *testing.T) { {name: "ipcc_2022_01_31_20_56_49", table: nil}, {name: "private_01_02", table: nil, isCustom: true}, {name: "disaster_2023_01_31_20_56_49", table: nil}, + {name: "auto1w_2023_06_13_14_15_34", table: nil}, + {name: "auto2w_2023_06_13_14_16_23", table: nil}, + {name: "auto1d_2023_06_13_14_15_34", table: nil}, + {name: "country_2023_06_13_06_35_51", table: nil}, }, expected: []*Table{ {name: "private_01_02", table: nil, isCustom: true}, {name: "dcbranch_2022_02_01_14_00_49", table: nil}, + {name: "auto1d_2023_06_13_14_15_34", table: nil}, {name: "frequent_2022_02_01_14_20_47", table: nil}, + {name: "auto1w_2023_06_13_14_15_34", table: nil}, + {name: "auto2w_2023_06_13_14_16_23", table: nil}, {name: "ipcc_2022_01_31_20_56_49", table: nil}, {name: "disaster_2023_01_31_20_56_49", table: nil}, + {name: "country_2023_06_13_06_35_51", table: nil}, {name: "random_2022", table: nil}, {name: "infrequent_2022_01_31_23_15_14", table: nil}, },